[cig-commits] r14453 - in long/3D/Gale/trunk: . input/benchmarks

walter at geodynamics.org walter at geodynamics.org
Wed Mar 25 15:17:51 PDT 2009


Author: walter
Date: 2009-03-25 15:17:50 -0700 (Wed, 25 Mar 2009)
New Revision: 14453

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/input/benchmarks/divergence.xml
Log:
 r2600 at dante:  boo | 2009-03-25 14:30:27 -0700
 Make divergence.xml work in 2D



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2599
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2600

Modified: long/3D/Gale/trunk/input/benchmarks/divergence.xml
===================================================================
--- long/3D/Gale/trunk/input/benchmarks/divergence.xml	2009-03-25 22:17:47 UTC (rev 14452)
+++ long/3D/Gale/trunk/input/benchmarks/divergence.xml	2009-03-25 22:17:50 UTC (rev 14453)
@@ -116,25 +116,6 @@
       <param name="DofLayout">pressureDofLayout</param>
       <param name="LinkedDofInfo">pressureLinkedDofs</param>
     </struct>
-    <struct name="nodalPressure">
-      <param name="Type">MeshVariable</param>
-      <param name="mesh">mesh-linear</param>
-      <param name="Rank">Scalar</param>
-      <param name="DataType">Double</param>
-    </struct>
-    <struct name="nodalPressureDofLayout">
-      <param name="Type">DofLayout</param>
-      <param name="mesh">mesh-linear</param>
-      <list name="BaseVariables">
-        <param>nodalPressure</param>
-      </list>
-    </struct>
-    <struct name="NodalPressureField">
-      <param name="Type">FeVariable</param>
-      <param name="FEMesh">mesh-linear</param>
-      <param name="DofLayout">nodalPressureDofLayout</param>
-      <param name="LinkedDofInfo">nodalPressureLinkedDofs</param>
-    </struct>
     <struct name="StressField">
       <param name="Type">StressField</param>
       <param name="StrainRateField">StrainRateField</param>
@@ -300,7 +281,7 @@
     <struct name="uzawa">
       <param name="Type">Stokes_SLE_UzawaSolver</param>
       <param name="Preconditioner">preconditioner</param>
-      <param name="tolerance">1.0e-5</param>
+      <param name="tolerance">linearTolerance</param>
       <param name="maxIterations">5000</param>
     </struct>
     <struct name="stokesEqn">
@@ -385,7 +366,7 @@
 
     <struct name="chamberShape">
       <param name="Type">Sphere</param>
-      <param name="radius">0.3</param>
+      <param name="radius">10.0</param>
       <param name="CentreX">1.0</param>
       <param name="CentreY">1.0</param>
       <param name="CentreZ">1.0</param>
@@ -397,8 +378,8 @@
       <param name="endX">0.01</param>
       <param name="startY">1.99</param>
       <param name="endY">2.01</param>
-      <param name="startZ">0</param>
-      <param name="endZ">1</param>
+      <param name="startZ">minZ</param>
+      <param name="endZ">maxZ</param>
     </struct>
 
     <struct name="topRightShape">
@@ -407,8 +388,8 @@
       <param name="endX">2.01</param>
       <param name="startY">1.99</param>
       <param name="endY">2.01</param>
-      <param name="startZ">0</param>
-      <param name="endZ">1</param>
+      <param name="startZ">minZ</param>
+      <param name="endZ">maxZ</param>
     </struct>
 
     <struct name="bottomLeftShape">
@@ -417,8 +398,8 @@
       <param name="endX">0.01</param>
       <param name="startY">-0.01</param>
       <param name="endY">0.01</param>
-      <param name="startZ">0</param>
-      <param name="endZ">1</param>
+      <param name="startZ">minZ</param>
+      <param name="endZ">maxZ</param>
     </struct>
 
     <struct name="bottomRightShape">
@@ -427,8 +408,8 @@
       <param name="endX">2.01</param>
       <param name="startY">-0.01</param>
       <param name="endY">0.01</param>
-      <param name="startZ">0</param>
-      <param name="endZ">1</param>
+      <param name="startZ">minZ</param>
+      <param name="endZ">maxZ</param>
     </struct>
     
       
