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

[walter at geodynamics.org]

Author: walter
Date: 2008-04-22 12:03:19 -0700 (Tue, 22 Apr 2008)
New Revision: 11846

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/input/benchmarks/extension.xml
Log:
 r2109 at earth:  boo | 2008-04-22 12:03:21 -0700
 Add friction BC's back into the extension model



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

Modified: long/3D/Gale/trunk/input/benchmarks/extension.xml
===================================================================
--- long/3D/Gale/trunk/input/benchmarks/extension.xml	2008-04-22 18:56:23 UTC (rev 11845)
+++ long/3D/Gale/trunk/input/benchmarks/extension.xml	2008-04-22 19:03:19 UTC (rev 11846)
@@ -422,19 +422,19 @@
     <struct name="conditionFunctions">
       <param name="Type">StgFEM_StandardConditionFunctions</param>
     </struct>
-<!--     <struct name="kineticFriction"> -->
-<!--       <param name="Type">StressBC</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">PressureField</param> -->
-<!--       <param name="VelocityField">VelocityField</param> -->
-<!--       <param name="friction_type">double</param> -->
-<!--       <param name="friction_value">0.30</param> -->
-<!--       <param name="vx_type">func</param> -->
-<!--       <param name="vx_value">StepFunction</param> -->
-<!--     </struct> -->
+    <struct name="kineticFriction">
+      <param name="Type">StressBC</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">PressureField</param>
+      <param name="VelocityField">VelocityField</param>
+      <param name="friction_type">double</param>
+      <param name="friction_value">0.30</param>
+      <param name="vx_type">func</param>
+      <param name="vx_value">StepFunction</param>
+    </struct>
   </struct>
   <list name="plugins">
     <param>Underworld_EulerDeform</param>
@@ -554,6 +554,22 @@
             <param name="type">double</param>
             <param name="value">0</param>
           </struct>
+<!--           <struct> -->
+<!--             <param name="name">vx</param> -->
+<!--             <param name="type">func</param> -->
+<!--             <param name="value">StepFunction</param> -->
+<!--           </struct> -->
+        </list>
+      </struct>
+
+      <struct>
+        <param name="type">StaticFrictionVC</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>
@@ -561,22 +577,6 @@
           </struct>
         </list>
       </struct>
-
-<!--       <struct> -->
-<!--         <param name="type">StaticFrictionVC</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>