From 7cf16a04ae895d729ca0869f4c9f771f3ed890ae Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Sat, 23 Jan 2016 07:47:35 +0000 Subject: [PATCH] After r22501 and r22512 GmshFinalize throws an exception or crashes on most of our test builds; removing for now --- Fltk/Main.cpp | 2 +- Mesh/meshGRegion.cpp | 8 ++++---- doc/gmsh.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp index d708f7d6e6..3dfc02b332 100644 --- a/Fltk/Main.cpp +++ b/Fltk/Main.cpp @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) if(CTX::instance()->batch) { if(!Msg::GetGmshClient()) CTX::instance()->terminal = 1; GmshBatch(); - GmshFinalize(); + //GmshFinalize(); Msg::Exit(0); } diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp index 352edc18aa..fbb46a1a60 100644 --- a/Mesh/meshGRegion.cpp +++ b/Mesh/meshGRegion.cpp @@ -604,7 +604,7 @@ static void MeshDelaunayVolumeNewCode(std::vector<GRegion*> ®ions) { f = regions[i]->embeddedFaces(); allFacesSet.insert(f.begin(), f.end()); } - + std::list<GFace*> allFaces; allFaces.insert(allFaces.end(), allFacesSet.begin(), allFacesSet.end()); gr->set(allFaces); @@ -628,9 +628,9 @@ static void MeshDelaunayVolumeNewCode(std::vector<GRegion*> ®ions) { // restore the initial set of faces gr->set(faces); - - void edgeBasedRefinement (const int numThreads, - const int nptsatonce, + + void edgeBasedRefinement (const int numThreads, + const int nptsatonce, GRegion *gr); // just to remove tets that are not to be meshed insertVerticesInRegion(gr,0); diff --git a/doc/gmsh.html b/doc/gmsh.html index 87066ac7dc..c2ca5655f4 100644 --- a/doc/gmsh.html +++ b/doc/gmsh.html @@ -148,7 +148,7 @@ algorithms</a>. <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> <p> <input type="hidden" name="cmd" value="_xclick"> - <input type="hidden" name="business" value="paypal@geuz.org"> + <input type="hidden" name="business" value="paypal@onelab.info"> <input type="hidden" name="item_name" value="Gmsh donation"> <input type="hidden" name="no_note" value="1"> <input type="hidden" name="currency_code" value="EUR"> -- GitLab