From b1b9d09c073bc1367e3c17d1c79590cbc0019037 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 13 Nov 2017 20:10:29 +0100
Subject: [PATCH] these test-cases should be rewritten
---
benchmarks/3d/CubeAniso2.geo | 13 ++-----------
benchmarks/extrude/Cylinder.geo | 6 ------
benchmarks/extrude/aorta.geo | 20 +++++++++-----------
benchmarks/extrude/aorta_extrude.geo | 7 ++++---
4 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/benchmarks/3d/CubeAniso2.geo b/benchmarks/3d/CubeAniso2.geo
index 337fbb3666..fa93a1fef1 100644
--- a/benchmarks/3d/CubeAniso2.geo
+++ b/benchmarks/3d/CubeAniso2.geo
@@ -1,19 +1,10 @@
lc = 0.1;
-Mesh.RemeshParametrization=1; //(0) harmonic (1) conformal
-Mesh.RemeshAlgorithm=1; //(0) nosplit (1) automatic (2) split only with metis ///Default: 1
+General.MeshDiscrete=1;
Merge "CubeAniso2D.msh";
-CreateTopology;
-Compound Surface(106) = {6}; //, 15};
-Compound Surface(115) = {15};
-Compound Surface(119) = {19};
-Compound Surface(123) = {23};
-Compound Surface(127) = {27};
-Compound Surface(128) = {28};
-
-Surface Loop(100) = {106, 115, 119,123,127,128};
+Surface Loop(100) = {6, 15, 19, 23, 27, 28};
Volume(1) = {100};
Field[2] = MathEvalAniso;
diff --git a/benchmarks/extrude/Cylinder.geo b/benchmarks/extrude/Cylinder.geo
index 4e0e81bd4f..187f27e6de 100644
--- a/benchmarks/extrude/Cylinder.geo
+++ b/benchmarks/extrude/Cylinder.geo
@@ -1,5 +1,3 @@
-Mesh.RemeshParametrization=1; //(0) harmonic (1) conformal
-Mesh.RemeshAlgorithm=1; //(0) nosplit (1) automatic (2) split metis
Point(1) = {0, 0, 0};
Point(2) = {1, 0, 0};
@@ -13,7 +11,3 @@ Circle(4) = {5, 1, 3};
Extrude {0, 0, 13} {
Line{4, 1, 2, 3};
}
-
-
-Compound Surface(10000) = {20, 16, 12, 8};
-
diff --git a/benchmarks/extrude/aorta.geo b/benchmarks/extrude/aorta.geo
index 507e3b2e70..5dace658c1 100644
--- a/benchmarks/extrude/aorta.geo
+++ b/benchmarks/extrude/aorta.geo
@@ -1,15 +1,13 @@
+General.MeshDiscrete = 1;
Merge "aorta2.stl";
-CreateTopology;
-//Merge "aortaRADIUS2.bgm";
+//Line Loop(60) = {1}; Plane Surface(61) = {60};
+//Line Loop(62) = {2}; Plane Surface(63) = {62};
+//Line Loop(64) = {3}; Plane Surface(65) = {64};
+//Line Loop(66) = {4}; Plane Surface(67) = {66};
+//Line Loop(68) = {5}; Plane Surface(69) = {68};
-Line Loop(60) = {1}; Plane Surface(61) = {60};
-Line Loop(62) = {2}; Plane Surface(63) = {62};
-Line Loop(64) = {3}; Plane Surface(65) = {64};
-Line Loop(66) = {4}; Plane Surface(67) = {66};
-Line Loop(68) = {5}; Plane Surface(69) = {68};
+//Mesh.Algorithm3D = 4;
-Mesh.Algorithm3D = 4;
-
-Surface Loop(100) = {1, 61:69:2};
-Volume(100) = 100;
+//Surface Loop(100) = {1, 61:69:2};
+//Volume(100) = 100;
diff --git a/benchmarks/extrude/aorta_extrude.geo b/benchmarks/extrude/aorta_extrude.geo
index 74c9141382..88283f74fd 100644
--- a/benchmarks/extrude/aorta_extrude.geo
+++ b/benchmarks/extrude/aorta_extrude.geo
@@ -1,14 +1,14 @@
+General.MeshDiscrete = 1;
Merge "aorta2.stl";
-CreateTopology;
Merge "aortaRADIUS2.bgm";
// create a boundary layer, whose tickness is given in View[0]
-out1[] = Extrude{Surface{-1}; Layers{4, 0.5}; Using Index[0]; Using View[0]; };
+//out1[] = Extrude{Surface{-1}; Layers{4, 0.5}; Using Index[0]; Using View[0]; };
// we could create a second boundary layer inside...
//out2[] = Extrude{Surface{1}; Layers{4, -0.5}; Using Index[1]; Using View[0]; };
-
+/*
Line Loop(60) = {1}; Plane Surface(61) = {60};
Line Loop(62) = {2}; Plane Surface(63) = {62};
Line Loop(64) = {3}; Plane Surface(65) = {64};
@@ -19,3 +19,4 @@ Mesh.Algorithm3D = 4;
Surface Loop(100) = {1, 61:69:2};
Volume(100) = 100;
+*/
--
GitLab