[cig-commits] commit: * Name mangling added such the toolboxes only need to be called by e.g. StgFEM a

Mercurial hg at geodynamics.org
Mon Nov 24 11:30:32 PST 2008


changeset:   37:6a8704d68523
user:        SteveQuenette
date:        Sun Aug 05 09:48:58 2007 +0000
files:       Apps/BuoyancyBenchmark/BuoyancyExample.xml Apps/BuoyancyBenchmark/tests/testBuoyancy.0of1.sh Apps/LidDrivenPIC/LidDrivenPIC.xml Apps/LidDrivenPIC/tests/testLidDrivenPIC-Analytic-2D.0of1.sh Apps/LidDrivenPIC/tests/testLidDrivenPIC-Analytic-2D.0of2.sh Apps/RayleighTaylor/RayTay_Example-flip1.xml Apps/RayleighTaylor/RayTay_Example-test1.xml Apps/RayleighTaylor/RayTay_Example.xml Apps/RayleighTaylor/tests/testAnalyticBlock.0of1.sh Apps/RayleighTaylor/tests/testAnalyticBlock.0of2.sh Apps/RayleighTaylor/tests/testAnalyticColumn.0of1.sh Apps/RayleighTaylor/tests/testAnalyticColumn.0of2.sh Apps/RayleighTaylor/tests/testAnalyticColumn3D.0of1.sh Apps/RayleighTaylor/tests/testRayTay2D-i686.0of1.sh Apps/RayleighTaylor/tests/testRayTay2D.0of1.sh Apps/RayleighTaylor/tests/testRayTay3D.0of1.sh Apps/RayleighTaylor/tests/testRayTaySuperimposedBall2D-invert.0of1.sh Apps/RayleighTaylor/tests/testRayTaySuperimposedBall2D.0of1.sh Apps/ThermoChem/ThermoChem.xml MaterialPoints/tests/testEuler.0of1.sh MaterialPoints/tests/testEuler.0of2.sh MaterialPoints/tests/testEuler.0of3.sh MaterialPoints/tests/testEuler.xml MaterialPoints/tests/testMaterialFeVariable.0of1.sh MaterialPoints/tests/testMaterialFeVariable.0of2.sh MaterialPoints/tests/testMaterialFeVariable.xml MaterialPoints/tests/testRK2.0of1.sh MaterialPoints/tests/testRK2.0of2.sh MaterialPoints/tests/testRK2.xml MaterialPoints/tests/testRK4.0of1.sh MaterialPoints/tests/testRK4.0of2.sh MaterialPoints/tests/testRK4.xml PopulationControl/tests/testDiscreteVoronoiRemove.0of1.sh PopulationControl/tests/testDiscreteVoronoiRemove.xml PopulationControl/tests/testDiscreteVoronoiSplitting.0of1.sh PopulationControl/tests/testDiscreteVoronoiSplitting.xml PopulationControl/tests/testReseedSplitting.0of1.sh PopulationControl/tests/testReseedSplitting.xml Utils/tests/testPCDVC.xml Utils/tests/testPCDVC_Circle.0of1.sh Utils/tests/testPCDVC_ExpIface.0of1.sh Utils/tests/testPCDVC_Poly.0of1.sh Voronoi/tests/testAdaptiveVoronoi.xml Voronoi/tests/testAdaptiveVoronoi2D.0of1.sh Voronoi/tests/testCellularAutomataVoronoi.xml Voronoi/tests/testCellularAutomataVoronoi2D.0of1.sh Weights/tests/testConstantWeights.xml Weights/tests/testConstantWeightsCircle.0of1.sh Weights/tests/testConstantWeightsExpIface.0of1.sh Weights/tests/testConstantWeightsPoly.0of1.sh Weights/tests/testDVCWeights.xml Weights/tests/testDVCWeightsCircle.0of1.sh Weights/tests/testDVCWeightsExpIface.0of1.sh Weights/tests/testDVCWeightsPoly.0of1.sh Weights/tests/testDiscreteVoronoiWeights.xml Weights/tests/testDiscreteVoronoiWeightsCircle.0of1.sh Weights/tests/testDiscreteVoronoiWeightsExpIface.0of1.sh Weights/tests/testDiscreteVoronoiWeightsPoly.0of1.sh Weights/tests/testIterativeVoronoiWeights.xml Weights/tests/testIterativeWeights.xml Weights/tests/testIterativeWeightsCircle.0of1.sh Weights/tests/testIterativeWeightsExpIface.0of1.sh Weights/tests/testIterativeWeightsPoly.0of1.sh Weights/tests/testMomentBalanceWeights.xml Weights/tests/testMomentBalanceWeightsCircle.0of1.sh Weights/tests/testMomentBalanceWeightsExpIface.0of1.sh Weights/tests/testMomentBalanceWeightsPoly.0of1.sh libPICellerator/Toolbox/Toolbox.c libPICellerator/Toolbox/Toolbox.meta makefile src/Makefile.def src/main.c src/makefile
description:
* Name mangling added such the toolboxes only need to be called by e.g. StgFEM a
nd not StgFEM_Toolbox
* Better module loading error messaging
* Removed StgFEM(.exe) and PICellerator(.exe)
* Updated StgFEM and PICellerator input files to import StgFEM/PICellerator
* Refactored StGermain(.exe) and Underworld(.exe) to have common code
* Underworld(.exe) uses toolbox system now
* ExperimentalUnderworld old Init plugin removed and input files updated to load the new toolbox


