[cig-commits] r4948 - in long/3D/Gale/trunk/src/Underworld: .
InputFiles/tests InputFiles/tests/expected
walter at geodynamics.org
walter at geodynamics.org
Wed Oct 11 13:54:49 PDT 2006
Author: walter
Date: 2006-10-11 13:54:48 -0700 (Wed, 11 Oct 2006)
New Revision: 4948
Modified:
long/3D/Gale/trunk/src/Underworld/
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM3D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionDP-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of4.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark.xml
Log:
r608 at earth: boo | 2006-10-11 13:52:13 -0700
r570 at earth (orig r347): KathleenHumble | 1969-12-31 18:18:28 -0800
This commmit reduces the size of the problems to be
run in checkpointing in Underworld/Inputfiles/tests/
to as small as possible and still
have the tests be logical ( and working).
most are reduced to in 3D, 8^3 and 4^3 and in 2D, 8^2 and 4^2
all the tests not changed to only run for 3 timesteps
have now also been changed.
The order in which they are run has also been changed:
now all serial checkpointing tests are run first,
then parallel ( all 2 proc runs, then all 4 proc runs).
This should enable a basic test to be run on smaller serial
machines before the (much) longer parallel tests are run.
Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
- 9570c393-cf10-0410-b476-9a651db1e55a:/cig:607
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:346
+ 9570c393-cf10-0410-b476-9a651db1e55a:/cig:608
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:347
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:48 UTC (rev 4948)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:48 UTC (rev 4948)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:48 UTC (rev 4948)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM3D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM3D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionFMM3D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:48 UTC (rev 4948)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:48 UTC (rev 4948)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:48 UTC (rev 4948)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of4.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-10-11 20:54:48 UTC (rev 4948)
@@ -1,2 +1,2 @@
-Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh 2006-10-11 20:54:48 UTC (rev 4948)
@@ -23,8 +23,10 @@
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
+ printf "\tRemoving old data files \n"
+ rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
+ rm -rf ./output/*"$SaveCheckpointStep".dat
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"
# copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of2.sh 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of2.sh 2006-10-11 20:54:48 UTC (rev 4948)
@@ -23,8 +23,10 @@
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
+ printf "\tRemoving old data files \n"
+ rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
+ rm -rf ./output/*"$SaveCheckpointStep".dat
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"
# copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of4.sh 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of4.sh 2006-10-11 20:54:48 UTC (rev 4948)
@@ -22,9 +22,10 @@
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
-
+ printf "\tRemoving old data files \n"
+ rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
+ rm -rf ./output/*"$SaveCheckpointStep".dat
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"
# copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic.xml 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic.xml 2006-10-11 20:54:48 UTC (rev 4948)
@@ -45,16 +45,16 @@
</list>
</struct>
<!-- Create Alignment Swarm Variable - for the sake of plotting -->
-<!-- <struct name="alignment">
+ <struct name="alignment">
<param name="Type">AlignmentSwarmVariable</param>
<param name="Swarm">materialSwarm</param>
<param name="Director">director</param>
<param name="VelocityField">VelocityField</param>
- </struct-->
+ </struct>
</struct>
<!-- Simulation control -->
- <param name="maxTimeSteps"> 20000 </param>
+ <param name="maxTimeSteps"> 20 </param>
<param name="outputPath"> ./output </param>
<param name="dumpEvery"> 1 </param>
@@ -74,8 +74,8 @@
<!-- Geometry & Mesh setup -->
<param name="dim"> 2 </param>
- <param name="elementResI"> 32 </param>
- <param name="elementResJ"> 32 </param>
+ <param name="elementResI"> 4 </param>
+ <param name="elementResJ"> 4 </param>
<param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
@@ -92,7 +92,8 @@
<include> ../VariableConditions/velocityBCs.freeslip.xml </include>
<!-- Integration Scheme configuration -->
- <param name="particlesPerCell"> 20 </param>
+ <param name="particlesPerCell"> 4 </param>
+ <param name="nonLinearMaxIterations"> 5 </param>
<struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
<list name="variables">
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius.xml 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius.xml 2006-10-11 20:54:48 UTC (rev 4948)
@@ -38,6 +38,9 @@
<param name="Ra"> 1e6 </param>
<param name="courantFactor"> 0.25 </param>
+
+ <param name="particlesPerCell"> 4 </param>
+ <param name="nonLinearMaxIterations"> 5 </param>
<!-- Journal Control -->
<param name="journal.info.Context-verbose">True</param>
@@ -53,12 +56,8 @@
<!-- Geometry & Mesh setup -->
<param name="dim"> 2 </param>
- <param name="elementResI"> 32 </param>
- <param name="elementResJ"> 32 </param>
- <!--
- <param name="elementResI"> 5 </param>
- <param name="elementResJ"> 5 </param>
- -->
+ <param name="elementResI"> 4 </param>
+ <param name="elementResJ"> 4 </param>
<param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension.xml 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension.xml 2006-10-11 20:54:48 UTC (rev 4948)
@@ -95,8 +95,8 @@
<!-- Geometry & Mesh setup -->
<param name="dim"> 2 </param>
- <param name="elementResI"> 64 </param>
- <param name="elementResJ"> 32 </param>
+ <param name="elementResI"> 4 </param>
+ <param name="elementResJ"> 2 </param>
<param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
@@ -107,7 +107,8 @@
<param name="maxZ"> 1.0 </param>
<param name="allowUnbalancing"> True </param>
- <param name="particlesPerCell"> 20 </param>
+ <param name="particlesPerCell"> 4 </param>
+ <param name="nonLinearMaxIterations"> 5 </param>
<!-- Set up BCs and ICs -->
<include> ../VariableConditions/velocityBCs.extension.xml </include>
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-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionDP-checkpoint.0of1.sh 2006-10-11 20:54:48 UTC (rev 4948)
@@ -14,23 +14,28 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRemoving old data files \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"
+ rm -rf ./output/*"$SaveCheckpointStep".dat
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --elementResI=4 --elementResJ=2 --nonLinearMaxIterations=5 --particlesPerCell=4 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=40 --elementResJ=20 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=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" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=4 --elementResJ=2 --nonLinearMaxIterations=5 --particlesPerCell=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/testExtensionFMM-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of1.sh 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of1.sh 2006-10-11 20:54:48 UTC (rev 4948)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=20 --elementResJ=10 --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=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"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=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" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=20 --elementResJ=10 --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/testExtensionFMM-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of2.sh 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of2.sh 2006-10-11 20:54:48 UTC (rev 4948)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=20 --elementResJ=10 --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=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"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=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" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=20 --elementResJ=10 --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/testExtensionFMM-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of4.sh 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of4.sh 2006-10-11 20:54:48 UTC (rev 4948)
@@ -14,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=20 --elementResJ=10 --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=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"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=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" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=20 --elementResJ=10 --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/testExtensionFMM3D-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D-checkpoint.0of1.sh 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D-checkpoint.0of1.sh 2006-10-11 20:54:48 UTC (rev 4948)
@@ -7,7 +7,6 @@
. ${TEST_SCRIPT}
. `dirname ${TEST_SCRIPT}`/build-functions.sh
-
setUpdateModeFromArg ${1}
# Extract out names
@@ -15,23 +14,26 @@
nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
partTestname=`echo $testname | cut -f 1 -d '-'`
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --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"
-
+ # copy checkpoint data to location to reload from for runAndHandleSystemTestStdLocations.
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
+
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --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/testExtensionFMM3D.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D.xml 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D.xml 2006-10-11 20:54:48 UTC (rev 4948)
@@ -201,9 +201,9 @@
<!-- Note : for proper resolution of the problem, it is strongly recommended you run
this problem in parallel, with at least 100 * 50 * 100 elements. The values below are for
small testing / demonstration only. -->
- <param name="elementResI"> 32 </param>
- <param name="elementResJ"> 16 </param>
- <param name="elementResK"> 32 </param>
+ <param name="elementResI"> 4 </param>
+ <param name="elementResJ"> 2 </param>
+ <param name="elementResK"> 4 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
<param name="minY"> 0.0 </param>
@@ -213,8 +213,8 @@
<param name="maxZ"> 2.0 </param>
<param name="allowUnbalancing"> True </param>
- <param name="particlesPerCell"> 25 </param>
- <param name="cellParticleCount"> 25 </param>
+ <param name="particlesPerCell"> 4 </param>
+ <param name="cellParticleCount"> 4 </param>
<param name="seed"> 13 </param>
<!-- Set up BCs and ICs -->
@@ -222,9 +222,8 @@
<!-- Integration Scheme configuration -->
- <!--
- <param name="Gravity">10.0</param>
- -->
+ <param name="nonLinearMaxIterations"> 5 </param>
+
<struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
<list name="variables">
<param>PressureField</param>
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii.xml 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii.xml 2006-10-11 20:54:48 UTC (rev 4948)
@@ -31,7 +31,7 @@
</struct>
<!-- Simulation control -->
- <param name="maxTimeSteps"> 200000 </param>
+ <param name="maxTimeSteps"> 20 </param>
<param name="outputPath"> ./output </param>
<param name="dumpEvery"> 10 </param>
@@ -48,8 +48,8 @@
<!-- Geometry & Mesh setup -->
<param name="dim"> 2 </param>
- <param name="elementResI"> 32 </param>
- <param name="elementResJ"> 32 </param>
+ <param name="elementResI"> 4 </param>
+ <param name="elementResJ"> 4 </param>
<param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
@@ -66,7 +66,8 @@
<include> ../VariableConditions/velocityBCs.freeslip.xml </include>
<!-- Integration Scheme configuration -->
- <param name="particlesPerCell"> 20 </param>
+ <param name="particlesPerCell"> 5 </param>
+ <param name="nonLinearMaxIterations"> 5 </param>
<struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
<list name="variables">
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating.xml 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating.xml 2006-10-11 20:54:48 UTC (rev 4948)
@@ -49,6 +49,8 @@
<param name="Ra"> 1e4 </param>
<param name="courantFactor"> 0.25 </param>
+ <param name="nonLinearMaxIterations"> 5 </param>
+ <param name="particlesPerCell"> 4 </param>
<!-- Journal Control -->
<param name="journal.info.Context-verbose">True</param>
@@ -59,8 +61,8 @@
<!-- Geometry & Mesh setup -->
<param name="dim"> 2 </param>
- <param name="elementResI"> 16 </param>
- <param name="elementResJ"> 16 </param>
+ <param name="elementResI"> 4 </param>
+ <param name="elementResJ"> 4 </param>
<param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid.xml 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid.xml 2006-10-11 20:54:48 UTC (rev 4948)
@@ -45,7 +45,7 @@
</struct>
<!-- Simulation control -->
- <param name="maxTimeSteps"> 200000 </param>
+ <param name="maxTimeSteps"> 20 </param>
<param name="outputPath"> ./output </param>
<param name="dumpEvery"> 1 </param>
@@ -53,8 +53,9 @@
<param name="courantFactor"> 0.25 </param>
<!-- Non-linear stuff -->
- <param name="nonLinearMaxIterations"> 500 </param>
-
+ <param name="nonLinearMaxIterations"> 4 </param>
+ <param name="particlesPerCell"> 4 </param>
+
<!-- Journal Control -->
<param name="journal.info.Context-verbose">True</param>
<param name="journal-level.info.Stg_ComponentFactory">2</param>
@@ -64,8 +65,8 @@
<!-- Geometry & Mesh setup -->
<param name="dim"> 2 </param>
- <param name="elementResI"> 32 </param>
- <param name="elementResJ"> 32 </param>
+ <param name="elementResI"> 8 </param>
+ <param name="elementResJ"> 8 </param>
<param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent.xml 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent.xml 2006-10-11 20:54:48 UTC (rev 4948)
@@ -56,7 +56,7 @@
</struct>
<!-- Simulation control -->
- <param name="maxTimeSteps"> 200000 </param>
+ <param name="maxTimeSteps"> 20 </param>
<param name="outputPath"> ./output </param>
<param name="dumpEvery"> 10 </param>
@@ -73,8 +73,8 @@
<!-- Geometry & Mesh setup -->
<param name="dim"> 2 </param>
- <param name="elementResI"> 32 </param>
- <param name="elementResJ"> 32 </param>
+ <param name="elementResI"> 4 </param>
+ <param name="elementResJ"> 4 </param>
<param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
@@ -91,7 +91,8 @@
<include> ../VariableConditions/velocityBCs.freeslip.xml </include>
<!-- Integration Scheme configuration -->
- <param name="particlesPerCell"> 20 </param>
+ <param name="particlesPerCell"> 4 </param>
+ <param name="nonLinearMaxIterations"> 5 </param>
<struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
<list name="variables">
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian.xml 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian.xml 2006-10-11 20:54:48 UTC (rev 4948)
@@ -56,8 +56,8 @@
<!-- Geometry & Mesh setup -->
<param name="dim"> 2 </param>
- <param name="elementResI"> 32 </param>
- <param name="elementResJ"> 32 </param>
+ <param name="elementResI"> 4 </param>
+ <param name="elementResJ"> 4 </param>
<param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
@@ -74,7 +74,8 @@
<include> ../VariableConditions/velocityBCs.freeslip.xml </include>
<!-- Integration Scheme configuration -->
- <param name="particlesPerCell"> 20 </param>
+ <param name="particlesPerCell"> 4 </param>
+ <param name="nonLinearMaxIterations"> 5 </param>
<struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
<list name="variables">
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh 2006-10-11 20:54:48 UTC (rev 4948)
@@ -15,24 +15,28 @@
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
#partTestname=`echo $testname | cut -f 1 -d '-'`
partTestname=testRayleighTaylorBenchmark
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRemoving old data files \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"
-
+ rm -rf ./output/*"$SaveCheckpointStep".dat
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --elementResI=8 --elementResJ=8 --nonLinearMaxIterations=5 --particlesPerCell=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 2 timesteps to reload location.\n"
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
- cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*2.dat ./output/
-
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=8 --elementResJ=8 --nonLinearMaxIterations=5 --particlesPerCell=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/testRayleighTaylor2D-checkpoint.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of2.sh 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of2.sh 2006-10-11 20:54:48 UTC (rev 4948)
@@ -15,23 +15,28 @@
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
#partTestname=`echo $testname | cut -f 1 -d '-'`
partTestname=testRayleighTaylorBenchmark
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRemoving old data files \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"
+ rm -rf ./output/*"$SaveCheckpointStep".dat
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --elementResI=8 --elementResJ=8 --nonLinearMaxIterations=5 --particlesPerCell=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 2 timesteps to reload location.\n"
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
- cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*2.dat ./output/
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=8 --elementResJ=8 --nonLinearMaxIterations=5 --particlesPerCell=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/testRayleighTaylor2D-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of4.sh 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of4.sh 2006-10-11 20:54:48 UTC (rev 4948)
@@ -15,23 +15,28 @@
procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
#partTestname=`echo $testname | cut -f 1 -d '-'`
partTestname=testRayleighTaylorBenchmark
+MaxTimeStepsDefault=3
+SaveCheckpointStep=2
+StepsLeft=1
# test if xml with this name exists
if test -r "${partTestname}.xml"; then
# Run MPI's to generate results to test against.
printf "$testname: doing pre-test setup:\n"
- printf "\tRunning for 4 timesteps to generate expected result\n"
+ printf "\tRemoving old data files \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"
+ rm -rf ./output/*"$SaveCheckpointStep".dat
+ printf "\tRunning for $MaxTimeStepsDefault timesteps to generate expected result\n"
+ RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --checkpointEvery=1 --elementResI=8 --elementResJ=8 --nonLinearMaxIterations=5 --particlesPerCell=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 2 timesteps to reload location.\n"
+ printf "\tCopying results for $SaveCheckpointStep timesteps to reload location.\n"
- cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*2.dat ./output/
+ cp -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult/"*"$SaveCheckpointStep".dat ./output/
# Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+ printf "Doing actual test: restarting from timestep $SaveCheckpointStep, checking if result by timestep $MaxTimeStepsDefault == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=8 --elementResJ=8 --nonLinearMaxIterations=5 --particlesPerCell=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/testSlabSubduction.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction.xml 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction.xml 2006-10-11 20:54:48 UTC (rev 4948)
@@ -140,9 +140,9 @@
<!-- general decomposition parameters -->
<param name="dim"> 3 </param>
<!-- mesh parameters -->
- <param name="elementResI"> 8 </param>
- <param name="elementResJ"> 4 </param>
- <param name="elementResK"> 8 </param>
+ <param name="elementResI"> 4 </param>
+ <param name="elementResJ"> 2 </param>
+ <param name="elementResK"> 4 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
@@ -155,10 +155,10 @@
<param name="buildElementNodeTbl"> True </param>
<!-- Non-linear stuff -->
- <param name="nonLinearMaxIterations"> 20 </param>
+ <param name="nonLinearMaxIterations"> 5 </param>
<!-- Swarm parameters -->
- <param name="particlesPerCell"> 10 </param>
+ <param name="particlesPerCell"> 4 </param>
<!-- Boundary conditions -->
<include>../VariableConditions/velocityBCs.freeslip.xml</include>
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark.xml 2006-10-11 20:54:46 UTC (rev 4947)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark.xml 2006-10-11 20:54:48 UTC (rev 4948)
@@ -58,6 +58,7 @@
<param name="gravity"> 3e5 </param>
<param name="courantFactor"> 0.25 </param>
+ <param name="nonLinearMaxIterations"> 10 </param>
<!-- Journal Parameters -->
<param name="journal.info.Context-verbose">True</param>
@@ -68,8 +69,8 @@
<!-- Geometry & Mesh setup -->
<param name="dim"> 2 </param>
- <param name="elementResI"> 32 </param>
- <param name="elementResJ"> 16 </param>
+ <param name="elementResI"> 8 </param>
+ <param name="elementResJ"> 4 </param>
<param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
<param name="minX"> 0.0 </param>
@@ -81,7 +82,7 @@
<param name="allowUnbalancing"> True </param>
<!-- Swarm parameters -->
- <param name="particlesPerCell"> 20 </param>
+ <param name="particlesPerCell"> 10 </param>
<!-- Set up BCs -->
<include> ../VariableConditions/temperatureBCs.xml </include>
More information about the cig-commits
mailing list