[cig-commits] r5651 - in long/3D/Gale/trunk/src/PICellerator: . Weights/tests Weights/tests/expected

walter at geodynamics.org walter at geodynamics.org
Fri Jan 5 11:33:40 PST 2007


Author: walter
Date: 2007-01-05 11:33:39 -0800 (Fri, 05 Jan 2007)
New Revision: 5651

Added:
   long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsCircle.0of1.output.dat.expected
   long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsExpIface.0of1.output.dat.expected
   long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsPoly.0of1.output.dat.expected
   long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.0of1.expected
   long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.0of1.sh
   long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.c
   long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.xml
   long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsCircle.0of1.sh
   long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsExpIface.0of1.sh
   long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsPoly.0of1.sh
Modified:
   long/3D/Gale/trunk/src/PICellerator/
Log:
 r550 at earth (orig r402):  LukeHodkinson | 2007-01-04 16:57:00 -0800
 Forgot to add a bunch of DVC weights testing 
 code.
 
 



Property changes on: long/3D/Gale/trunk/src/PICellerator
___________________________________________________________________
Name: svk:merge
   - 00de75e2-39f1-0310-8538-9683d00a49cc:/branches/decomp3d:400
00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:381
aee11096-cf10-0410-a191-eea5772ba81f:/cig:524
   + 00de75e2-39f1-0310-8538-9683d00a49cc:/branches/decomp3d:402
00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:381
aee11096-cf10-0410-a191-eea5772ba81f:/cig:524

Added: long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsCircle.0of1.output.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsCircle.0of1.output.dat.expected	2007-01-05 19:32:31 UTC (rev 5650)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsCircle.0of1.output.dat.expected	2007-01-05 19:33:39 UTC (rev 5651)
@@ -0,0 +1 @@
+20 	 0.090837 0.055628

Added: long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsExpIface.0of1.output.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsExpIface.0of1.output.dat.expected	2007-01-05 19:32:31 UTC (rev 5650)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsExpIface.0of1.output.dat.expected	2007-01-05 19:33:39 UTC (rev 5651)
@@ -0,0 +1 @@
+20 	 0.047945 0.035636

Added: long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsPoly.0of1.output.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsPoly.0of1.output.dat.expected	2007-01-05 19:32:31 UTC (rev 5650)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/expected/testDVCWeightsPoly.0of1.output.dat.expected	2007-01-05 19:33:39 UTC (rev 5651)
@@ -0,0 +1 @@
+20 	 0.0077474 0.0014641