diff -r 6247718ede20 -r 6a8704d68523 Apps/BuoyancyBenchmark/BuoyancyExample.xml
--- a/Apps/BuoyancyBenchmark/BuoyancyExample.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/BuoyancyBenchmark/BuoyancyExample.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -2,6 +2,11 @@
 <!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<list name="plugins" mergeType="Replace">
 		<!--param>Underworld_MovingMesh</param-->
 		<param>StgFEM_StandardConditionFunctions</param>	
diff -r 6247718ede20 -r 6a8704d68523 Apps/BuoyancyBenchmark/tests/testBuoyancy.0of1.sh
--- a/Apps/BuoyancyBenchmark/tests/testBuoyancy.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/BuoyancyBenchmark/tests/testBuoyancy.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testBuoyancy.0of1.sh 306 2006-05-17 08:22:48Z VincentLemiale $
+## $Id: testBuoyancy.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ./testBuoyancy.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ./testBuoyancy.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/LidDrivenPIC/LidDrivenPIC.xml
--- a/Apps/LidDrivenPIC/LidDrivenPIC.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/LidDrivenPIC/LidDrivenPIC.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -2,6 +2,10 @@
 
 <!-- DTD to validate against -->
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
 
 	<include>StgFEM/ConstantMesh.xml           </include>
 	<include>StgFEM/LinearMesh.xml             </include>
