Skip to content
Snippets Groups Projects
Commit fd87cc1a authored by Tristan Carrier Baudouin's avatar Tristan Carrier Baudouin
Browse files

correction

parent 7068f45f
No related branches found
No related tags found
No related merge requests found
...@@ -495,20 +495,21 @@ static void Mesh2D(GModel *m) ...@@ -495,20 +495,21 @@ static void Mesh2D(GModel *m)
mesher(temp[K]); mesher(temp[K]);
#if defined(HAVE_BFGS) #if defined(HAVE_BFGS)
if (temp[K]->geomType()==GEntity::CompoundSurface || if(CTX::instance()->mesh.optimizeLloyd){
temp[K]->geomType()==GEntity::Plane) { if (temp[K]->geomType()==GEntity::CompoundSurface || temp[K]->geomType()==GEntity::Plane) {
if (temp[K]->meshAttributes.method != MESH_TRANSFINITE && !temp[K]->meshAttributes.extrude) { if (temp[K]->meshAttributes.method != MESH_TRANSFINITE && !temp[K]->meshAttributes.extrude) {
smoothing smm(CTX::instance()->mesh.optimizeLloyd,6); smoothing smm(CTX::instance()->mesh.optimizeLloyd,6);
//m->writeMSH("beforeLLoyd.msh"); //m->writeMSH("beforeLLoyd.msh");
smm.optimize_face(temp[K]); smm.optimize_face(temp[K]);
int rec = ((CTX::instance()->mesh.recombineAll || int rec = ((CTX::instance()->mesh.recombineAll ||
temp[K]->meshAttributes.recombine) && temp[K]->meshAttributes.recombine) &&
!CTX::instance()->mesh.recombine3DAll); !CTX::instance()->mesh.recombine3DAll);
//m->writeMSH("afterLLoyd.msh"); //m->writeMSH("afterLLoyd.msh");
if (rec) recombineIntoQuads(temp[K]); if (rec) recombineIntoQuads(temp[K]);
//m->writeMSH("afterRecombine.msh"); //m->writeMSH("afterRecombine.msh");
} }
} }
}
#endif #endif
#if defined(_OPENMP) #if defined(_OPENMP)
...@@ -530,20 +531,21 @@ static void Mesh2D(GModel *m) ...@@ -530,20 +531,21 @@ static void Mesh2D(GModel *m)
mesher(*it); mesher(*it);
#if defined(HAVE_BFGS) #if defined(HAVE_BFGS)
if ((*it)->geomType()==GEntity::CompoundSurface || if(CTX::instance()->mesh.optimizeLloyd){
(*it)->geomType()==GEntity::Plane) { if ((*it)->geomType()==GEntity::CompoundSurface || (*it)->geomType()==GEntity::Plane) {
if ((*it)->meshAttributes.method != MESH_TRANSFINITE && !(*it)->meshAttributes.extrude) { if ((*it)->meshAttributes.method != MESH_TRANSFINITE && !(*it)->meshAttributes.extrude) {
smoothing smm(CTX::instance()->mesh.optimizeLloyd,6); smoothing smm(CTX::instance()->mesh.optimizeLloyd,6);
//m->writeMSH("beforeLLoyd.msh"); //m->writeMSH("beforeLLoyd.msh");
smm.optimize_face(*it); smm.optimize_face(*it);
int rec = ((CTX::instance()->mesh.recombineAll || int rec = ((CTX::instance()->mesh.recombineAll ||
(*it)->meshAttributes.recombine) && (*it)->meshAttributes.recombine) &&
!CTX::instance()->mesh.recombine3DAll); !CTX::instance()->mesh.recombine3DAll);
//m->writeMSH("afterLLoyd.msh"); //m->writeMSH("afterLLoyd.msh");
if (rec) recombineIntoQuads(*it); if (rec) recombineIntoQuads(*it);
//m->writeMSH("afterRecombine.msh"); //m->writeMSH("afterRecombine.msh");
} }
} }
}
#endif #endif
nPending++; nPending++;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment