From 016dadb0b8f5df0c79b816577420828421180029 Mon Sep 17 00:00:00 2001
From: Emilie Marchandise <emilie.marchandise@uclouvain.be>
Date: Thu, 14 Jul 2011 12:46:15 +0000
Subject: [PATCH]
---
benchmarks/curvature/TorusRemesh.geo | 10 +++++-----
benchmarks/curvature/occtorus.brep | 8 ++++----
benchmarks/curvature/torus.py | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/benchmarks/curvature/TorusRemesh.geo b/benchmarks/curvature/TorusRemesh.geo
index 53e0d06c9b..68624b03e8 100644
--- a/benchmarks/curvature/TorusRemesh.geo
+++ b/benchmarks/curvature/TorusRemesh.geo
@@ -6,19 +6,19 @@ Mesh.RemeshAlgorithm=6; //1=MeshAdapt, 5=Delaunay, 6=Frontal
Mesh.RemeshParametrization= 1; //(0) harmonic (1) conformal
Mesh.RemeshAlgorithm = 1;
-Mesh.CharacteristicLengthFactor=0.2;
+Mesh.CharacteristicLengthFactor=1.2;
Mesh.CharacteristicLengthFromPoints = 0;
Mesh.CharacteristicLengthFromCurvature=1; //-clcurv
-Mesh.CharacteristicLengthMin = 0.2; //-clmin
-Mesh.CharacteristicLengthMax = 3.0; //-clmax
+Mesh.CharacteristicLengthMin = 0.001; //-clmin
+Mesh.CharacteristicLengthMax = 0.5; //-clmax
Mesh.LcIntegrationPrecision = 1.e-5; //-epslc1d
-
Mesh.MinimumCirclePoints=15; //default=7
Mesh.CharacteristicLengthExtendFromBoundary=0;
//Merge "TorusRemeshedBAMG.stl";
//Merge "SimpleTorus.msh";
-Merge "TorusInput.stl";
+//Merge "TorusInput.stl";
+Merge "occtorus.stl";
CreateTopology;
diff --git a/benchmarks/curvature/occtorus.brep b/benchmarks/curvature/occtorus.brep
index c97da515a0..bde610e90b 100644
--- a/benchmarks/curvature/occtorus.brep
+++ b/benchmarks/curvature/occtorus.brep
@@ -7,18 +7,18 @@ Curve2ds 4
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
Curves 2
-2 -2.4492935982947064e-16 0 0 1 0 0 -0 0 1 0 -1 0 4
-2 0 7.3478807948841188e-16 3 0 1 -2.4492935982947064e-16 0 2.4492935982947064e-16 1 1 0 0 1
+2 -3.6739403974420594e-16 0 0 1 0 0 -0 0 1 0 -1 0 3.5
+2 0 4.8985871965894128e-16 2 0 1 -2.4492935982947064e-16 0 2.4492935982947064e-16 1 1 0 0 1.5
Polygon3D 0
PolygonOnTriangulations 0
Surfaces 1
-5 0 0 0 1 0 0 -0 0 1 0 -1 0 3 1
+5 0 0 0 1 0 0 -0 0 1 0 -1 0 2 1.5
Triangulations 0
TShapes 8
Ve
1e-07
--2.44929359829471e-16 9.79717439317883e-16 4
+-3.67394039744206e-16 8.57252759403147e-16 3.5
0 0
0101101
diff --git a/benchmarks/curvature/torus.py b/benchmarks/curvature/torus.py
index 701a4959f1..c566e79a75 100644
--- a/benchmarks/curvature/torus.py
+++ b/benchmarks/curvature/torus.py
@@ -10,7 +10,7 @@ g = GModel();
g.setFactory('OpenCASCADE')
#g.addBlock([-R,-R,-R],[R,R,R]);
-g.addTorus([0,0,0],[1,0,0], 3.0, 1.0);
+g.addTorus([0,0,0],[1,0,0], 2.0, 1.5);
#g.mesh(2);
#g.save("occtorus.msh");
--
GitLab