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

[walter at geodynamics.org]

Author: walter
Date: 2006-07-09 14:36:57 -0700 (Sun, 09 Jul 2006)
New Revision: 4001

Removed:
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/checkpoint/
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of1/
Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/
   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/testRayleighTaylor2D-checkpoint.0of1.sh
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylorBenchmark.xml
Log:
 r345 at earth:  boo | 2006-07-09 14:31:03 -0700
  r341 at earth (orig r251):  PatrickSunter | 2006-07-07 03:47:10 -0700
  Refactored the Ray Tay checkpointing test to do as I originally intended:
   1) generate an expected soln after 4 timesteps
   2) run for 2 timesteps and checkpoint
   3) restart from timestep 2, and run till 4, then compare with previously generated
  
  The test should now be portable on all systems, and not need to be updated when
  we update the stable version to test against.
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:344
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:250
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:345
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:251


Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests
___________________________________________________________________
Name: svn:ignore
   + Underworld


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-07-09 21:36:54 UTC (rev 4000)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testRayleighTaylor2D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected	2006-07-09 21:36:57 UTC (rev 4001)
@@ -1,2 +1,2 @@
-Timestep 20: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
-Timestep 20: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.
+Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.005.
+Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 5e-06.

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh	2006-07-09 21:36:54 UTC (rev 4000)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh	2006-07-09 21:36:57 UTC (rev 4001)
@@ -10,6 +10,15 @@
 
 testname="`basename $0 .sh`"
 
-cp checkpoint/* output/
+printf "$testname: doing pre-test setup:\n"
 
-runAndHandleSystemTestStdLocations "Underworld testRayleighTaylorBenchmark.xml --interactive=False --maxTimeSteps=5 --restartTimestep=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./expected/testRayleighTaylor2D-checkpoint.0of1 --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=20" "$0" "$@"
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/generatedTestResult
+Underworld testRayleighTaylorBenchmark.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/generatedTestResult > ./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"
+
+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/generatedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylorBenchmark.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylorBenchmark.xml	2006-07-09 21:36:54 UTC (rev 4000)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylorBenchmark.xml	2006-07-09 21:36:57 UTC (rev 4001)
@@ -60,12 +60,12 @@
 	</struct>
 
 	<param name="journal.info.Context-verbose">true</param>
-	<param name="journal.debug">f</param>
 	<param name="journal-level.info.Stg_ComponentFactory">2</param>
-	<param name="journal-enable-branch.debug.StG_FEM">f</param>
+	<param name="journal-enable-branch.debug.StG_FEM">t</param>
 	<param name="journal-level-branch.debug.StG_FEM"> 2 </param>
-	<param name="journal-enable-branch.debug.Swarm">f</param>
+	<param name="journal-enable-branch.debug.Swarm">t</param>
 	<param name="journal-level-branch.debug.Swarm"> 2 </param>
+	<param name="journal.debug">t</param>
 
 	<!-- general simulation parameters -->
 	<param name="maxTimeSteps"> 300 </param>