Added: long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.0of1.expected	2007-01-05 19:32:31 UTC (rev 5650)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.0of1.expected	2007-01-05 19:33:39 UTC (rev 5651)
@@ -0,0 +1,333 @@
+StGermain Framework revision 3927. Copyright (C) 2003-2005 VPAC.
+StGermain Discretisation Library revision 3927. Copyright (C) 2003-2005 VPAC.
+StGermain Finite Element Framework revision 687. Copyright (C) 2003-2005 VPAC.
+StGermain FEM Discretisation Framework revision 687. Copyright (C) 2003-2005 VPAC.
+StGermain SLE Library revision 687. Copyright (C) 2003-2005 VPAC.
+StGermain PETSc-LinearAlgebra Interface revision 687. Copyright (C) 2003-2005 VPAC.
+StGermain FEM Assembly Library revision 687. Copyright (C) 2003-2005 VPAC.
+-----------------------------
+3D functions:  
+-----------------------------
+
+****************************
+Test _DVCWeights_ConstructGrid function 
+****************************
+size of element:
+	 x = (-1.000000, 1.000000)
+	 y = (-1.000000, 1.000000) 
+	 z = (-1.000000, 1.000000)
+Resolution: 
+	 (x, y, z) = (0.000000, 1.000000, -1.000000)
+cell[0]:	Particle Index: -1
+ 		Values: (N: 2, S: -2, E: 1, W: -2, U: 4, D: -2) 
+ 		Coords: (-0.500000, -0.500000,-0.500000) 	 Done = 0
+cell[1]:	Particle Index: -1
+ 		Values: (N: 3, S: -2, E: -2, W: 0, U: 5, D: -2) 
+ 		Coords: (0.500000, -0.500000,-0.500000) 	 Done = 0
+cell[2]:	Particle Index: -1
+ 		Values: (N: -2, S: 0, E: 3, W: -2, U: 6, D: -2) 
+ 		Coords: (-0.500000, 0.500000,-0.500000) 	 Done = 0
+cell[3]:	Particle Index: -1
+ 		Values: (N: -2, S: 1, E: -2, W: 2, U: 7, D: -2) 
+ 		Coords: (0.500000, 0.500000,-0.500000) 	 Done = 0
+cell[4]:	Particle Index: -1
+ 		Values: (N: 6, S: -2, E: 5, W: -2, U: -2, D: 0) 
+ 		Coords: (-0.500000, -0.500000,0.500000) 	 Done = 0
+cell[5]:	Particle Index: -1
+ 		Values: (N: 7, S: -2, E: -2, W: 4, U: -2, D: 1) 
+ 		Coords: (0.500000, -0.500000,0.500000) 	 Done = 0
+cell[6]:	Particle Index: -1
+ 		Values: (N: -2, S: 4, E: 7, W: -2, U: -2, D: 2) 
+ 		Coords: (-0.500000, 0.500000,0.500000) 	 Done = 0
+cell[7]:	Particle Index: -1
+ 		Values: (N: -2, S: 5, E: -2, W: 6, U: -2, D: 3) 
+ 		Coords: (0.500000, 0.500000,0.500000) 	 Done = 0
+****************************
+Test _DVCWeights_InitialiseStructs function 
+****************************
+bchain[0]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+bchain[1]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+bchain[2]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+bchain[3]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+bchain[4]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+bchain[5]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+bchain[6]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+bchain[7]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+****************************
+Test _DVCWeights_ResetGrid function 
+****************************
+numz * numy * numx = 8
+cells[0].p = -1 	 cells[0].done = 0
+cells[1].p = -1 	 cells[1].done = 0
+cells[2].p = -1 	 cells[2].done = 0
+cells[3].p = -1 	 cells[3].done = 0
+cells[4].p = -1 	 cells[4].done = 0
+cells[5].p = -1 	 cells[5].done = 0
+cells[6].p = -1 	 cells[6].done = 0
+cells[7].p = -1 	 cells[7].done = 0
+****************************
+Test _DVCWeights_CreateVoronoi function 
+****************************
+pList[0]:		 coords: (x, y, z) = (0.333333, 0.333333, 0.333333)
+pList[1]:		 coords: (x, y, z) = (0.333333, 0.333333, 0.666667)
+pList[2]:		 coords: (x, y, z) = (0.333333, 0.666667, 0.333333)
+pList[3]:		 coords: (x, y, z) = (0.333333, 0.666667, 0.666667)
+pList[4]:		 coords: (x, y, z) = (0.666667, 0.333333, 0.333333)
+pList[5]:		 coords: (x, y, z) = (0.666667, 0.333333, 0.666667)
+pList[6]:		 coords: (x, y, z) = (0.666667, 0.666667, 0.333333)
+pList[7]:		 coords: (x, y, z) = (0.666667, 0.666667, 0.666667)
+
+(dx, dy, dz) = (1.000000, 1.000000, 1.000000)	da = 1.000000
+
+bchain[0]: 	 index = 7 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+bchain[1]: 	 index = 7 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+bchain[2]: 	 index = 7 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+bchain[3]: 	 index = 7 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+bchain[4]: 	 index = 7 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+bchain[5]: 	 index = 7 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+bchain[6]: 	 index = 7 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+bchain[7]: 	 index = 7 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+pList[0]:
+		 coords: (x, y, z) = (0.333333, 0.333333, 0.333333)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[1]:
+		 coords: (x, y, z) = (0.333333, 0.333333, 0.666667)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[2]:
+		 coords: (x, y, z) = (0.333333, 0.666667, 0.333333)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[3]:
+		 coords: (x, y, z) = (0.333333, 0.666667, 0.666667)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[4]:
+		 coords: (x, y, z) = (0.666667, 0.333333, 0.333333)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[5]:
+		 coords: (x, y, z) = (0.666667, 0.333333, 0.666667)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[6]:
+		 coords: (x, y, z) = (0.666667, 0.666667, 0.333333)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[7]:
+		 coords: (x, y, z) = (0.666667, 0.666667, 0.666667)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+****************************
+Test _DVCWeights_GetCentroids function 
+****************************
+pList[0]:
+		 coords: (x, y, z) = (0.333333, 0.333333, 0.333333)
+		 centroids: (cx, cy, cz) = (-0.071429, -0.071429 -0.071429)
+		 weight = 7.000000
+pList[1]:
+		 coords: (x, y, z) = (0.333333, 0.333333, 0.666667)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[2]:
+		 coords: (x, y, z) = (0.333333, 0.666667, 0.333333)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[3]:
+		 coords: (x, y, z) = (0.333333, 0.666667, 0.666667)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[4]:
+		 coords: (x, y, z) = (0.666667, 0.333333, 0.333333)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[5]:
+		 coords: (x, y, z) = (0.666667, 0.333333, 0.666667)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[6]:
+		 coords: (x, y, z) = (0.666667, 0.666667, 0.333333)
+		 centroids: (cx, cy, cz) = (0.000000, 0.000000 0.000000)
+		 weight = 0.000000
+pList[7]:
+		 coords: (x, y, z) = (0.666667, 0.666667, 0.666667)
+		 centroids: (cx, cy, cz) = (0.500000, 0.500000 0.500000)
+		 weight = 1.000000
+****************************
+Test _DVCWeights_DistanceSquared function 
+****************************
+particle0:
+		 coords: (x, y, z) = (0.500000, 0.500000, 0.500000)
+particle1:
+		 coords: (x, y, z) = (0.250000, 0.250000, 0.000000)
+calculated distance^2 between particles = 0.375000 
+
+-----------------------------
+2D functions:  
+-----------------------------
+
+****************************
+Test _DVCWeights_ConstructGrid2D function 
+****************************
+size of element:
+	 x = (-1.000000, 1.000000)
+	 y = (-1.000000, 1.000000) 
+Resolution: 
+	 (x, y) = (0.000000, 1.000000)
+cells2d[0]:	Particle Index: -1 
+ 		Values: (N: 2, S: -2, E: 1, W: -2) 
+ 		Coords: (-0.500000, -0.500000) 	 Done = 0
+cells2d[1]:	Particle Index: -1 
+ 		Values: (N: 3, S: -2, E: -2, W: 0) 
+ 		Coords: (0.500000, -0.500000) 	 Done = 0
+cells2d[2]:	Particle Index: -1 
+ 		Values: (N: -2, S: 0, E: 3, W: -2) 
+ 		Coords: (-0.500000, 0.500000) 	 Done = 0
+cells2d[3]:	Particle Index: -1 
+ 		Values: (N: -2, S: 1, E: -2, W: 2) 
+ 		Coords: (0.500000, 0.500000) 	 Done = 0
+****************************
+Test _DVCWeights_InitialiseStructs2D function 
+****************************
+bchain2D[0]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+bchain2D[1]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+bchain2D[2]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+bchain2D[3]: No of new_claimed_cells = 50, No of new_bound_cells = 50
+****************************
+Test _DVCWeights_ResetGrid2D function 
+****************************
+numz * numy = 4
+cells2D[0].p = -1 	 cells2D[0].done = 0
+cells2D[1].p = -1 	 cells2D[1].done = 0
+cells2D[2].p = -1 	 cells2D[2].done = 0
+cells2D[3].p = -1 	 cells2D[3].done = 0
+****************************
+Test _DVCWeights_CreateVoronoi2D function 
+****************************
+pList2D[0]:		 coords: (x, y) = (0.333333, 0.333333)
+pList2D[1]:		 coords: (x, y) = (0.333333, 0.666667)
+pList2D[2]:		 coords: (x, y) = (0.666667, 0.333333)
+pList2D[3]:		 coords: (x, y) = (0.666667, 0.666667)
+
+(dx, dy) = (1.000000, 1.000000)	da = 1.000000
+
+bchain2D[0]: 	  index = 3 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+bchain2D[1]: 	  index = 3 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+bchain2D[2]: 	  index = 3 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+bchain2D[3]: 	  index = 3 
+		 sizeofboundary = 0 
+		 numclaimed = 0 
+		 totalclaimed = 1
+		 new_bound_cells_malloced = 50 
+		 new_claimed_cells_malloced = 50 
+		 done = 0
+pList2D[0]:
+		 coords: (x, y) = (0.333333, 0.333333)
+		 centroids: (cx, cy) = (0.000000, 0.000000)
+		 weight = 0.000000
+pList2D[1]:
+		 coords: (x, y) = (0.333333, 0.666667)
+		 centroids: (cx, cy) = (0.000000, 0.000000)
+		 weight = 0.000000
+pList2D[2]:
+		 coords: (x, y) = (0.666667, 0.333333)
+		 centroids: (cx, cy) = (0.000000, 0.000000)
+		 weight = 0.000000
+pList2D[3]:
+		 coords: (x, y) = (0.666667, 0.666667)
+		 centroids: (cx, cy) = (0.000000, 0.000000)
+		 weight = 0.000000
+****************************
+Test _DVCWeights_GetCentroids2D function 
+****************************
+pList2D[0]:
+		 coords: (x, y) = (0.333333, 0.333333)
+		 centroids: (cx, cy) = (-0.166667, -0.166667)
+		 weight = 3.000000
+pList2D[1]:
+		 coords: (x, y) = (0.333333, 0.666667)
+		 centroids: (cx, cy) = (0.000000, 0.000000)
+		 weight = 0.000000
+pList2D[2]:
+		 coords: (x, y) = (0.666667, 0.333333)
+		 centroids: (cx, cy) = (0.000000, 0.000000)
+		 weight = 0.000000
+pList2D[3]:
+		 coords: (x, y) = (0.666667, 0.666667)
+		 centroids: (cx, cy) = (0.500000, 0.500000)
+		 weight = 1.000000
+****************************
+Test _DVCWeights_DistanceSquared2D function 
+****************************
+particle0:
+		 coords: (x, y) = (0.500000, 0.500000)
+particle1:
+		 coords: (x, y) = (0.250000, 0.250000)
+calculated distance^2 between particles = 0.125000 

