diff --git a/Plugin/CutGrid.cpp b/Plugin/CutGrid.cpp
index 7f94c3c99fe1ca5972880d463279abc22450af9f..085596bf5ff33e4e550f9127bdf465dd93fbf094 100644
--- a/Plugin/CutGrid.cpp
+++ b/Plugin/CutGrid.cpp
@@ -1,4 +1,4 @@
-// $Id: CutGrid.cpp,v 1.4 2004-04-24 04:46:20 geuzaine Exp $
+// $Id: CutGrid.cpp,v 1.5 2004-04-24 05:22:50 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -102,7 +102,7 @@ int GMSH_CutGridPlugin::getNbV()const
return (int)CutGridOptions_Number[10].def;
}
-void GMSH_CutGridPlugin::getPoint(int iU, int iV, double *X )const
+void GMSH_CutGridPlugin::getPoint(int iU, int iV, double *X) const
{
double u = (double)iU / (double)(getNbU () - 1.);
double v = (double)iV / (double)(getNbV () - 1.);
diff --git a/Plugin/Octree.cpp b/Plugin/Octree.cpp
index 53e0480e4e8b3526fd2ab1da822df831e6647a2a..401ae9c5c53f0df617c6af1524cd37674d80f4b2 100644
--- a/Plugin/Octree.cpp
+++ b/Plugin/Octree.cpp
@@ -1,4 +1,4 @@
-// $Id: Octree.cpp,v 1.1 2004-04-24 03:52:00 geuzaine Exp $
+// $Id: Octree.cpp,v 1.2 2004-04-24 05:22:50 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -56,8 +56,8 @@ void Octree_Insert(void * element, Octree *myOctree)
(*(myOctree->function_BB))(element, minBB, maxBB);
(*(myOctree->function_centroid))(element, centroid);
bucket = findElementBucket(myOctree->root, centroid);
- addElement2Bucket (bucket, element, minBB, maxBB,
- centroid,myOctree->info);
+ addElement2Bucket(bucket, element, minBB, maxBB,
+ centroid, myOctree->info);
}
void Octree_Arrange(Octree *myOctree)
diff --git a/Plugin/OctreeInternals.cpp b/Plugin/OctreeInternals.cpp
index ecbfd82b8a7c3565001c1ea13a1c0b6445026db5..f9d765994776b7aa280b8bde3287f4aa8b83ebd5 100644
--- a/Plugin/OctreeInternals.cpp
+++ b/Plugin/OctreeInternals.cpp
@@ -1,4 +1,4 @@
-// $Id: OctreeInternals.cpp,v 1.1 2004-04-24 03:52:00 geuzaine Exp $
+// $Id: OctreeInternals.cpp,v 1.2 2004-04-24 05:22:50 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -164,7 +164,7 @@ int addElement2Bucket(octantBucket *_bucket, void * _element,
printf(" numElements = %d\n",_bucket->numElements);
printf("the element is add to this bucket: (%f, %f, %f) to (%f, %f, %f)\n",
_bucket->minPt[0],_bucket->minPt[1], _bucket->minPt[2], _bucket->maxPt[0],
- _bucket->maxPt[1], _bucket->maxPt[2] );
+ _bucket->maxPt[1], _bucket->maxPt[2]);
#endif
// check whether the number of elements in the bucket > maxElements
@@ -201,7 +201,7 @@ int addElement2Bucket(octantBucket *_bucket, void * _element,
return 1;
}
-int checkElementInBucket (octantBucket *_bucket, void* _element)
+int checkElementInBucket(octantBucket *_bucket, void* _element)
// Given an elememt and an octant bucket, check if the element
// exists in the bucket's element list. return 1 if already exits,
// otherwise, return 0
@@ -249,7 +249,7 @@ octantBucket *findElementBucket(octantBucket *_buckets_head, double *_pt)
}
-int subdivideOctantBucket (octantBucket *_bucket, globalInfo *_globalPara)
+int subdivideOctantBucket(octantBucket *_bucket, globalInfo *_globalPara)
// To many elements are in this octant bucket, so try to refine
// Returns 1 for success, 0 for failure (no memory left).
{
@@ -278,7 +278,7 @@ int subdivideOctantBucket (octantBucket *_bucket, globalInfo *_globalPara)
tmp1 = 2;
for (i = 0; i < 3; i++) {
- tmp[i] = ((double )(_bucket->maxPt[i]-_bucket->minPt[i]))/tmp1;
+ tmp[i] = ((double)(_bucket->maxPt[i]-_bucket->minPt[i]))/tmp1;
}
for (k = 0; k < tmp1; k++) {
diff --git a/Plugin/OctreePost.cpp b/Plugin/OctreePost.cpp
index d6c5ae45659b467dfd1f3171a5712e587fc5ddf4..0949d015e7ad03775f52dd6c5f80d9e155e5bb99 100644
--- a/Plugin/OctreePost.cpp
+++ b/Plugin/OctreePost.cpp
@@ -1,4 +1,4 @@
-// $Id: OctreePost.cpp,v 1.3 2004-04-24 03:52:00 geuzaine Exp $
+// $Id: OctreePost.cpp,v 1.4 2004-04-24 05:22:50 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -42,6 +42,7 @@ static double computeBarycentricTriangle(double *X , double *Y, double *Z,
sys2x2(mat, b, U);
return 0.5 * ( mat[0][0] * mat[1][1] - mat[1][0] *mat[0][1]);
}
+
static void computeBarycentricSimplex(double *X, double *Y, double *Z,
double *P, double *U)
{
@@ -63,12 +64,12 @@ static void computeBarycentricSimplex(double *X, double *Y, double *Z,
sys3x3(mat, b, U, &det);
}
-static void minmax (int n,
- double *X,
- double *Y,
- double *Z,
- double *min,
- double *max)
+static void minmax(int n,
+ double *X,
+ double *Y,
+ double *Z,
+ double *min,
+ double *max)
{
min[0] = X[0];
min[1] = Y[0];
@@ -130,7 +131,7 @@ int PostTriangleInEle(void *a, double *x)
double W = 1.-U[0]-U[1];
if (U[0] < -eps || U[0] > 1+eps ||
U[1] < -eps || U[1] > 1+eps ||
- W < -eps || W > 1+eps ) return 0;
+ W < -eps || W > 1+eps) return 0;
return 1;
}
@@ -142,7 +143,7 @@ void PostTriangleCentroid(void *a , double *x)
centroid(3, X, Y, Z, x);
}
-void PostSimplexBB (void *a, double *min, double *max)
+void PostSimplexBB(void *a, double *min, double *max)
{
double *X = (double*) a;
double *Y = &X[4];
@@ -164,7 +165,7 @@ int PostSimplexInEle(void *a, double *x)
if(U[0] < -eps || U[0] > 1+eps ||
U[1] < -eps || U[1] > 1+eps ||
U[2] < -eps || U[2] > 1+eps ||
- W < -eps || W > 1+eps ) return 0;
+ W < -eps || W > 1+eps) return 0;
return 1;
}
@@ -233,7 +234,7 @@ OctreePost::OctreePost(Post_View *v)
PostSimplexBB,
PostSimplexCentroid,
PostSimplexInEle);
- addListOfStuff(VS, v->VS, 12 + 12 * v->NbTimeStep );
+ addListOfStuff(VS, v->VS, 12 + 12 * v->NbTimeStep);
Octree_Arrange(ST);
Octree_Arrange(VT);
@@ -308,7 +309,7 @@ bool OctreePost::searchVector(double x,
return true;
}
- void * inVS = Octree_Search (P, VS);
+ void * inVS = Octree_Search(P, VS);
if(inVS){
double U[3];
@@ -329,12 +330,12 @@ bool OctreePost::searchVector(double x,
values[3*i+1] =
V[12*i+4] * U[0] +
V[12*i+9] * U[1] +
- V[12*i+10] * U[2] +
+ V[12*i+10] * U[2] +
V[12*i+1] * (1-U[0]-U[1]-U[2]);
values[3*i+2] =
V[12*i+5] * U[0] +
V[12*i+7] * U[1] +
- V[12*i+11] * U[2] +
+ V[12*i+11] * U[2] +
V[12*i+2] * (1-U[0]-U[1]-U[2]);
}
}
@@ -347,13 +348,13 @@ bool OctreePost::searchVector(double x,
values[1] =
V[12*timestep+4] * U[0] +
V[12*timestep+7] * U[1] +
- V[12*timestep+10] * U[2] +
- V[12*timestep+1 ] * (1-U[0]-U[1]-U[2]);
+ V[12*timestep+10] * U[2] +
+ V[12*timestep+1 ] * (1-U[0]-U[1]-U[2]);
values[2] =
- V[12*timestep+5 ] * U[0] +
- V[12*timestep+8 ] * U[1] +
- V[12*timestep+11] * U[2] +
- V[12*timestep+2 ] * (1-U[0]-U[1]-U[2]);
+ V[12*timestep+5 ] * U[0] +
+ V[12*timestep+8 ] * U[1] +
+ V[12*timestep+11] * U[2] +
+ V[12*timestep+2 ] * (1-U[0]-U[1]-U[2]);
}
return true;
}
@@ -414,14 +415,13 @@ bool OctreePost::searchScalar(double x,
V[3*i+0] * (1.-U[0]-U[1]-U[2]);
}
}
- else
- {
- values[0] =
- V[3*timestep+1] * U[0] +
- V[3*timestep+2] * U[1] +
- V[3*timestep+3] * U[2] +
- V[3*timestep ] * (1-U[0]-U[1]-U[2]);
- }
+ else{
+ values[0] =
+ V[3*timestep+1] * U[0] +
+ V[3*timestep+2] * U[1] +
+ V[3*timestep+3] * U[2] +
+ V[3*timestep ] * (1-U[0]-U[1]-U[2]);
+ }
return true;
}