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

[walter at geodynamics.org]

Author: walter
Date: 2006-12-07 14:14:22 -0800 (Thu, 07 Dec 2006)
New Revision: 5505

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of4.sh
Log:
 r758 at earth:  boo | 2006-12-07 14:13:22 -0800
  r737 at earth (orig r379):  KathleenHumble | 2006-11-15 21:47:42 -0800
  removed -no_signal_handler tags left over from debugging
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:757
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:378
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:758
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:379

Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of4.sh	2006-12-07 22:14:15 UTC (rev 5504)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of4.sh	2006-12-07 22:14:22 UTC (rev 5505)
@@ -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 --elementResI=24 --elementResJ=12 --elementResK=24 --nonLinearMaxIterations=10  --particlesPerCell=20  -no_signal_handler --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=24 --elementResJ=12 --elementResK=24 --nonLinearMaxIterations=10  --particlesPerCell=20  --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 --elementResI=24 --elementResJ=12 --elementResK=24 --nonLinearMaxIterations=10 --particlesPerCell=20 -no_signal_handler --plugins[]=StgFEM_CompareFeVariableAgainstReferenceSolution --StgFEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StgFEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=$MaxTimeStepsDefault --StgFEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+	runAndHandleSystemTestStdLocations "Underworld ./${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=$StepsLeft --restartTimestep=$SaveCheckpointStep --checkpointEvery=1 --elementResI=24 --elementResJ=12 --elementResK=24 --nonLinearMaxIterations=10 --particlesPerCell=20 --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