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

[walter at geodynamics.org]

Author: walter
Date: 2007-07-20 23:08:14 -0700 (Fri, 20 Jul 2007)
New Revision: 7733

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/input/extension.xml
Log:
 r1888 at earth:  boo | 2007-07-20 13:26:24 -0700
 make extension.xml use both static and kinetic friction



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

Modified: long/3D/Gale/trunk/input/extension.xml
===================================================================
--- long/3D/Gale/trunk/input/extension.xml	2007-07-21 06:08:10 UTC (rev 7732)
+++ long/3D/Gale/trunk/input/extension.xml	2007-07-21 06:08:14 UTC (rev 7733)
@@ -424,7 +424,7 @@
       <param name="PressureField">PressureField</param>
       <param name="VelocityField">VelocityField</param>
       <param name="friction_type">double</param>
-      <param name="friction_value">0.35</param>
+      <param name="friction_value">0.30</param>
       <param name="vx_type">func</param>
       <param name="vx_value">StepFunction</param>
     </struct>
@@ -550,21 +550,21 @@
         </list>
       </struct>
 
-<!--       <struct> -->
-<!--         <param name="type">FrictionVC</param> -->
-<!--         <param name="wall">bottom</param> -->
-<!--         <param name="StaticFriction">0.33</param> -->
-<!--         <param name="includeUpperX">False</param> -->
-<!--         <param name="StressField">StressField</param> -->
-<!--         <param name="PressureField">PressureField</param> -->
-<!--         <list name="variables"> -->
-<!--           <struct> -->
-<!--             <param name="name">vx</param> -->
-<!--             <param name="type">func</param> -->
-<!--             <param name="value">StepFunction</param> -->
-<!--           </struct> -->
-<!--         </list> -->
-<!--       </struct> -->
+      <struct>
+        <param name="type">FrictionVC</param>
+        <param name="wall">bottom</param>
+        <param name="StaticFriction">0.33</param>
+        <param name="includeUpperX">False</param>
+        <param name="StressField">StressField</param>
+        <param name="PressureField">PressureField</param>
+        <list name="variables">
+          <struct>
+            <param name="name">vx</param>
+            <param name="type">func</param>
+            <param name="value">StepFunction</param>
+          </struct>
+        </list>
+      </struct>
     </list>
   </struct>