Changeset 281324 for molecuilder/tests/regression/Tesselation/2/post

Timestamp:

Dec 16, 2009, 4:18:46 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

0310b8

Parents:

230b16 (diff), 16f34d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'FixTestSuite' into FixDegeneratedTesselation

Location:

molecuilder/tests/regression/Tesselation/2/post

Files:

• ConvexEnvelope.dat (modified) (2 diffs)
• ConvexEnvelope.r3d (modified) (2 diffs)
• NonConvexEnvelope.dat (modified) (2 diffs)
• NonConvexEnvelope.r3d (modified) (2 diffs)

molecuilder/tests/regression/Tesselation/2/post/ConvexEnvelope.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="0- H08_ H09_ H11", N=8, E=12, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="test", N=8, E=12, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 9.78209 2.64589 2.64589 0
 9.78209 2.64589 4.42589 0
@@ -13 +13 @@
 1 3 4
 1 4 7
+4 6 7
 3 4 5
-1 7 8
-1 2 8
-4 6 7
+4 5 6
 2 3 5
-4 5 6
-6 7 8
-1 2 3
 2 5 8
 5 6 8
+6 7 8
+1 2 7
+2 7 8
+1 2 3

molecuilder/tests/regression/Tesselation/2/post/ConvexEnvelope.r3d

@@ -34 +34 @@
   1.37419 -0.89433 -0.89        0.12489 1.24767 -0.89   -1.12431 -0.89433 -0.89         1. 0. 0.
 1
-  2.26414 0.364321 -4.44089e-16         0.12489 1.24767 -0.89   0.12489 1.24767 0.89    1. 0. 0.
-1
-  1.37419 -0.89433 -0.89        -1.12431 -0.89433 -0.89         -1.12431 -0.89433 0.89  1. 0. 0.
-1
-  1.37419 -0.89433 -0.89        1.37419 -0.89433 0.89   -1.12431 -0.89433 0.89  1. 0. 0.
-1
   0.12489 1.24767 -0.89         -2.01426 0.364321 -4.44089e-16  -1.12431 -0.89433 -0.89         1. 0. 0.
 1
-  1.37419 -0.89433 0.89         2.26414 0.364321 -4.44089e-16   0.12489 1.24767 0.89    1. 0. 0.
+  2.26414 0.364321 -4.44089e-16         0.12489 1.24767 -0.89   0.12489 1.24767 0.89    1. 0. 0.
 1
   0.12489 1.24767 -0.89         0.12489 1.24767 0.89    -2.01426 0.364321 -4.44089e-16  1. 0. 0.
 1
-  -2.01426 0.364321 -4.44089e-16        -1.12431 -0.89433 -0.89         -1.12431 -0.89433 0.89  1. 0. 0.
-1
-  1.37419 -0.89433 -0.89        1.37419 -0.89433 0.89   2.26414 0.364321 -4.44089e-16   1. 0. 0.
+  1.37419 -0.89433 0.89         2.26414 0.364321 -4.44089e-16   0.12489 1.24767 0.89    1. 0. 0.
 1
   1.37419 -0.89433 0.89         0.12489 1.24767 0.89    -1.12431 -0.89433 0.89  1. 0. 0.
 1
   0.12489 1.24767 0.89  -2.01426 0.364321 -4.44089e-16  -1.12431 -0.89433 0.89  1. 0. 0.
+1
+  -2.01426 0.364321 -4.44089e-16        -1.12431 -0.89433 -0.89         -1.12431 -0.89433 0.89  1. 0. 0.
+1
+  1.37419 -0.89433 -0.89        1.37419 -0.89433 0.89   -1.12431 -0.89433 -0.89         1. 0. 0.
+1
+  1.37419 -0.89433 0.89         -1.12431 -0.89433 -0.89         -1.12431 -0.89433 0.89  1. 0. 0.
+1
+  1.37419 -0.89433 -0.89        1.37419 -0.89433 0.89   2.26414 0.364321 -4.44089e-16   1. 0. 0.
 9
 #  terminating special property
