[cig-commits] r5029 - in long/3D/Gale/trunk/src/Underworld: .
InputFiles/tests
walter at geodynamics.org
walter at geodynamics.org
Sat Oct 14 11:34:41 PDT 2006
Author: walter
Date: 2006-10-14 11:34:40 -0700 (Sat, 14 Oct 2006)
New Revision: 5029
Modified:
long/3D/Gale/trunk/src/Underworld/
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark.xml
Log:
r661 at earth: boo | 2006-10-14 11:34:07 -0700
r655 at earth (orig r352): KathleenHumble | 2006-10-11 22:34:11 -0700
ng the xml for testThermoChemBenchmark
as other tests relied on it.
changed the checkpointing shell scripts so that these
checkpoint tests are still small.
This line, and those below, will be ignored--
M tests/testThermoChemBenchmark.xml
M tests/testThermoChemBenchmark-checkpoint.0of2.sh
M tests/testThermoChemBenchmark-checkpoint.0of1.sh
M tests/testThermoChemBenchmark-checkpoint.0of4.sh
Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
- 9570c393-cf10-0410-b476-9a651db1e55a:/cig:611
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:350
+ 9570c393-cf10-0410-b476-9a651db1e55a:/cig:661
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:352
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh 2006-10-14 18:32:16 UTC (rev 5028)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh 2006-10-14 18:34:40 UTC (rev 5029)
@@ -25,7 +25,7 @@
printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --elementResI=8 --elementResJ=4 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
# copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
@@ -33,7 +33,7 @@
cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=8 --elementResJ=4 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of2.sh 2006-10-14 18:32:16 UTC (rev 5028)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of2.sh 2006-10-14 18:34:40 UTC (rev 5029)
@@ -25,7 +25,7 @@
printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --elementResI=8 --elementResJ=4 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
# copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
@@ -33,7 +33,7 @@
cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=8 --elementResJ=4 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of4.sh 2006-10-14 18:32:16 UTC (rev 5028)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of4.sh 2006-10-14 18:34:40 UTC (rev 5029)
@@ -25,7 +25,7 @@
printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --elementResI=8 --elementResJ=4 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
# copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
@@ -33,7 +33,7 @@
cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=8 --elementResJ=4 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
else echo "${partTestname}.xml doesn't exist, so can't test it"
fi
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark.xml 2006-10-14 18:32:16 UTC (rev 5028)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark.xml 2006-10-14 18:34:40 UTC (rev 5029)
@@ -69,8 +69,8 @@
<!-- Geometry & Mesh setup -->
<param name="dim"> 2 </param>
- <param name="elementResI"> 8 </param>
- <param name="elementResJ"> 4 </param>
+ <param name="elementResI"> 32 </param>
+ <param name="elementResJ"> 16 </param>
<param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
More information about the cig-commits
mailing list