From c8ac285cdaad3e2e2d1ac058a5e6ff856ee6e7a6 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 23 Jul 2012 09:46:27 +0000
Subject: [PATCH] revert JF's last commit: it prevents 1D meshes with even nb
of points. Better solution still needed for compounds.
---
Mesh/meshGEdge.cpp | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/Mesh/meshGEdge.cpp b/Mesh/meshGEdge.cpp
index fac7b4106d..88ecbba4c8 100644
--- a/Mesh/meshGEdge.cpp
+++ b/Mesh/meshGEdge.cpp
@@ -384,15 +384,14 @@ void meshGEdge::operator() (GEdge *ge)
a = smoothPrimitive(ge, sqrt(CTX::instance()->mesh.smoothRatio), Points);
N = std::max(ge->minimumMeshSegments() + 1, (int)(a + 1.));
}
-
+
// force odd number of points for if blossom is used for recombination
if(ge->meshAttributes.Method != MESH_TRANSFINITE &&
- (CTX::instance()->mesh.algoRecombine == 1 || CTX::instance()->mesh.recombineAll) && N % 2 == 0){
- // if(CTX::instance()->mesh.recombineAll){
+ CTX::instance()->mesh.algoRecombine == 1 && N % 2 == 0){
+ if(CTX::instance()->mesh.recombineAll){
N++;
- // }
- }
- /* else{
+ }
+ else{
std::list<GFace*> faces = ge->faces();
for(std::list<GFace*>::iterator it = faces.begin(); it != faces.end(); it++){
if((*it)->meshAttributes.recombine){
@@ -402,7 +401,6 @@ void meshGEdge::operator() (GEdge *ge)
}
}
}
- */
// printFandPrimitive(ge->tag(),Points);
--
GitLab