diff -r 6247718ede20 -r 6a8704d68523 Apps/LidDrivenPIC/tests/testLidDrivenPIC-Analytic-2D.0of1.sh
--- a/Apps/LidDrivenPIC/tests/testLidDrivenPIC-Analytic-2D.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/LidDrivenPIC/tests/testLidDrivenPIC-Analytic-2D.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testLidDrivenPIC-Analytic-2D.0of1.sh 287 2006-04-24 07:32:07Z RobertTurnbull $
+## $Id: testLidDrivenPIC-Analytic-2D.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ../LidDrivenPIC.xml ../lidDrivenAnalytic.xml --AnalyticVelocityWavenumber=1 --maxTimeSteps=10" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ../LidDrivenPIC.xml ../lidDrivenAnalytic.xml --AnalyticVelocityWavenumber=1 --maxTimeSteps=10" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/LidDrivenPIC/tests/testLidDrivenPIC-Analytic-2D.0of2.sh
--- a/Apps/LidDrivenPIC/tests/testLidDrivenPIC-Analytic-2D.0of2.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/LidDrivenPIC/tests/testLidDrivenPIC-Analytic-2D.0of2.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testLidDrivenPIC-Analytic-2D.0of2.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testLidDrivenPIC-Analytic-2D.0of2.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ../LidDrivenPIC.xml ../lidDrivenAnalytic.xml --AnalyticVelocityWavenumber=1 --journal-level.info.StG_FEM_CompareFeVariables=1 --maxTimeSteps=2" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ../LidDrivenPIC.xml ../lidDrivenAnalytic.xml --AnalyticVelocityWavenumber=1 --journal-level.info.StG_FEM_CompareFeVariables=1 --maxTimeSteps=2" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/RayTay_Example-flip1.xml
--- a/Apps/RayleighTaylor/RayTay_Example-flip1.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/RayTay_Example-flip1.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -2,6 +2,10 @@
 
 <!-- DTD to validate against -->
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
 
 	<include>StgFEM/ConstantMesh.xml           </include>
 	<include>StgFEM/LinearMesh.xml             </include>
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/RayTay_Example-test1.xml
--- a/Apps/RayleighTaylor/RayTay_Example-test1.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/RayTay_Example-test1.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -2,6 +2,10 @@
 
 <!-- DTD to validate against -->
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
 
 	<include>StgFEM/ConstantMesh.xml           </include>
 	<include>StgFEM/LinearMesh.xml             </include>
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/RayTay_Example.xml
--- a/Apps/RayleighTaylor/RayTay_Example.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/RayTay_Example.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -2,6 +2,10 @@
 
 <!-- DTD to validate against -->
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
 
 	<include>StgFEM/ConstantMesh.xml           </include>
 	<include>StgFEM/LinearMesh.xml             </include>
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/tests/testAnalyticBlock.0of1.sh
--- a/Apps/RayleighTaylor/tests/testAnalyticBlock.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/tests/testAnalyticBlock.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testAnalyticBlock.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testAnalyticBlock.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ./testAnalyticBlock.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ./testAnalyticBlock.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/tests/testAnalyticBlock.0of2.sh
--- a/Apps/RayleighTaylor/tests/testAnalyticBlock.0of2.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/tests/testAnalyticBlock.0of2.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testAnalyticBlock.0of2.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testAnalyticBlock.0of2.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ./testAnalyticBlock.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ./testAnalyticBlock.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/tests/testAnalyticColumn.0of1.sh
--- a/Apps/RayleighTaylor/tests/testAnalyticColumn.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/tests/testAnalyticColumn.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testAnalyticColumn.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testAnalyticColumn.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ./testAnalyticColumn.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ./testAnalyticColumn.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/tests/testAnalyticColumn.0of2.sh
--- a/Apps/RayleighTaylor/tests/testAnalyticColumn.0of2.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/tests/testAnalyticColumn.0of2.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testAnalyticColumn.0of2.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testAnalyticColumn.0of2.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ./testAnalyticColumn.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ./testAnalyticColumn.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/tests/testAnalyticColumn3D.0of1.sh
--- a/Apps/RayleighTaylor/tests/testAnalyticColumn3D.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/tests/testAnalyticColumn3D.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testAnalyticColumn3D.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testAnalyticColumn3D.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ./testAnalyticColumn.xml --dim=3" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ./testAnalyticColumn.xml --dim=3" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/tests/testRayTay2D-i686.0of1.sh
--- a/Apps/RayleighTaylor/tests/testRayTay2D-i686.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/tests/testRayTay2D-i686.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ./testRayTay.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ./testRayTay.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/tests/testRayTay2D.0of1.sh
--- a/Apps/RayleighTaylor/tests/testRayTay2D.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/tests/testRayTay2D.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testRayTay2D.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testRayTay2D.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ./testRayTay.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ./testRayTay.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/tests/testRayTay3D.0of1.sh
--- a/Apps/RayleighTaylor/tests/testRayTay3D.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/tests/testRayTay3D.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testRayTay3D.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testRayTay3D.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ./testRayTay.xml --dim=3" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ./testRayTay.xml --dim=3" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/tests/testRayTaySuperimposedBall2D-invert.0of1.sh
--- a/Apps/RayleighTaylor/tests/testRayTaySuperimposedBall2D-invert.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/tests/testRayTaySuperimposedBall2D-invert.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ./testRayTaySuperimposedBall-invert.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ./testRayTaySuperimposedBall-invert.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/RayleighTaylor/tests/testRayTaySuperimposedBall2D.0of1.sh
--- a/Apps/RayleighTaylor/tests/testRayTaySuperimposedBall2D.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/RayleighTaylor/tests/testRayTaySuperimposedBall2D.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator ./testRayTaySuperimposedBall.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain ./testRayTaySuperimposedBall.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Apps/ThermoChem/ThermoChem.xml
--- a/Apps/ThermoChem/ThermoChem.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Apps/ThermoChem/ThermoChem.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
  
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<!-- Component Stuff -->
 	<include>StgFEM/ConstantMesh.xml           </include>
 	<include>StgFEM/LinearMesh.xml             </include>
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testEuler.0of1.sh
--- a/MaterialPoints/tests/testEuler.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testEuler.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testEuler.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testEuler.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testEuler.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testEuler.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testEuler.0of2.sh
--- a/MaterialPoints/tests/testEuler.0of2.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testEuler.0of2.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testEuler.0of2.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testEuler.0of2.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testEuler.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testEuler.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testEuler.0of3.sh
--- a/MaterialPoints/tests/testEuler.0of3.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testEuler.0of3.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testEuler.0of3.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testEuler.0of3.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testEuler.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testEuler.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testEuler.xml
--- a/MaterialPoints/tests/testEuler.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testEuler.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>testAdvection.xml</include>
 	
 	<param name="timeIntegratorOrder">1</param>
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testMaterialFeVariable.0of1.sh
--- a/MaterialPoints/tests/testMaterialFeVariable.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testMaterialFeVariable.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testMaterialFeVariable.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testMaterialFeVariable.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testMaterialFeVariable.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testMaterialFeVariable.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testMaterialFeVariable.0of2.sh
--- a/MaterialPoints/tests/testMaterialFeVariable.0of2.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testMaterialFeVariable.0of2.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testMaterialFeVariable.0of2.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testMaterialFeVariable.0of2.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testMaterialFeVariable.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testMaterialFeVariable.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testMaterialFeVariable.xml
--- a/MaterialPoints/tests/testMaterialFeVariable.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testMaterialFeVariable.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>StgFEM/LinearMesh.xml</include>
 	<include>StgFEM/GaussSwarm.xml</include>
 	<include>StgFEM/VelocityField.xml</include>
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testRK2.0of1.sh
--- a/MaterialPoints/tests/testRK2.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testRK2.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testRK2.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testRK2.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testRK2.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testRK2.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testRK2.0of2.sh
--- a/MaterialPoints/tests/testRK2.0of2.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testRK2.0of2.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testRK2.0of2.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testRK2.0of2.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testRK2.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testRK2.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testRK2.xml
--- a/MaterialPoints/tests/testRK2.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testRK2.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>testAdvection.xml</include>
 	
 	<param name="timeIntegratorOrder">2</param>
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testRK4.0of1.sh
--- a/MaterialPoints/tests/testRK4.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testRK4.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testRK4.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testRK4.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testRK4.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testRK4.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testRK4.0of2.sh
--- a/MaterialPoints/tests/testRK4.0of2.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testRK4.0of2.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testRK4.0of2.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testRK4.0of2.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testRK4.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testRK4.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 MaterialPoints/tests/testRK4.xml
--- a/MaterialPoints/tests/testRK4.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/MaterialPoints/tests/testRK4.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>testAdvection.xml</include>
 	
 	<param name="timeIntegratorOrder">4</param>
