From 88603d152217f2b2d8be5c7e81a3de53dae3264e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 5 Mar 2008 07:12:18 +0000
Subject: [PATCH] *** empty log message ***
---
benchmarks/2d/Square-Attr2.geo | 74 ++++++++++++++++------------------
benchmarks/2d/Square-Attr3.geo | 12 ++++--
benchmarks/2d/projection.geo | 5 +--
benchmarks/2d/t7.geo | 19 +++------
4 files changed, 50 insertions(+), 60 deletions(-)
diff --git a/benchmarks/2d/Square-Attr2.geo b/benchmarks/2d/Square-Attr2.geo
index 9ca3898285..6394cee5b0 100644
--- a/benchmarks/2d/Square-Attr2.geo
+++ b/benchmarks/2d/Square-Attr2.geo
@@ -1,39 +1,35 @@
-/******************************
-Square uniformly meshed
-******************************/
-lc = .1;
-Point(1) = {0.0,0.0,0,lc};
-Point(2) = {1,0.0,0,lc};
-Point(3) = {1,1,0,lc};
-Point(4) = {0,1,0,lc};
-Line(1) = {3,2};
-Line(2) = {2,1};
-Line(3) = {1,4};
-Line(4) = {4,3};
-Line Loop(5) = {1,2,3,4};
-Plane Surface(6) = {5};
-e = .03;
-Point(11) = {-.2,.5,0,lc};
-Point(12) = {.2,.5,0,lc};
-Point(13) = {.5,.8-e,0,lc};
-Point(14) = { (.8)-(2*e),.5,0,lc};
-Point(15) = { .5,(.2)+(3*e),0,lc};
-Point(16) = {.2+(4*e),.5,0,lc};
-Point(17) = {.5,.8-(5*e),0,lc};
-Point(18) = { .8-(6*e),.5,0,lc};
-Point(19) = { .5,.2+(7*e),0,lc};
-Point(20) = {.2+(8*e),.5,0,lc};
-Line(7) = {11,12};
-Line(8) = {12,13};
-Line(9) = {13,14};
-Line(10) = {14,15};
-Line(11) = {15,16};
-Line(12) = {16,17};
-Line(13) = {17,18};
-Line(14) = {18,19};
-Line(15) = {19,20};
-// OK:
-Attractor Line{7,8,9,10,11,12,13,14,15} = {.04,lc/30,lc,1000,7} ;
-// Argh:
-//Attractor Line{7,8,9,10,11,12,13,14,15} = {.2,0.002,10} ;
-//Mesh.Algorithm = 2;
+lc = .1;
+Point(1) = {0.0,0.0,0,lc};
+Point(2) = {1,0.0,0,lc};
+Point(3) = {1,1,0,lc};
+Point(4) = {0,1,0,lc};
+Line(1) = {3,2};
+Line(2) = {2,1};
+Line(3) = {1,4};
+Line(4) = {4,3};
+Line Loop(5) = {1,2,3,4};
+Plane Surface(6) = {5};
+e = .03;
+Point(11) = {-.2,.5,0,lc};
+Point(12) = {.2,.5,0,lc};
+Point(13) = {.5,.8-e,0,lc};
+Point(14) = { (.8)-(2*e),.5,0,lc};
+Point(15) = { .5,(.2)+(3*e),0,lc};
+Point(16) = {.2+(4*e),.5,0,lc};
+Point(17) = {.5,.8-(5*e),0,lc};
+Point(18) = { .8-(6*e),.5,0,lc};
+Point(19) = { .5,.2+(7*e),0,lc};
+Point(20) = {.2+(8*e),.5,0,lc};
+Line(7) = {11,12};
+Line(8) = {12,13};
+Line(9) = {13,14};
+Line(10) = {14,15};
+Line(11) = {15,16};
+Line(12) = {16,17};
+Line(13) = {17,18};
+Line(14) = {18,19};
+Line(15) = {19,20};
+
+r_min = 0.03;
+r_max = 0.06;
+Attractor Line{7,8,9,10,11,12,13,14,15} = {r_min,lc/30,lc,100,r_max/r_min};
diff --git a/benchmarks/2d/Square-Attr3.geo b/benchmarks/2d/Square-Attr3.geo
index db9048528b..d6ee2581d3 100644
--- a/benchmarks/2d/Square-Attr3.geo
+++ b/benchmarks/2d/Square-Attr3.geo
@@ -13,8 +13,12 @@ Line(4) = {4,3};
Line Loop(5) = {1,2,3,4};
Plane Surface(6) = {5};
Line(5) = {3,1};
-Attractor Line{5} = {1,0.01,3};
-Attractor Line{1,3} = {1,0.01,3};
-Attractor Line{2} = {.1,0.1,3};
-Mesh.Algorithm = 2;
+
+num_pts = 100;
+lc_min = 0.005;
+lc_max = lc;
+r_min = 0.01;
+r_max = 0.5;
+Attractor Line{5,1,3,2} = {r_min, lc_min, lc_max, num_pts, r_max / r_min};
+
diff --git a/benchmarks/2d/projection.geo b/benchmarks/2d/projection.geo
index 40f296b67e..c61447f640 100644
--- a/benchmarks/2d/projection.geo
+++ b/benchmarks/2d/projection.geo
@@ -2,12 +2,9 @@
Point(1) = {0,0,0,1};
Point(2) = {0,10,0,1};
Line(1) = {2,1};
-Extrude Line {1, {50.0,0.0,0.0}, {1,0,0}, {0,5,0}, 2*Pi}{Recombine;Layers{50,9000,1};};
+Extrude Line {1, {50.0,0.0,0.0}, {1,0,0}, {0,5,0}, 2*Pi}{Recombine;Layers{50};};
//
Point(1000) = {0,0,20,1};
Point(2000) = {0,10,20,1};
Line(1000) = {2000,1000};
Extrude Line {1000, {50.0,0.0,0.0}, {1,0,0}, {0,5,20}, 2*Pi};
-
-
-
diff --git a/benchmarks/2d/t7.geo b/benchmarks/2d/t7.geo
index 21035a7ec5..1e0c05cbfe 100644
--- a/benchmarks/2d/t7.geo
+++ b/benchmarks/2d/t7.geo
@@ -6,14 +6,6 @@
*
*********************************************************************/
-// The anisotropic 2D mesh generator can be selected with:
-
-Mesh.Algorithm = 2 ;
-
-// One can force a 4 step Laplacian smoothing of the mesh with:
-
-Mesh.Smoothing = 4 ;
-
lc = .3;
Point(1) = {0.0,0.0,0,lc};
@@ -38,9 +30,10 @@ Line(5) = {11,22};
Spline(7) = {4,5,12,2};
-// Isotropic and anisotropic attractors can be defined on points and
-// lines (this is still experimental and known to be unstable: use at
-// your own risk!):
-
-Attractor Line{7,5,3,2} = {0.01, 0.01, 10};
+num_pts = 100;
+lc_min = 0.005;
+lc_max = lc;
+r_min = 0.01;
+r_max = 0.5;
+Attractor Line{7,5,3,2} = {r_min, lc_min, lc_max, num_pts, r_max / r_min};
--
GitLab