Added: long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.0of1.sh	2007-01-05 19:32:31 UTC (rev 5650)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.0of1.sh	2007-01-05 19:33:39 UTC (rev 5651)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+        TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+
+runAndHandleSystemTest "testDVCWeights" "$0" "$@"

Added: long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.c	2007-01-05 19:32:31 UTC (rev 5650)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.c	2007-01-05 19:33:39 UTC (rev 5651)
@@ -0,0 +1,418 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**
+** Copyright (C), 2003, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street, Melbourne, 3053, Australia.
+**
+** Authors:
+**	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
+**	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
+**	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
+**	Siew-Ching Tan, Software Engineer, VPAC. (siew at vpac.org)
+**	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
+**	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
+**	Robert B. Turnbull, Monash Cluster Computing. (Robert.Turnbull at sci.monash.edu.au)
+**	Kathleen M. Humble, Computational Scientist, VPAC. (khumble at vpac.org)
+**
+**  This library is free software; you can redistribute it and/or
+**  modify it under the terms of the GNU Lesser General Public
+**  License as published by the Free Software Foundation; either
+**  version 2.1 of the License, or (at your option) any later version.
+**
+**  This library is distributed in the hope that it will be useful,
+**  but WITHOUT ANY WARRANTY; without even the implied warranty of
+**  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+**  Lesser General Public License for more details.
+**
+**  You should have received a copy of the GNU Lesser General Public
+**  License along with this library; if not, write to the Free Software
+**  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+**
+** $Id: testTensorMath.c 3462 2006-02-19 06:53:24Z WalterLandry $
+**
+**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+#include <mpi.h>
+
+#include <StGermain/StGermain.h>
+#include <StgFEM/StgFEM.h>
+#include <PICellerator/Voronoi/Voronoi.h>
+#include <PICellerator/PopulationControl/PopulationControl.h>
+
+#include "PICellerator/Weights/Weights.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main( int argc, char* argv[] ) {
+	MPI_Comm CommWorld;
+	int rank;
+	int numProcessors;
+	int procToWatch;
+	Stream*  stream;
+	
+	/* Initialise MPI, get world info */
+	MPI_Init( &argc, &argv );
+	MPI_Comm_dup( MPI_COMM_WORLD, &CommWorld );
+	MPI_Comm_size( CommWorld, &numProcessors );
+	MPI_Comm_rank( CommWorld, &rank );
+	
+	StGermain_Init( &argc, &argv );
+	StgFEM_Init( &argc, &argv );
+    PICellerator_Voronoi_Init( &argc, &argv );
+    PICellerator_PopulationControl_Init( &argc, &argv );
+	PICellerator_Weights_Init( &argc, &argv );
+
+	/* TODO Not sure how to use the DVCWeights Init as it doesn't match the other ones */
+	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
+	
+	stream = Journal_Register( InfoStream_Type, "testDVCWeights" );
+
+	stJournal->firewallProducesAssert = False;
+	//Stream_RedirectFile(Journal_Register( Error_Type, "FullTensorMath"), "FullTensorMath.txt");
+	//Stream_RedirectFile(stream, "FullTensorMath.txt");
+	
+	
+	if( argc >= 2 ) {
+		procToWatch = atoi( argv[1] );
+	}
+	else {
+		procToWatch = 0;
+	}
+
+	if( rank == procToWatch ) {
+	
+		double dx,dy,dz,da;
+		static struct cell *cells;// the 3D connected grid 
+		struct particle *pList;// 3D particle List
+		struct chain *bchain;//3D boundary chain
+			
+		static struct cell2d *cells2D;// the 2D connected grid
+		struct particle2d *pList2D;//2D particle List
+		struct chain *bchain2D;//2D boundary chain
+			
+		int nump,numx,numy,numz;
+		int px, py, pz;
+		double BBXMIN = -1.0; // the ranges of the local coordinates of a FEM cell.
+		double BBXMAX = 1.0;
+		double BBYMIN = -1.0;
+		double BBYMAX = 1.0;
+		double BBZMIN = -1.0;
+		double BBZMAX = 1.0;
+		int i,j,k,l;
+		double particleDistance;		
+		double particle0[3], particle1[3];
+		
+		/* Do the testing of the 3D functions*/
+
+		Journal_Printf( stream, "-----------------------------\n");	
+		Journal_Printf( stream, "3D functions:  \n");
+		Journal_Printf( stream, "-----------------------------\n\n");	
+
+
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_ConstructGrid function \n");
+		Journal_Printf( stream, "****************************\n");
+		
+		//Define the resolution
+		
+		numx = 2;
+		numy = 2;
+		numz = 2;
+
+		Journal_Printf( stream, "size of element:\n\t x = (%f, %f)\n\t y = (%f, %f) \n\t z = (%f, %f)\n",
+			BBXMIN, BBXMAX, BBYMIN, BBYMAX, BBZMIN, BBZMAX);
+		Journal_Printf( stream, "Resolution: \n\t (x, y, z) = (%f, %f, %f)\n", numx, numy, numz);
+		
+     		_DVCWeights_ConstructGrid(&cells,numz,numy,numx,BBXMIN,BBYMIN,BBZMIN,BBXMAX,BBYMAX,BBZMAX);		
+		
+		/* Print out the grid somehow */
+		for (i = 0; i < (numx * numy * numz); i++ ) {
+			Journal_Printf(stream, "cell[%d]:\tParticle Index: %d\n", 
+					i, cells[i].p);
+			Journal_Printf(stream, " \t\tValues: (N: %d, S: %d, E: %d, W: %d, U: %d, D: %d) \n", 
+					cells[i].N, cells[i].S, cells[i].E, cells[i].W,cells[i].U, cells[i].D );
+			Journal_Printf(stream, " \t\tCoords: (%f, %f,%f) \t Done = %d\n", 
+					cells[i].x, cells[i].y, cells[i].z, cells[i].done);			
+		}
+
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_InitialiseStructs function \n");
+		Journal_Printf( stream, "****************************\n");
+		
+		//Define the number of particles
+		px = 2;
+		py = 2; 
+		pz = 2;
+		nump = px * py * pz;
+		
+		_DVCWeights_InitialiseStructs( &bchain, &pList, nump);
+		for (i = 0; i < nump; i++) {
+			Journal_Printf( stream, "bchain[%d]: ", i);
+			Journal_Printf( stream, "No of new_claimed_cells = %d, ", 
+				bchain[i].new_claimed_cells_malloced);
+			Journal_Printf( stream, "No of new_bound_cells = %d\n",
+				bchain[i].new_bound_cells_malloced);
+		}
+		
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_ResetGrid function \n");
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "numz * numy * numx = %d\n", numz*numy*numx);
+		
+		_DVCWeights_ResetGrid(&cells,numz*numy*numx);
+
+		for ( i = 0; i < numz*numy*numx; i++) {
+			Journal_Printf( stream, "cells[%d].p = %d \t cells[%d].done = %d\n",
+				i, cells[i].p, i, cells[i].done);
+			
+		}
+		
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_CreateVoronoi function \n");
+		Journal_Printf( stream, "****************************\n");
+
+		dx = (BBXMAX - BBXMIN)/numx;
+		dy = (BBYMAX - BBYMIN)/numy;
+		dz = (BBZMAX - BBZMIN)/numz;
+		da = dx*dy*dz;
+		//Initialise particle coords
+		l = 0;
+		for(i = 0; i < px ;i++){
+	    	for ( j = 0; j < py ; j++) {
+				for ( k = 0; k < pz; k++ ) { 
+	      			pList[l].x = (1 + i) / (px + 1.0);
+	      			pList[l].y = (1 + j) / ( py + 1.0);
+	      			pList[l].z = (1 + k) / (pz + 1.0);
+					l++;
+				}
+		  	}
+	  	}
+		for ( i = 0; i < nump; i++) {	    
+			Journal_Printf( stream, "pList[%d]:", i);
+			Journal_Printf( stream, "\t\t coords: (x, y, z) = (%f, %f, %f)\n",
+				pList[i].x, pList[i].y, pList[i].z);
+
+		}
+		Journal_Printf( stream, "\n(dx, dy, dz) = (%f, %f, %f)	da = %f\n\n",
+			dx, dy, dz, da);		
+		_DVCWeights_CreateVoronoi( &bchain, &pList, &cells, dx, dy, dz, nump, numx, numy, numz, BBXMIN, BBXMAX, BBYMIN, BBYMAX, BBZMIN, BBZMAX);
+		
+		/* print out bchain changes */
+		for (i = 0; i < nump; i++) {
+			Journal_Printf( stream, "bchain[%d]: \t index = %d \n",
+					i, bchain[i].index);
+			Journal_Printf( stream, "\t\t sizeofboundary = %d \n\t\t numclaimed = %d \n",
+					bchain[i].sizeofboundary, bchain[i].numclaimed);
+			Journal_Printf( stream, "\t\t totalclaimed = %d\n", bchain[i].totalclaimed);
+			Journal_Printf( stream, "\t\t new_bound_cells_malloced = %d \n",
+					bchain[i].new_bound_cells_malloced);
+			Journal_Printf( stream, "\t\t new_claimed_cells_malloced = %d \n",
+					bchain[i].new_claimed_cells_malloced);
+			Journal_Printf( stream, "\t\t done = %d\n", bchain[i].done);
+		}
+		/* Print out particle values */
+		for (i = 0; i < nump; i++) {
+		
+			Journal_Printf( stream, "pList[%d]:\n", i);
+			Journal_Printf( stream, "\t\t coords: (x, y, z) = (%f, %f, %f)\n",
+				pList[i].x, pList[i].y, pList[i].z);
+			Journal_Printf( stream, "\t\t centroids: (cx, cy, cz) = (%f, %f %f)\n",
+				pList[i].cx, pList[i].cy, pList[i].cz);
+			Journal_Printf( stream, "\t\t weight = %f\n", pList[i].w);
+		
+		}
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_GetCentroids function \n");
+		Journal_Printf( stream, "****************************\n");
+
+		_DVCWeights_GetCentroids( cells, pList,numz,numy,numx,nump,da);
+		for (i = 0; i < nump; i++) {
+		
+			Journal_Printf( stream, "pList[%d]:\n", i);
+			Journal_Printf( stream, "\t\t coords: (x, y, z) = (%f, %f, %f)\n",
+				pList[i].x, pList[i].y, pList[i].z);
+			Journal_Printf( stream, "\t\t centroids: (cx, cy, cz) = (%f, %f %f)\n",
+				pList[i].cx, pList[i].cy, pList[i].cz);
+			Journal_Printf( stream, "\t\t weight = %f\n", pList[i].w);
+		
+		}
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_DistanceSquared function \n");
+		Journal_Printf( stream, "****************************\n");
+		particle0[0] = 0.5;	particle0[1] = 0.5;	particle0[2] = 0.5;
+		particle1[0] = 0.25; particle1[1] = 0.25; 	particle1[2] = 0; 		
+		Journal_Printf( stream, "particle0:\n");
+		Journal_Printf( stream, "\t\t coords: (x, y, z) = (%f, %f, %f)\n",
+				particle0[0], particle0[1], particle0[2]);
+		Journal_Printf( stream, "particle1:\n");
+		Journal_Printf( stream, "\t\t coords: (x, y, z) = (%f, %f, %f)\n",
+				particle1[0], particle1[1], particle1[2]);
+		
+		particleDistance = _DVCWeights_DistanceSquared(
+			particle0[0], particle0[1], particle0[2],
+			particle1[0], particle1[1], particle1[2]);
+		Journal_Printf( stream, "calculated distance^2 between particles = %f \n", particleDistance);
+		
+		free(bchain);
+		free(pList);
+		
+		Journal_Printf( stream, "\n-----------------------------\n");	
+		Journal_Printf( stream, "2D functions:  \n");
+		Journal_Printf( stream, "-----------------------------\n\n");
+
+		/*********************************/
+		/* Test construct grid 2D */
+
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_ConstructGrid2D function \n");
+		Journal_Printf( stream, "****************************\n");
+		
+		//Define the resolution
+		
+		numx = 2;
+		numy = 2;
+
+		Journal_Printf( stream, "size of element:\n\t x = (%f, %f)\n\t y = (%f, %f) \n",
+			BBXMIN, BBXMAX, BBYMIN, BBYMAX);
+		Journal_Printf( stream, "Resolution: \n\t (x, y) = (%f, %f)\n", numx, numy);
+		
+     		_DVCWeights_ConstructGrid2D(&cells2D,numy,numx, BBXMIN,BBYMIN,BBXMAX,BBYMAX);		
+		
+		/* Print out the grid somehow */
+		for (i = 0; i < (numx * numy ); i++ ) {
+			Journal_Printf(stream, "cells2d[%d]:\tParticle Index: %d \n", 
+					i, cells2D[i].p);
+			Journal_Printf(stream, " \t\tValues: (N: %d, S: %d, E: %d, W: %d) \n", 
+					cells2D[i].N, cells2D[i].S, cells2D[i].E, cells2D[i].W );
+			Journal_Printf(stream, " \t\tCoords: (%f, %f) \t Done = %d\n", 
+					cells2D[i].x, cells2D[i].y, cells[i].done);			
+		}
+
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_InitialiseStructs2D function \n");
+		Journal_Printf( stream, "****************************\n");
+		
+		//Define size of swarm-to-be
+		px = 2;
+		py = 2; 
+		nump = px * py ;
+		
+		_DVCWeights_InitialiseStructs2D( &bchain2D, &pList2D, nump);
+		for (i = 0; i < nump; i++) {
+			Journal_Printf( stream, "bchain2D[%d]: ", i);
+			Journal_Printf( stream, "No of new_claimed_cells = %d, ", 
+				bchain2D[i].new_claimed_cells_malloced);
+			Journal_Printf( stream, "No of new_bound_cells = %d\n",
+				bchain2D[i].new_bound_cells_malloced);
+		}
+		
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_ResetGrid2D function \n");
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "numz * numy = %d\n", numz*numy);
+		
+		_DVCWeights_ResetGrid2D(&cells2D,numx*numy);
+
+		for ( i = 0; i < numx*numy; i++) {
+			Journal_Printf( stream, "cells2D[%d].p = %d \t cells2D[%d].done = %d\n",
+				i, cells2D[i].p, i, cells2D[i].done);
+			
+		}
+		
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_CreateVoronoi2D function \n");
+		Journal_Printf( stream, "****************************\n");
+
+		dx = (BBXMAX - BBXMIN)/numx;
+		dy = (BBYMAX - BBYMIN)/numy;
+		da = dx*dy;
+		//Initialise particle coords
+		l = 0;
+		for(i = 0; i < px ;i++){
+	    	for ( j = 0; j < py ; j++) {
+	      		pList2D[l].x = (1 + i) / (px + 1.0);
+	      		pList2D[l].y = (1 + j) / ( py + 1.0);
+				l++;
+		  	}
+	  	}
+		for ( i = 0; i < nump; i++) {	    
+			Journal_Printf( stream, "pList2D[%d]:", i);
+			Journal_Printf( stream, "\t\t coords: (x, y) = (%f, %f)\n",
+				pList2D[i].x, pList2D[i].y);
+
+		}
+		Journal_Printf( stream, "\n(dx, dy) = (%f, %f)	da = %f\n\n",
+			dx, dy, da);		
+		_DVCWeights_CreateVoronoi2D( &bchain2D, &pList2D, &cells2D, dx, dy, nump, numx, numy, BBXMIN, BBXMAX, BBYMIN, BBYMAX);
+		
+		/* print out bchain changes */
+		for (i = 0; i < nump; i++) {
+			Journal_Printf( stream, "bchain2D[%d]: \t  index = %d \n",
+					i, bchain2D[i].index);
+			Journal_Printf( stream, "\t\t sizeofboundary = %d \n\t\t numclaimed = %d \n",
+					bchain2D[i].sizeofboundary, bchain2D[i].numclaimed);
+			Journal_Printf( stream, "\t\t totalclaimed = %d\n", bchain2D[i].totalclaimed);
+			Journal_Printf( stream, "\t\t new_bound_cells_malloced = %d \n",
+					bchain2D[i].new_bound_cells_malloced);
+			Journal_Printf( stream, "\t\t new_claimed_cells_malloced = %d \n",
+					bchain2D[i].new_claimed_cells_malloced);
+			Journal_Printf( stream, "\t\t done = %d\n", bchain2D[i].done);
+		}
+		/* Print out particle values */
+		for (i = 0; i < nump; i++) {
+		
+			Journal_Printf( stream, "pList2D[%d]:\n", i);
+			Journal_Printf( stream, "\t\t coords: (x, y) = (%f, %f)\n",
+				pList2D[i].x, pList2D[i].y);
+			Journal_Printf( stream, "\t\t centroids: (cx, cy) = (%f, %f)\n",
+				pList2D[i].cx, pList2D[i].cy);
+			Journal_Printf( stream, "\t\t weight = %f\n", pList2D[i].w);
+		
+		}
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_GetCentroids2D function \n");
+		Journal_Printf( stream, "****************************\n");
+
+		_DVCWeights_GetCentroids2D( cells2D, pList2D,numy,numx,nump,da);
+		for (i = 0; i < nump; i++) {
+		
+			Journal_Printf( stream, "pList2D[%d]:\n", i);
+			Journal_Printf( stream, "\t\t coords: (x, y) = (%f, %f)\n",
+				pList2D[i].x, pList2D[i].y);
+			Journal_Printf( stream, "\t\t centroids: (cx, cy) = (%f, %f)\n",
+				pList2D[i].cx, pList2D[i].cy);
+			Journal_Printf( stream, "\t\t weight = %f\n", pList2D[i].w);
+		
+		}
+		Journal_Printf( stream, "****************************\n");
+		Journal_Printf( stream, "Test _DVCWeights_DistanceSquared2D function \n");
+		Journal_Printf( stream, "****************************\n");
+		
+		Journal_Printf( stream, "particle0:\n");
+		Journal_Printf( stream, "\t\t coords: (x, y) = (%f, %f)\n",
+				particle0[0], particle0[1]);
+		Journal_Printf( stream, "particle1:\n");
+		Journal_Printf( stream, "\t\t coords: (x, y) = (%f, %f)\n",
+				particle1[0], particle1[1]);
+		
+		particleDistance = _DVCWeights_DistanceSquared2D(
+			particle0[0], particle0[1],
+			particle1[0], particle1[1] );
+		Journal_Printf( stream, "calculated distance^2 between particles = %f \n", particleDistance);
+		
+		
+		
+		free(bchain2D);
+		free(pList2D);
+
+	}
+		
+	
+	DiscretisationGeometry_Finalise();
+	
+	Base_Finalise();
+	
+	/* Close off MPI */
+	MPI_Finalize();
+	
+	return 0;
+}

