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

[walter at geodynamics.org]

Author: walter
Date: 2008-07-25 00:51:33 -0700 (Fri, 25 Jul 2008)
New Revision: 12477

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/input/examples/rifting.xml
Log:
 r2282 at earth:  boo | 2008-07-25 00:49:25 -0700
 Make rifting use plasticity



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

Modified: long/3D/Gale/trunk/input/examples/rifting.xml
===================================================================
--- long/3D/Gale/trunk/input/examples/rifting.xml	2008-07-24 22:41:32 UTC (rev 12476)
+++ long/3D/Gale/trunk/input/examples/rifting.xml	2008-07-25 07:51:33 UTC (rev 12477)
@@ -372,7 +372,7 @@
       <param name="endZ">maxZ</param>
     </struct>
 
-    <struct name="dikeBoxShape">
+    <struct name="dikeShape">
       <param name="Type">Box</param>
       <param name="startX">17500</param>
       <param name="endX">22500</param>
@@ -382,27 +382,6 @@
       <param name="endZ">maxZ</param>
     </struct>
 
-
-    <struct name="nondikeShape">
-      <param name="Type">Box</param>
-      <param name="startX">18500</param>
-      <param name="endX">21500</param>
-      <param name="startY">16000</param>
-      <param name="endY">maxY</param>
-      <param name="startZ">minZ</param>
-      <param name="endZ">maxZ</param>
-    </struct>
-
-    <struct name="dikeShape">
-      <param name="Type">Intersection</param>
-      <list name="shapes">
-        <param>dikeBoxShape</param>
-<!--         <param>!nondikeShape</param> -->
-      </list>
-    </struct>
-
-
-
     <struct name="storeViscosity">
       <param name="Type">StoreVisc</param>
       <param name="MaterialPointsSwarm">materialSwarm</param>
@@ -413,18 +392,13 @@
     </struct>
 
     <struct name="crustViscosity">
-      <param name="Type">MaterialViscosity</param>
-      <param name="eta0">1e20</param>
-    </struct>	
+      <param name="Type">FrankKamenetskii</param>
+      <param name="TemperatureField">TemperatureField</param>
+<!--       at T=273, viscosity=1e25, at T=1273, viscosity=1e20 -->
+      <param name="eta0">2.31739465e26</param>
+      <param name="theta">0.011512925465</param>
+    </struct>
 
-<!--     <struct name="crustViscosity"> -->
-<!--       <param name="Type">FrankKamenetskii</param> -->
-<!--       <param name="TemperatureField">TemperatureField</param> -->
-      <!-- at T=273, viscosity=1e25, at T=1273, viscosity=1e20 -->
-<!--       <param name="eta0">2.31739465e26</param> -->
-<!--       <param name="theta">0.011512925465</param> -->
-<!--     </struct>	 -->
-
     <struct name="strainWeakening">
       <param name="Type">StrainWeakening</param>
       <param name="TimeIntegrator">timeIntegrator</param>
@@ -462,7 +436,7 @@
       </list>
       <list name="Rheology">
         <param>crustViscosity</param>
-<!--         <param>yielding</param> -->
+        <param>yielding</param>
         <param>storeViscosity</param>
         <param>storeStress</param>
       </list>