[cig-commits] r4358 - in long/3D/Gale/trunk/src/Underworld: .
InputFiles/tests
walter at geodynamics.org
walter at geodynamics.org
Thu Aug 17 17:18:18 PDT 2006
Author: walter
Date: 2006-08-17 17:18:16 -0700 (Thu, 17 Aug 2006)
New Revision: 4358
Added:
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D.xml
Removed:
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.0of2.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.xml
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D-checkpoint.0of1.sh
long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D.xml
Modified:
long/3D/Gale/trunk/src/Underworld/
Log:
r493 at earth: boo | 2006-08-17 17:15:28 -0700
r467 at earth (orig r298): VincentLemiale | 2006-08-03 22:59:41 -0700
updating test files as a result of recent renaming.
Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
- 9570c393-cf10-0410-b476-9a651db1e55a:/cig:492
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:297
+ 9570c393-cf10-0410-b476-9a651db1e55a:/cig:493
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:298
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of1.sh 2006-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of1.sh 2006-08-18 00:18:16 UTC (rev 4358)
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+ TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
+setUpdateModeFromArg ${1}
+
+# Extract out names
+testname="`basename $0 .sh`"
+nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
+procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
+partTestname=`echo $testname | cut -f 1 -d '-'`
+
+# test if xml with this name exists
+if test -r "${partTestname}.xml"; then
+ # Run MPI's to generate results to test against.
+ printf "$testname: doing pre-test setup:\n"
+
+ printf "\tRunning for 4 timesteps to generate expected result\n"
+ rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
+ RunMPICommand ${testname} Underworld "${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=20 --elementResJ=10 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+ # Run MPI's to generate first few stepa to checkpoint.
+ printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+ RunMPICommand ${testname} Underworld "${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=20 --elementResJ=10 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
+
+ # Do checkpointing test
+ printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=20 --elementResJ=10 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+
+else echo "${partTestname}.xml doesn't exist, so can't test it"
+fi
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.0of1.sh 2006-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.0of1.sh 2006-08-18 00:18:16 UTC (rev 4358)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+ TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+
+setUpdateModeFromArg ${1}
+
+testname="`basename $0 .sh`"
+runAndHandleSystemTestStdLocations "Underworld testExtensionFMM.xml --maxTimeSteps=5 --interactive=False --dumpEvery=1 --checkpointEvery=1" "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.0of2.sh 2006-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.0of2.sh 2006-08-18 00:18:16 UTC (rev 4358)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+ TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+
+setUpdateModeFromArg ${1}
+
+testname="`basename $0 .sh`"
+runAndHandleSystemTestStdLocations "Underworld testExtensionFMM.xml --maxTimeSteps=5 --interactive=False --dumpEvery=1 --checkpointEvery=1" "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.0of2.sh
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ LastChangedDate Author Id
Name: svn:eol-style
+ native
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.xml 2006-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM.xml 2006-08-18 00:18:16 UTC (rev 4358)
@@ -0,0 +1,28 @@
+<!-- DTD to validate against -->
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <include>../ExtensionFMM.xml</include>
+
+ <list name="plugins" mergeType="merge">
+ <param>StG_FEM_CompareFeVariableAgainstReferenceSolution</param>
+ </list>
+
+
+ <param name="maxTimeSteps">5</param>
+ <param name="interactive">f</param>
+
+ <param name="journal-level-branch.debug.StG_FEM" mergeType="replace"> 1 </param>
+
+ <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
+ <list name="variables">
+ <param>PressureField</param>
+ <param>VelocityField</param>
+ </list>
+ <param name="referencePath">./expected/testExtensionFMM.0of1</param>
+ <param name="VelocityField-tolerance">0.000005</param>
+ </struct>
+
+ <param name="elementResI">20</param>
+ <param name="elementResJ">10</param>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D-checkpoint.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D-checkpoint.0of1.sh 2006-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D-checkpoint.0of1.sh 2006-08-18 00:18:16 UTC (rev 4358)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+ TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+. `dirname ${TEST_SCRIPT}`/build-functions.sh
+
+
+setUpdateModeFromArg ${1}
+
+# Extract out names
+testname="`basename $0 .sh`"
+nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
+procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
+partTestname=`echo $testname | cut -f 1 -d '-'`
+
+# test if xml with this name exists
+if test -r "${partTestname}.xml"; then
+ # Run MPI's to generate results to test against.
+ printf "$testname: doing pre-test setup:\n"
+
+ printf "\tRunning for 4 timesteps to generate expected result\n"
+ rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
+ RunMPICommand ${testname} Underworld "${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
+
+ # Run MPI's to generate first few stepa to checkpoint.
+ printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
+ RunMPICommand ${testname} Underworld "${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
+
+ # Do checkpointing test
+ printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
+ runAndHandleSystemTestStdLocations "Underworld ${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
+
+else echo "${partTestname}.xml doesn't exist, so can't test it"
+fi
Property changes on: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D-checkpoint.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D.xml 2006-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionFMM3D.xml 2006-08-18 00:18:16 UTC (rev 4358)
@@ -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">FaultingMoresiMuhlhaus2006</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>
Deleted: 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-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC-checkpoint.0of1.sh 2006-08-18 00:18:16 UTC (rev 4358)
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-TEST_SCRIPT=./VMake/executableTester.sh
-until test -r ${TEST_SCRIPT} ; do
- TEST_SCRIPT=../${TEST_SCRIPT}
-done
-. ${TEST_SCRIPT}
-. `dirname ${TEST_SCRIPT}`/build-functions.sh
-
-setUpdateModeFromArg ${1}
-
-# Extract out names
-testname="`basename $0 .sh`"
-nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
-procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
-partTestname=`echo $testname | cut -f 1 -d '-'`
-
-# test if xml with this name exists
-if test -r "${partTestname}.xml"; then
- # Run MPI's to generate results to test against.
- printf "$testname: doing pre-test setup:\n"
-
- printf "\tRunning for 4 timesteps to generate expected result\n"
- rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=20 --elementResJ=10 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=20 --elementResJ=10 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
- # Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=20 --elementResJ=10 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
-
-else echo "${partTestname}.xml doesn't exist, so can't test it"
-fi
Deleted: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.0of1.sh 2006-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.0of1.sh 2006-08-18 00:18:16 UTC (rev 4358)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-TEST_SCRIPT=./VMake/executableTester.sh
-until test -r ${TEST_SCRIPT} ; do
- TEST_SCRIPT=../${TEST_SCRIPT}
-done
-. ${TEST_SCRIPT}
-
-setUpdateModeFromArg ${1}
-
-testname="`basename $0 .sh`"
-runAndHandleSystemTestStdLocations "Underworld testExtensionMC.xml --maxTimeSteps=5 --interactive=False --dumpEvery=1 --checkpointEvery=1" "$0" "$@"
Deleted: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.0of2.sh 2006-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.0of2.sh 2006-08-18 00:18:16 UTC (rev 4358)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-TEST_SCRIPT=./VMake/executableTester.sh
-until test -r ${TEST_SCRIPT} ; do
- TEST_SCRIPT=../${TEST_SCRIPT}
-done
-. ${TEST_SCRIPT}
-
-setUpdateModeFromArg ${1}
-
-testname="`basename $0 .sh`"
-runAndHandleSystemTestStdLocations "Underworld testExtensionMC.xml --maxTimeSteps=5 --interactive=False --dumpEvery=1 --checkpointEvery=1" "$0" "$@"
Deleted: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.xml 2006-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC.xml 2006-08-18 00:18:16 UTC (rev 4358)
@@ -1,28 +0,0 @@
-<!-- DTD to validate against -->
-<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
-
- <include>../ExtensionMC.xml</include>
-
- <list name="plugins" mergeType="merge">
- <param>StG_FEM_CompareFeVariableAgainstReferenceSolution</param>
- </list>
-
-
- <param name="maxTimeSteps">5</param>
- <param name="interactive">f</param>
-
- <param name="journal-level-branch.debug.StG_FEM" mergeType="replace"> 1 </param>
-
- <struct name="StG_FEM_CompareFeVariableAgainstReferenceSolution">
- <list name="variables">
- <param>PressureField</param>
- <param>VelocityField</param>
- </list>
- <param name="referencePath">./expected/testExtensionMC.0of1</param>
- <param name="VelocityField-tolerance">0.000005</param>
- </struct>
-
- <param name="elementResI">20</param>
- <param name="elementResJ">10</param>
-
-</StGermainData>
Deleted: 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-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D-checkpoint.0of1.sh 2006-08-18 00:18:16 UTC (rev 4358)
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-TEST_SCRIPT=./VMake/executableTester.sh
-until test -r ${TEST_SCRIPT} ; do
- TEST_SCRIPT=../${TEST_SCRIPT}
-done
-. ${TEST_SCRIPT}
-. `dirname ${TEST_SCRIPT}`/build-functions.sh
-
-
-setUpdateModeFromArg ${1}
-
-# Extract out names
-testname="`basename $0 .sh`"
-nproc=`echo ${testname} | cut -d . -f 2 | cut -c 4`
-procToWatch=`echo ${testname} | cut -d . -f 2 | cut -f 1 -d 'o'`
-partTestname=`echo $testname | cut -f 1 -d '-'`
-
-# test if xml with this name exists
-if test -r "${partTestname}.xml"; then
- # Run MPI's to generate results to test against.
- printf "$testname: doing pre-test setup:\n"
-
- printf "\tRunning for 4 timesteps to generate expected result\n"
- rm -rf ./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult"
- RunMPICommand ${testname} Underworld "${partTestname}.xml" --interactive=False --maxTimeSteps=4 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --outputPath=./output/"${partTestname}${procToWatch}of${nproc}GeneratedTestResult" > ./log/"${testname}.generateExpectedResult.out" 2> ./log/"${testname}.generateExpectedResult.error"
-
- # Run MPI's to generate first few stepa to checkpoint.
- printf "\tRunning for 2 timesteps to generate checkpoints to reload from\n"
- RunMPICommand ${testname} Underworld "${partTestname}.xml" --interactive=False --maxTimeSteps=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 > ./log/"${testname}.generateCheckpoint.out" --outputPath=./output/ 2> ./log/"${testname}.generateCheckpoint.error"
-
- # Do checkpointing test
- printf "Doing actual test: restarting from timestep 2, checking if result by timestep 4 == previously generated one\n"
- runAndHandleSystemTestStdLocations "Underworld ${partTestname}.xml --interactive=False --dumpEvery=1 --maxTimeSteps=2 --restartTimestep=2 --checkpointEvery=1 --elementResI=8 --elementResJ=4 --elementResK=8 --plugins[]=StG_FEM_CompareFeVariableAgainstReferenceSolution --StG_FEM_CompareFeVariableAgainstReferenceSolution.referencePath=./output/${partTestname}${procToWatch}of${nproc}GeneratedTestResult --StG_FEM_CompareFeVariableAgainstReferenceSolution.timeStepToCompare=4 --StG_FEM_CompareFeVariableAgainstReferenceSolution.referenceFeVariabeSuffix=" "$0" "$@"
-
-else echo "${partTestname}.xml doesn't exist, so can't test it"
-fi
Deleted: long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D.xml 2006-08-18 00:18:15 UTC (rev 4357)
+++ long/3D/Gale/trunk/src/Underworld/InputFiles/tests/testExtensionMC3D.xml 2006-08-18 00:18:16 UTC (rev 4358)
@@ -1,238 +0,0 @@
-<?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>
More information about the cig-commits
mailing list