[cig-commits] r4079 - in long/3D/Gale/trunk/src/StGermain: .
Discretisation/Geometry/tests
walter at geodynamics.org
walter at geodynamics.org
Thu Jul 20 20:11:25 PDT 2006
Author: walter
Date: 2006-07-20 20:11:24 -0700 (Thu, 20 Jul 2006)
New Revision: 4079
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of1.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of2.expected
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.c
Log:
r2547 at earth: boo | 2006-07-20 20:01:49 -0700
r2523 at earth (orig r3692): RaquibulHassan | 2006-07-19 19:12:08 -0700
Patching up the test that was failing on marvin.
Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
- 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2546
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3691
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2547
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3692
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of1.expected 2006-07-21 03:10:58 UTC (rev 4078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of1.expected 2006-07-21 03:11:24 UTC (rev 4079)
@@ -1,289 +1,55 @@
StGermain Framework revision 3667. Copyright (C) 2003-2005 VPAC.
-Parallel Triangulator..
-Stg_Component (ptr): 0x1138eb8
-Stg_Object (ptr): 0x1138eb8
- Stg_Class (ptr): 0x1138eb8
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138eb8)
- Num Sites 100
- Num Edges 0
- Num Triangles 183
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138eb8)
-Parallel Triangulator..
-Stg_Component (ptr): 0x1138ea8
-Stg_Object (ptr): 0x1138ea8
- Stg_Class (ptr): 0x1138ea8
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138ea8)
- Num Sites 400
- Num Edges 0
- Num Triangles 787
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138ea8)
+Testing irregular parallel triangulation..
-Parallel Triangulator..
-Stg_Component (ptr): 0x1138ea8
-Stg_Object (ptr): 0x1138ea8
- Stg_Class (ptr): 0x1138ea8
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138ea8)
- Num Sites 900
- Num Edges 0
- Num Triangles 1780
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138ea8)
-Parallel Triangulator..
-Stg_Component (ptr): 0x1138ea8
-Stg_Object (ptr): 0x1138ea8
- Stg_Class (ptr): 0x1138ea8
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138ea8)
- Num Sites 1600
- Num Edges 0
- Num Triangles 3180
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138ea8)
+ Running Parallel Triangulator on 100 nodes
-Testing irregular parallel triangulation..
-Parallel Voronoi Area test: passed
-Parallel Voronoi Sides test: passed
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
-Parallel Triangulator..
-Stg_Component (ptr): 0x1138ea8
-Stg_Object (ptr): 0x1138ea8
- Stg_Class (ptr): 0x1138ea8
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138ea8)
- Num Sites 100
- Num Edges 0
- Num Triangles 162
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138ea8)
+ Running Parallel Triangulator on 400 nodes
-Parallel Triangulator..
-Stg_Component (ptr): 0x1138ea8
-Stg_Object (ptr): 0x1138ea8
- Stg_Class (ptr): 0x1138ea8
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138ea8)
- Num Sites 400
- Num Edges 0
- Num Triangles 722
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138ea8)
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
-Parallel Triangulator..
-Stg_Component (ptr): 0x1138ea8
-Stg_Object (ptr): 0x1138ea8
- Stg_Class (ptr): 0x1138ea8
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138ea8)
- Num Sites 900
- Num Edges 0
- Num Triangles 1682
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138ea8)
+ Running Parallel Triangulator on 900 nodes
-Parallel Triangulator..
-Stg_Component (ptr): 0x1138ea8
-Stg_Object (ptr): 0x1138ea8
- Stg_Class (ptr): 0x1138ea8
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138ea8)
- Num Sites 1600
- Num Edges 0
- Num Triangles 3042
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138ea8)
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
+ Running Parallel Triangulator on 1600 nodes
+
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
+
Testing regular parallel triangulation..
-Parallel Voronoi Area test: passed
-Parallel Voronoi Sides test: passed
+
+ Running Parallel Triangulator on 100 nodes
+
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
+
+ Running Parallel Triangulator on 400 nodes
+
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
+
+ Running Parallel Triangulator on 900 nodes
+
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
+
+ Running Parallel Triangulator on 1600 nodes
+
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of2.expected 2006-07-21 03:10:58 UTC (rev 4078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of2.expected 2006-07-21 03:11:24 UTC (rev 4079)
@@ -1,289 +1,55 @@
StGermain Framework revision 3667. Copyright (C) 2003-2005 VPAC.
-Parallel Triangulator..
-Stg_Component (ptr): 0x1139148
-Stg_Object (ptr): 0x1139148
- Stg_Class (ptr): 0x1139148
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1139148)
- Num Sites 100
- Num Edges 0
- Num Triangles 183
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1139148)
-Parallel Triangulator..
-Stg_Component (ptr): 0x113d038
-Stg_Object (ptr): 0x113d038
- Stg_Class (ptr): 0x113d038
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x113d038)
- Num Sites 400
- Num Edges 0
- Num Triangles 787
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x113d038)
+Testing irregular parallel triangulation..
-Parallel Triangulator..
-Stg_Component (ptr): 0x113d038
-Stg_Object (ptr): 0x113d038
- Stg_Class (ptr): 0x113d038
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x113d038)
- Num Sites 900
- Num Edges 0
- Num Triangles 1780
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x113d038)
-Parallel Triangulator..
-Stg_Component (ptr): 0x113d038
-Stg_Object (ptr): 0x113d038
- Stg_Class (ptr): 0x113d038
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x113d038)
- Num Sites 1600
- Num Edges 0
- Num Triangles 3180
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x113d038)
+ Running Parallel Triangulator on 100 nodes
-Testing irregular parallel triangulation..
-Parallel Voronoi Area test: passed
-Parallel Voronoi Sides test: passed
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
-Parallel Triangulator..
-Stg_Component (ptr): 0x113d038
-Stg_Object (ptr): 0x113d038
- Stg_Class (ptr): 0x113d038
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x113d038)
- Num Sites 100
- Num Edges 0
- Num Triangles 162
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x113d038)
+ Running Parallel Triangulator on 400 nodes
-Parallel Triangulator..
-Stg_Component (ptr): 0x113d038
-Stg_Object (ptr): 0x113d038
- Stg_Class (ptr): 0x113d038
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x113d038)
- Num Sites 400
- Num Edges 0
- Num Triangles 722
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x113d038)
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
-Parallel Triangulator..
-Stg_Component (ptr): 0x113d038
-Stg_Object (ptr): 0x113d038
- Stg_Class (ptr): 0x113d038
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x113d038)
- Num Sites 900
- Num Edges 0
- Num Triangles 1682
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x113d038)
+ Running Parallel Triangulator on 900 nodes
-Parallel Triangulator..
-Stg_Component (ptr): 0x113d038
-Stg_Object (ptr): 0x113d038
- Stg_Class (ptr): 0x113d038
- sizeOfSelf: 296
- _deleteSelf: Yes
- type: ParallelDelaunay
- _delete (func ptr): 0x55218
- _print (func ptr): 0x55364
- _copy (func ptr): 0x55438
- name: Delaunay
- nameAllocationType: NON_GLOBAL
- _defaultConstructor (func ptr): 0x54a50
- _construct (func ptr): 0x5546c
- _build (func ptr): 0x5548c
- _initialise (func ptr): 0x56770
- _execute (func ptr): 0x56790
- _destroy (func ptr): 0x567b0
- isConstructed: False
- isBuilt: True
- isInitialised: False
- hasExecuted: False
- isDestroyed: False
- constructor function name: Delaunay-Construct
- build function name: Delaunay-Build
- initialise function name: Delaunay-Initialise
- execute function name: Delaunay-Execute
- destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x113d038)
- Num Sites 1600
- Num Edges 0
- Num Triangles 3042
- Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x113d038)
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
+ Running Parallel Triangulator on 1600 nodes
+
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
+
Testing regular parallel triangulation..
-Parallel Voronoi Area test: passed
-Parallel Voronoi Sides test: passed
+
+ Running Parallel Triangulator on 100 nodes
+
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
+
+ Running Parallel Triangulator on 400 nodes
+
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
+
+ Running Parallel Triangulator on 900 nodes
+
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
+
+ Running Parallel Triangulator on 1600 nodes
+
+ Parallel Voronoi Area test: passed
+ Parallel Voronoi Sides test: passed
+ Parallel Triangle count test: passed
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.c 2006-07-21 03:10:58 UTC (rev 4078)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.c 2006-07-21 03:11:24 UTC (rev 4079)
@@ -79,24 +79,6 @@
}
}
-int compareFunc( const void *a, const void *b )
-{
- int *p, *q;
-
- p = (int*)a;
- q = (int*)b;
-
- if( *p > *q ){
- return 1;
- }
- else if( *p < *q ){
- return -1;
- }
- else{
- return 0;
- }
-}
-
int compareFunction( const void *a, const void *b )
{
int *p, *q;
@@ -133,6 +115,7 @@
int numNeighboursTest = 0;
int voronoiSidesTest = 0;
int voronoiAreaTest = 0;
+ int triangleCountTest = 0;
int numSitesArray[4] = { 100, 400, 900, 1600 };
Dictionary *dictionary = NULL;
@@ -162,7 +145,17 @@
label: numNeighboursTest = 1;
voronoiAreaTest = 1;
voronoiSidesTest = 1;
-
+ triangleCountTest = 1;
+
+ if (rank == 0){
+ if( p == Irregular ){
+ printf( "\nTesting irregular parallel triangulation..\n\n" );
+ }
+ else if ( p == Regular ){
+ printf( "\nTesting regular parallel triangulation..\n\n" );
+ }
+ }
+
for( i=0; i<4; i++ ){
numSites = numSitesArray[i];
@@ -184,7 +177,7 @@
d = Delaunay_New( "Delaunay", dictionary, sites, numSites, 0, &attr );
Stg_Component_Build( d, NULL, True );
-
+
for( j=0; j<numSites; j++ ){
if( fabs(d->voronoiArea[j] - pd->voronoiArea[j]) > TOLERANCE ){
@@ -216,11 +209,12 @@
}
}
}
- Stg_Class_Delete( d );
- printf( "Parallel Triangulator..\n" );
- Stg_Class_Print( pd, Journal_Register( "stream", Info_Type ) );
- printf( "\n" );
+ if( d->numTriangles != pd->numTriangles ){
+ triangleCountTest = 0;
+ }
+
+ Stg_Class_Delete( d );
}
Stg_Class_Delete( pd );
@@ -228,24 +222,22 @@
if( rank == 0 ){
free( sites );
}
- }
+
+ if (rank == 0){
-
- if (rank == 0){
-
- if( p == Irregular ){
- printf( "Testing irregular parallel triangulation..\n" );
- }
- else if ( p == Regular ){
- printf( "Testing regular parallel triangulation..\n" );
- }
+ printf( "\n\tRunning Parallel Triangulator on %d nodes\n\n", numSites );
- if( voronoiAreaTest ){
- printf( "Parallel Voronoi Area test: passed\n" );
- }
+ if( voronoiAreaTest ){
+ printf( "\t\tParallel Voronoi Area test: passed\n" );
+ }
- if( voronoiSidesTest ){
- printf( "Parallel Voronoi Sides test: passed\n\n" );
+ if( voronoiSidesTest ){
+ printf( "\t\tParallel Voronoi Sides test: passed\n" );
+ }
+
+ if( triangleCountTest ){
+ printf( "\t\tParallel Triangle count test: passed\n" );
+ }
}
}
More information about the cig-commits
mailing list