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

[walter at geodynamics.org]

Author: walter
Date: 2006-08-17 17:17:49 -0700 (Thu, 17 Aug 2006)
New Revision: 4344

Added:
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of2.sh
Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh
Log:
 r487 at earth:  boo | 2006-08-17 17:15:25 -0700
  r461 at earth (orig r292):  KathleenHumble | 2006-08-01 22:15:05 -0700
  Adding in a new Anisotropic test for parrallel (uses 2 processors)
  and it's expected file
  editting serial ANisotropic test so that it uses the new mpi call function
  rather than an explicitly serial call
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:486
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:291
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:487
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:292

Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected	2006-08-18 00:17:47 UTC (rev 4343)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of2.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected	2006-08-18 00:17:49 UTC (rev 4344)
@@ -0,0 +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.

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-18 00:17:47 UTC (rev 4343)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh	2006-08-18 00:17:49 UTC (rev 4344)
@@ -10,19 +10,21 @@
 setUpdateModeFromArg ${1}
 
 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'`
 
 printf "$testname: doing pre-test setup:\n"
 
 softlinkCreateOrRemove 'Underworld' 'create'
 
 printf "\tRunning for 4 timesteps to generate expected result\n"
-rm -rf ./output/testAnisotropic0of1GeneratedTestResult
-./Underworld-softlink testAnisotropic.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/testAnisotropic0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+rm -rf ./output/"testAnisotropic0of${nproc}GeneratedTestResult"
+RunMPICommand ${testname} Underworld testAnisotropic.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/"testAnisotropic${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
 
 printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
-./Underworld-softlink testAnisotropic.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=1  > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
+RunMPICommand ${testname} Underworld 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=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testAnisotropic0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
+runAndHandleSystemTestStdLocations "Underworld testAnisotropic.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testAnisotropic${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"

Added: 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-08-18 00:17:47 UTC (rev 4343)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of2.sh	2006-08-18 00:17:49 UTC (rev 4344)
@@ -0,0 +1,26 @@
+#!/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}
+
+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'`
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/"testAnisotropic0of${nproc}GeneratedTestResult"
+RunMPICommand ${testname} Underworld "testAnisotropic.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=8 --elementResJ=8 --outputPath=./output/testAnisotropic${procToWatch}of${nproc}GeneratedTestResult" > "./log/${testname}.generateExpectedResult.out" 2> "./log/${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+RunMPICommand ${testname} Underworld testAnisotropic.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=8 --elementResJ=8 > ./log/${testname}.generateCheckpoint.out --outputPath=./output/ 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 testAnisotropic.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --elementResI=8 --elementResJ=8 --elementResK=1 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testAnisotropic${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"


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