diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index ddec4fe8cd118f4ff60dd1ef99d88954c6ea77af..2a1af1ac7e7ed035e5af1632d59f15ceeb276119 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -1,4 +1,4 @@
-// $Id: HighOrder.cpp,v 1.25 2008-03-12 08:36:49 remacle Exp $
+// $Id: HighOrder.cpp,v 1.26 2008-03-12 14:52:58 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -135,21 +135,21 @@ bool computeEquidistantParameters(GEdge *ge, double u0, double uN, int N, double
for (int i = 0; i < M; i++){
u[i+1] -= underRelax*DU(i);
}
- // printf("N %d M %d u1 = %g u0 = %g uN1 = %22.15E uN = %22.15E\n",N,M,u[1],u0,u[N - 1],uN);
+ // printf("N %d M %d u1 = %g u0 = %g uN1 = %22.15E uN = %22.15E\n",
+ // N, M, u[1], u0, u[N - 1], uN);
if (u[1] < u0) break;
if (u[N - 2] > uN) break;
double newt_norm = DU.norm();
- // printf("%22.15E\n",newt_norm);
- if (newt_norm < PRECISION) {/*printf("ok %g\n",underRelax);*/return true;}
+ // printf("%22.15E\n",newt_norm);
+ if (newt_norm < PRECISION) { /*printf("ok %g\n",underRelax);*/ return true; }
}
// FAILED, use equidistant in param space
- // printf("coucou FAILED\n");
- // printf("failed %g\n",underRelax);
-// for (int i = 1; i < N; i++){
-// u[i] = u[i - 1] + du;
-// }
+ // printf("failed %g\n",underRelax);
+ // for (int i = 1; i < N; i++){
+ // u[i] = u[i - 1] + du;
+ // }
return false;
}
@@ -785,7 +785,8 @@ bool straightLine(std::vector<MVertex*> &l, MVertex *n1, MVertex *n2)
return true;
}
-static double mesh_functional_distorsion ( MTriangle *t, double u, double v){
+static double mesh_functional_distorsion(MTriangle *t, double u, double v)
+{
// compute uncurved element jacobian d_u x and d_v x
double mat[2][3];
t->jac(1, 0, 0, 0, mat);
@@ -1228,7 +1229,7 @@ void checkHighOrderTriangles(GModel *m)
void printJacobians(GModel *m, const char *nm)
{
- // return;
+ return;
const int n = 5;
double D[n][n];
@@ -1315,7 +1316,6 @@ void SetOrderN(GModel *m, int order, bool linear, bool incomplete)
printJacobians(m, "detjIni.pos");
-
if(CTX.mesh.smooth_internal_edges){
checkHighOrderTriangles(m);
for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it){
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 0a3187b012ed35fee67df7f37e31c0968e2e717f..30bdabc60dacd32b7955e1e25e233eb5dd04e0e7 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -1,4 +1,4 @@
-// $Id: meshGFace.cpp,v 1.124 2008-03-12 08:36:49 remacle Exp $
+// $Id: meshGFace.cpp,v 1.125 2008-03-12 14:52:58 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -1279,7 +1279,7 @@ const int debugSurface = -1;
void meshGFace::operator() (GFace *gf)
{
- if (debugSurface>=0 && gf->tag() != debugSurface){
+ if (debugSurface >= 0 && gf->tag() != debugSurface){
gf->meshStatistics.status = GFace::DONE;
return;
}
@@ -1324,10 +1324,10 @@ void meshGFace::operator() (GFace *gf)
Msg(DEBUG1, "Generating the mesh");
if(noseam(gf) || gf->getNativeType() == GEntity::GmshModel || gf->edgeLoops.empty()){
- gmsh2DMeshGenerator(gf,0, debugSurface>=0);
+ gmsh2DMeshGenerator(gf, 0, debugSurface >= 0);
}
else{
- if(!gmsh2DMeshGeneratorPeriodic(gf, debugSurface>=0))
+ if(!gmsh2DMeshGeneratorPeriodic(gf, debugSurface >= 0))
Msg(GERROR, "Impossible to mesh face %d", gf->tag());
}
diff --git a/Mesh/meshGFaceDelaunayInsertion.cpp b/Mesh/meshGFaceDelaunayInsertion.cpp
index cca3ca113c041aa3f0bf865aa8ef23450971ad0e..ae7b68ebe57cc5e401215ea1d98edc4ae50c6863 100644
--- a/Mesh/meshGFaceDelaunayInsertion.cpp
+++ b/Mesh/meshGFaceDelaunayInsertion.cpp
@@ -1,4 +1,4 @@
-// $Id: meshGFaceDelaunayInsertion.cpp,v 1.12 2008-03-12 08:36:49 remacle Exp $
+// $Id: meshGFaceDelaunayInsertion.cpp,v 1.13 2008-03-12 14:52:58 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -365,12 +365,12 @@ bool insertVertex(GFace *gf, MVertex *v, double *param , MTri3 *t,
while (it != shell.end()){
MTriangle *t = new MTriangle(it->v[0], it->v[1], v);
- double lc = 0.3333333333 * (vSizes [t->getVertex(0)->getNum()]+
- vSizes [t->getVertex(1)->getNum()]+
- vSizes [t->getVertex(2)->getNum()]);
- double lcBGM = 0.3333333333 * (vSizesBGM [t->getVertex(0)->getNum()]+
- vSizesBGM [t->getVertex(1)->getNum()]+
- vSizesBGM [t->getVertex(2)->getNum()]);
+ double lc = 0.3333333333 * (vSizes[t->getVertex(0)->getNum()] +
+ vSizes[t->getVertex(1)->getNum()] +
+ vSizes[t->getVertex(2)->getNum()]);
+ double lcBGM = 0.3333333333 * (vSizesBGM[t->getVertex(0)->getNum()] +
+ vSizesBGM[t->getVertex(1)->getNum()] +
+ vSizesBGM[t->getVertex(2)->getNum()]);
MTri3 *t4 = new MTri3(t, Extend1dMeshIn2dSurfaces() ? std::min(lc, lcBGM) : lcBGM);
newTris[k++] = t4;
// all new triangles are pushed front in order to
@@ -504,13 +504,15 @@ void insertVerticesInFace(GFace *gf, BDS_Mesh *bds)
gf->mesh_vertices.push_back(v);
}
else {
- Msg(DEBUG,"Point %g %g is outside (%g %g , %g %g , %g %g) (metric %g %g %g)",center[0],center[1],
+ Msg(DEBUG,"Point %g %g is outside (%g %g , %g %g , %g %g) (metric %g %g %g)",
+ center[0], center[1],
Us[base->getVertex(0)->getNum()],
Vs[base->getVertex(0)->getNum()],
Us[base->getVertex(1)->getNum()],
Vs[base->getVertex(1)->getNum()],
Us[base->getVertex(2)->getNum()],
- Vs[base->getVertex(2)->getNum()],metric[0],metric[1],metric[2]);
+ Vs[base->getVertex(2)->getNum()],
+ metric[0], metric[1], metric[2]);
AllTris.erase(AllTris.begin());
worst->forceRadius(0);
AllTris.insert(worst);
diff --git a/Mesh/meshGRegionDelaunayInsertion.h b/Mesh/meshGRegionDelaunayInsertion.h
index 104f4b0ae6b932a497f22ac0810860d50842a274..c4971ec0249ec8c69c5d27944586bf1114c701f4 100644
--- a/Mesh/meshGRegionDelaunayInsertion.h
+++ b/Mesh/meshGRegionDelaunayInsertion.h
@@ -98,14 +98,14 @@ class MTet4
const double dz = base->getVertex(0)->z() - center[2];
circum_radius = sqrt ( dx*dx + dy*dy + dz*dz);
- double lc1 = 0.25*(sizes [base->getVertex(0)->getNum()]+
- sizes [base->getVertex(1)->getNum()]+
- sizes [base->getVertex(2)->getNum()]+
- sizes [base->getVertex(3)->getNum()]);
- double lcBGM = 0.25*(sizesBGM [base->getVertex(0)->getNum()]+
- sizesBGM [base->getVertex(1)->getNum()]+
- sizesBGM [base->getVertex(2)->getNum()]+
- sizesBGM [base->getVertex(3)->getNum()]);
+ double lc1 = 0.25*(sizes[base->getVertex(0)->getNum()]+
+ sizes[base->getVertex(1)->getNum()]+
+ sizes[base->getVertex(2)->getNum()]+
+ sizes[base->getVertex(3)->getNum()]);
+ double lcBGM = 0.25*(sizesBGM[base->getVertex(0)->getNum()]+
+ sizesBGM[base->getVertex(1)->getNum()]+
+ sizesBGM[base->getVertex(2)->getNum()]+
+ sizesBGM[base->getVertex(3)->getNum()]);
double lc = Extend2dMeshIn3dVolumes() ? std::min(lc1, lcBGM) : lcBGM;
circum_radius /= lc;
@@ -209,14 +209,15 @@ class MTet4Factory
delete [] allSlots;
#endif
}
- MTet4 * Create (MTetrahedron * t, std::vector<double> & sizes, std::vector<double> & sizesBGM)
+ MTet4 * Create (MTetrahedron * t, std::vector<double> &sizes,
+ std::vector<double> &sizesBGM)
{
#ifdef _GMSH_PRE_ALLOCATE_STRATEGY_
MTet4 *t4 = getAnEmptySlot();
#else
MTet4 *t4 = new MTet4;
#endif
- t4->setup(t,sizes,sizesBGM);
+ t4->setup(t, sizes, sizesBGM);
return t4;
}
void Free(MTet4 *t)