From e909906296d1042816b7d91344509b901eb22069 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 21 Dec 2004 18:38:47 +0000
Subject: [PATCH] remove extra vol defs
---
benchmarks/3d/Cube-02.geo | 3 ---
benchmarks/3d/Cube-03.geo | 2 --
benchmarks/3d/Cube-04.geo | 10 ++++++----
benchmarks/3d/Cube-05.geo | 6 ------
benchmarks/3d/Cube-06.geo | 6 ------
benchmarks/3d/Cube-07.geo | 1 -
benchmarks/3d/Cube-08.geo | 8 +++++---
benchmarks/3d/Revolve.geo | 2 --
8 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/benchmarks/3d/Cube-02.geo b/benchmarks/3d/Cube-02.geo
index fc5c29197d..232b58b319 100644
--- a/benchmarks/3d/Cube-02.geo
+++ b/benchmarks/3d/Cube-02.geo
@@ -14,6 +14,3 @@ Line(4) = {1,4};
Line Loop(5) = {2,3,4,1};
Plane Surface(6) = {5};
Extrude Surface {6, {0,0.0,1}};
-
-Surface Loop(29) = {23,6,15,19,28,27};
-Complex Volume(30) = {29};
diff --git a/benchmarks/3d/Cube-03.geo b/benchmarks/3d/Cube-03.geo
index c6d350a14d..273df429aa 100644
--- a/benchmarks/3d/Cube-03.geo
+++ b/benchmarks/3d/Cube-03.geo
@@ -6,5 +6,3 @@ Point(1) = {0.0,0.0,0.0,.2};
Extrude Point {1, {1,0.0,0} };
Extrude Line {1, {0.0,0.0,1} };
Extrude Surface {5, {0,1,0} };
-Surface Loop(28) = {26,5,14,18,22,27};
-Complex Volume(29) = {28};
diff --git a/benchmarks/3d/Cube-04.geo b/benchmarks/3d/Cube-04.geo
index cbfe75ad9e..357bd131cf 100644
--- a/benchmarks/3d/Cube-04.geo
+++ b/benchmarks/3d/Cube-04.geo
@@ -5,16 +5,18 @@ A cube with a hole
Point(1) = {0.0,0.0,0.0,.1};
Extrude Point {1, {1,0.0,0} };
Extrude Line {1, {0.0,0.0,1} };
-Extrude Surface {5, {0,1,0} };
+aa[] = Extrude Surface {5, {0,1,0} };;
Point(100) = {0.3,0.3,0.3,.02};
Extrude Point {100, {.4,0.0,0} };
Extrude Line {28, {0,0.4,0} };
Coherence;
-Extrude Surface {32, {0,0.,0.4} };
+bb[] = Extrude Surface {32, {0,0.,0.4} };;
Coherence;
-
+
+Delete { Volume{aa[1],bb[1]}; }
+
Surface Loop(55) = {26,5,14,18,22,27};
Surface Loop(56) = {41,32,45,49,53,54};
-Complex Volume(57) = {55,56};
+Volume(57) = {55,56};
diff --git a/benchmarks/3d/Cube-05.geo b/benchmarks/3d/Cube-05.geo
index 74061352e6..de932c299f 100644
--- a/benchmarks/3d/Cube-05.geo
+++ b/benchmarks/3d/Cube-05.geo
@@ -1,6 +1,3 @@
-/*****************************
-cube with a hole
-*****************************/
lv = .1;
lc = .04;
Point(1) = {0.0,0.0,0.0,lv};
@@ -25,6 +22,3 @@ Line Loop(10) = {7,8,5,6};
Plane Surface(11) = {9,10};
Extrude Surface{11, {0.0,1,0}, {-.5,0.0,0.0}, 3.14159/4 } ;
-Coherence;
-Surface Loop(54) = {36,11,24,28,32,53,40,44,48,52};
-Complex Volume(55) = {54};
diff --git a/benchmarks/3d/Cube-06.geo b/benchmarks/3d/Cube-06.geo
index f73f583533..ac8411f622 100644
--- a/benchmarks/3d/Cube-06.geo
+++ b/benchmarks/3d/Cube-06.geo
@@ -1,6 +1,3 @@
-/*****************************
-cube with a hole
-*****************************/
lv = .1;
lc = .04;
Point(1) = {0.0,0.0,0.0,lv};
@@ -24,6 +21,3 @@ Line Loop(9) = {1,2,3,4};
Line Loop(10) = {7,8,5,6};
Plane Surface(11) = {9,10};
Extrude Surface {11, {.0,0.0,.5} };
-Coherence;
-Surface Loop(54) = {24,11,28,32,36,53,40,44,48,52};
-Complex Volume(55) = {54};
diff --git a/benchmarks/3d/Cube-07.geo b/benchmarks/3d/Cube-07.geo
index 81ccdebf54..e326c3dfb6 100644
--- a/benchmarks/3d/Cube-07.geo
+++ b/benchmarks/3d/Cube-07.geo
@@ -9,4 +9,3 @@ Line(4) = {4,1};
Line Loop(5) = {1,2,3,4};
Plane Surface(6) = {5};
Extrude Surface {6, {1.0,0.0,0.0} };
-Coherence;
diff --git a/benchmarks/3d/Cube-08.geo b/benchmarks/3d/Cube-08.geo
index 5954091478..e7dc6e4f64 100644
--- a/benchmarks/3d/Cube-08.geo
+++ b/benchmarks/3d/Cube-08.geo
@@ -5,14 +5,16 @@ A cube with a hole
Point(1) = {0.0,0.0,0.0,.1};
Extrude Point {1, {1,0.0,0} };
Extrude Line {1, {0.0,0.0,1} };
-Extrude Surface {5, {0,1,0} };
+aa[] = Extrude Surface {5, {0,1,0} };;
Point(100) = {0.3,0.3,0.3,.1};
Extrude Point {100, {.4,0.0,0} };
Extrude Line {28, {0,0.4,0} };
-Extrude Surface {32, {0,0.,0.4} };
+bb[] = Extrude Surface {32, {0,0.,0.4} };;
+
+Delete{Volume{aa[1],bb[1]};}
Surface Loop(55) = {-26,5,-14,-18,-22,-27};
Surface Loop(56) = {-41,32,-45,-49,-53,-54};
Volume(57) = {55,56};
-//Volume(57) = {55};
+Volume(58) = {56};
diff --git a/benchmarks/3d/Revolve.geo b/benchmarks/3d/Revolve.geo
index 2a4627ce43..6d6081cc08 100644
--- a/benchmarks/3d/Revolve.geo
+++ b/benchmarks/3d/Revolve.geo
@@ -13,5 +13,3 @@ Line Loop(5) = {4,1,2,3};
Plane Surface(6) = {5};
Extrude Surface{6, {0.0,1,0}, {0,0.0,0.0}, 3.14159/4};
-
-Coherence;
--
GitLab