diff --git a/benchmarks/3d/Cube-02.geo b/benchmarks/3d/Cube-02.geo index fc5c29197d83955e74d4c3a7e512745d747b8fd3..232b58b319049d1f36e5eb9f03a18f64befdd9c0 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 c6d350a14de57bab12a760d5cee55597881a99e5..273df429aafb770f4dcc96443d8e99cb0b73663a 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 cbfe75ad9e39f10350a9af8bebf9cb3628b51488..357bd131cff1769057d24fcd49fd61327d15543a 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 74061352e6825cfec453356716d29c3640e2200e..de932c299f4dbe39b58501729b46553ae4847ac1 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 f73f583533b88f556761aa6c698c9e8b88b370cb..ac8411f6221315ff09d525fe31818853ce53ecb2 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 81ccdebf548703e55acb5d97e93488f824f839fb..e326c3dfb6da081209f413f25e1c33713f1acd78 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 5954091478d92eccd3aab3da0570751ed99bd285..e7dc6e4f64e956116931fe0b6611ad370c8070f2 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 2a4627ce43eb80857d0ee3a08f75d2372c4cfa60..6d6081cc08a174d34a38c4041f02e4b64ec7d903 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;