Added: long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.xml
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.xml	2007-01-05 19:32:31 UTC (rev 5650)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.xml	2007-01-05 19:33:39 UTC (rev 5651)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+	
+	<include>testElementIntegral.xml</include>
+	
+	<struct name="components" mergeType="merge">
+		<struct name="weights">
+			<param name="Type">DVCWeights</param>
+		</struct>		
+	</struct>
+
+</StGermainData>

Added: long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsCircle.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsCircle.0of1.sh	2007-01-05 19:32:31 UTC (rev 5650)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsCircle.0of1.sh	2007-01-05 19:33:39 UTC (rev 5651)
@@ -0,0 +1,52 @@
+#!/bin/sh
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+##
+## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
+##	Melbourne, 3053, Australia.
+## Copyright (c) 2005-2006, Monash Cluster Computing, Building 28, Monash University Clayton Campus,
+##	Victoria, 3800, Australia
+##
+## Primary Contributing Organisations:
+##	Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
+##	Australian Computational Earth Systems Simulator - http://www.access.edu.au
+##	Monash Cluster Computing - http://www.mcc.monash.edu.au
+##
+## Contributors:
+##	Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
+##	Patrick D. Sunter, Software Engineer, VPAC. (patrick at vpac.org)
+##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
+##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
+##	David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
+##	Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
+##	Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
+##	Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
+##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
+##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
+##	David Stegman, Postdoctoral Fellow, Monash University. (david.stegman at sci.monash.edu.au)
+##	Wendy Sharples, PhD Student, Monash University (wendy.sharples at sci.monash.edu.au)
+##
+##  This library is free software; you can redistribute it and/or
+##  modify it under the terms of the GNU Lesser General Public
+##  License as published by the Free Software Foundation; either
+##  version 2.1 of the License, or (at your option) any later version.
+##
+##  This library is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+##  Lesser General Public License for more details.
+##
+##  You should have received a copy of the GNU Lesser General Public
+##  License along with this library; if not, write to the Free Software
+##  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## $Id: testConstantWeightsCircle.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+##
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+        TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+
+runAndHandleSystemTestStdLocations "PICellerator testDVCWeights.xml --FunctionName=CircleInterface" "$0" "$@"

