From e0c0c85b1b0d42067ef592328adeb9d56e30b77f Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 23 Jan 2013 18:55:16 +0000
Subject: [PATCH] fix progress of 2d meshing
---
Mesh/Generator.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 616201188a..09dc4721b5 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -477,9 +477,7 @@ static void Mesh2D(GModel *m)
int nIter = 0, nTot = m->getNumFaces();
while(1){
int nPending = 0;
-
- std::vector<GFace*> _temp; _temp.insert(_temp.begin(),f.begin(),f.end());
-
+ std::vector<GFace*> _temp; _temp.insert(_temp.begin(), f.begin(), f.end());
#pragma omp parallel for schedule (dynamic)
for(size_t K = 0 ; K < _temp.size() ; K++){
if (_temp[K]->meshStatistics.status == GFace::PENDING){
@@ -490,10 +488,9 @@ static void Mesh2D(GModel *m)
nPending++;
}
}
+ if(!nIter) Msg::ProgressMeter(nPending, nTot, false, "Meshing 2D...");
}
#pragma omp master
- if(!nIter) Msg::ProgressMeter(nPending, nTot, false, "Meshing 2D...");
-
for(std::set<GFace*>::iterator it = cf.begin(); it != cf.end(); ++it){
if ((*it)->meshStatistics.status == GFace::PENDING){
meshGFace mesher (true, CTX::instance()->mesh.multiplePasses);
--
GitLab