[cig-commits] r4070 - in long/3D/Gale/trunk/src/Underworld: .
InputFiles/tests InputFiles/tests/expected
walter at geodynamics.org
walter at geodynamics.org
Thu Jul 20 20:09:23 PDT 2006
Author: walter
Date: 2006-07-20 20:09:21 -0700 (Thu, 20 Jul 2006)
New Revision: 4070
Added:
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionDP-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionMC-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionMC3D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of1.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.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh
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/testExtensionMC-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh
Modified:
long/3D/Gale/trunk/src/Underworld/
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh
Log:
r370 at earth: boo | 2006-07-20 20:05:18 -0700
r355 at earth (orig r257): KathleenHumble | 2006-07-13 01:15:03 -0700
Added a swath of checkpoint tests for Underworld Inputfiles.
With corresponding xml and expected files
for Comparing FEVariables that are checkpointed.
Currently only checks Pressure and Velocity.
Currently all these checkpointing tests are failing.
I believe these are due to the tolerances set in the
expected file.
There are a few tests added that are not being run by the makefile
this is because they are failing to run rater than just failing to be
accurate enough. These will be debugged soon.
Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
- 9570c393-cf10-0410-b476-9a651db1e55a:/cig:369
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:256
+ 9570c393-cf10-0410-b476-9a651db1e55a:/cig:370
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:257
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testAnisotropic-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testArrhenius-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtension-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionDP-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionDP-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionDP-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionMC-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionMC-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionMC-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionMC3D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionMC3D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testExtensionMC3D-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testFrankKamenetskii-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testInternalHeating-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMobileLid-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testMultiComponent-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testNonNewtonian-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/expected/testSlabSubduction-checkpoint.0of1.StG_FEM_CompareFeVariableAgainstReferenceSolution.dat.expected 2006-07-21 03:09:21 UTC (rev 4070)
@@ -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.
Added: 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-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,28 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+#set -x
+getValueFromMakefile_System BIN_DIR
+ln -sf ${BIN_DIR}/Underworld Underworld
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testAnisotropic0of1GeneratedTestResult
+./Underworld testAnisotropic.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --outputPath=./output/testAnisotropic0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+./Underworld testAnisotropic.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=1 > ./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 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testAnisotropic0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic.xml 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testAnisotropic.xml 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <include> ../BaseApps/ThermalConvectionPIC.xml </include>
+
+ <list name="plugins" mergeType="merge">
+ <!-- Output Plugins -->
+ <param>StG_FEM_FrequentOutput</param>
+ <param>Underworld_Nusselt</param>
+ <param>Underworld_Vrms</param>
+ <param>StG_FEM_CPUTime</param>
+ </list>
+
+ <struct name="components" mergeType="merge">
+ <struct name="director">
+ <param name="Type">Director</param>
+ <param name="TimeIntegrator">timeIntegrator</param>
+ <param name="VelocityGradientsField">VelocityGradientsField</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
+ <param name="initialDirectionX">1.0</param>
+ <param name="initialDirectionY">0.0</param>
+ <param name="initialDirectionZ">0.0</param>
+ <param name="dontUpdate">False</param>
+ </struct>
+ <struct name="isotropicViscosity">
+ <param name="Type">MaterialViscosity</param>
+ <param name="eta0">1.0</param>
+ </struct>
+ <struct name="anisotropic">
+ <param name="Type">Anisotropic</param>
+ <param name="Director">director</param>
+ <param name="viscosityRatio">10.0</param>
+ </struct>
+ <struct name="shape">
+ <param name="Type">Everywhere</param>
+ </struct>
+ <struct name="material">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">shape</param>
+ <list name="Rheology">
+ <param>isotropicViscosity</param>
+ <param>anisotropic</param>
+ </list>
+ </struct>
+ <!-- Create Alignment Swarm Variable - for the sake of plotting -->
+ <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>
+
+ <!-- Simulation control -->
+ <param name="maxTimeSteps"> 20000 </param>
+ <param name="outputPath"> ./output </param>
+ <param name="dumpEvery"> 1 </param>
+
+ <param name="Ra"> 5.6e5 </param>
+
+ <param name="courantFactor"> 0.25 </param>
+
+ <!-- Journal Control -->
+ <param name="journal.info.Context-verbose">True</param>
+ <param name="journal-level.info.Stg_ComponentFactory">2</param>
+ <param name="journal-level.info.lucInfo">2</param>
+ <param name="journal-level.debug.lucDebug">1</param>
+ <param name="journal-enable-branch.debug.lucDebug">t</param>
+ <param name="journal.debug">f</param>
+ <param name="journal-enable-branch.debug.StG_FEM">t</param>
+ <param name="journal-level-branch.debug.StG_FEM"> 2 </param>
+
+ <!-- Geometry & Mesh setup -->
+ <param name="dim"> 2 </param>
+ <param name="elementResI"> 32 </param>
+ <param name="elementResJ"> 32 </param>
+ <param name="elementResK"> 1 </param>
+ <param name="shadowDepth"> 1 </param>
+ <param name="minX"> 0.0 </param>
+ <param name="minY"> 0.0 </param>
+ <param name="minZ"> 0.0 </param>
+ <param name="maxX"> 1.0 </param>
+ <param name="maxY"> 1.0 </param>
+ <param name="maxZ"> 1.0 </param>
+ <param name="allowUnbalancing"> True </param>
+
+ <!-- Set up BCs and ICs -->
+ <include> ../VariableConditions/temperatureBCs.xml </include>
+ <include> ../VariableConditions/temperatureICs.sinusoid.xml </include>
+ <include> ../VariableConditions/velocityBCs.freeslip.xml </include>
+
+ <!-- Integration Scheme configuration -->
+ <param name="particlesPerCell"> 20 </param>
+
+ <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
+ <list name="variables">
+ <param>PressureField</param>
+ <param>VelocityField</param>
+ </list>
+ <param name="VelocityField-tolerance">0.000005</param>
+ </struct>
+</StGermainData>
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of1.sh 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testArrhenius0of1GeneratedTestResult
+Underworld testArrhenius.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testArrhenius0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testArrhenius.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 testArrhenius.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testArrhenius0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius.xml 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testArrhenius.xml 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <include> ../BaseApps/ThermalConvection.xml </include>
+
+ <list name="plugins" mergeType="merge">
+ <!-- Output Plugins -->
+ <param>StG_FEM_FrequentOutput</param>
+ <param>Underworld_Nusselt</param>
+ <param>Underworld_Vrms</param>
+ <param>StG_FEM_CPUTime</param>
+ </list>
+
+ <struct name="components" mergeType="merge">
+ <struct name="temperatureDependence">
+ <param name="Type">Arrhenius</param>
+ <param name="TemperatureField">TemperatureField</param>
+ <param name="eta0">1.0e-6</param>
+ <param name="activationEnergy">27.63102112</param>
+ </struct>
+ <struct name="shape">
+ <param name="Type">Everywhere</param>
+ </struct>
+ <struct name="material">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">shape</param>
+ <param name="Rheology">temperatureDependence</param>
+ </struct>
+ </struct>
+
+ <!-- Simulation control -->
+ <param name="maxTimeSteps"> 2 </param>
+ <param name="outputPath"> ./output </param>
+ <param name="dumpEvery"> 1 </param>
+
+ <param name="Ra"> 1e6 </param>
+
+ <param name="courantFactor"> 0.25 </param>
+
+ <!-- Journal Control -->
+ <param name="journal.info.Context-verbose">True</param>
+ <param name="journal-level.info.Stg_ComponentFactory">2</param>
+ <param name="journal-level.info.lucInfo">2</param>
+ <param name="journal-level.debug.lucDebug">1</param>
+ <param name="journal-enable-branch.debug.lucDebug">t</param>
+ <param name="journal.debug">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.debug.Plugin"> t </param>
+
+ <!-- Geometry & Mesh setup -->
+ <param name="dim"> 2 </param>
+ <param name="elementResI"> 32 </param>
+ <param name="elementResJ"> 32 </param>
+ <param name="elementResK"> 1 </param>
+ <param name="shadowDepth"> 1 </param>
+ <param name="minX"> 0.0 </param>
+ <param name="minY"> 0.0 </param>
+ <param name="minZ"> 0.0 </param>
+ <param name="maxX"> 1.0 </param>
+ <param name="maxY"> 1.0 </param>
+ <param name="maxZ"> 1.0 </param>
+ <param name="allowUnbalancing"> True </param>
+
+ <!-- Set up BCs and ICs -->
+ <include> ../VariableConditions/temperatureBCs.xml </include>
+ <include> ../VariableConditions/temperatureICs.sinusoid.xml </include>
+ <include> ../VariableConditions/velocityBCs.freeslip.xml </include>
+
+ <!-- Integration Scheme configuration -->
+ <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
+ <list name="variables">
+ <param>PressureField</param>
+ <param>VelocityField</param>
+ </list>
+ <param name="VelocityField-tolerance">0.000005</param>
+ </struct>
+
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testExtension0of1GeneratedTestResult
+Underworld testExtension.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=15 --elementResJ=15 --outputPath=./output/testExtension0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testExtension.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=15 --elementResJ=15 > ./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 testExtension.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --elementResI=15 --elementResJ=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testExtension0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension.xml 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtension.xml 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <include> ../BaseApps/ExtensionBaseApp.xml </include>
+
+ <list name="plugins" mergeType="merge">
+ <param>Underworld_MovingMesh</param>
+
+ <!-- Output Plugins -->
+ <param>StG_FEM_FrequentOutput</param>
+ <param>Underworld_Vrms</param>
+ <param>StG_FEM_CPUTime</param>
+ </list>
+
+ <struct name="components" mergeType="merge">
+ <!-- Shape Stuff -->
+ <struct name="backgroundShape">
+ <param name="Type">Everywhere</param>
+ </struct>
+ <struct name="box">
+ <param name="Type">Box</param>
+ <param name="startX"> minX </param> <param name="endX"> maxX </param>
+ <param name="startY"> 0.3 </param> <param name="endY"> 0.7 </param>
+ <param name="startZ"> minZ </param> <param name="endZ"> maxZ </param>
+ </struct>
+ <struct name="weakZone">
+ <param name="Type">Box</param>
+ <param name="startX"> 0.975 </param> <param name="endX"> 1.025 </param>
+ <param name="startY"> 0.3 </param> <param name="endY"> 0.35 </param>
+ <param name="startZ"> minZ </param> <param name="endZ"> maxZ </param>
+ </struct>
+ <struct name="barShape">
+ <param name="Type">Intersection</param>
+ <list name="shapes">
+ <param>box</param>
+ <param>!weakZone</param>
+ </list>
+ </struct>
+
+ <!-- Background Material Stuff -->
+ <struct name="backgroundViscosity">
+ <param name="Type">MaterialViscosity</param>
+ <param name="eta0">1.0</param>
+ </struct>
+ <struct name="compresibility">
+ <param name="Type">Compressible</param>
+ <param name="GeometryMesh">mesh-linear</param>
+ <param name="StiffnessMatrix">c_matrix</param>
+ <param name="Swarm">picIntegrationPoints</param>
+ <param name="oneOnLambda">10.0</param>
+ </struct>
+ <struct name="background">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">backgroundShape</param>
+ <param name="Rheology">backgroundViscosity</param>
+ <param name="Compressible">compresibility</param>
+ </struct>
+
+ <!-- Bar Material Stuff -->
+ <struct name="barViscosity">
+ <param name="Type">MaterialViscosity</param>
+ <param name="eta0">100.0</param>
+ </struct>
+ <struct name="vonMises">
+ <param name="Type">VonMises</param>
+ <param name="StrainRateField">StrainRateField</param>
+ <param name="cohesion">50.0</param>
+ </struct>
+ <struct name="bar">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">barShape</param>
+ <list name="Rheology">
+ <param>barViscosity</param>
+ <param>vonMises</param>
+ </list>
+ </struct>
+ </struct>
+
+ <!-- Simulation control -->
+ <param name="maxTimeSteps"> 200000 </param>
+ <param name="outputPath"> ./output </param>
+ <param name="dumpEvery"> 1 </param>
+
+ <!-- Non-linear stuff -->
+ <param name="nonLinearMaxIterations"> 500 </param>
+
+ <!-- Journal Control -->
+ <param name="journal.info.Context-verbose">True</param>
+ <param name="journal-level.info.Stg_ComponentFactory">2</param>
+ <param name="journal.debug">t</param>
+ <param name="journal-enable-branch.debug.StG_FEM">t</param>
+ <param name="journal-level-branch.debug.StG_FEM"> 2 </param>
+
+ <!-- Geometry & Mesh setup -->
+ <param name="dim"> 2 </param>
+ <param name="elementResI"> 64 </param>
+ <param name="elementResJ"> 32 </param>
+ <param name="elementResK"> 1 </param>
+ <param name="shadowDepth"> 1 </param>
+ <param name="minX"> 0.0 </param>
+ <param name="minY"> 0.0 </param>
+ <param name="minZ"> 0.0 </param>
+ <param name="maxX"> 2.0 </param>
+ <param name="maxY"> 1.0 </param>
+ <param name="maxZ"> 1.0 </param>
+ <param name="allowUnbalancing"> True </param>
+
+ <param name="particlesPerCell"> 20 </param>
+
+ <!-- Set up BCs and ICs -->
+ <include> ../VariableConditions/velocityBCs.extension.xml </include>
+
+ <!-- Integration Scheme configuration -->
+
+ <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
+ <list name="variables">
+ <param>PressureField</param>
+ <param>VelocityField</param>
+ </list>
+ <param name="VelocityField-tolerance">0.000005</param>
+ </struct>
+
+</StGermainData>
Added: 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-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionDP-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testExtensionDP0of1GeneratedTestResult
+Underworld testExtensionDP.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=15 --elementResJ=15--outputPath=./output/testExtensionDP0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testExtensionDP.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=15 --elementResJ=15 > ./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 testExtensionDP.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --elementResI=15 --elementResJ=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testExtensionDP0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionDP-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC-checkpoint.0of1.sh 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testExtensionMC0of1GeneratedTestResult
+Underworld testExtensionMC.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=15 --elementResJ=15 --outputPath=./output/testExtensionMC0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testExtensionMC.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=15 --elementResJ=15 > ./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 testExtensionMC.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --elementResI=15 --elementResJ=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testExtensionMC0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.xml 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.xml 2006-07-21 03:09:21 UTC (rev 4070)
@@ -23,4 +23,4 @@
<param name="elementResI">30</param>
<param name="elementResJ">15</param>
-</StGermainData>
+</StGermainData>
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D-checkpoint.0of1.sh 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testExtensionMC3DGeneratedTestResult
+Underworld testExtensionMC3D.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=15 --elementResJ=15 --outputPath=./output/testExtensionMC3DGeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testExtensionMC3D.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 testExtensionMC3D.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --elementResI=15 --elementResJ=15 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testExtensionMC3DGeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D.xml 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D.xml 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,238 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <include> ../BaseApps/ExtensionBaseApp.xml </include>
+ <include> ../PIC_Components/PopulationControl.xml </include>
+
+ <list name="plugins" mergeType="merge">
+ <!-- Output Plugins -->
+ <param>StG_FEM_FrequentOutput</param>
+ <param>Underworld_Vrms</param>
+ <param>StG_FEM_CPUTime</param>
+ </list>
+
+ <!-- Rheology Components -->
+ <struct name="components" mergeType="merge">
+ <!-- Shape Stuff -->
+ <struct name="backgroundShape">
+ <param name="Type">Everywhere</param>
+ </struct>
+ <struct name="incompressibleShape">
+ <param name="Type">Box</param>
+ <param name="startX"> minX </param> <param name="endX"> maxX </param>
+ <param name="startY"> 0.8 </param> <param name="endY"> 0.85 </param>
+ <param name="startZ"> minZ </param> <param name="endZ"> maxZ </param>
+ </struct>
+ <struct name="crustShape">
+ <param name="Type">Box</param>
+ <param name="startX"> minX </param> <param name="endX"> maxX </param>
+ <param name="startY"> 0.4 </param> <param name="endY"> 0.8 </param>
+ <param name="startZ"> minZ </param> <param name="endZ"> maxZ </param>
+ </struct>
+ <struct name="weakZoneShape1">
+ <param name="Type">Box</param>
+ <param name="startX"> 0.775 </param> <param name="endX"> 0.825 </param>
+ <param name="startY"> 0.4 </param> <param name="endY"> 0.45 </param>
+ <param name="startZ"> minZ </param> <param name="endZ"> 0.66666 </param>
+ </struct>
+ <struct name="weakZoneShape2">
+ <param name="Type">Box</param>
+ <param name="startX"> 1.175 </param> <param name="endX"> 1.225 </param>
+ <param name="startY"> 0.4 </param> <param name="endY"> 0.45 </param>
+ <param name="startZ"> 1.33333 </param> <param name="endZ"> maxZ </param>
+ </struct>
+ <struct name="weakZoneShape">
+ <param name="Type">Union</param>
+ <list name="shapes">
+ <param>weakZoneShape1</param>
+ <param>weakZoneShape2</param>
+ </list>
+ </struct>
+ <struct name="crustShape2">
+ <param name="Type">Intersection</param>
+ <list name="shapes">
+ <param>crustShape</param>
+ <param>!weakZoneShape</param>
+ </list>
+ </struct>
+ <struct name="mantleShape">
+ <param name="Type">Box</param>
+ <param name="startX"> minX </param> <param name="endX"> maxX </param>
+ <param name="startY"> 0.0 </param> <param name="endY"> 0.4 </param>
+ <param name="startZ"> minZ </param> <param name="endZ"> maxZ </param>
+ </struct>
+ <struct name="mantleShape2">
+ <param name="Type">Union</param>
+ <list name="shapes">
+ <param>mantleShape</param>
+ <param>weakZoneShape</param>
+ </list>
+ </struct>
+
+ <!-- Material Stuff -->
+ <struct name="backgroundViscosity">
+ <param name="Type">MaterialViscosity</param>
+ <param name="eta0">1.0e-1</param>
+ </struct>
+ <struct name="compresibility">
+ <param name="Type">Compressible</param>
+ <param name="GeometryMesh">mesh-linear</param>
+ <param name="StiffnessMatrix">c_matrix</param>
+ <param name="Swarm">picIntegrationPoints</param>
+ <param name="oneOnLambda">10.0</param>
+ </struct>
+ <struct name="background">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">backgroundShape</param>
+ <!--param name="density">0.0</param-->
+ <param name="Compressible">compresibility</param>
+ <param name="Rheology">backgroundViscosity</param>
+ </struct>
+ <struct name="incompressible">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">incompressibleShape</param>
+ <!--param name="density">0.0</param-->
+ <param name="Rheology">backgroundViscosity</param>
+ </struct>
+
+ <!-- Crust Rheology -->
+ <struct name="crustViscosity">
+ <param name="Type">MaterialViscosity</param>
+ <param name="eta0">10.000</param>
+ </struct>
+ <struct name="strainWeakening">
+ <param name="Type">StrainWeakening</param>
+ <param name="TimeIntegrator">timeIntegrator</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
+ <param name="softeningStrain">0.1</param>
+ <param name="initialDamageFraction">0.0</param>
+ <param name="initialDamageWavenumber">0.5</param>
+ <param name="initialDamageFactor">0.5</param>
+ <param name="healingRate">0.0</param>
+ </struct>
+ <struct name="director">
+ <param name="Type">Director</param>
+ <param name="TimeIntegrator">timeIntegrator</param>
+ <param name="VelocityGradientsField">VelocityGradientsField</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
+ <param name="initialDirectionX">0.0</param>
+ <param name="initialDirectionY">1.0</param>
+ <param name="initialDirectionZ">0.0</param>
+ <param name="dontUpdate">True</param>
+ </struct>
+ <struct name="yielding">
+ <param name="Type">MohrCoulomb</param>
+ <param name="PressureField">PressureField</param>
+ <param name="VelocityGradientsField">VelocityGradientsField</param>
+ <param name="MaterialPointsSwarm">materialSwarm</param>
+ <param name="Director">director</param>
+ <param name="Context">context</param>
+ <param name="StrainWeakening">strainWeakening</param>
+ <param name="cohesion">10.0</param>
+ <param name="cohesionAfterSoftening">0.0001</param><!--0.0001-->
+ <param name="frictionCoefficient">0.0</param><!--0.5-->
+ <param name="frictionCoefficientAfterSoftening">0.0</param><!--0.0-->
+ <param name="minimumYieldStress">0.00001</param>
+ <param name="ignoreOldOrientation">false</param>
+ </struct>
+ <struct name="crust">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">crustShape2</param>
+ <!--param name="density">1.0</param-->
+ <list name="Rheology">
+ <param>crustViscosity</param>
+ <param>yielding</param>
+ </list>
+ </struct>
+
+ <struct name="mantleViscosity">
+ <param name="Type">MaterialViscosity</param>
+ <param name="eta0">1.000</param>
+ </struct>
+ <struct name="mantle">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">mantleShape2</param>
+ <!-- <param name="density">1.1</param>-->
+ <!-- Rheology Stuff -->
+ <param name="Rheology">mantleViscosity</param>
+ </struct>
+
+ <!-- Mantle Field Stuff -->
+ <struct name="MantleField">
+ <param name="Type">MaterialFeVariable</param>
+ <param name="Swarm">picIntegrationPoints</param>
+ <param name="Material">mantle</param>
+ <param name="Context">context</param>
+ <param name="Mesh">mesh-linear</param>
+ </struct>
+
+ <!-- Compressible Field Stuff -->
+ <struct name="CompressibleField">
+ <param name="Type">MaterialFeVariable</param>
+ <param name="Swarm">picIntegrationPoints</param>
+ <param name="Material">background</param>
+ <param name="Context">context</param>
+ <param name="Mesh">mesh-linear</param>
+ </struct>
+ </struct>
+
+
+ <!-- Simulation control -->
+ <param name="maxTimeSteps"> 300 </param>
+ <param name="outputPath"> ./output </param>
+ <param name="dumpEvery"> 1 </param>
+
+ <!-- Non-linear stuff -->
+ <param name="nonLinearMaxIterations"> 20 </param>
+
+ <!-- Journal Control -->
+ <param name="journal.info.Context-verbose">True</param>
+ <param name="journal-level.info.Stg_ComponentFactory">2</param>
+ <param name="journal.debug">t</param>
+ <param name="journal-enable-branch.debug.StG_FEM">t</param>
+ <param name="journal-enable-branch.debug.lucDebug">t</param>
+ <param name="journal-level-branch.debug.lucDebug">2</param>
+ <param name="journal-level-branch.debug.StG_FEM"> 2 </param>
+
+ <!-- Geometry & Mesh setup -->
+ <param name="dim"> 3 </param>
+ <!-- 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="shadowDepth"> 1 </param>
+ <param name="minX"> 0.0 </param>
+ <param name="minY"> 0.0 </param>
+ <param name="minZ"> 0.0 </param>
+ <param name="maxX"> 2.0 </param>
+ <param name="maxY"> 1.0 </param>
+ <param name="maxZ"> 2.0 </param>
+ <param name="allowUnbalancing"> True </param>
+
+ <param name="particlesPerCell"> 25 </param>
+ <param name="cellParticleCount"> 25 </param>
+ <param name="seed"> 13 </param>
+
+ <!-- Set up BCs and ICs -->
+ <include> VariableConditions/velocityBCs.extension.xml </include>
+
+ <!-- Integration Scheme configuration -->
+
+ <!--
+ <param name="Gravity">10.0</param>
+ -->
+ <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
+ <list name="variables">
+ <param>PressureField</param>
+ <param>VelocityField</param>
+ </list>
+ <param name="VelocityField-tolerance">0.000005</param>
+ </struct>
+<!--
+-->
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testFrankKamenetskii0of1GeneratedTestResult
+Underworld testFrankKamenetskii.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testFrankKamenetskii0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testFrankKamenetskii.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 testFrankKamenetskii.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testFrankKamenetskii0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii.xml 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testFrankKamenetskii.xml 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <include> ../BaseApps/ThermalConvection.xml </include>
+
+ <list name="plugins" mergeType="merge">
+ <!-- Output Plugins -->
+ <param>StG_FEM_FrequentOutput</param>
+ <param>Underworld_Nusselt</param>
+ <param>Underworld_Vrms</param>
+ <param>StG_FEM_CPUTime</param>
+ </list>
+
+ <struct name="components" mergeType="merge">
+ <struct name="temperatureDependence">
+ <param name="Type">FrankKamenetskii</param>
+ <param name="TemperatureField">TemperatureField</param>
+ <param name="eta0">1.0e6</param>
+ <param name="theta">13.815510558</param>
+ </struct>
+ <struct name="shape">
+ <param name="Type">Everywhere</param>
+ </struct>
+ <struct name="material">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">shape</param>
+ <param name="Rheology">temperatureDependence</param>
+ </struct>
+ </struct>
+
+ <!-- Simulation control -->
+ <param name="maxTimeSteps"> 200000 </param>
+ <param name="outputPath"> ./output </param>
+ <param name="dumpEvery"> 10 </param>
+
+ <param name="Ra"> 1e7 </param>
+
+ <param name="courantFactor"> 0.25 </param>
+
+ <!-- Journal Control -->
+ <param name="journal.info.Context-verbose">True</param>
+ <param name="journal-level.info.Stg_ComponentFactory">2</param>
+ <param name="journal.debug">f</param>
+ <param name="journal-enable-branch.debug.StG_FEM">f</param>
+ <param name="journal-level-branch.debug.StG_FEM"> 2 </param>
+
+ <!-- Geometry & Mesh setup -->
+ <param name="dim"> 2 </param>
+ <param name="elementResI"> 32 </param>
+ <param name="elementResJ"> 32 </param>
+ <param name="elementResK"> 1 </param>
+ <param name="shadowDepth"> 1 </param>
+ <param name="minX"> 0.0 </param>
+ <param name="minY"> 0.0 </param>
+ <param name="minZ"> 0.0 </param>
+ <param name="maxX"> 1.0 </param>
+ <param name="maxY"> 1.0 </param>
+ <param name="maxZ"> 1.0 </param>
+ <param name="allowUnbalancing"> True </param>
+
+ <!-- Set up BCs and ICs -->
+ <include> ../VariableConditions/temperatureBCs.xml </include>
+ <include> ../VariableConditions/temperatureICs.sinusoid.xml </include>
+ <include> ../VariableConditions/velocityBCs.freeslip.xml </include>
+
+ <!-- Integration Scheme configuration -->
+ <param name="particlesPerCell"> 20 </param>
+
+ <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
+ <list name="variables">
+ <param>PressureField</param>
+ <param>VelocityField</param>
+ </list>
+ <param name="VelocityField-tolerance">0.000005</param>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testInternalHeating0of1GeneratedTestResult
+Underworld testInternalHeating.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testInternalHeating0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testInternalHeating.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 testInternalHeating.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testInternalHeating0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating.xml 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testInternalHeating.xml 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <include> ../BaseApps/ThermalConvection.xml </include>
+
+ <list name="plugins" mergeType="merge">
+ <!-- Output Plugins -->
+ <param>StG_FEM_FrequentOutput</param>
+ <param>Underworld_Nusselt</param>
+ <param>Underworld_Vrms</param>
+ <param>StG_FEM_CPUTime</param>
+ </list>
+
+ <struct name="components" mergeType="merge">
+ <struct name="internalHeatingTerm">
+ <param name="Type">RadiogenicHeatingTerm</param>
+ <param name="ForceVector">residual</param>
+ <param name="Swarm">gaussSwarm</param>
+ </struct>
+ <struct name="temperatureDependence">
+ <param name="Type">FrankKamenetskii</param>
+ <param name="TemperatureField">TemperatureField</param>
+ <param name="eta0">1.0e6</param>
+ <param name="theta">13.815510558</param>
+ </struct>
+ <struct name="shape">
+ <param name="Type">Everywhere</param>
+ </struct>
+ <struct name="material">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">shape</param>
+ <param name="Rheology">temperatureDependence</param>
+ <list name="heatingElements">
+ <struct>
+ <param name="Q">1.0</param>
+ <param name="lambda">1.65</param>
+ </struct>
+ </list>
+ </struct>
+ </struct>
+
+ <!-- Simulation control -->
+ <param name="maxTimeSteps"> 200000 </param>
+ <param name="outputPath"> ./output </param>
+ <param name="dumpEvery"> 1 </param>
+
+ <param name="Ra"> 1e4 </param>
+
+ <param name="courantFactor"> 0.25 </param>
+
+ <!-- Journal Control -->
+ <param name="journal.info.Context-verbose">True</param>
+ <param name="journal-level.info.Stg_ComponentFactory">2</param>
+ <param name="journal.debug">f</param>
+ <param name="journal-enable-branch.debug.StG_FEM">f</param>
+ <param name="journal-level-branch.debug.StG_FEM"> 2 </param>
+
+ <!-- Geometry & Mesh setup -->
+ <param name="dim"> 2 </param>
+ <param name="elementResI"> 16 </param>
+ <param name="elementResJ"> 16 </param>
+ <param name="elementResK"> 1 </param>
+ <param name="shadowDepth"> 1 </param>
+ <param name="minX"> 0.0 </param>
+ <param name="minY"> 0.0 </param>
+ <param name="minZ"> 0.0 </param>
+ <param name="maxX"> 1.0 </param>
+ <param name="maxY"> 1.0 </param>
+ <param name="maxZ"> 1.0 </param>
+ <param name="allowUnbalancing"> True </param>
+
+ <!-- Set up BCs and ICs -->
+ <include> ../VariableConditions/temperatureBCs.xml </include>
+ <include> ../VariableConditions/temperatureICs.sinusoid.xml </include>
+ <include> ../VariableConditions/velocityBCs.freeslip.xml </include>
+
+ <!-- Integration Scheme configuration -->
+
+ <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
+ <list name="variables">
+ <param>PressureField</param>
+ <param>VelocityField</param>
+ </list>
+ <param name="VelocityField-tolerance">0.000005</param>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testMobileLid0of1GeneratedTestResult
+Underworld testMobileLid.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testMobileLid0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testMobileLid.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 testMobileLid.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testMobileLid0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid.xml 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMobileLid.xml 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <include> ../BaseApps/ThermalConvection.xml </include>
+
+ <list name="plugins" mergeType="merge">
+ <!-- Output Plugins -->
+ <param>StG_FEM_FrequentOutput</param>
+ <param>Underworld_Nusselt</param>
+ <param>Underworld_Vrms</param>
+ <param>StG_FEM_CPUTime</param>
+ </list>
+
+ <struct name="components" mergeType="merge">
+ <!-- Rheology Stuff -->
+ <struct name="temperatureDependence">
+ <param name="Type">FrankKamenetskii</param>
+ <param name="TemperatureField">TemperatureField</param>
+ <param name="eta0">3e4</param>
+ <param name="theta">10.308952661</param>
+ </struct>
+ <struct name="yielding">
+ <param name="Type">Byerlee</param>
+ <param name="StrainRateField">StrainRateField</param>
+ <param name="BlockGeometry">geometry</param>
+ <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="cohesion"> 5e5 </param>
+ <param name="depthCoefficient"> 1e7 </param>
+ </struct>
+
+ <!-- Material Stuff -->
+ <struct name="shape">
+ <param name="Type">Everywhere</param>
+ </struct>
+ <struct name="material">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">shape</param>
+ <list name="Rheology">
+ <param>temperatureDependence</param>
+ <param>yielding</param>
+ </list>
+ </struct>
+ </struct>
+
+ <!-- Simulation control -->
+ <param name="maxTimeSteps"> 200000 </param>
+ <param name="outputPath"> ./output </param>
+ <param name="dumpEvery"> 1 </param>
+
+ <param name="Ra"> 1e7 </param>
+ <param name="courantFactor"> 0.25 </param>
+
+ <!-- Non-linear stuff -->
+ <param name="nonLinearMaxIterations"> 500 </param>
+
+ <!-- Journal Control -->
+ <param name="journal.info.Context-verbose">True</param>
+ <param name="journal-level.info.Stg_ComponentFactory">2</param>
+ <param name="journal.debug">f</param>
+ <param name="journal-enable-branch.debug.StG_FEM">t</param>
+ <param name="journal-level-branch.debug.StG_FEM"> 1 </param>
+
+ <!-- Geometry & Mesh setup -->
+ <param name="dim"> 2 </param>
+ <param name="elementResI"> 32 </param>
+ <param name="elementResJ"> 32 </param>
+ <param name="elementResK"> 1 </param>
+ <param name="shadowDepth"> 1 </param>
+ <param name="minX"> 0.0 </param>
+ <param name="minY"> 0.0 </param>
+ <param name="minZ"> 0.0 </param>
+ <param name="maxX"> 1.0 </param>
+ <param name="maxY"> 1.0 </param>
+ <param name="maxZ"> 1.0 </param>
+ <param name="allowUnbalancing"> True </param>
+
+ <!-- Set up BCs and ICs -->
+ <include> ../VariableConditions/temperatureBCs.xml </include>
+ <include> ../VariableConditions/temperatureICs.sinusoid.xml </include>
+ <include> ../VariableConditions/velocityBCs.freeslip.xml </include>
+
+ <!-- Integration Scheme configuration -->
+
+ <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
+ <list name="variables">
+ <param>PressureField</param>
+ <param>VelocityField</param>
+ </list>
+ <param name="VelocityField-tolerance">0.000005</param>
+ </struct>
+
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testMultiComponent0of1GeneratedTestResult
+Underworld testMultiComponent.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testMultiComponent0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testMultiComponent.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 testMultiComponent.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testMultiComponent0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent.xml 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testMultiComponent.xml 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <include> ../BaseApps/ThermalConvection.xml </include>
+
+ <list name="plugins" mergeType="merge">
+ <!-- Output Plugins -->
+ <param>StG_FEM_FrequentOutput</param>
+ <param>Underworld_Nusselt</param>
+ <param>Underworld_Vrms</param>
+ <param>StG_FEM_CPUTime</param>
+ </list>
+
+ <struct name="components" mergeType="merge">
+ <struct name="temperatureDependence1">
+ <param name="Type">FrankKamenetskii</param>
+ <param name="TemperatureField">TemperatureField</param>
+ <param name="eta0">6.31e10</param>
+ <param name="theta">13.815510558</param>
+ </struct>
+ <struct name="temperatureDependence2">
+ <param name="Type">FrankKamenetskii</param>
+ <param name="TemperatureField">TemperatureField</param>
+ <param name="eta0">1.00e24</param>
+ <param name="theta">13.815510558</param>
+ </struct>
+ <struct name="n1">
+ <param name="Type">NonNewtonian</param>
+ <param name="StrainRateInvariantField">StrainRateInvariantField</param>
+ <param name="stressExponent">1.8</param>
+ </struct>
+ <struct name="n2">
+ <param name="Type">NonNewtonian</param>
+ <param name="StrainRateInvariantField">StrainRateInvariantField</param>
+ <param name="stressExponent">4.0</param>
+ </struct>
+ <struct name="shape">
+ <param name="Type">Everywhere</param>
+ </struct>
+ <struct name="material">
+ <param name="Type">MultiRheologyMaterial</param>
+ <param name="Shape">shape</param>
+ <list name="MultiRheologies">
+ <list>
+ <param>temperatureDependence1</param>
+ <param>n1</param>
+ </list>
+ <list>
+ <param>temperatureDependence2</param>
+ <param>n2</param>
+ </list>
+ </list>
+ </struct>
+ </struct>
+
+ <!-- Simulation control -->
+ <param name="maxTimeSteps"> 200000 </param>
+ <param name="outputPath"> ./output </param>
+ <param name="dumpEvery"> 10 </param>
+
+ <param name="Ra"> 4.57e7 </param>
+
+ <param name="courantFactor"> 0.25 </param>
+
+ <!-- Journal Control -->
+ <param name="journal.info.Context-verbose">True</param>
+ <param name="journal-level.info.Stg_ComponentFactory">2</param>
+ <param name="journal.debug">f</param>
+ <param name="journal-enable-branch.debug.StG_FEM">f</param>
+ <param name="journal-level-branch.debug.StG_FEM"> 2 </param>
+
+ <!-- Geometry & Mesh setup -->
+ <param name="dim"> 2 </param>
+ <param name="elementResI"> 32 </param>
+ <param name="elementResJ"> 32 </param>
+ <param name="elementResK"> 1 </param>
+ <param name="shadowDepth"> 1 </param>
+ <param name="minX"> 0.0 </param>
+ <param name="minY"> 0.0 </param>
+ <param name="minZ"> 0.0 </param>
+ <param name="maxX"> 1.0 </param>
+ <param name="maxY"> 1.0 </param>
+ <param name="maxZ"> 1.0 </param>
+ <param name="allowUnbalancing"> True </param>
+
+ <!-- Set up BCs and ICs -->
+ <include> ../VariableConditions/temperatureBCs.xml </include>
+ <include> ../VariableConditions/temperatureICs.sinusoid.xml </include>
+ <include> ../VariableConditions/velocityBCs.freeslip.xml </include>
+
+ <!-- Integration Scheme configuration -->
+ <param name="particlesPerCell"> 20 </param>
+
+ <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
+ <list name="variables">
+ <param>PressureField</param>
+ <param>VelocityField</param>
+ </list>
+ <param name="VelocityField-tolerance">0.000005</param>
+ </struct>
+
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testNonNewtonianGeneratedTestResult
+Underworld testNonNewtonian.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testNonNewtonianGeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testNonNewtonian.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 testNonNewtonian.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testNonNewtonianGeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian.xml 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testNonNewtonian.xml 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <include> ../BaseApps/ThermalConvection.xml </include>
+
+ <list name="plugins" mergeType="merge">
+ <!-- Output Plugins -->
+ <param>StG_FEM_FrequentOutput</param>
+ <param>Underworld_Nusselt</param>
+ <param>Underworld_Vrms</param>
+ <param>StG_FEM_CPUTime</param>
+ </list>
+
+ <struct name="components" mergeType="merge">
+ <struct name="temperatureDependence">
+ <param name="Type">FrankKamenetskii</param>
+ <param name="TemperatureField">TemperatureField</param>
+ <param name="eta0">2.51e14</param>
+ <param name="theta">13.815510558</param>
+ </struct>
+ <struct name="nonNewtonian">
+ <param name="Type">NonNewtonian</param>
+ <param name="StrainRateInvariantField">StrainRateInvariantField</param>
+ <param name="stressExponent"> 2.4 </param>
+ </struct>
+ <struct name="shape">
+ <param name="Type">Everywhere</param>
+ </struct>
+ <struct name="material">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">shape</param>
+ <list name="Rheology">
+ <param>temperatureDependence</param>
+ <param>nonNewtonian</param>
+ </list>
+ </struct>
+ </struct>
+
+ <!-- Simulation control -->
+ <param name="maxTimeSteps"> 200000 </param>
+ <param name="outputPath"> ./output </param>
+ <param name="dumpEvery"> 1 </param>
+
+ <param name="Ra"> 3.162278e7.0 </param>
+
+ <param name="courantFactor"> 0.25 </param>
+
+ <!-- Journal Control -->
+ <param name="journal.info.Context-verbose">True</param>
+ <param name="journal-level.info.Stg_ComponentFactory">2</param>
+ <param name="journal.debug">f</param>
+ <param name="journal-enable-branch.debug.StG_FEM">f</param>
+ <param name="journal-level-branch.debug.StG_FEM"> 2 </param>
+
+ <!-- Geometry & Mesh setup -->
+ <param name="dim"> 2 </param>
+ <param name="elementResI"> 32 </param>
+ <param name="elementResJ"> 32 </param>
+ <param name="elementResK"> 1 </param>
+ <param name="shadowDepth"> 1 </param>
+ <param name="minX"> 0.0 </param>
+ <param name="minY"> 0.0 </param>
+ <param name="minZ"> 0.0 </param>
+ <param name="maxX"> 1.0 </param>
+ <param name="maxY"> 1.0 </param>
+ <param name="maxZ"> 1.0 </param>
+ <param name="allowUnbalancing"> True </param>
+
+ <!-- Set up BCs and ICs -->
+ <include> ../VariableConditions/temperatureBCs.xml </include>
+ <include> ../VariableConditions/temperatureICs.sinusoid.xml </include>
+ <include> ../VariableConditions/velocityBCs.freeslip.xml </include>
+
+ <!-- Integration Scheme configuration -->
+ <param name="particlesPerCell"> 20 </param>
+
+ <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
+ <list name="variables">
+ <param>PressureField</param>
+ <param>VelocityField</param>
+ </list>
+ <param name="VelocityField-tolerance">0.000005</param>
+ </struct>
+
+
+</StGermainData>
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-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testRayleighTaylor2D-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -13,12 +13,12 @@
printf "$testname: doing pre-test setup:\n"
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"
+rm -rf ./output/testRayleighTaylor2DCheckpoint0of1GeneratedTestResult
+Underworld testRayleighTaylorBenchmark.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testRayleighTaylor2DCheckpoint0of1GeneratedTestResult > ./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" "$@"
+runAndHandleSystemTestStdLocations 'Underworld testRayleighTaylorBenchmark.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testRayleighTaylor2DCheckpoint0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testSlabSubduction0of1GeneratedTestResult
+Underworld testSlabSubduction.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --elementResI=8 --elementResJ=4 --elementResK=8 --outputPath=./output/testSlabSubduction0of1GeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testSlabSubduction.xml --interactive=False --maxTimeSteps=2 --checkpointEvery=2 --elementResI=8 --elementResJ=4 --elementResK=8 > ./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 testSlabSubduction.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --elementResI=8 --elementResJ=4 --elementResK=8 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testSlabSubduction0of1GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction.xml 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testSlabSubduction.xml 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,174 @@
+<!-- Rayleigh-Taylor app input file -->
+
+<!-- DTD to validate against -->
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <include>../BaseApps/RayleighTaylor.xml</include>
+
+ <list name="plugins" mergeType="merge">
+ <!-- Output Plugins -->
+ <param>StG_FEM_FrequentOutput</param>
+ <param>Underworld_Vrms</param>
+ <param>StG_FEM_CPUTime</param>
+ </list>
+
+ <struct name="components" mergeType="merge">
+ <!-- Shape Stuff -->
+ <struct name="upperMantleShape">
+ <param name="Type">Everywhere</param>
+ </struct>
+ <struct name="lowerMantleShape">
+ <param name="Type">Box</param>
+ <param name="startX">0.0</param> <param name="endX">4.0</param>
+ <param name="startY">0.0</param> <param name="endY">0.35</param>
+ <param name="startZ">0.0</param> <param name="endZ">4.0</param>
+ </struct>
+ <struct name="mainSlab">
+ <param name="Type">Box</param>
+ <param name="startX">1.2</param> <param name="endX">3.4</param>
+ <param name="startY">0.90</param> <param name="endY">1.0</param>
+ <param name="startZ">1.25</param> <param name="endZ">2.75</param>
+ </struct>
+ <struct name="slabPerturbation">
+ <param name="Type">PolygonShape</param>
+ <param name="startZ"> 1.25 </param> <param name="endZ"> 2.75 </param>
+ <list name="verticies">
+ <asciidata>
+ <columnDefinition name = "x" type="double"/>
+ <columnDefinition name = "y" type="double"/>
+ 1.20 1.0
+ 1.20 0.9
+ 1.02 0.8
+ 1.02 0.9
+ </asciidata>
+ </list>
+ </struct>
+ <struct name="slabShape">
+ <param name="Type">Union</param>
+ <list name="shapes">
+ <param>mainSlab</param>
+ <param>slabPerturbation</param>
+ </list>
+ </struct>
+
+ <!-- Background Material Stuff -->
+ <struct name="upperMantleViscosity">
+ <param name="Type">MaterialViscosity</param>
+ <param name="eta0">1.0</param>
+ </struct>
+ <struct name="upperMantle">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">upperMantleShape</param>
+ <param name="density">0.0</param>
+ <param name="Rheology">upperMantleViscosity</param>
+ </struct>
+
+ <!-- Lower Mantle Material Stuff -->
+ <struct name="lowerMantleViscosity">
+ <param name="Type">MaterialViscosity</param>
+ <!-- Viscosity 100 x Upper Mantle -->
+ <param name="eta0">100.0</param>
+ </struct>
+ <struct name="LowerMantle">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">lowerMantleShape</param>
+ <param name="density">0.0</param>
+ <param name="Rheology">lowerMantleViscosity</param>
+ </struct>
+
+ <!-- Slab Stuff -->
+ <struct name="slabViscosity">
+ <param name="Type">MaterialViscosity</param>
+ <!-- Viscosity 200 x Upper Mantle (Background)-->
+ <param name="eta0">200.0</param>
+ </struct>
+ <struct name="slabYielding">
+ <param name="Type">Byerlee</param>
+ <param name="StrainRateField">StrainRateField</param>
+ <param name="BlockGeometry">geometry</param>
+ <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="cohesion">0.04</param>
+ <param name="depthCoefficient">0.25</param>
+ </struct>
+ <struct name="Slab">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">slabShape</param>
+ <param name="density">1.0</param>
+ <list name="Rheology">
+ <param>slabViscosity</param>
+ <param>slabYielding</param>
+ </list>
+ </struct>
+ <!-- Slab Field Stuff -->
+ <struct name="SlabField">
+ <param name="Type">MaterialFeVariable</param>
+ <param name="Swarm">picIntegrationPoints</param>
+ <param name="Material">Slab</param>
+ <param name="Context">context</param>
+ <param name="Mesh">mesh-linear</param>
+ </struct>
+
+ <!-- Lower Mantle Field Stuff -->
+ <struct name="LowerMantleField">
+ <param name="Type">MaterialFeVariable</param>
+ <param name="Swarm">picIntegrationPoints</param>
+ <param name="Material">LowerMantle</param>
+ <param name="Context">context</param>
+ <param name="Mesh">mesh-linear</param>
+ </struct>
+ </struct>
+
+ <!--<include>../Viewports/SlabViewports.xml</include>-->
+
+ <param name="journal.info.Context-verbose">true</param>
+ <param name="journal.debug">t</param>
+ <param name="journal-level.info.Stg_ComponentFactory">2</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-level-branch.debug.Swarm"> 2 </param>
+ <param name="journal-level.debug.lucDebug">2</param>
+ <param name="journal-enable-branch.debug.lucDebug">f</param>
+
+ <!-- general simulation parameters -->
+ <param name="maxTimeSteps"> 150 </param>
+ <param name="dumpEvery"> 1 </param>
+ <param name="outputPath"> ./output </param>
+ <param name="gravity"> 1.0 </param>
+
+ <!-- general decomposition parameters -->
+ <param name="dim"> 3 </param>
+ <!-- mesh parameters -->
+ <param name="elementResI"> 30 </param>
+ <param name="elementResJ"> 15 </param>
+ <param name="elementResK"> 30 </param>
+
+ <param name="shadowDepth"> 1 </param>
+ <param name="minX"> 0.0 </param>
+ <param name="minY"> 0.0 </param>
+ <param name="minZ"> 2.0 </param>
+ <param name="maxX"> 4.0 </param>
+ <param name="maxY"> 1.0 </param>
+ <param name="maxZ"> 4.0 </param>
+ <param name="allowUnbalancing"> True </param>
+ <param name="buildElementNodeTbl"> True </param>
+
+ <!-- Non-linear stuff -->
+ <param name="nonLinearMaxIterations"> 100 </param>
+
+ <!-- Swarm parameters -->
+ <param name="particlesPerCell"> 20 </param>
+
+ <!-- Boundary conditions -->
+ <include>../VariableConditions/velocityBCs.freeslip.xml</include>
+ <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
+ <list name="variables">
+ <param>PressureField</param>
+ <param>VelocityField</param>
+ </list>
+ <param name="VelocityField-tolerance">0.000005</param>
+ </struct>
+
+
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh 2006-07-21 03:09:05 UTC (rev 4069)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh 2006-07-21 03:09:21 UTC (rev 4070)
@@ -0,0 +1,24 @@
+#!/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`"
+
+printf "$testname: doing pre-test setup:\n"
+
+printf "\tRunning for 4 timesteps to generate expected result\n"
+rm -rf ./output/testThermoChemBenchmarkGeneratedTestResult
+Underworld testThermoChemBenchmark.xml --interactive=False --maxTimeSteps=4 --checkpointEvery=4 --outputPath=./output/testThermoChemBenchmarkGeneratedTestResult > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+Underworld testThermoChemBenchmark.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 testThermoChemBenchmark.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=0 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/testThermoChemBenchmarkGeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=' "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testThermoChemBenchmark-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
More information about the cig-commits
mailing list