diff -r 6247718ede20 -r 6a8704d68523 PopulationControl/tests/testDiscreteVoronoiRemove.0of1.sh
--- a/PopulationControl/tests/testDiscreteVoronoiRemove.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/PopulationControl/tests/testDiscreteVoronoiRemove.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testDiscreteVoronoiRemove.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testDiscreteVoronoiRemove.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testDiscreteVoronoiRemove.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testDiscreteVoronoiRemove.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 PopulationControl/tests/testDiscreteVoronoiRemove.xml
--- a/PopulationControl/tests/testDiscreteVoronoiRemove.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/PopulationControl/tests/testDiscreteVoronoiRemove.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -2,6 +2,10 @@
 <!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
 
 	<include>testPopulationControl.xml</include>
 	
diff -r 6247718ede20 -r 6a8704d68523 PopulationControl/tests/testDiscreteVoronoiSplitting.0of1.sh
--- a/PopulationControl/tests/testDiscreteVoronoiSplitting.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/PopulationControl/tests/testDiscreteVoronoiSplitting.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testDiscreteVoronoiSplitting.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testDiscreteVoronoiSplitting.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testDiscreteVoronoiSplitting.xml --particleCount=30" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testDiscreteVoronoiSplitting.xml --particleCount=30" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 PopulationControl/tests/testDiscreteVoronoiSplitting.xml
--- a/PopulationControl/tests/testDiscreteVoronoiSplitting.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/PopulationControl/tests/testDiscreteVoronoiSplitting.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -2,6 +2,10 @@
 <!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
 
 	<include>testPopulationControl.xml</include>
 	
diff -r 6247718ede20 -r 6a8704d68523 PopulationControl/tests/testReseedSplitting.0of1.sh
--- a/PopulationControl/tests/testReseedSplitting.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/PopulationControl/tests/testReseedSplitting.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testReseedSplitting.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testReseedSplitting.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testReseedSplitting.xml --particleCount=30" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testReseedSplitting.xml --particleCount=30" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 PopulationControl/tests/testReseedSplitting.xml
--- a/PopulationControl/tests/testReseedSplitting.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/PopulationControl/tests/testReseedSplitting.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -2,6 +2,10 @@
 <!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
 
 	<include>testPopulationControl.xml</include>
 	
diff -r 6247718ede20 -r 6a8704d68523 Utils/tests/testPCDVC.xml
--- a/Utils/tests/testPCDVC.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Utils/tests/testPCDVC.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -2,6 +2,11 @@
 <!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<!-- This included xml is a copy from PICellerator/Weights/tests
 	directory. It uses a plugin defined in that directory --> 
 	<include>testElementIntegral.xml</include>
