[cig-commits] r4915 - in long/3D/Gale/trunk/src/Underworld: . InputFiles/tests InputFiles/tests/expected

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:52:55 -0700 (Wed, 11 Oct 2006)
New Revision: 4915

Added:
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of2.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/testRayleighTaylor2D-checkpoint.0of2.sh
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of2.sh
Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh
Log:
 r575 at earth:  boo | 2006-10-11 13:52:03 -0700
  r537 at earth (orig r314):  PatrickSunter | 2006-08-21 16:56:02 -0700
  * Adding a parallel RayTay and Parallel Thermochem checkpoint test.
  * Fixed the serial RayTay test.
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:574
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:313
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:575
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:314

Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected	2006-10-11 20:52:53 UTC (rev 4914)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected	2006-10-11 20:52:55 UTC (rev 4915)
@@ -0,0 +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.

Added: 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:52:53 UTC (rev 4914)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testThermoChemBenchmark-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected	2006-10-11 20:52:55 UTC (rev 4915)
@@ -0,0 +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.

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:52:53 UTC (rev 4914)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh	2006-10-11 20:52:55 UTC (rev 4915)
@@ -13,7 +13,8 @@
 testname="`basename $0 .sh`"
 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 '-'`
+#partTestname=`echo $testname | cut -f 1 -d '-'`
+partTestname=testRayleighTaylorBenchmark
 
 # test if xml with this name exists
 if test -r "${partTestname}.xml"; then

Added: 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:52:53 UTC (rev 4914)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of2.sh	2006-10-11 20:52:55 UTC (rev 4915)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+        TEST_SCRIPT=../${TEST_SCRIPT}
+done
+
+. ${TEST_SCRIPT}
+
+setUpdateModeFromArg ${1}
+
+# Extract out names
+testname="`basename $0 .sh`"
+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 '-'`
+partTestname=testRayleighTaylorBenchmark
+
+# 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"
+	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"
+	
+	# 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" "$@"
+
+else echo "${partTestname}.xml doesn't exist, so can't test it"
+fi


Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of2.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + LastChangedDate Author Id
Name: svn:eol-style
   + native

Added: 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:52:53 UTC (rev 4914)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of2.sh	2006-10-11 20:52:55 UTC (rev 4915)
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+        TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
+setUpdateModeFromArg ${1}
+
+# Extract out names
+testname="`basename $0 .sh`"
+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 '-'`
+
+# 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"
+	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"
+	
+	# 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" "$@"
+
+else echo "${partTestname}.xml doesn't exist, so can't test it"
+fi


Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of2.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + LastChangedDate Author Id
Name: svn:eol-style
   + native