[cig-commits] r13892 - in long/3D/Gale/trunk: . input/examples

[walter at geodynamics.org]

Author: walter
Date: 2009-01-20 15:12:18 -0800 (Tue, 20 Jan 2009)
New Revision: 13892

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/input/examples/tibet.xml
Log:
 r2459 at dante:  boo | 2009-01-20 12:07:39 -0800
 Make tibet work with everything



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

Modified: long/3D/Gale/trunk/input/examples/tibet.xml
===================================================================
--- long/3D/Gale/trunk/input/examples/tibet.xml	2009-01-20 23:12:15 UTC (rev 13891)
+++ long/3D/Gale/trunk/input/examples/tibet.xml	2009-01-20 23:12:18 UTC (rev 13892)
@@ -376,21 +376,21 @@
       <param name="endZ">maxZ</param>
     </struct>
 
-<!--     <struct name="surfaceAdaptor"> -->
-<!--       <param name="Type">SurfaceAdaptor</param> -->
-<!--       <param name="mesh">mesh-linear</param> -->
-<!--       <param name="sourceGenerator">linearMesh-generator</param> -->
-<!--       <param name="surfaceType">plateau</param> -->
-<!--       <param name="x1">300000</param> -->
-<!--       <param name="x2">350000</param> -->
-<!--       <param name="x3">650000</param> -->
-<!--       <param name="x4">700000</param> -->
-<!--       <param name="z1">200000</param> -->
-<!--       <param name="z2">250000</param> -->
-<!--       <param name="z3">750000</param> -->
-<!--       <param name="z4">800000</param> -->
-<!--       <param name="height">3030.3030303</param> -->
-<!--     </struct> -->
+    <struct name="surfaceAdaptor">
+      <param name="Type">SurfaceAdaptor</param>
+      <param name="mesh">mesh-linear</param>
+      <param name="sourceGenerator">linearMesh-generator</param>
+      <param name="surfaceType">plateau</param>
+      <param name="x1">300000</param>
+      <param name="x2">350000</param>
+      <param name="x3">650000</param>
+      <param name="x4">700000</param>
+      <param name="z1">200000</param>
+      <param name="z2">250000</param>
+      <param name="z3">750000</param>
+      <param name="z4">800000</param>
+      <param name="height">3030.3030303</param>
+    </struct>
 
     <struct name="boxShape">
       <param name="Type">Box</param>
@@ -422,10 +422,10 @@
           <columnDefinition name = "x" type="double"/>
           <columnDefinition name = "y" type="double"/>
           0         68000
-<!--           300000    68000 -->
-<!--           350000    51030.3030303 -->
-<!--           650000    51030.3030303 -->
-<!--           700000    68000 -->
+          300000    68000
+          350000    51030.3030303
+          650000    51030.3030303
+          700000    68000
           1000000   68000
           1000000   100000
           0         100000
@@ -434,9 +434,6 @@
     </struct>
 
     <struct name="crustViscosity">
-<!--       <param name="Type">MaterialViscosity</param> -->
-<!--       <param name="eta0">0.1</param> -->
-
       <param name="Type">FrankKamenetskii</param>
       <param name="TemperatureField">TemperatureField</param>
 <!--       at T=273, viscosity=1e25, at T=1273, viscosity=1e20 -->
@@ -455,19 +452,19 @@
       <param name="initialDamageFactor">0.5</param>
       <param name="healingRate">0.0</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="Context">context</param> -->
-<!--       <param name="StrainWeakening">strainWeakening</param> -->
-<!--       <param name="cohesion">44e6</param> -->
-<!--       <param name="cohesionAfterSoftening">4e6</param> -->
-<!--       <param name="frictionCoefficient">0.57735026919</param> -->
-<!--       <param name="frictionCoefficientAfterSoftening">0.57735026919</param> -->
-<!--       <param name="HydrostaticTerm">hydrostaticTerm</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="Context">context</param>
+      <param name="StrainWeakening">strainWeakening</param>
+      <param name="cohesion">44e6</param>
+      <param name="cohesionAfterSoftening">4e6</param>
+      <param name="frictionCoefficient">0.57735026919</param>
+      <param name="frictionCoefficientAfterSoftening">0.57735026919</param>
+      <param name="HydrostaticTerm">hydrostaticTerm</param>
+    </struct>
 
     <struct name="crustViscous">
       <param name="Type">RheologyMaterial</param>
@@ -483,7 +480,7 @@
       </list>
       <list name="Rheology">
         <param>crustViscosity</param>
-<!--         <param>yielding</param> -->
+        <param>yielding</param>
         <param>storeViscosity</param>
         <param>storeStress</param>
       </list>
@@ -499,8 +496,6 @@
     </struct>
 
     <struct name="mantleViscosity">
-<!--       <param name="Type">MaterialViscosity</param> -->
-<!--       <param name="eta0">0.1</param> -->
       <param name="Type">FrankKamenetskii</param>
       <param name="TemperatureField">TemperatureField</param>
       <param name="eta0">2.31739465</param>
@@ -727,9 +722,7 @@
           <struct>
             <param name="name">vy</param>
             <param name="type">double</param>
-            <param name="value">4.17097919838e15</param>
-<!--             <param name="value">3.17097919838e15</param> -->
-<!--             <param name="value">0.0</param> -->
+            <param name="value">3.17097919838e15</param>
           </struct>
         </list>
       </struct>