diff -r 6247718ede20 -r 6a8704d68523 Utils/tests/testPCDVC_Circle.0of1.sh
--- a/Utils/tests/testPCDVC_Circle.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Utils/tests/testPCDVC_Circle.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testPCDVC.xml --FunctionName=CircleInterface --mean-tolerance=0.001 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.162 --standardDeviation-expectedValue=0.063" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testPCDVC.xml --FunctionName=CircleInterface --mean-tolerance=0.001 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.162 --standardDeviation-expectedValue=0.063" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Utils/tests/testPCDVC_ExpIface.0of1.sh
--- a/Utils/tests/testPCDVC_ExpIface.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Utils/tests/testPCDVC_ExpIface.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testPCDVC.xml --FunctionName=ExponentialInterface --mean-tolerance=0.001 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.07 --standardDeviation-expectedValue=0.05" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testPCDVC.xml --FunctionName=ExponentialInterface --mean-tolerance=0.001 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.07 --standardDeviation-expectedValue=0.05" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Utils/tests/testPCDVC_Poly.0of1.sh
--- a/Utils/tests/testPCDVC_Poly.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Utils/tests/testPCDVC_Poly.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testPCDVC.xml --FunctionName=PolynomialFunction --mean-tolerance=0.001 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.012 --standardDeviation-expectedValue=0.002" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testPCDVC.xml --FunctionName=PolynomialFunction --mean-tolerance=0.001 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.012 --standardDeviation-expectedValue=0.002" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Voronoi/tests/testAdaptiveVoronoi.xml
--- a/Voronoi/tests/testAdaptiveVoronoi.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Voronoi/tests/testAdaptiveVoronoi.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>testDiscreteVoronoi.xml</include>
 	
 	<struct name="components" mergeType="merge">
diff -r 6247718ede20 -r 6a8704d68523 Voronoi/tests/testAdaptiveVoronoi2D.0of1.sh
--- a/Voronoi/tests/testAdaptiveVoronoi2D.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Voronoi/tests/testAdaptiveVoronoi2D.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testAdaptiveVoronoi2D.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testAdaptiveVoronoi2D.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testAdaptiveVoronoi.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testAdaptiveVoronoi.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Voronoi/tests/testCellularAutomataVoronoi.xml
--- a/Voronoi/tests/testCellularAutomataVoronoi.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Voronoi/tests/testCellularAutomataVoronoi.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>testDiscreteVoronoi.xml</include>
 	
 	<struct name="components" mergeType="merge">
