[cig-commits] commit: spelling change: verticies ---> vertices
Mercurial
hg at geodynamics.org
Fri Feb 5 12:10:18 PST 2010
changeset: 814:847af1136f99
branch: 1.4.x
user: JulianGiordani
date: Wed Jan 20 12:29:35 2010 +1100
files: InputFiles/+LithosphereSandbox/shape_configurations/upper_crust_into_the_lower_crust_and_raised_above_surface_oct.xml InputFiles/MultiThermalDiffusivity.xml InputFiles/SlabSubduction.xml SysTest/PerformanceTests/testVelicSolHA.xml SysTest/RegressionTests/MultiThermalDiffusivity.xml SysTest/RegressionTests/expected/MultiThermalDiffusivity.xml/input-2009.07.30-11.26.10.xml SysTest/RegressionTests/expected/MultiThermalDiffusivity.xml/input.xml SysTest/RegressionTests/lowres_expected/MultiThermalDiffusivity.xml/input.xml SysTest/RegressionTests/oldTesting/testSlabSubduction.xml SysTest/RegressionTests/oldTesting/testVelicSolL.xml
description:
spelling change: verticies ---> vertices
diff -r d01b9b15b769 -r 847af1136f99 InputFiles/+LithosphereSandbox/shape_configurations/upper_crust_into_the_lower_crust_and_raised_above_surface_oct.xml
--- a/InputFiles/+LithosphereSandbox/shape_configurations/upper_crust_into_the_lower_crust_and_raised_above_surface_oct.xml Tue Jan 19 15:33:56 2010 +1100
+++ b/InputFiles/+LithosphereSandbox/shape_configurations/upper_crust_into_the_lower_crust_and_raised_above_surface_oct.xml Wed Jan 20 12:29:35 2010 +1100
@@ -11,7 +11,7 @@
<struct name="CrustBlock">
<param name="Type">PolygonShape</param>
<param name="perpendicularAxis">y</param>
- <list name="verticies">
+ <list name="vertices">
<asciidata>
<columnDefinition name = "x" type="double"/>
<columnDefinition name = "y" type="double"/>
diff -r d01b9b15b769 -r 847af1136f99 InputFiles/MultiThermalDiffusivity.xml
--- a/InputFiles/MultiThermalDiffusivity.xml Tue Jan 19 15:33:56 2010 +1100
+++ b/InputFiles/MultiThermalDiffusivity.xml Wed Jan 20 12:29:35 2010 +1100
@@ -81,7 +81,7 @@ appropriate parameters and their values
</struct>
<struct name="shapeA">
<param name="Type">PolygonShape</param>
- <list name="verticies">
+ <list name="vertices">
<asciidata>
<columnDefinition name = "x" type="double"/>
<columnDefinition name = "y" type="double"/>
@@ -104,7 +104,7 @@ appropriate parameters and their values
<struct name="shapeB">
<param name="Type">PolygonShape</param>
- <list name="verticies">
+ <list name="vertices">
<asciidata>
<columnDefinition name = "x" type="double"/>
<columnDefinition name = "y" type="double"/>
@@ -127,7 +127,7 @@ appropriate parameters and their values
<struct name="shapeC">
<param name="Type">PolygonShape</param>
- <list name="verticies">
+ <list name="vertices">
<asciidata>
<columnDefinition name = "x" type="double"/>
<columnDefinition name = "y" type="double"/>
@@ -150,7 +150,7 @@ appropriate parameters and their values
<struct name="HeatShape">
<param name="Type">PolygonShape</param>
- <list name="verticies">
+ <list name="vertices">
<asciidata>
<columnDefinition name = "x" type="double"/>
<columnDefinition name = "y" type="double"/>
diff -r d01b9b15b769 -r 847af1136f99 InputFiles/SlabSubduction.xml
--- a/InputFiles/SlabSubduction.xml Tue Jan 19 15:33:56 2010 +1100
+++ b/InputFiles/SlabSubduction.xml Wed Jan 20 12:29:35 2010 +1100
@@ -54,7 +54,7 @@
<struct name="slabPerturbation">
<param name="Type">PolygonShape</param>
<param name="startZ"> 1.25 </param> <param name="endZ"> 2.75 </param>
- <list name="verticies">
+ <list name="vertices">
<asciidata>
<columnDefinition name = "x" type="double"/>
<columnDefinition name = "y" type="double"/>
diff -r d01b9b15b769 -r 847af1136f99 SysTest/PerformanceTests/testVelicSolHA.xml
--- a/SysTest/PerformanceTests/testVelicSolHA.xml Tue Jan 19 15:33:56 2010 +1100
+++ b/SysTest/PerformanceTests/testVelicSolHA.xml Wed Jan 20 12:29:35 2010 +1100
@@ -77,7 +77,7 @@
<!--
Define the 3D column
-->
- <list name="verticies">
+ <list name="vertices">
<asciidata>
<columnDefinition name = "x" type="double"/>
<columnDefinition name = "y" type="double"/>
diff -r d01b9b15b769 -r 847af1136f99 SysTest/RegressionTests/MultiThermalDiffusivity.xml
--- a/SysTest/RegressionTests/MultiThermalDiffusivity.xml Tue Jan 19 15:33:56 2010 +1100
+++ b/SysTest/RegressionTests/MultiThermalDiffusivity.xml Wed Jan 20 12:29:35 2010 +1100
@@ -1,1 +1,278 @@
-../../InputFiles/MultiThermalDiffusivity.xml
\ No newline at end of file
+<!--
+This is test xml for Multiple Material Thermal Diffusivity parameter.
+It uses the plugin Underworld_MaterialThermalDiffusivity to enable this feature
+The simulation is a 1x1 free slip box, with 3 strips of constant isoviscous material algined in the y-axis.
+Each material has a different diffusivity; going from 1, 10, 100 from x = 0 to x = 1.
+
+For the ascii art connoisseurs.
+ _______________________
+ 1| | | |
+ | | | |
+Y | k=1 | k=10 | k=100 |
+| | | | |
+A | | | |
+x | | | |
+i | *****|*******|***** |
+s | The|rmalPac|ket |
+ | *****|*******|***** |
+ | | | |
+ |_______|_______|_______|
+ 0 X - Axis 1
+
+The fluid is driven by a thermal packet which spreads over each material.
+
+The below is the definitions of the material layout and the thermal packet distribution.
+
+Note: The settings in this xml produce some unrealistic temperature max and min. So be aware of the
+appropriate parameters and their values if you use this xml from production runs.
+-->
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <list name="import">
+ <param> Underworld </param>
+ </list>
+
+ <include> Underworld/BaseApps/ThermalConvectionPIC.xml </include>
+
+ <param name="lucPluginContext">context</param>
+ <list name="plugins" mergeType="merge">
+ <struct>
+ <param name="Type">StgFEM_FrequentOutput</param>
+ <param name="Context">context</param>
+ </struct>
+ <struct>
+ <param name="Type">Underworld_Nusselt</param>
+ <param name="Context">context</param>
+ <param name="GaussSwarm">gaussSwarm</param>
+ </struct>
+ <struct>
+ <param name="Type">Underworld_Vrms</param>
+ <param name="Context">context</param>
+ <param name="GaussSwarm">gaussSwarm</param>
+ <param name="VelocityField">VelocityField</param>
+ </struct>
+ <struct>
+ <param name="Type">StgFEM_CPUTime</param>
+ <param name="Context">context</param>
+ </struct>
+ <struct>
+ <param name="Type">Underworld_MaterialThermalDiffusivity</param>
+ <param name="Context">context</param>
+ <param name="IntegrationSwarm">picIntegrationPoints</param>
+ </struct>
+ <struct>
+ <param name="Type">Underworld_ShapeFemIC</param>
+ <param name="Context">context</param>
+ </struct>
+ <struct>
+ <param name="Type">lucPlugin</param>
+ <param name="Context">lucPluginContext</param>
+ </struct>
+ </list>
+
+ <struct name="components" mergeType="merge">
+ <struct name="context">
+ <param name="Type">UnderworldContext</param>
+ </struct>
+ <struct name="isotropicViscosity">
+ <param name="Type">MaterialViscosity</param>
+ <param name="eta0">1.0</param>
+ </struct>
+ <struct name="shapeA">
+ <param name="Type">PolygonShape</param>
+ <list name="vertices">
+ <asciidata>
+ <columnDefinition name = "x" type="double"/>
+ <columnDefinition name = "y" type="double"/>
+ <columnDefinition name = "z" type="double"/>
+ 0.0 0.0 0.0
+ 0.3333 0.0 0.0
+ 0.3333 1.0 0.0
+ 0.0 1.0 0.0
+ </asciidata>
+ </list>
+ </struct>
+ <struct name="materialA">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">shapeA</param>
+ <param name="thermalDiffusivity">1</param>
+ <list name="Rheology">
+ <param>isotropicViscosity</param>
+ </list>
+ </struct>
+ <struct name="shapeB">
+ <param name="Type">PolygonShape</param>
+
+ <list name="vertices">
+ <asciidata>
+ <columnDefinition name = "x" type="double"/>
+ <columnDefinition name = "y" type="double"/>
+ <columnDefinition name = "z" type="double"/>
+ 0.3333 0.0 0.0
+ 0.6666 0.0 0.0
+ 0.6666 1.0 0.0
+ 0.3333 1.0 0.0
+ </asciidata>
+ </list>
+ </struct>
+ <struct name="materialB">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">shapeB</param>
+ <param name="thermalDiffusivity">10</param>
+ <list name="Rheology">
+ <param>isotropicViscosity</param>
+ </list>
+ </struct>
+ <struct name="shapeC">
+ <param name="Type">PolygonShape</param>
+
+ <list name="vertices">
+ <asciidata>
+ <columnDefinition name = "x" type="double"/>
+ <columnDefinition name = "y" type="double"/>
+ <columnDefinition name = "z" type="double"/>
+ 0.6666 0.0 0.0
+ 1.0 0.0 0.0
+ 1.0 1.0 0.0
+ 0.6666 1.0 0.0
+ </asciidata>
+ </list>
+ </struct>
+ <struct name="materialC">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">shapeC</param>
+ <param name="thermalDiffusivity">100</param>
+ <list name="Rheology">
+ <param>isotropicViscosity</param>
+ </list>
+ </struct>
+
+ <struct name="HeatShape">
+ <param name="Type">PolygonShape</param>
+ <list name="vertices">
+ <asciidata>
+ <columnDefinition name = "x" type="double"/>
+ <columnDefinition name = "y" type="double"/>
+ <columnDefinition name = "z" type="double"/>
+ 0.1 0.25 0.0
+ 0.9 0.25 0.0
+ 0.9 0.5 0.0
+ 0.1 0.5 0.0
+ </asciidata>
+ </list>
+ </struct>
+ </struct>
+
+ <!-- Simulation control -->
+ <param name="maxTimeSteps"> 300 </param>
+ <param name="outputPath"> ./output/MultiThermalDiffusivity </param>
+ <param name="dumpEvery"> 1 </param>
+ <param name="checkpointEvery"> 0 </param>
+
+ <!-- choose what to checkpoint
+ <list name="FieldVariablesToCheckpoint">
+ <param>VelocityField</param>
+ <param>VelocityGradientsField</param>
+ </list>
+ -->
+
+ <!-- restart from a previous checkpoint
+ <param name="restartTimestep"> 10 </param>
+ -->
+
+ <param name="Ra"> 1e5 </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">f</param>
+ <param name="journal-enable-branch.debug.StgFEM">t</param>
+ <param name="journal-level-branch.debug.StgFEM"> 2 </param>
+ <param name="journal.debug">t</param>
+
+ <!-- Geometry & Mesh setup -->
+ <param name="dim"> 2 </param>
+ <param name="elementResI"> 64 </param>
+ <param name="elementResJ"> 64 </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 -->
+ <param name="ShapeFemIC"> HeatShape </param>
+ <struct name="temperatureICs">
+ <param name="type">CompositeVC</param>
+ <list name="vcList">
+ <struct>
+ <param name="type"> AllNodesVC </param>
+ <list name="variables">
+ <struct>
+ <param name="name">temperature</param>
+ <param name="type">func</param>
+ <param name="value"> Inside1_Outside0_ShapeIC </param>
+ </struct>
+ </list>
+ </struct>
+ </list>
+ </struct>
+
+ <include> Underworld/VariableConditions/velocityBCs.freeslip.xml </include>
+
+ <!-- Integration Scheme configuration -->
+ <param name="particlesPerCell"> 20 </param>
+
+ <!-- Viewport stuff -->
+ <include>Underworld/Viewports/TemperatureAndVelocityArrowsVP.xml</include>
+ <include>Underworld/Viewports/VelocityMagnitudeVP.xml</include>
+ <include>glucifer/window.xml</include>
+ <struct name="components" mergeType="merge">
+ <struct name="camera" mergeType="replace">
+ <param name="Type">lucCamera</param>
+ <param name="CentreFieldVariable">VelocityField</param>
+ <param name="coordZ">1.4762</param>
+ </struct>
+ <struct name="densityColourMap">
+ <param name="Type">lucColourMap</param>
+ <param name="colours">Red Green Blue</param>
+ <param name="dynamicRange">True</param>
+ </struct>
+ <struct name="particleDots">
+ <param name="Type">lucSwarmViewer</param>
+ <param name="Swarm">materialSwarm</param>
+ <param name="ColourVariable">materialSwarm-MaterialIndex</param>
+ <param name="ColourMap">densityColourMap</param>
+ <param name="pointSize">2.0</param>
+ </struct>
+ <struct name="border" mergeType="replace">
+ <param name="Type">lucFieldVariableBorder</param>
+ <param name="FieldVariable">VelocityField</param>
+ </struct>
+ <struct name="particleTypeTitle" mergeType="replace">
+ <param name="Type">lucTitle</param>
+ <param name="string">Particle Types</param>
+ </struct>
+ <struct name="ParticleVP">
+ <param name="Type">lucViewport</param>
+ <param name="Camera">camera</param>
+ <list name="DrawingObject">
+ <param>particleDots</param>
+ <param>particleTypeTitle</param>
+ <param>border</param>
+ </list>
+ </struct>
+ <struct name="window" mergeType="merge">
+ <param name="Viewport">TemperatureAndVelocityArrowsVP ParticleVP </param>
+ </struct>
+ </struct>
+
+</StGermainData>
diff -r d01b9b15b769 -r 847af1136f99 SysTest/RegressionTests/expected/MultiThermalDiffusivity.xml/input-2009.07.30-11.26.10.xml
--- a/SysTest/RegressionTests/expected/MultiThermalDiffusivity.xml/input-2009.07.30-11.26.10.xml Tue Jan 19 15:33:56 2010 +1100
+++ b/SysTest/RegressionTests/expected/MultiThermalDiffusivity.xml/input-2009.07.30-11.26.10.xml Wed Jan 20 12:29:35 2010 +1100
@@ -432,7 +432,7 @@
</element>
<element type="struct" name="shapeA">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
@@ -457,7 +457,7 @@
</element>
<element type="struct" name="shapeB">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
@@ -482,7 +482,7 @@
</element>
<element type="struct" name="shapeC">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
@@ -507,7 +507,7 @@
</element>
<element type="struct" name="HeatShape">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
diff -r d01b9b15b769 -r 847af1136f99 SysTest/RegressionTests/expected/MultiThermalDiffusivity.xml/input.xml
--- a/SysTest/RegressionTests/expected/MultiThermalDiffusivity.xml/input.xml Tue Jan 19 15:33:56 2010 +1100
+++ b/SysTest/RegressionTests/expected/MultiThermalDiffusivity.xml/input.xml Wed Jan 20 12:29:35 2010 +1100
@@ -471,7 +471,7 @@
</element>
<element type="struct" name="shapeA">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
@@ -496,7 +496,7 @@
</element>
<element type="struct" name="shapeB">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
@@ -521,7 +521,7 @@
</element>
<element type="struct" name="shapeC">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
@@ -546,7 +546,7 @@
</element>
<element type="struct" name="HeatShape">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
diff -r d01b9b15b769 -r 847af1136f99 SysTest/RegressionTests/lowres_expected/MultiThermalDiffusivity.xml/input.xml
--- a/SysTest/RegressionTests/lowres_expected/MultiThermalDiffusivity.xml/input.xml Tue Jan 19 15:33:56 2010 +1100
+++ b/SysTest/RegressionTests/lowres_expected/MultiThermalDiffusivity.xml/input.xml Wed Jan 20 12:29:35 2010 +1100
@@ -471,7 +471,7 @@
</element>
<element type="struct" name="shapeA">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
@@ -496,7 +496,7 @@
</element>
<element type="struct" name="shapeB">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
@@ -521,7 +521,7 @@
</element>
<element type="struct" name="shapeC">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
@@ -546,7 +546,7 @@
</element>
<element type="struct" name="HeatShape">
<element type="param" name="Type">PolygonShape</element>
- <element type="list" name="verticies">
+ <element type="list" name="vertices">
<asciidata>
<columnDefinition name="x" paramType="string"/>
diff -r d01b9b15b769 -r 847af1136f99 SysTest/RegressionTests/oldTesting/testSlabSubduction.xml
--- a/SysTest/RegressionTests/oldTesting/testSlabSubduction.xml Tue Jan 19 15:33:56 2010 +1100
+++ b/SysTest/RegressionTests/oldTesting/testSlabSubduction.xml Wed Jan 20 12:29:35 2010 +1100
@@ -32,7 +32,7 @@
<struct name="slabPerturbation">
<param name="Type">PolygonShape</param>
<param name="startZ"> 1.25 </param> <param name="endZ"> 2.75 </param>
- <list name="verticies">
+ <list name="vertices">
<asciidata>
<columnDefinition name = "x" type="double"/>
<columnDefinition name = "y" type="double"/>
diff -r d01b9b15b769 -r 847af1136f99 SysTest/RegressionTests/oldTesting/testVelicSolL.xml
--- a/SysTest/RegressionTests/oldTesting/testVelicSolL.xml Tue Jan 19 15:33:56 2010 +1100
+++ b/SysTest/RegressionTests/oldTesting/testVelicSolL.xml Wed Jan 20 12:29:35 2010 +1100
@@ -38,7 +38,7 @@
<struct name="shapeB">
<param name="Type">PolygonShape</param>
- <list name="verticies">
+ <list name="vertices">
<asciidata>
<columnDefinition name = "x" type="double"/>
<columnDefinition name = "y" type="double"/>
More information about the CIG-COMMITS
mailing list