@@ -446,10 +427,9 @@
 
   </struct>
   <list name="plugins">
-<!--     <param>Underworld_EulerDeform</param> -->
     <param>Underworld_VTKOutput</param>
   </list>
-  <param name="maxTimeSteps">10</param>
+  <param name="maxTimeSteps">1</param>
   <param name="outputEvery">1</param>
   <param name="dumpEvery">1</param>
   <param name="outputPath">./output.divergence</param>
@@ -463,7 +443,7 @@
   <param name="maxZ">2.0f</param>
   <param name="elementResI">16</param>
   <param name="elementResJ">16</param>
-  <param name="elementResK">4</param>
+  <param name="elementResK">16</param>
   <param name="allowUnbalancing">True</param>
   <param name="buildNodeNeighbourTbl">True</param>
   <param name="buildElementNeighbourTbl">True</param>
@@ -473,62 +453,22 @@
   <param name="gaussParticlesY">2</param>
   <param name="gaussParticlesZ">2</param>
   <param name="particlesPerCell">30</param>
-  <struct name="EulerDeform">
-    <list name="systems">
-      <struct>
-        <param name="mesh">mesh-linear</param>
-        <param name="remesher">velocityRemesher</param>
-        <param name="velocityField">VelocityField</param>
-        <param name="wrapTop">True</param>
-        <list name="fields">
-          <struct>
-            <param name="field">VelocityField</param>
-            <param name="variable">velocity</param>
-          </struct>
-          <struct>
-            <param name="field">PressureField</param>
-            <param name="variable">pressure</param>
-          </struct>
-        </list>
-      </struct>
-    </list>
-  </struct>
   <struct name="velocityBCs">
     <param name="type">CompositeVC</param>
     <list name="vcList">
-
       <struct>
         <param name="type">ShapeVC</param>
-        <param name="Shape">chamberShape</param>
-        <list name="variables">
-          <struct>
-            <param name="name">vx</param>
-            <param name="type">func</param>
-            <param name="value">Velocity_Extension</param>
-          </struct>
-          <struct>
-            <param name="name">vy</param>
-            <param name="type">func</param>
-            <param name="value">Velocity_SimpleShear</param>
-          </struct>
-        </list>
-      </struct>
-
-
-
-      <struct>
-        <param name="type">ShapeVC</param>
         <param name="Shape">topLeftShape</param>
         <list name="variables">
           <struct>
             <param name="name">vx</param>
             <param name="type">double</param>
-            <param name="value">0</param>
+            <param name="value">-1.0</param>
           </struct>
           <struct>
             <param name="name">vy</param>
             <param name="type">double</param>
-            <param name="value">0</param>
+            <param name="value">1.0</param>
           </struct>
         </list>
       </struct>
@@ -541,12 +481,12 @@
           <struct>
             <param name="name">vx</param>
             <param name="type">double</param>
-            <param name="value">0</param>
+            <param name="value">1.0</param>
           </struct>
           <struct>
             <param name="name">vy</param>
             <param name="type">double</param>
-            <param name="value">0</param>
+            <param name="value">1.0</param>
           </struct>
         </list>
       </struct>
@@ -558,12 +498,12 @@
           <struct>
             <param name="name">vx</param>
             <param name="type">double</param>
-            <param name="value">0</param>
+            <param name="value">-1.0</param>
           </struct>
           <struct>
             <param name="name">vy</param>
             <param name="type">double</param>
-            <param name="value">0</param>
+            <param name="value">-1.0</param>
           </struct>
         </list>
       </struct>
@@ -575,12 +515,12 @@
           <struct>
             <param name="name">vx</param>
             <param name="type">double</param>
-            <param name="value">0</param>
+            <param name="value">1.0</param>
           </struct>
           <struct>
             <param name="name">vy</param>
             <param name="type">double</param>
-            <param name="value">0</param>
+            <param name="value">-1.0</param>
           </struct>
         </list>
       </struct>
@@ -588,6 +528,7 @@
     </list>
   </struct>
 
+  <param name="linearTolerance">1.0e-7</param>
   <param name="checkpointEvery">1</param>
   <param name="ExtensionFactor">1</param>
   <param name="ExtensionCentreX">1</param>



More information about the CIG-COMMITS mailing list