diff -r 6247718ede20 -r 6a8704d68523 Voronoi/tests/testCellularAutomataVoronoi2D.0of1.sh
--- a/Voronoi/tests/testCellularAutomataVoronoi2D.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Voronoi/tests/testCellularAutomataVoronoi2D.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testCellularAutomataVoronoi2D.0of1.sh 279 2006-04-11 12:36:05Z PatrickSunter $
+## $Id: testCellularAutomataVoronoi2D.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testCellularAutomataVoronoi.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testCellularAutomataVoronoi.xml" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testConstantWeights.xml
--- a/Weights/tests/testConstantWeights.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testConstantWeights.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>testElementIntegral.xml</include>
 	
 	<struct name="components" mergeType="merge">
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testConstantWeightsCircle.0of1.sh
--- a/Weights/tests/testConstantWeightsCircle.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testConstantWeightsCircle.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testConstantWeightsCircle.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testConstantWeights.xml --FunctionName=CircleInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.091215 --standardDeviation-expectedValue=0.066458" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testConstantWeights.xml --FunctionName=CircleInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.091215 --standardDeviation-expectedValue=0.066458" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testConstantWeightsExpIface.0of1.sh
--- a/Weights/tests/testConstantWeightsExpIface.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testConstantWeightsExpIface.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testConstantWeightsExpIface.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testConstantWeights.xml --FunctionName=ExponentialInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.155483 --standardDeviation-expectedValue=0.116796" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testConstantWeights.xml --FunctionName=ExponentialInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.155483 --standardDeviation-expectedValue=0.116796" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testConstantWeightsPoly.0of1.sh
--- a/Weights/tests/testConstantWeightsPoly.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testConstantWeightsPoly.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testConstantWeightsPoly.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testConstantWeights.xml --FunctionName=PolynomialFunction --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.017475 --standardDeviation-expectedValue=0.013738" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testConstantWeights.xml --FunctionName=PolynomialFunction --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.017475 --standardDeviation-expectedValue=0.013738" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testDVCWeights.xml
--- a/Weights/tests/testDVCWeights.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testDVCWeights.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>testElementIntegral.xml</include>
 	
 	<struct name="components" mergeType="merge">
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testDVCWeightsCircle.0of1.sh
--- a/Weights/tests/testDVCWeightsCircle.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testDVCWeightsCircle.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testDVCWeights.xml --FunctionName=CircleInterface --mean-tolerance=0.005 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.090837 --standardDeviation-expectedValue=0.055628" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testDVCWeights.xml --FunctionName=CircleInterface --mean-tolerance=0.005 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.090837 --standardDeviation-expectedValue=0.055628" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testDVCWeightsExpIface.0of1.sh
--- a/Weights/tests/testDVCWeightsExpIface.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testDVCWeightsExpIface.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testDVCWeights.xml --FunctionName=ExponentialInterface --mean-tolerance=0.001 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.047945 --standardDeviation-expectedValue=0.035636" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testDVCWeights.xml --FunctionName=ExponentialInterface --mean-tolerance=0.001 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.047945 --standardDeviation-expectedValue=0.035636" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testDVCWeightsPoly.0of1.sh
--- a/Weights/tests/testDVCWeightsPoly.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testDVCWeightsPoly.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testDVCWeights.xml --FunctionName=PolynomialFunction --mean-tolerance=0.001 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.0077474 --standardDeviation-expectedValue=0.0014641" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testDVCWeights.xml --FunctionName=PolynomialFunction --mean-tolerance=0.001 --standardDeviation-tolerance=0.001 --mean-expectedValue=0.0077474 --standardDeviation-expectedValue=0.0014641" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testDiscreteVoronoiWeights.xml
--- a/Weights/tests/testDiscreteVoronoiWeights.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testDiscreteVoronoiWeights.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>testElementIntegral.xml</include>
 	
 	<struct name="components" mergeType="merge">
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testDiscreteVoronoiWeightsCircle.0of1.sh
--- a/Weights/tests/testDiscreteVoronoiWeightsCircle.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testDiscreteVoronoiWeightsCircle.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testDiscreteVoronoiWeightsCircle.0of1.sh 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testDiscreteVoronoiWeightsCircle.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testDiscreteVoronoiWeights.xml --FunctionName=CircleInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.09264 --standardDeviation-expectedValue=0.063171" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testDiscreteVoronoiWeights.xml --FunctionName=CircleInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.09264 --standardDeviation-expectedValue=0.063171" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testDiscreteVoronoiWeightsExpIface.0of1.sh
--- a/Weights/tests/testDiscreteVoronoiWeightsExpIface.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testDiscreteVoronoiWeightsExpIface.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testDiscreteVoronoiWeightsExpIface.0of1.sh 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testDiscreteVoronoiWeightsExpIface.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testDiscreteVoronoiWeights.xml --FunctionName=ExponentialInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.074954 --standardDeviation-expectedValue=0.059645" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testDiscreteVoronoiWeights.xml --FunctionName=ExponentialInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.074954 --standardDeviation-expectedValue=0.059645" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testDiscreteVoronoiWeightsPoly.0of1.sh
--- a/Weights/tests/testDiscreteVoronoiWeightsPoly.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testDiscreteVoronoiWeightsPoly.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testDiscreteVoronoiWeightsPoly.0of1.sh 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testDiscreteVoronoiWeightsPoly.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testDiscreteVoronoiWeights.xml --FunctionName=PolynomialFunction --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.011722 --standardDeviation-expectedValue=0.0092122" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testDiscreteVoronoiWeights.xml --FunctionName=PolynomialFunction --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.011722 --standardDeviation-expectedValue=0.0092122" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testIterativeVoronoiWeights.xml
--- a/Weights/tests/testIterativeVoronoiWeights.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testIterativeVoronoiWeights.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>testElementIntegral.xml</include>
 	
 	<struct name="components" mergeType="merge">
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testIterativeWeights.xml
--- a/Weights/tests/testIterativeWeights.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testIterativeWeights.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>testElementIntegral.xml</include>
 	
 	<struct name="components" mergeType="merge">
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testIterativeWeightsCircle.0of1.sh
--- a/Weights/tests/testIterativeWeightsCircle.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testIterativeWeightsCircle.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testIterativeWeightsCircle.0of1.sh 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testIterativeWeightsCircle.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testIterativeWeights.xml --FunctionName=CircleInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.10172 --standardDeviation-expectedValue=0.070065" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testIterativeWeights.xml --FunctionName=CircleInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.10172 --standardDeviation-expectedValue=0.070065" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testIterativeWeightsExpIface.0of1.sh
--- a/Weights/tests/testIterativeWeightsExpIface.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testIterativeWeightsExpIface.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testIterativeWeightsExpIface.0of1.sh 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testIterativeWeightsExpIface.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testIterativeWeights.xml --FunctionName=ExponentialInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.088927 --standardDeviation-expectedValue=0.06681" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testIterativeWeights.xml --FunctionName=ExponentialInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.088927 --standardDeviation-expectedValue=0.06681" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testIterativeWeightsPoly.0of1.sh
--- a/Weights/tests/testIterativeWeightsPoly.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testIterativeWeightsPoly.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testIterativeWeightsPoly.0of1.sh 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testIterativeWeightsPoly.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testIterativeWeights.xml --FunctionName=PolynomialFunction --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.017526 --standardDeviation-expectedValue=0.013522" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testIterativeWeights.xml --FunctionName=PolynomialFunction --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.017526 --standardDeviation-expectedValue=0.013522" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testMomentBalanceWeights.xml
--- a/Weights/tests/testMomentBalanceWeights.xml	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testMomentBalanceWeights.xml	Sun Aug 05 09:48:58 2007 +0000
@@ -3,6 +3,10 @@
 
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
+	<list name="import" mergeType="merge">
+		<param>PICellerator</param>
+	</list>
+
 	<include>testElementIntegral.xml</include>
 	
 	<struct name="components" mergeType="merge">
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testMomentBalanceWeightsCircle.0of1.sh
--- a/Weights/tests/testMomentBalanceWeightsCircle.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testMomentBalanceWeightsCircle.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testMomentBalanceWeightsCircle.0of1.sh 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testMomentBalanceWeightsCircle.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testMomentBalanceWeights.xml --FunctionName=CircleInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.097814 --standardDeviation-expectedValue=0.068607" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testMomentBalanceWeights.xml --FunctionName=CircleInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.097814 --standardDeviation-expectedValue=0.068607" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testMomentBalanceWeightsExpIface.0of1.sh
--- a/Weights/tests/testMomentBalanceWeightsExpIface.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testMomentBalanceWeightsExpIface.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testMomentBalanceWeightsExpIface.0of1.sh 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testMomentBalanceWeightsExpIface.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testMomentBalanceWeights.xml --FunctionName=ExponentialInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.094671 --standardDeviation-expectedValue=0.075287" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testMomentBalanceWeights.xml --FunctionName=ExponentialInterface --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.094671 --standardDeviation-expectedValue=0.075287" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 Weights/tests/testMomentBalanceWeightsPoly.0of1.sh
--- a/Weights/tests/testMomentBalanceWeightsPoly.0of1.sh	Thu Aug 02 08:41:48 2007 +0000
+++ b/Weights/tests/testMomentBalanceWeightsPoly.0of1.sh	Sun Aug 05 09:48:58 2007 +0000
@@ -39,7 +39,7 @@
 ##  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: testMomentBalanceWeightsPoly.0of1.sh 406 2007-01-15 03:03:20Z KathleenHumble $
