From ace845c23a47299b4924da19905c033865b36401 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Fri, 14 Feb 2014 09:46:40 +0000 Subject: [PATCH] pp --- Mesh/meshGRegion.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp index 093efc8698..2b5ea11918 100644 --- a/Mesh/meshGRegion.cpp +++ b/Mesh/meshGRegion.cpp @@ -1621,20 +1621,18 @@ void meshGRegion::operator() (GRegion *gr) std::list<GFace*> faces = gr->faces(); - // REMOVE SANITY CHECK FOR DELAUNAY : PYRAMIDS AVAILABLE - // sanity check - + // sanity check for frontal algo if(CTX::instance()->mesh.algo3d == ALGO_3D_FRONTAL){ for(std::list<GFace*>::iterator it = faces.begin(); it != faces.end(); it++){ if((*it)->quadrangles.size()){ - Msg::Error("Cannot tetrahedralize volume with quadrangles on boundary"); + Msg::Error("Cannot use frontal 3D algorithm with quadrangles on boundary"); return; } } } // replace discreteFaces by their compounds - if( 1 || gr->geomType() == GEntity::CompoundVolume){ + { std::set<GFace*> mySet; std::list<GFace*>::iterator it = faces.begin(); while(it != faces.end()){ @@ -1649,8 +1647,6 @@ void meshGRegion::operator() (GRegion *gr) gr->set(faces); } - std::list<GFace*> myface = gr->faces(); - if(CTX::instance()->mesh.algo3d != ALGO_3D_FRONTAL){ delaunay.push_back(gr); } -- GitLab