Added: long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsExpIface.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsExpIface.0of1.sh	2007-01-05 19:32:31 UTC (rev 5650)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsExpIface.0of1.sh	2007-01-05 19:33:39 UTC (rev 5651)
@@ -0,0 +1,52 @@
+#!/bin/sh
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+##
+## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
+##	Melbourne, 3053, Australia.
+## Copyright (c) 2005-2006, Monash Cluster Computing, Building 28, Monash University Clayton Campus,
+##	Victoria, 3800, Australia
+##
+## Primary Contributing Organisations:
+##	Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
+##	Australian Computational Earth Systems Simulator - http://www.access.edu.au
+##	Monash Cluster Computing - http://www.mcc.monash.edu.au
+##
+## Contributors:
+##	Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
+##	Patrick D. Sunter, Software Engineer, VPAC. (patrick at vpac.org)
+##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
+##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
+##	David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
+##	Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
+##	Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
+##	Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
+##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
+##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
+##	David Stegman, Postdoctoral Fellow, Monash University. (david.stegman at sci.monash.edu.au)
+##	Wendy Sharples, PhD Student, Monash University (wendy.sharples at sci.monash.edu.au)
+##
+##  This library is free software; you can redistribute it and/or
+##  modify it under the terms of the GNU Lesser General Public
+##  License as published by the Free Software Foundation; either
+##  version 2.1 of the License, or (at your option) any later version.
+##
+##  This library is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+##  Lesser General Public License for more details.
+##
+##  You should have received a copy of the GNU Lesser General Public
+##  License along with this library; if not, write to the Free Software
+##  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## $Id: testConstantWeightsExpIface.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+##
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+        TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+
+runAndHandleSystemTestStdLocations "PICellerator testDVCWeights.xml --FunctionName=ExponentialInterface" "$0" "$@"

