diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp index e9ddb0f4743b3e0219286a786d0d259cfdba7843..8c913f24eb550b59312b2de7ccd309616c326ea9 100644 --- a/Mesh/meshGFace.cpp +++ b/Mesh/meshGFace.cpp @@ -657,15 +657,12 @@ static void modifyInitialMeshForTakingIntoAccountBoundaryLayers(GFace *gf, std::set<MEdge,Less_Edge> bedges; std::set<MEdge,Less_Edge> removed; -// std::vector<MQuadrangle*> blQuads; -// std::vector<MTriangle*> blTris; std::list<GEdge*> edges = gf->edges(); std::list<GEdge*> embedded_edges = gf->embeddedEdges(); edges.insert(edges.begin(), embedded_edges.begin(),embedded_edges.end()); std::list<GEdge*>::iterator ite = edges.begin(); FILE *ff2 = Fopen ("tato.pos","w"); if(ff2) fprintf(ff2,"View \" \"{\n"); -// std::set<MVertex*> verts; std::vector<MLine*> _lines; @@ -827,10 +824,6 @@ static void modifyInitialMeshForTakingIntoAccountBoundaryLayers(GFace *gf, deMeshGFace kil_; kil_(gf); meshGenerator(gf, 0, 0, true , false, &hop); - -// gf->quadrangles = blQuads; -// gf->triangles.insert(gf->triangles.begin(),blTris.begin(),blTris.end()); -// gf->mesh_vertices.insert(gf->mesh_vertices.begin(),verts.begin(),verts.end()); } static bool inside_domain(MElementOctree* octree,double x,double y) @@ -1611,8 +1604,6 @@ bool meshGenerator(GFace *gf, int RECUR_ITER, gf->triangles.insert(gf->triangles.begin(),blTris.begin(),blTris.end()); gf->mesh_vertices.insert(gf->mesh_vertices.begin(),verts.begin(),verts.end()); - gf->model()->writeMSH("AAA.msh"); - if((CTX::instance()->mesh.recombineAll || gf->meshAttributes.recombine) && !CTX::instance()->mesh.optimizeLloyd && !onlyInitialMesh && CTX::instance()->mesh.algoRecombine != 2) diff --git a/Mesh/meshGFaceOptimize.cpp b/Mesh/meshGFaceOptimize.cpp index 2d17092d1a562c3e5ba74ead30acca8fc80d0bca..785d7f39440205e6b3a3669fcde739ea1d8940a3 100644 --- a/Mesh/meshGFaceOptimize.cpp +++ b/Mesh/meshGFaceOptimize.cpp @@ -496,20 +496,13 @@ static int _removeTwoQuadsNodes(GFace *gf) MVertex *v2 = q1->getVertex((comm+2)%4); MVertex *v3 = q1->getVertex((comm+3)%4); MVertex *v4 = 0; - int cnt = 0; for (int i=0;i<4;i++){ if (q2->getVertex(i) != v1 && q2->getVertex(i) != v3 && q2->getVertex(i) != v){ v4 = q2->getVertex(i); - ++cnt; + break; } } - if (cnt != 1) { - // The two quads do not actually share two edges. This can happen if the - // boundary layer mesh inserted to the surface only after this routine - ++it; - continue; - } if (!v4){ Msg::Error("BUG DISCOVERED IN _removeTwoQuadsNodes ,%p,%p,%p",v1,v2,v3); q1->writePOS(stdout,true,false,false,false,false,false); @@ -1247,9 +1240,7 @@ static int _recombineIntoQuads(GFace *gf, double minqual, bool cubicGraph = 1) sprintf(MATCHFILE,".face.match"); if(perfect_match(ncount, NULL, ecount, &elist, &elen, NULL, MATCHFILE, 0, 0, 0, 0, &matzeit)){ - printf("coucou x\n"); Msg::Error("Perfect Match failed in Quadrangulation, try something else"); - printf("coucou x\n"); free(elist); pairs.clear(); } @@ -1433,7 +1424,6 @@ void recombineIntoQuads(GFace *gf, // simple recombination algo for (int IT=0;IT<2;IT++){ _recombineIntoQuads(gf, 0); - printf("done\n"); if(haveParam) RelocateVertices (gf,CTX::instance()->mesh.nbSmoothing); }