[cig-commits] r4791 - long/3D/Gale/trunk

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:20:51 -0700 (Wed, 11 Oct 2006)
New Revision: 4791

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/shortening.xml
   long/3D/Gale/trunk/simple-extension.xml
Log:
 r711 at earth:  boo | 2006-10-11 12:14:58 -0700
 Convert shortening and simple-extension to MohrCoulomb



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

Modified: long/3D/Gale/trunk/shortening.xml
===================================================================
--- long/3D/Gale/trunk/shortening.xml	2006-10-11 20:20:49 UTC (rev 4790)
+++ long/3D/Gale/trunk/shortening.xml	2006-10-11 20:20:51 UTC (rev 4791)
@@ -417,16 +417,6 @@
       <param name="Type">MaterialViscosity</param>
       <param name="eta0">10.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="strainWeakening">
       <param name="Type">StrainWeakening</param>
       <param name="TimeIntegrator">timeIntegrator</param>
@@ -438,11 +428,10 @@
       <param name="healingRate">0.0</param>
     </struct>
     <struct name="yielding">
-      <param name="Type">FaultingMoresiMuhlhaus2006</param>
+      <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>
@@ -450,7 +439,6 @@
       <param name="frictionCoefficient">0.0</param>
       <param name="frictionCoefficientAfterSoftening">0.0</param>
       <param name="minimumYieldStress">0.00001</param>
-      <param name="ignoreOldOrientation">false</param>
     </struct>
     <struct name="beadsViscosity">
       <param name="Type">MaterialViscosity</param>

Modified: long/3D/Gale/trunk/simple-extension.xml
===================================================================
--- long/3D/Gale/trunk/simple-extension.xml	2006-10-11 20:20:49 UTC (rev 4790)
+++ long/3D/Gale/trunk/simple-extension.xml	2006-10-11 20:20:51 UTC (rev 4791)
@@ -389,16 +389,6 @@
       <param name="Type">MaterialViscosity</param>
       <param name="eta0">10.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="strainWeakening">
       <param name="Type">StrainWeakening</param>
       <param name="TimeIntegrator">timeIntegrator</param>
@@ -410,11 +400,10 @@
       <param name="healingRate">0.0</param>
     </struct>
     <struct name="yielding">
-      <param name="Type">FaultingMoresiMuhlhaus2006</param>
+      <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>
@@ -422,7 +411,6 @@
       <param name="frictionCoefficient">0.0</param>
       <param name="frictionCoefficientAfterSoftening">0.0</param>
       <param name="minimumYieldStress">0.00001</param>
-      <param name="ignoreOldOrientation">false</param>
     </struct>
     <struct name="pdmsViscosity">
       <param name="Type">MaterialViscosity</param>