From 364729058c46d60fa7b6383fa338aad78ec6a2c2 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 6 Sep 2007 16:04:25 +0000
Subject: [PATCH] fix logic for unconstrained bgmesh
---
Mesh/BackgroundMesh.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Mesh/BackgroundMesh.cpp b/Mesh/BackgroundMesh.cpp
index 6683773ff9..05ac6295d8 100644
--- a/Mesh/BackgroundMesh.cpp
+++ b/Mesh/BackgroundMesh.cpp
@@ -1,4 +1,4 @@
-// $Id: BackgroundMesh.cpp,v 1.23 2007-09-04 13:47:02 remacle Exp $
+// $Id: BackgroundMesh.cpp,v 1.24 2007-09-06 16:04:25 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -184,15 +184,15 @@ double BGM_MeshSize(GEntity *ge, double U, double V, double X, double Y, double
double l3 = CTX.lc;
double l4 = lc_field.empty() ? MAX_LC : lc_field(X, Y, Z);
+ // use the field unconstrained by other characteristic lengths
+ if(l4 < MAX_LC && !CTX.mesh.constrained_bgmesh)
+ return l4 * CTX.mesh.lc_factor;
+
if(CTX.mesh.lc_from_curvature && ge->dim() < 3)
l1 = LC_MVertex_CURV(ge, U, V);
- if(l4 < MAX_LC && CTX.mesh.constrained_bgmesh)
- return std::min(l4,l1) * CTX.mesh.lc_factor;
-
if(ge->dim() < 2)
l2 = LC_MVertex_PNTS(ge, U, V);
-
// printf("l1 = %12.5E l2 = %12.5E l4 = %12.5E\n",l1,l2,l4);
--
GitLab