Added: long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsPoly.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsPoly.0of1.sh	2007-01-05 19:32:31 UTC (rev 5650)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeightsPoly.0of1.sh	2007-01-05 19:33:39 UTC (rev 5651)
@@ -0,0 +1,52 @@
+#!/bin/sh
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+##
+## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
+##	Melbourne, 3053, Australia.
+## Copyright (c) 2005-2006, Monash Cluster Computing, Building 28, Monash University Clayton Campus,
+##	Victoria, 3800, Australia
+##
+## Primary Contributing Organisations:
+##	Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
+##	Australian Computational Earth Systems Simulator - http://www.access.edu.au
+##	Monash Cluster Computing - http://www.mcc.monash.edu.au
+##
+## Contributors:
+##	Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
+##	Patrick D. Sunter, Software Engineer, VPAC. (patrick at vpac.org)
+##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
+##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
+##	David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
+##	Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
+##	Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
+##	Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
+##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
+##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
+##	David Stegman, Postdoctoral Fellow, Monash University. (david.stegman at sci.monash.edu.au)
+##	Wendy Sharples, PhD Student, Monash University (wendy.sharples at sci.monash.edu.au)
+##
+##  This library is free software; you can redistribute it and/or
+##  modify it under the terms of the GNU Lesser General Public
+##  License as published by the Free Software Foundation; either
+##  version 2.1 of the License, or (at your option) any later version.
+##
+##  This library is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+##  Lesser General Public License for more details.
+##
+##  You should have received a copy of the GNU Lesser General Public
+##  License along with this library; if not, write to the Free Software
+##  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## $Id: testConstantWeightsPoly.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+##
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+        TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+
+runAndHandleSystemTestStdLocations "PICellerator testDVCWeights.xml --FunctionName=PolynomialFunction" "$0" "$@"



More information about the cig-commits mailing list