+## $Id: testMomentBalanceWeightsPoly.0of1.sh 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -49,4 +49,4 @@ done
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "PICellerator testMomentBalanceWeights.xml --FunctionName=PolynomialFunction --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.016697 --standardDeviation-expectedValue=0.013041" "$0" "$@"
+runAndHandleSystemTestStdLocations "StGermain testMomentBalanceWeights.xml --FunctionName=PolynomialFunction --mean-tolerance=0.000001 --standardDeviation-tolerance=0.000001 --mean-expectedValue=0.016697 --standardDeviation-expectedValue=0.013041" "$0" "$@"
diff -r 6247718ede20 -r 6a8704d68523 libPICellerator/Toolbox/Toolbox.c
--- a/libPICellerator/Toolbox/Toolbox.c	Thu Aug 02 08:41:48 2007 +0000
+++ b/libPICellerator/Toolbox/Toolbox.c	Sun Aug 05 09:48:58 2007 +0000
@@ -103,8 +103,6 @@ void* _PICellerator_Toolbox_DefaultNew( 
 }
 
 void PICellerator_Toolbox_Initialise( PluginsManager* pluginsManager, int* argc, char*** argv ) {
-	Journal_Printf( Journal_Register( Info_Type, PICellerator_Toolbox_Type ), "Initialising: PICellerator Toolbox.\n" );
-
 	PICellerator_Init( argc, argv );
 }
 
diff -r 6247718ede20 -r 6a8704d68523 libPICellerator/Toolbox/Toolbox.meta
--- a/libPICellerator/Toolbox/Toolbox.meta	Thu Aug 02 08:41:48 2007 +0000
+++ b/libPICellerator/Toolbox/Toolbox.meta	Sun Aug 05 09:48:58 2007 +0000
@@ -3,11 +3,12 @@
 <!-- DTD to validate against -->
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 
+<!-- Note: suffixing the name by "_Toolbox" is important here! -->
 <param name="Name">PICellerator_Toolbox</param>
 
 <list name="dependenices">
 	<struct>
-		<param name="plugin">StgFEM_Toolbox</param>
+		<param name="plugin">StgFEM</param>
 		<param name="version">0</param>
 	</struct>
 </list>
diff -r 6247718ede20 -r 6a8704d68523 makefile
--- a/makefile	Thu Aug 02 08:41:48 2007 +0000
+++ b/makefile	Sun Aug 05 09:48:58 2007 +0000
@@ -38,7 +38,7 @@
 ##  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: makefile 277 2006-04-11 11:28:01Z PatrickSunter $
+## $Id: makefile 504 2007-08-05 09:48:58Z SteveQuenette $
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -46,7 +46,7 @@ override PROJ_ROOT=.
 override PROJ_ROOT=.
 include ${PROJ_ROOT}/Makefile.system
 
-subdirs = Voronoi PopulationControl Weights MaterialPoints Utils libPICellerator src plugins Apps
+subdirs = Voronoi PopulationControl Weights MaterialPoints Utils libPICellerator plugins Apps
 
 ifeq (true,$(shell if test -x $(DOXYGEN); then echo true; fi ))
         subdirs += doc