@@ -59 +59 @@
   25.0    0.6     -1.0 -1.0 -1.0     0.2        0 0 0 0
 2
-  -1.00456 0.23922 0.593333     5       1 0 0
+  1.67084 -0.47478 -8.88178e-16 5       1 0 0
 9
   terminating special property

molecuilder/tests/regression/Tesselation/2/post/NonConvexEnvelope.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="0- H08_ H09_ H11", N=8, E=12, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="test", N=8, E=12, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 9.78209 2.64589 2.64589 0
 9.78209 2.64589 4.42589 0
@@ -13 +13 @@
 1 3 4
 1 4 7
+4 6 7
 3 4 5
-1 7 8
-1 2 8
-4 6 7
+4 5 6
 2 3 5
-4 5 6
-6 7 8
-1 2 3
 2 5 8
 5 6 8
+6 7 8
+1 2 7
+2 7 8
+1 2 3

molecuilder/tests/regression/Tesselation/2/post/NonConvexEnvelope.r3d

@@ -34 +34 @@
   1.37419 -0.89433 -0.89        0.12489 1.24767 -0.89   -1.12431 -0.89433 -0.89         1. 0. 0.
 1
-  2.26414 0.364321 -4.44089e-16         0.12489 1.24767 -0.89   0.12489 1.24767 0.89    1. 0. 0.
-1
-  1.37419 -0.89433 -0.89        -1.12431 -0.89433 -0.89         -1.12431 -0.89433 0.89  1. 0. 0.
-1
-  1.37419 -0.89433 -0.89        1.37419 -0.89433 0.89   -1.12431 -0.89433 0.89  1. 0. 0.
-1
   0.12489 1.24767 -0.89         -2.01426 0.364321 -4.44089e-16  -1.12431 -0.89433 -0.89         1. 0. 0.
 1
-  1.37419 -0.89433 0.89         2.26414 0.364321 -4.44089e-16   0.12489 1.24767 0.89    1. 0. 0.
+  2.26414 0.364321 -4.44089e-16         0.12489 1.24767 -0.89   0.12489 1.24767 0.89    1. 0. 0.
 1
   0.12489 1.24767 -0.89         0.12489 1.24767 0.89    -2.01426 0.364321 -4.44089e-16  1. 0. 0.
 1
-  -2.01426 0.364321 -4.44089e-16        -1.12431 -0.89433 -0.89         -1.12431 -0.89433 0.89  1. 0. 0.
-1
-  1.37419 -0.89433 -0.89        1.37419 -0.89433 0.89   2.26414 0.364321 -4.44089e-16   1. 0. 0.
+  1.37419 -0.89433 0.89         2.26414 0.364321 -4.44089e-16   0.12489 1.24767 0.89    1. 0. 0.
 1
   1.37419 -0.89433 0.89         0.12489 1.24767 0.89    -1.12431 -0.89433 0.89  1. 0. 0.
 1
   0.12489 1.24767 0.89  -2.01426 0.364321 -4.44089e-16  -1.12431 -0.89433 0.89  1. 0. 0.
+1
+  -2.01426 0.364321 -4.44089e-16        -1.12431 -0.89433 -0.89         -1.12431 -0.89433 0.89  1. 0. 0.
+1
+  1.37419 -0.89433 -0.89        1.37419 -0.89433 0.89   -1.12431 -0.89433 -0.89         1. 0. 0.
+1
+  1.37419 -0.89433 0.89         -1.12431 -0.89433 -0.89         -1.12431 -0.89433 0.89  1. 0. 0.
+1
+  1.37419 -0.89433 -0.89        1.37419 -0.89433 0.89   2.26414 0.364321 -4.44089e-16   1. 0. 0.
 9
 #  terminating special property
@@ -59 +59 @@
   25.0    0.6     -1.0 -1.0 -1.0     0.2        0 0 0 0
 2
-  -1.00456 0.23922 0.593333     5       1 0 0
+  1.67084 -0.47478 -8.88178e-16 5       1 0 0
 9
   terminating special property