From a3e62805e29e8da709e2bcc2f600112ddfe9b7d4 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Sat, 15 Nov 2008 17:39:52 +0000 Subject: [PATCH] *** empty log message *** --- Mesh/meshGRegionExtruded.cpp | 18 ++++++++++++------ contrib/Netgen/Makefile | 3 +++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Mesh/meshGRegionExtruded.cpp b/Mesh/meshGRegionExtruded.cpp index 370714f960..6b1aa6f803 100644 --- a/Mesh/meshGRegionExtruded.cpp +++ b/Mesh/meshGRegionExtruded.cpp @@ -142,12 +142,18 @@ static void extrudeMesh(GFace *from, GRegion *to, } } } - for(unsigned int i = 0; i < from->quadrangles.size(); i++){ - for(int j = 0; j < ep->mesh.NbLayer; j++) { - for(int k = 0; k < ep->mesh.NbElmLayer[j]; k++) { - std::vector<MVertex*> verts; - if(getExtrudedVertices(from->quadrangles[i], ep, j, k, pos, verts) == 8) - createHexPri(verts, to); + + if(from->quadrangles.size() && !ep->mesh.Recombine){ + Msg::Error("Cannot extrude quadrangles without Recombine"); + } + else{ + for(unsigned int i = 0; i < from->quadrangles.size(); i++){ + for(int j = 0; j < ep->mesh.NbLayer; j++) { + for(int k = 0; k < ep->mesh.NbElmLayer[j]; k++) { + std::vector<MVertex*> verts; + if(getExtrudedVertices(from->quadrangles[i], ep, j, k, pos, verts) == 8) + createHexPri(verts, to); + } } } } diff --git a/contrib/Netgen/Makefile b/contrib/Netgen/Makefile index 0ac3e23432..6cfe65819a 100644 --- a/contrib/Netgen/Makefile +++ b/contrib/Netgen/Makefile @@ -50,3 +50,6 @@ clean: depend: true + +# DO NOT DELETE THIS LINE +nglib_addon.o: ../../Common/GmshMessage.h -- GitLab