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

[walter at geodynamics.org]

Author: walter
Date: 2008-09-01 00:07:12 -0700 (Mon, 01 Sep 2008)
New Revision: 12764

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/input/benchmarks/geomod_2008_bulldozer.xml
Log:
 r2337 at earth:  boo | 2008-08-31 23:53:25 -0700
 Make geomod2008 bulldozer use vfriction.



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

Modified: long/3D/Gale/trunk/input/benchmarks/geomod_2008_bulldozer.xml
===================================================================
--- long/3D/Gale/trunk/input/benchmarks/geomod_2008_bulldozer.xml	2008-09-01 07:07:07 UTC (rev 12763)
+++ long/3D/Gale/trunk/input/benchmarks/geomod_2008_bulldozer.xml	2008-09-01 07:07:12 UTC (rev 12764)
@@ -442,20 +442,6 @@
     <struct name="conditionFunctions">
       <param name="Type">StgFEM_StandardConditionFunctions</param>
     </struct>
-    <struct name="kineticFrictionBottom">
-      <param name="Type">KineticFriction</param>
-      <param name="ForceVector">mom_force</param>
-      <param name="Swarm">picIntegrationPoints</param>
-      <param name="wall">bottom</param>
-      <param name="StressField">StressField</param>
-      <param name="PressureField">NodalPressureField</param>
-      <param name="VelocityField">VelocityField</param>
-      <param name="friction_type">double</param>
-      <param name="friction_value">0.267949192431</param>
-      <param name="vx_type">double</param>
-      <param name="vx_value">0.0</param>
-    </struct>
-
   </struct>
   <list name="plugins">
     <param>Underworld_EulerDeform</param>
@@ -546,11 +532,6 @@
             <param name="type">double</param>
             <param name="value">0.0</param>
           </struct>
-          <struct>
-            <param name="name">vy</param>
-            <param name="type">double</param>
-            <param name="value">0.0</param>
-          </struct>
         </list>
       </struct>
       <struct>
@@ -563,6 +544,11 @@
             <!-- 2.5 cm/hr -->
             <param name="value">-6.94444444444e-6</param>
           </struct>
+          <struct>
+            <param name="name">vy</param>
+            <param name="type">func</param>
+            <param name="value">StaticFriction2</param>
+          </struct>
         </list>
       </struct>
       <struct>
@@ -570,6 +556,11 @@
         <param name="wall">bottom</param>
         <list name="variables">
           <struct>
+            <param name="name">vx</param>
+            <param name="type">func</param>
+            <param name="value">StaticFriction</param>
+          </struct>
+          <struct>
             <param name="name">vy</param>
             <param name="type">double</param>
             <param name="value">0</param>
@@ -598,11 +589,23 @@
 
 <!--   <param name="checkpointEvery">1</param> -->
 <!--   <param name="dtFactor">1.0</param> -->
-  <param name="dt">3.6</param>
+<!--   <param name="dt">3.6</param> -->
 
   <param name="maxUzawaIterations">20000</param>
   <param name="linearTolerance">1.0e-5</param>
 
+  <param name="StaticFrictionCoefficient">0.267949192431</param>
+  <param name="StaticFrictionNormalDim">1</param>
+  <param name="StaticFrictionTangentDim">0</param>
+  <param name="StaticFrictionUpperV">-6.94444444444e-6</param>
+  <param name="StaticFrictionLowerV">0</param>
+
+  <param name="StaticFriction2Coefficient">0.267949192431</param>
+  <param name="StaticFriction2NormalDim">0</param>
+  <param name="StaticFriction2TangentDim">1</param>
+
+  <param name="StaticFriction2LowerV">0</param>
+
 <!--   <param name="journal.info">True</param> -->
 <!--   <param name="journal.debug">True</param> -->
 <!--   <param name="journal-level.info">2</param> -->