[cig-commits] r4945 - in long/3D/Gale/trunk/src/Underworld: .
InputFiles/tests InputFiles/tests/expected
walter at geodynamics.org
walter at geodynamics.org
Wed Oct 11 13:54:42 PDT 2006
Author: walter
Date: 2006-10-11 13:54:41 -0700 (Wed, 11 Oct 2006)
New Revision: 4945
Modified:
long/3D/Gale/trunk/src/Underworld/
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of4.sh
Log:
r605 at earth: boo | 2006-10-11 13:52:12 -0700
r567 at earth (orig r344): KathleenHumble | 2006-10-05 00:20:34 -0700
rewriting a lot of the checkpointing tests in
Underworld2/Inputfiles/tests
They have been changed to:
-only run for 3 time steps
-copy the reloading information from expected
to ./output rather than rerunning the tests again
a few have been reduced in size ( such as SlabSubduction) to run in
a reasonable amount of time.
This should cut down the time to run the tests by half
Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
- 9570c393-cf10-0410-b476-9a651db1e55a:/cig:604
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:343
+ 9570c393-cf10-0410-b476-9a651db1e55a:/cig:605
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:344
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 6e-05.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 6e-05.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 6e-05.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 6e-05.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of2.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of2.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=8 --elementResJ=8 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few steps to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=8 --elementResJ=8 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=8 --elementResJ=8 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of4.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of4.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=8 --elementResJ=8 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" -no_signal_handler > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=8 --elementResJ=8 -no_signal_handler > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=8 --elementResJ=8 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution -no_signal_handler --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of1.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of1.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of2.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of2.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 -no_signal_handler --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 -no_signal_handler > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution -no_signal_handler --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of4.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of4.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 -no_signal_handler --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 -no_signal_handler > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution -no_signal_handler --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Find test script to run tests
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=15 --elementResJ=15 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --elementResI=8 --elementResJ=4 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=15 --elementResJ=15 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=15 --elementResJ=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=8 --elementResJ=4 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of2.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of2.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Find test script to run tests
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=15 --elementResJ=15 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --elementResI=8 --elementResJ=4 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=15 --elementResJ=15 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=15 --elementResJ=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=8 --elementResJ=4 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of4.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of4.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Find test script to run tests
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=15 --elementResJ=15 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --elementResI=8 --elementResJ=4 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=15 --elementResJ=15 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=15 --elementResJ=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=8 --elementResJ=4 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -7,7 +7,6 @@
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
-
setUpdateModeFromArg ${1}
# Extract out names
@@ -15,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of2.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of2.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -7,7 +7,6 @@
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
-
setUpdateModeFromArg ${1}
# Extract out names
@@ -15,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of4.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of4.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -7,7 +7,6 @@
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
-
setUpdateModeFromArg ${1}
# Extract out names
@@ -15,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of2.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of2.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of4.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of4.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of2.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of2.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of2.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of2.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of4.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of4.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -7,7 +7,6 @@
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
-
setUpdateModeFromArg ${1}
# Extract out names
@@ -15,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of2.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of2.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -7,7 +7,6 @@
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
-
setUpdateModeFromArg ${1}
# Extract out names
@@ -15,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of4.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of4.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -7,7 +7,6 @@
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
-
setUpdateModeFromArg ${1}
# Extract out names
@@ -15,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -24,11 +24,12 @@
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for 2 timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*2.dat ./output/
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
# Do checkpointing test
printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of2.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of2.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -25,10 +25,10 @@
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for 2 timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*2.dat ./output/
# Do checkpointing test
printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of4.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of4.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -25,10 +25,10 @@
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for 2 timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*2.dat ./output/
# Do checkpointing test
printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of2.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of2.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of4.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of4.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -1,5 +1,5 @@
#!/bin/sh
-#Find testing shell scripts
+
TEST_SCRIPT=./VMake/executableTester.sh
until test -r ${TEST_SCRIPT} ; do
TEST_SCRIPT=../${TEST_SCRIPT}
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction.xml 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction.xml 2006-10-11 20:54:41 UTC (rev 4945)
@@ -140,9 +140,9 @@
<!-- general decomposition parameters -->
<param name="dim"> 3 </param>
<!-- mesh parameters -->
- <param name="elementResI"> 30 </param>
- <param name="elementResJ"> 15 </param>
- <param name="elementResK"> 30 </param>
+ <param name="elementResI"> 8 </param>
+ <param name="elementResJ"> 4 </param>
+ <param name="elementResK"> 8 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
@@ -155,10 +155,10 @@
<param name="buildElementNodeTbl"> True </param>
<!-- Non-linear stuff -->
- <param name="nonLinearMaxIterations"> 100 </param>
+ <param name="nonLinearMaxIterations"> 20 </param>
<!-- Swarm parameters -->
- <param name="particlesPerCell"> 20 </param>
+ <param name="particlesPerCell"> 10 </param>
<!-- Boundary conditions -->
<include>../VariableConditions/velocityBCs.freeslip.xml</include>
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of2.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of2.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of4.sh 2006-10-11 20:54:39 UTC (rev 4944)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of4.sh 2006-10-11 20:54:41 UTC (rev 4945)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
More information about the cig-commits
mailing list