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

[walter at geodynamics.org]

Author: walter
Date: 2006-12-07 14:15:16 -0800 (Thu, 07 Dec 2006)
New Revision: 5519

Added:
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionWithPopControl-checkpoint.0of1.StgFEM_CompareFeVariableAgainstReferenceSolution.dat.expected
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionWithPopControl-checkpoint.0of1.sh
Modified:
   long/3D/Gale/trunk/src/Underworld/
Log:
 r772 at earth:  boo | 2006-12-07 14:13:26 -0800
  r751 at earth (orig r393):  KathleenHumble | 2006-11-26 16:59:23 -0800
  commiting a test that has population Control
  and checkpointing to test that they work together.
  Not a rigourous test.
  commiting the makefile so this and the other population control
  test will work.
  These tests are a little slow, this is deliberate as they are large,
  and need to be large to pick up problems.
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:771
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:392
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:772
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:393

Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionWithPopControl-checkpoint.0of1.StgFEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionWithPopControl-checkpoint.0of1.StgFEM_CompareFeVariableAgainstReferenceSolution.dat.expected	2006-12-07 22:15:14 UTC (rev 5518)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionWithPopControl-checkpoint.0of1.StgFEM_CompareFeVariableAgainstReferenceSolution.dat.expected	2006-12-07 22:15:16 UTC (rev 5519)
@@ -0,0 +1,2 @@
+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.

Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionWithPopControl-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionWithPopControl-checkpoint.0of1.sh	2006-12-07 22:15:14 UTC (rev 5518)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionWithPopControl-checkpoint.0of1.sh	2006-12-07 22:15:16 UTC (rev 5519)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+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}
+
+# Extract out names
+testname="`basename $0 .sh`"
+nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
+procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
+partTestname=`echo $testname | cut -f 1 -d '-'`
+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 $MaxTimeStepsDefault timesteps to generate expected result\n"
+	rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
+	RunMPICommand ${testname} Underworld "./${partTestname}.xml" --interactive=False --maxTimeSteps=$MaxTimeStepsDefault --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"
+
+	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  --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --plugins[]=StgFEM_CompareFeVariableAgainstReferenceSolution --StgFEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StgFEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StgFEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+
+else echo "${partTestname}.xml doesn't exist, so can't test it"
+fi


Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionWithPopControl-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
   + *