[cig-commits] r4346 - in long/3D/Gale/trunk/src/Underworld: .
InputFiles/tests
walter at geodynamics.org
walter at geodynamics.org
Thu Aug 17 17:17:55 PDT 2006
Author: walter
Date: 2006-08-17 17:17:54 -0700 (Thu, 17 Aug 2006)
New Revision: 4346
Modified:
long/3D/Gale/trunk/src/Underworld/
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/testArrhenius-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionDP-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh
Log:
r488 at earth: boo | 2006-08-17 17:15:26 -0700
r462 at earth (orig r293): KathleenHumble | 2006-08-01 23:58:47 -0700
Changed all the tests so that they used RunMPICommand
ALso changed the way they reference the xml file.
They now all look for an xml that is the same
as the first part of the test name.
e.g testAnisotropic-checkpoint.0of1.sh
will look for testAnisotropic.xml to run.
This makes all the tests virtually identical except for
the reductions in size from --elementRes* calls in Underworld.
Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
- 9570c393-cf10-0410-b476-9a651db1e55a:/cig:487
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:292
+ 9570c393-cf10-0410-b476-9a651db1e55a:/cig:488
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:293
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-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -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}
@@ -9,22 +9,28 @@
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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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" "$@"
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/"testAnisotropic0of${nproc}GeneratedTestResult"
-RunMPICommand ${testname} Underworld testAnisotropic.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"testAnisotropic${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-RunMPICommand ${testname} Underworld testAnisotropic.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-runAndHandleSystemTestStdLocations "Underworld testAnisotropic.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testAnisotropic${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
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-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of2.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -9,18 +9,28 @@
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'`
-printf "$testname: doing pre-test setup:\n"
+partTestname=`echo $testname | cut -f 1 -d '-'`
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/"testAnisotropic0of${nproc}GeneratedTestResult"
-RunMPICommand ${testname} Underworld "testAnisotropic.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=8 --elementResJ=8 --outputPath=./output/testAnisotropic${procToWatch}of${nproc}GeneratedTestResult" > "./log/${testname}.generateExpectedResult.out" 2> "./log/${testname}.generateExpectedResult.error"
+# 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 --elementResI=8 --elementResJ=8 --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"
+
+ # 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 "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-RunMPICommand ${testname} Underworld testAnisotropic.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=8 --elementResJ=8 > ./log/${testname}.generateCheckpoint.out --outputPath=./output/ 2> ./log/${testname}.generateCheckpoint.error
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-runAndHandleSystemTestStdLocations "Underworld testAnisotropic.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --elementResI=8 --elementResJ=8 --elementResK=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testAnisotropic${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
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-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -6,24 +6,31 @@
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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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" "$@"
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testArrhenius0of1GeneratedTestResult
-./Underworld-softlink testArrhenius.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/testArrhenius0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testArrhenius.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testArrhenius.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testArrhenius0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --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-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -9,23 +9,28 @@
setUpdateModeFromArg ${1}
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
+# 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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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 --elementResI=15 --elementResJ=15 --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"
+
+ # 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 "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testExtension0of1GeneratedTestResult
-./Underworld-softlink testExtension.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=15 --elementResJ=15 --outputPath=./output/testExtension0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testExtension.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=15 --elementResJ=15 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-# Remove softlink to executable
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testExtension.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --elementResI=15 --elementResJ=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testExtension0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --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/testExtensionDP-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionDP-checkpoint.0of1.sh 2006-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionDP-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -9,23 +9,28 @@
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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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 --elementResI=40 --elementResJ=20 --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=40 --elementResJ=20 > ./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 --elementResI=40 --elementResJ=20 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testExtensionDP0of1GeneratedTestResult
-./Underworld-softlink testExtensionDP.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=40 --elementResJ=20 --outputPath=./output/testExtensionDP0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testExtensionDP.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=40 --elementResJ=20 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testExtensionDP.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --elementResI=40 --elementResJ=20 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testExtensionDP0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --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/testExtensionMC-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC-checkpoint.0of1.sh 2006-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -7,26 +7,30 @@
. ${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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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 --elementResI=20 --elementResJ=10 --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=20 --elementResJ=10 > ./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 --elementResI=20 --elementResJ=10 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testExtensionMC0of1GeneratedTestResult
-./Underworld-softlink testExtensionMC.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=20 --elementResJ=10 --outputPath=./output/testExtensionMC0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testExtensionMC.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=20 --elementResJ=10 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-# Remove softlink to executable
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testExtensionMC.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=20 --elementResJ=10 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testExtensionMC0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --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/testExtensionMC3D-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D-checkpoint.0of1.sh 2006-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -10,23 +10,28 @@
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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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 --elementResI=8 --elementResJ=4 --elementResK=8 --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"
+
+ # 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" "$@"
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testExtensionMC3DGeneratedTestResult
-./Underworld-softlink testExtensionMC3D.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=8 --elementResJ=4 --elementResK=8 --outputPath=./output/testExtensionMC3DGeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" -no_signal_handler > ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testExtensionMC3D.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=8 --elementResJ=4 --elementResK=8 > ./log/"${testname}.generateCheckpoint.out" -no_signal_handler > ./log/"${testname}.generateCheckpoint.error"
-
-# Remove softlink to executable
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testExtensionMC3D.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/testExtensionMC3DGeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 -no_signal_handler --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-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -10,23 +10,28 @@
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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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" "$@"
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testFrankKamenetskii0of1GeneratedTestResult
-./Underworld-softlink testFrankKamenetskii.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testFrankKamenetskii0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testFrankKamenetskii.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-# Remove softlink to executable
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testFrankKamenetskii.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testFrankKamenetskii0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --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-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -7,26 +7,30 @@
. ${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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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" "$@"
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testInternalHeating0of1GeneratedTestResult
-./Underworld-softlink testInternalHeating.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testInternalHeating0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testInternalHeating.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-# Remove softlink to executable
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testInternalHeating.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testInternalHeating0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --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-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -9,23 +9,28 @@
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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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" "$@"
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testMobileLid0of1GeneratedTestResult
-./Underworld-softlink testMobileLid.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testMobileLid0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testMobileLid.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-# Remove softlink to executable
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testMobileLid.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testMobileLid0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --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-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -7,26 +7,30 @@
. ${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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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" "$@"
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testMultiComponent0of1GeneratedTestResult
-./Underworld-softlink testMultiComponent.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testMultiComponent0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testMultiComponent.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-# Remove softlink to executable
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testMultiComponent.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testMultiComponent0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --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-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -10,23 +10,28 @@
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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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" "$@"
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testNonNewtonianGeneratedTestResult
-./Underworld-softlink testNonNewtonian.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testNonNewtonianGeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testNonNewtonian.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-# Remove softlink to executable
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testNonNewtonian.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testNonNewtonianGeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --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-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -4,27 +4,33 @@
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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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" "$@"
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testRayleighTaylor2DCheckpoint0of1GeneratedTestResult
-./Underworld-softlink testRayleighTaylorBenchmark.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testRayleighTaylor2DCheckpoint0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testRayleighTaylorBenchmark.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-# Remove softlink to executable
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testRayleighTaylorBenchmark.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testRayleighTaylor2DCheckpoint0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --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.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh 2006-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -9,23 +9,28 @@
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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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 --elementResI=8 --elementResJ=4 --elementResK=8 --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"
+
+ # 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" "$@"
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testSlabSubduction0of1GeneratedTestResult
-./Underworld-softlink testSlabSubduction.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=8 --elementResJ=4 --elementResK=8 --outputPath=./output/testSlabSubduction0of1GeneratedTestResult -no_signal_handler > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testSlabSubduction.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 -no_signal_handler > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-# Remove softlink to executable
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testSlabSubduction.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution -no_signal_handler --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testSlabSubduction0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 -no_signal_handler --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.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh 2006-08-18 00:17:49 UTC (rev 4345)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh 2006-08-18 00:17:54 UTC (rev 4346)
@@ -9,23 +9,28 @@
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 '-'`
-printf "$testname: doing pre-test setup:\n"
+# 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" "$@"
-#Create a softlink to executable
-softlinkCreateOrRemove 'Underworld' 'create'
-
-printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testThermoChemBenchmarkGeneratedTestResult
-./Underworld-softlink testThermoChemBenchmark.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testThermoChemBenchmarkGeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
-printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testThermoChemBenchmark.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
-
-# Remove softlink to executable
-softlinkCreateOrRemove 'Underworld' 'remove'
-
-printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
-
-runAndHandleSystemTestStdLocations 'Underworld testThermoChemBenchmark.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testThermoChemBenchmarkGeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --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