From 7ff1d7f0a6c2ef7681e3f957ee4c7c3d1c3a24d5 Mon Sep 17 00:00:00 2001
From: Jean-Francois Remacle <jean-francois.remacle@uclouvain.be>
Date: Tue, 13 Mar 2012 20:25:30 +0000
Subject: [PATCH] This time the new frontal algo is stable... people should
definitively use it
---
Mesh/meshGFaceDelaunayInsertion.cpp | 20 ++++++++++--------
benchmarks/stl/artery.geo | 4 ++++
benchmarks/stl/falcon1.geo | 32 ++++++++++++++---------------
3 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/Mesh/meshGFaceDelaunayInsertion.cpp b/Mesh/meshGFaceDelaunayInsertion.cpp
index a2d200abf4..913d36d456 100644
--- a/Mesh/meshGFaceDelaunayInsertion.cpp
+++ b/Mesh/meshGFaceDelaunayInsertion.cpp
@@ -740,7 +740,7 @@ static bool insertAPoint(GFace *gf, std::set<MTri3*,compareTri3Ptr>::iterator it
bool inside = false;
double uv[2];
// FIXME !!! ----> FIXED (JFR)
- if (MTri3::radiusNorm == 2){
+ if (0 && MTri3::radiusNorm == 2){
inside = invMapUV(worst->tri(), center, Us, Vs, uv, 1.e-8);
if (inside)ptin = worst;
if (!inside && worst->getNeigh(0)){
@@ -778,7 +778,7 @@ static bool insertAPoint(GFace *gf, std::set<MTri3*,compareTri3Ptr>::iterator it
MVertex *v = new MFaceVertex(p.x(), p.y(), p.z(), gf, center[0], center[1]);
v->setIndex(Us.size());
double lc1,lc;
- if (backgroundMesh::current()){
+ if (0 && backgroundMesh::current()){
lc1 = lc =
backgroundMesh::current()->operator()(center[0], center[1], 0.0);
}
@@ -1022,7 +1022,6 @@ double optimalPointFrontal (GFace *gf,
dir[1] * dir[1] * metric[2]);
// const double p = 0.5 * lengthMetric(P, Q, metric); // / RATIO;
- // const double q = lengthMetric(center, midpoint, metric);
/*
const double rhoM1 = 0.5 *
(vSizes[base->getVertex(ip1)->getIndex()] +
@@ -1047,13 +1046,19 @@ double optimalPointFrontal (GFace *gf,
vSizesBGM[base->getVertex(ip2)->getIndex()] ) ;// * RATIO;
const double rhoM = Extend1dMeshIn2dSurfaces() ? std::min(rhoM1,rhoM2) : rhoM2;
const double rhoM_hat = rhoM;
- const double d = rhoM_hat * sqrt(3.)*0.5/RATIO;
+
+ const double q = lengthMetric(center, midpoint, metric);
+
+ const double d = rhoM_hat * sqrt(3.)*0.5;
// printf("%12.5E %12.5E\n",d,RATIO);
- newPoint[0] = midpoint[0] + d * dir[0];
- newPoint[1] = midpoint[1] + d * dir[1];
- return d * RATIO;
+ // const double L = d ;
+ const double L = d > q ? q : d;
+
+ newPoint[0] = midpoint[0] + L * dir[0]/RATIO;
+ newPoint[1] = midpoint[1] + L * dir[1]/RATIO;
+ return L;// > q ? d : q;
}
/*
@@ -1081,7 +1086,6 @@ void optimalPointFrontalB (GFace *gf,
std::vector<double> &vSizesBGM,
double newPoint[2],
double metric[3]){
- static int missed = 1;
// as a starting point, let us use the "fast algo"
double d = optimalPointFrontal (gf,worst,active_edge,Us,Vs,vSizes,vSizesBGM,newPoint,metric);
int ip1 = active_edge - 1 < 0 ? 2 : active_edge - 1;
diff --git a/benchmarks/stl/artery.geo b/benchmarks/stl/artery.geo
index 130ca3de1a..eda3c6c7b2 100644
--- a/benchmarks/stl/artery.geo
+++ b/benchmarks/stl/artery.geo
@@ -9,4 +9,8 @@ Merge "artery.stl";
CreateTopology;
Compound Surface(100)={1};
+Compound Line(1001)={1};
+Compound Line(1002)={2};
+Compound Line(1003)={3};
+
Physical Surface(101)={100};
diff --git a/benchmarks/stl/falcon1.geo b/benchmarks/stl/falcon1.geo
index 5c2f8b2809..49edee0ea1 100644
--- a/benchmarks/stl/falcon1.geo
+++ b/benchmarks/stl/falcon1.geo
@@ -1,18 +1,18 @@
Merge 'falcon1.stl';
-Point(201) = {-30.0,30.0,15.0,0.1};
-Point(202) = {-30.0,30.0,-15.0,0.1};
-Point(203) = {0.0,30.0,15.0,0.1};
-Point(204) = {0.0,30.0,-15.0,0.1};
-
-Line(203) = {202,204};
-Line(204) = {204,203};
-Line(205) = {203,201};
-Line(206) = {201,202};
-Line Loop(207) = {203,204,205,206};
-Plane Surface(208) = {207};
-Extrude {0,-50,0} { Surface{208}; }
-
-Surface Loop(1) = {1};
-Surface Loop(232) = {-217,208,-221,-225,-229,-230};
-Volume(233) = {232,1};
+Point(201) = {-30.0,30.0,15.0,0.1};
+Point(202) = {-30.0,30.0,-15.0,0.1};
+Point(203) = {0.0,30.0,15.0,0.1};
+Point(204) = {0.0,30.0,-15.0,0.1};
+
+Line(203) = {202,204};
+Line(204) = {204,203};
+Line(205) = {203,201};
+Line(206) = {201,202};
+Line Loop(207) = {203,204,205,206};
+Plane Surface(208) = {207};
+Extrude {0,-50,0} { Surface{208}; }
+
+Surface Loop(1) = {1};
+Surface Loop(232) = {-217,208,-221,-225,-229,-230};
+Volume(233) = {232,1};
--
GitLab