From 33d4e3551e3dc09a8922f39e6b31b4abbff28fb2 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 18 Jan 2007 10:18:30 +0000
Subject: [PATCH] fix logic for 3d delaunay
---
Mesh/Generator.cpp | 9 ++--
Mesh/meshGRegion.cpp | 117 +++++++++++++++++++++----------------------
Mesh/meshGRegion.h | 5 ++
3 files changed, 69 insertions(+), 62 deletions(-)
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 916b28f3e7..2a024578fc 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -1,4 +1,4 @@
-// $Id: Generator.cpp,v 1.112 2007-01-16 11:31:41 geuzaine Exp $
+// $Id: Generator.cpp,v 1.113 2007-01-18 10:18:30 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -236,8 +236,11 @@ void Mesh3D()
// then subdivide if necessary (unfortunately the subdivision is a
// global operation, which can require changing the surface mesh!)
SubdivideExtrudedMesh(GMODEL);
- // then mesh the rest
- std::for_each(GMODEL->firstRegion(), GMODEL->lastRegion(), meshGRegion());
+ // then mesh all the non-delaunay regions
+ std::vector<GRegion*> delaunay;
+ std::for_each(GMODEL->firstRegion(), GMODEL->lastRegion(), meshGRegion(delaunay));
+ // and finally mesh the delaunay regions (again, this is global)
+ MeshDelaunayVolume(delaunay);
double t2 = Cpu();
CTX.mesh_timer[2] = t2 - t1;
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index 0b28eed08c..b8ac10d815 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -1,4 +1,4 @@
-// $Id: meshGRegion.cpp,v 1.24 2007-01-16 14:19:31 remacle Exp $
+// $Id: meshGRegion.cpp,v 1.25 2007-01-18 10:18:30 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -25,6 +25,7 @@
#include "GRegion.h"
#include "GFace.h"
#include "GEdge.h"
+#include "gmshRegion.h"
#include "MRep.h"
#include "BDS.h"
#include "Message.h"
@@ -183,6 +184,53 @@ void TransferTetgenMesh(GRegion *gr,
#endif
+void MeshDelaunayVolume(std::vector<GRegion*> ®ions)
+{
+ if(regions.empty()) return;
+
+#if !defined(HAVE_TETGEN)
+ Msg(GERROR, "Tetgen is not compiled in this version of Gmsh");
+#else
+
+ // put all the faces in the same model
+ GRegion *gr = regions[0];
+ std::list<GFace*> faces = gr->faces();
+
+ std::set<GFace*> allFacesSet;
+ for(unsigned int i = 0; i < regions.size(); i++){
+ std::list<GFace*> f = regions[i]->faces();
+ allFacesSet.insert(f.begin(), f.end());
+ }
+ std::list<GFace*> allFaces;
+ for(std::set<GFace*>::iterator it = allFacesSet.begin(); it != allFacesSet.end(); it++)
+ allFaces.push_back(*it);
+ gr->set(allFaces);
+
+ // mesh with tetgen, possibly changing the mesh on boundaries
+ tetgenio in, out;
+ std::vector<MVertex*> numberedV;
+ char opts[128];
+ buildTetgenStructure(gr, in, numberedV);
+ sprintf(opts, "pe%c", (CTX.verbosity < 3) ? 'Q': (CTX.verbosity > 6)? 'V': '\0');
+ tetrahedralize(opts, &in, &out);
+ TransferTetgenMesh(gr, in, out, numberedV);
+
+ // sort triangles in all model faces in order to be able to search in vectors
+ std::list<GFace*>::iterator itf = allFaces.begin();
+ while(itf != allFaces.end()){
+ compareMTriangleLexicographic cmp;
+ std::sort((*itf)->triangles.begin(), (*itf)->triangles.end(), cmp);
+ ++itf;
+ }
+
+ // restore the initial set of faces
+ gr->set(faces);
+
+ // now do insertion of points
+ insertVerticesInRegion(gr);
+#endif
+}
+
#if defined(HAVE_NETGEN)
namespace nglib {
@@ -441,14 +489,14 @@ void meshGRegion::operator() (GRegion *gr)
Msg(STATUS2, "Meshing volume %d", gr->tag());
// destroy the mesh if it exists
- if(gr->meshAttributes.Method == TRANSFINI)
- {
- deMeshGRegion dem;
- dem(gr);
- MeshTransfiniteVolume(gr);
- return;
- }
+ deMeshGRegion dem;
+ dem(gr);
+ if(gr->meshAttributes.Method == TRANSFINI){
+ MeshTransfiniteVolume(gr);
+ return;
+ }
+
std::list<GFace*> faces = gr->faces();
// sanity check
@@ -460,61 +508,12 @@ void meshGRegion::operator() (GRegion *gr)
}
if(CTX.mesh.algo3d == ALGO_3D_DELAUNAY || CTX.mesh.algo3d == ALGO_3D_TETGEN){
-#if !defined(HAVE_TETGEN)
- Msg(GERROR, "Tetgen is not compiled in this version of Gmsh");
-#else
- // delete the mesh for all regions
- GModel::riter rit = gr->model()->firstRegion() ;
- if (gr != *rit)return;
- for (; rit != gr->model()->lastRegion();++rit)
- {
- deMeshGRegion dem;
- dem(*rit);
- }
- // put all the faces in the same model
- std::list<GFace*> allFaces;
- GModel::fiter fit = gr->model()->firstFace() ;
- while (fit != gr->model()->lastFace()){
- allFaces.push_back(*fit);
- ++fit;
- }
- gr->set(allFaces);
- // mesh with tetgen, possibly changing the mesh on boundaries
- tetgenio in, out;
- std::vector<MVertex*> numberedV;
- char opts[128];
- buildTetgenStructure(gr, in, numberedV);
- sprintf(opts, "pe%c", (CTX.verbosity < 3) ? 'Q': (CTX.verbosity > 6)? 'V': '\0');
- tetrahedralize(opts, &in, &out);
- TransferTetgenMesh(gr, in, out, numberedV);
- // sort triangles in all model faces in order to be able to search in vectors
- {
- std::list<GFace*>::iterator itf = allFaces.begin();
- while(itf!=allFaces.end())
- {
- compareMTriangleLexicographic cmp;
- std::sort((*itf)->triangles.begin(),
- (*itf)->triangles.end(),
- cmp);
- ++itf;
- }
- }
-
- // restore the initial set of faces
- gr->set(faces);
-
- // now do insertion of points
- insertVerticesInRegion(gr);
- // meshNormalsPointOutOfTheRegion(gr);
-#endif
+ delaunay.push_back(gr);
}
-
- if(CTX.mesh.algo3d == ALGO_3D_NETGEN ){
+ else if(CTX.mesh.algo3d == ALGO_3D_NETGEN ){
#if !defined(HAVE_NETGEN)
Msg(GERROR, "Netgen is not compiled in this version of Gmsh");
#else
- deMeshGRegion dem;
- dem(gr);
// orient the triangles of with respect to this region
meshNormalsPointOutOfTheRegion(gr);
std::vector<MVertex*> numberedV;
diff --git a/Mesh/meshGRegion.h b/Mesh/meshGRegion.h
index 9c15ea3466..b59fbb4320 100644
--- a/Mesh/meshGRegion.h
+++ b/Mesh/meshGRegion.h
@@ -20,12 +20,16 @@
//
// Please report all bugs and problems to <gmsh@geuz.org>.
+#include <vector>
+
class GModel;
class GRegion;
// Create the mesh of the region
class meshGRegion {
public :
+ std::vector<GRegion*> &delaunay;
+ meshGRegion(std::vector<GRegion*> &d) : delaunay(d) {}
void operator () (GRegion *);
};
@@ -46,6 +50,7 @@ class deMeshGRegion {
void operator () (GRegion *);
};
+void MeshDelaunayVolume(std::vector<GRegion*> &delaunay);
int MeshTransfiniteVolume(GRegion *gr);
int SubdivideExtrudedMesh(GModel *m);
--
GitLab