diff -r 6247718ede20 -r 6a8704d68523 src/Makefile.def
--- a/src/Makefile.def	Thu Aug 02 08:41:48 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Victorian Partnership for Advanced Computing (VPAC) Ltd, Australia
-## (C) 2003 All Rights Reserved
-##
-## <copyright-release-tag>
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-def_bin = PICellerator
-
-def_srcs = \
-	main.c
-
-def_hdrs = 
-	
-def_libs = 
diff -r 6247718ede20 -r 6a8704d68523 src/main.c
--- a/src/main.c	Thu Aug 02 08:41:48 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-**
-** 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: main.c 376 2006-10-18 06:58:41Z SteveQuenette $
-**
-**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
-#ifdef HAVE_PYTHON
-#include <Python.h>
-#endif
-
-#include <mpi.h>
-#include <StGermain/StGermain.h>
-#include <StgFEM/StgFEM.h>
-#include "PICellerator/PICellerator.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int main( int argc, char* argv[] ) {
-	/* StGermain standard bits & pieces */
-	MPI_Comm             CommWorld;
-	int                  rank;
-	int                  numProcessors;
-	Dictionary*          dictionary;
-	XML_IO_Handler*      ioHandler;
-	int	                 tmp         =  0;
-	PICelleratorContext* context = NULL;
-	
-	char* errMessage = "Component dictionary must have unique names\n";
-
-	/* Initialise PETSc, 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_Init( &argc, &argv );
-	#ifdef HAVE_PYTHON
-	Py_Initialize();
-	#endif
-
-	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
-	
-	/* StgFEM's init message */
-	tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
-	Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
-	Journal_Printf( /* DO NOT CHANGE OR REMOVE */
-		Journal_Register( InfoStream_Type, "Context" ), 
-		"PICellerator revision %s. Copyright (C) 2005 VPAC & Monash Cluster Computing.\n", VERSION );
-	Stream_Flush( Journal_Register( InfoStream_Type, "Context" ) );
-	Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), tmp );
-	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
-	
-	/* Create the application's dictionary */
-	dictionary = Dictionary_New();
-
-	/* Read input */
-	ioHandler = XML_IO_Handler_New();
-	IO_Handler_ReadAllFromCommandLine( ioHandler, argc, argv, dictionary );
-	Journal_ReadFromDictionary( dictionary );
-
-	/* Construction phase -----------------------------------------------------------------------------------------------*/
-	context = PICelleratorContext_New( "context", 0, 0, CommWorld, dictionary );
-	Stg_Component_Construct( context, 0 /* dummy */, &context, True );
-	
-	/* Building phase ---------------------------------------------------------------------------------------------------*/
-	Stg_Component_Build( context, 0 /* dummy */, False );
-	
-	/* Initialisaton phase ----------------------------------------------------------------------------------------------*/
-	Stg_Component_Initialise( context, 0 /* dummy */, False );
-	
-	/* Run (Solve) phase ------------------------------------------------------------------------------------------------*/
-	AbstractContext_Dump( context );
-	Stg_Component_Execute( context, 0 /* dummy */, False );
-
-	/* Destruct phase ---------------------------------------------------------------------------------------------------*/
-	Stg_Component_Destroy( context, 0 /* dummy */, False );
-	Stg_Class_Delete( context );
-	Stg_Class_Delete( dictionary );
-
-	#ifdef HAVE_PYTHON
-	Py_Finalize();
-	#endif
-	PICellerator_Finalise();
-	StgFEM_Finalise();
-	StGermain_Finalise();
-		
-	/* Close off MPI */
-	MPI_Finalize();
-	
-	return 0; /* success */
-}
diff -r 6247718ede20 -r 6a8704d68523 src/makefile
--- a/src/makefile	Thu Aug 02 08:41:48 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## 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: makefile 422 2007-02-12 04:15:13Z KathleenHumble $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-include Makefile.def
-
-# obtain defaults for required variables according to system and project location, and then run the build.
-ifndef PROJ_ROOT
-	PROJ_ROOT=..
-endif
-include ${PROJ_ROOT}/Makefile.system
-
-bin = ${def_bin}
-
-SRCS = ${def_srcs}
-
-PROJ_LIBS = ${def_libs}
-
-EXTERNAL_LIBS =  -lPICellerator ${EXPORT_DYNAMIC_LFLAGS} 
-
-EXTERNAL_INCLUDES = -DMODULE_EXT=\"${MODULE_EXT}\"
-
-packages = STGFEM STGERMAIN PETSC MPI XML MATH DL HYPRE
-
-ifdef HAVE_PYTHON
-	packages += PYTHON
-endif
-
-include ${PROJ_ROOT}/Makefile.vmake
-



More information about the CIG-COMMITS mailing list