[cig-commits] r4168 - in long/3D/Gale/trunk/src/Underworld: .
InputFiles/tests
walter at geodynamics.org
walter at geodynamics.org
Tue Aug 1 01:55:21 PDT 2006
Author: walter
Date: 2006-08-01 01:55:21 -0700 (Tue, 01 Aug 2006)
New Revision: 4168
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/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:
r417 at earth: boo | 2006-08-01 01:53:39 -0700
r397 at earth (orig r268): KathleenHumble | 2006-07-20 22:47:10 -0700
Editted checkpointing tests so that they use the new
softlink function rather than an absolute path, or assuming a link
already exits in the directory
Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
- 9570c393-cf10-0410-b476-9a651db1e55a:/cig:416
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:267
+ 9570c393-cf10-0410-b476-9a651db1e55a:/cig:417
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:268
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -13,16 +13,16 @@
printf "$testname: doing pre-test setup:\n"
-#set -x
-getValueFromMakefile_System BIN_DIR
-ln -sf ${BIN_DIR}/Underworld Underworld
+softlinkCreateOrRemove 'Underworld' 'create'
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testAnisotropic0of1GeneratedTestResult
-./Underworld testAnisotropic.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/testAnisotropic0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+./Underworld-softlink testAnisotropic.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/testAnisotropic0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld testAnisotropic.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
+./Underworld-softlink 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=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testAnisotropic0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -12,6 +12,8 @@
printf "$testname: doing pre-test setup:\n"
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testArrhenius0of1GeneratedTestResult
Underworld testArrhenius.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testArrhenius0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
@@ -19,6 +21,9 @@
printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
Underworld testArrhenius.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./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=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testArrhenius0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -1,24 +1,31 @@
#!/bin/sh
-
+# Find test script to run tests
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}
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
testname="`basename $0 .sh`"
printf "$testname: doing pre-test setup:\n"
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testExtension0of1GeneratedTestResult
-Underworld testExtension.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=15 --elementResJ=15 --outputPath=./output/testExtension0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+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 testExtension.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=15 --elementResJ=15 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+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" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionDP-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -6,19 +6,26 @@
done
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
setUpdateModeFromArg ${1}
testname="`basename $0 .sh`"
printf "$testname: doing pre-test setup:\n"
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testExtensionDP0of1GeneratedTestResult
-Underworld testExtensionDP.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=15 --elementResJ=15--outputPath=./output/testExtensionDP0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+Underworld-softlink testExtensionDP.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=15 --elementResJ=15--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 testExtensionDP.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=15 --elementResJ=15 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+Underworld-softlink testExtensionDP.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=15 --elementResJ=15 > ./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=15 --elementResJ=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testExtensionDP0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -6,19 +6,27 @@
done
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
+
setUpdateModeFromArg ${1}
testname="`basename $0 .sh`"
printf "$testname: doing pre-test setup:\n"
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testExtensionMC0of1GeneratedTestResult
-Underworld testExtensionMC.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=15 --elementResJ=15 --outputPath=./output/testExtensionMC0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+Underworld-softlink testExtensionMC.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=15 --elementResJ=15 --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 testExtensionMC.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=15 --elementResJ=15 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+Underworld-softlink testExtensionMC.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 testExtensionMC.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --elementResI=15 --elementResJ=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testExtensionMC0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -6,19 +6,27 @@
done
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
+
setUpdateModeFromArg ${1}
testname="`basename $0 .sh`"
printf "$testname: doing pre-test setup:\n"
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testExtensionMC3DGeneratedTestResult
-Underworld testExtensionMC3D.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=15 --elementResJ=15 --outputPath=./output/testExtensionMC3DGeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+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 testExtensionMC3D.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+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=0 --elementResI=15 --elementResJ=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testExtensionMC3DGeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
+runAndHandleSystemTestStdLocations 'Underworld testExtensionMC3D.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --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" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -6,19 +6,27 @@
done
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
+
setUpdateModeFromArg ${1}
testname="`basename $0 .sh`"
printf "$testname: doing pre-test setup:\n"
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testFrankKamenetskii0of1GeneratedTestResult
-Underworld testFrankKamenetskii.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testFrankKamenetskii0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+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 testFrankKamenetskii.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+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" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -6,19 +6,27 @@
done
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
+
setUpdateModeFromArg ${1}
testname="`basename $0 .sh`"
printf "$testname: doing pre-test setup:\n"
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testInternalHeating0of1GeneratedTestResult
-Underworld testInternalHeating.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testInternalHeating0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+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 testInternalHeating.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+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" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -6,19 +6,26 @@
done
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
setUpdateModeFromArg ${1}
testname="`basename $0 .sh`"
printf "$testname: doing pre-test setup:\n"
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testMobileLid0of1GeneratedTestResult
-Underworld testMobileLid.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testMobileLid0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+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 testMobileLid.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+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" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -6,19 +6,27 @@
done
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
+
setUpdateModeFromArg ${1}
testname="`basename $0 .sh`"
printf "$testname: doing pre-test setup:\n"
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testMultiComponent0of1GeneratedTestResult
-Underworld testMultiComponent.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testMultiComponent0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+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 testMultiComponent.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+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" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -6,19 +6,27 @@
done
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
+
setUpdateModeFromArg ${1}
testname="`basename $0 .sh`"
printf "$testname: doing pre-test setup:\n"
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testNonNewtonianGeneratedTestResult
-Underworld testNonNewtonian.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testNonNewtonianGeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+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 testNonNewtonian.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+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" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -12,13 +12,19 @@
printf "$testname: doing pre-test setup:\n"
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testRayleighTaylor2DCheckpoint0of1GeneratedTestResult
-Underworld testRayleighTaylorBenchmark.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testRayleighTaylor2DCheckpoint0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+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 testRayleighTaylorBenchmark.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+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" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -6,19 +6,26 @@
done
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
setUpdateModeFromArg ${1}
testname="`basename $0 .sh`"
printf "$testname: doing pre-test setup:\n"
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testSlabSubduction0of1GeneratedTestResult
-Underworld testSlabSubduction.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=8 --elementResJ=4 --elementResK=8 --outputPath=./output/testSlabSubduction0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+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 testSlabSubduction.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=8 --elementResJ=4 --elementResK=8 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+Underworld-softlink testSlabSubduction.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --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=0 --elementResI=8 --elementResJ=4 --elementResK=8 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testSlabSubduction0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
+runAndHandleSystemTestStdLocations 'Underworld testSlabSubduction.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --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" "$@"
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-01 08:55:18 UTC (rev 4167)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh 2006-08-01 08:55:21 UTC (rev 4168)
@@ -6,19 +6,26 @@
done
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
setUpdateModeFromArg ${1}
testname="`basename $0 .sh`"
printf "$testname: doing pre-test setup:\n"
+#Create a softlink to executable
+softlinkCreateOrRemove 'Underworld' 'create'
+
printf "\tRunning for 4 timesteps to generate expected result\n"
rm -rf ./output/testThermoChemBenchmarkGeneratedTestResult
-Underworld testThermoChemBenchmark.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testThermoChemBenchmarkGeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+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 testThermoChemBenchmark.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 > ./log/"${testname}.generateCheckpoint.out" 2> ./log/"${testname}.generateCheckpoint.error"
+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" "$@"
More information about the cig-commits
mailing list