From fd7446fc9bbf93b0973e173b237a6d543334f46f Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 15 Dec 2006 16:06:16 +0000
Subject: [PATCH] sanity check: don't try to tetrahedralize a volume with quads
on the boundary
---
Mesh/meshGRegion.cpp | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index 819368a632..88c139e05e 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -1,4 +1,4 @@
-// $Id: meshGRegion.cpp,v 1.20 2006-12-02 19:29:37 geuzaine Exp $
+// $Id: meshGRegion.cpp,v 1.21 2006-12-15 16:06:16 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -441,6 +441,16 @@ void meshGRegion::operator() (GRegion *gr)
if(MeshTransfiniteVolume(gr)) return;
if(MeshExtrudedVolume(gr)) return;
+ std::list<GFace*> faces = gr->faces();
+
+ // sanity check
+ for(std::list<GFace*>::iterator it = faces.begin(); it != faces.end(); it++){
+ if((*it)->quadrangles.size()){
+ Msg(GERROR, "Cannot tetrahedralize volume with quadrangles on boundary");
+ return;
+ }
+ }
+
if(CTX.mesh.algo3d == DELAUNAY_TETGEN || CTX.mesh.algo3d == DELAUNAY_ISO){
#if !defined(HAVE_TETGEN)
Msg(GERROR, "Tetgen is not compiled in this version of Gmsh");
@@ -448,7 +458,6 @@ void meshGRegion::operator() (GRegion *gr)
// put all the faces in the same model
GModel::riter rit = gr->model()->firstRegion() ;
if (gr != *rit)return;
- std::list<GFace*> faces = gr->faces();
std::list<GFace*> allFaces;
GModel::fiter fit = gr->model()->firstFace() ;
while (fit != gr->model()->lastFace()){
--
GitLab