[cig-commits] r4076 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Geometry/tests

walter at geodynamics.org walter at geodynamics.org
Thu Jul 20 20:10:35 PDT 2006


Author: walter
Date: 2006-07-20 20:10:35 -0700 (Thu, 20 Jul 2006)
New Revision: 4076

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.c
Log:
 r2545 at earth:  boo | 2006-07-20 20:01:48 -0700
  r2521 at earth (orig r3690):  RaquibulHassan | 2006-07-18 23:36:28 -0700
  Forgot to remove a debug "sleep" from the test.
  
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2544
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3689
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2545
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3690

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:33 UTC (rev 4075)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.0of1.expected	2006-07-21 03:10:35 UTC (rev 4076)
@@ -1,8 +1,8 @@
 StGermain Framework revision 3667. Copyright (C) 2003-2005 VPAC.
 Parallel Triangulator..
-Stg_Component (ptr): 0x1138ed8
-Stg_Object (ptr): 0x1138ed8
-	Stg_Class (ptr): 0x1138ed8
+Stg_Component (ptr): 0x1138eb8
+Stg_Object (ptr): 0x1138eb8
+	Stg_Class (ptr): 0x1138eb8
 		sizeOfSelf: 296
 		_deleteSelf: Yes
 		type: ParallelDelaunay
@@ -27,17 +27,17 @@
 	initialise function name: Delaunay-Initialise
 	execute function name: Delaunay-Execute
 	destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138ed8)
+Delaunay (ptr): (0x1138eb8)
 	Num Sites 100
 	Num Edges 0
 	Num Triangles 183
 	Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138ed8)
+ParallelDelaunay (ptr): (0x1138eb8)
 
 Parallel Triangulator..
-Stg_Component (ptr): 0x1138ec8
-Stg_Object (ptr): 0x1138ec8
-	Stg_Class (ptr): 0x1138ec8
+Stg_Component (ptr): 0x1138ea8
+Stg_Object (ptr): 0x1138ea8
+	Stg_Class (ptr): 0x1138ea8
 		sizeOfSelf: 296
 		_deleteSelf: Yes
 		type: ParallelDelaunay
@@ -62,17 +62,17 @@
 	initialise function name: Delaunay-Initialise
 	execute function name: Delaunay-Execute
 	destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138ec8)
+Delaunay (ptr): (0x1138ea8)
 	Num Sites 400
 	Num Edges 0
 	Num Triangles 787
 	Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138ec8)
+ParallelDelaunay (ptr): (0x1138ea8)
 
 Parallel Triangulator..
-Stg_Component (ptr): 0x1138ec8
-Stg_Object (ptr): 0x1138ec8
-	Stg_Class (ptr): 0x1138ec8
+Stg_Component (ptr): 0x1138ea8
+Stg_Object (ptr): 0x1138ea8
+	Stg_Class (ptr): 0x1138ea8
 		sizeOfSelf: 296
 		_deleteSelf: Yes
 		type: ParallelDelaunay
@@ -97,17 +97,17 @@
 	initialise function name: Delaunay-Initialise
 	execute function name: Delaunay-Execute
 	destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138ec8)
+Delaunay (ptr): (0x1138ea8)
 	Num Sites 900
 	Num Edges 0
 	Num Triangles 1780
 	Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138ec8)
+ParallelDelaunay (ptr): (0x1138ea8)
 
 Parallel Triangulator..
-Stg_Component (ptr): 0x1138ec8
-Stg_Object (ptr): 0x1138ec8
-	Stg_Class (ptr): 0x1138ec8
+Stg_Component (ptr): 0x1138ea8
+Stg_Object (ptr): 0x1138ea8
+	Stg_Class (ptr): 0x1138ea8
 		sizeOfSelf: 296
 		_deleteSelf: Yes
 		type: ParallelDelaunay
@@ -132,22 +132,158 @@
 	initialise function name: Delaunay-Initialise
 	execute function name: Delaunay-Execute
 	destroy function name: Delaunay-Destroy
-Delaunay (ptr): (0x1138ec8)
+Delaunay (ptr): (0x1138ea8)
 	Num Sites 1600
 	Num Edges 0
 	Num Triangles 3180
 	Num Voronoi Vertices 0
-ParallelDelaunay (ptr): (0x1138ec8)
+ParallelDelaunay (ptr): (0x1138ea8)
 
 Testing irregular parallel triangulation..
 Parallel Voronoi Area test: passed
 Parallel Voronoi Sides test: passed
 
 Parallel Triangulator..
-Stg_Component (ptr): 0x1138ec8
-Stg_Object (ptr): 0x1138ec8
-	Stg_Class (ptr): 0x1138ec8
+Stg_Component (ptr): 0x1138ea8
+Stg_Object (ptr): 0x1138ea8
+	Stg_Class (ptr): 0x1138ea8
 		sizeOfSelf: 296
 		_deleteSelf: Yes
 		type: ParallelDelaunay
-		_de
\ No newline at end of file
+		_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)
+
+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 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)
+
+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)
+
+Testing regular parallel triangulation..
+Parallel Voronoi Area test: passed
+Parallel Voronoi Sides 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:33 UTC (rev 4075)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testParallelDelaunay.c	2006-07-21 03:10:35 UTC (rev 4076)
@@ -263,6 +263,5 @@
 	
 	/* Close off MPI */
 	MPI_Finalize();
-	sleep(500);
 	return 0;
 }



More information about the cig-commits mailing list