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

[walter at geodynamics.org]

Author: walter
Date: 2009-02-04 11:23:08 -0800 (Wed, 04 Feb 2009)
New Revision: 14018

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/input/benchmarks/divergence.xml
Log:
 r2482 at dante:  boo | 2009-01-27 17:00:50 -0800
 Make divergence use linear elements



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

Modified: long/3D/Gale/trunk/input/benchmarks/divergence.xml
===================================================================
--- long/3D/Gale/trunk/input/benchmarks/divergence.xml	2009-02-04 05:36:33 UTC (rev 14017)
+++ long/3D/Gale/trunk/input/benchmarks/divergence.xml	2009-02-04 19:23:08 UTC (rev 14018)
@@ -4,15 +4,6 @@
     <struct name="conditionFunctions">
       <param name="Type">StgFEM_StandardConditionFunctions</param>
     </struct>
-    <struct name="mesh-constant">
-      <param name="Type">FeMesh</param>
-      <param name="elementType">constant</param>
-    </struct>
-    <struct name="constantMesh-generator">
-      <param name="Type">C0Generator</param>
-      <param name="mesh">mesh-constant</param>
-      <param name="elementMesh">mesh-linear</param>
-    </struct>
     <struct name="mesh-linear">
       <param name="Type">FeMesh</param>
       <param name="elementType">linear</param>
@@ -108,20 +99,20 @@
     </struct>
     <struct name="pressure">
       <param name="Type">MeshVariable</param>
-      <param name="mesh">mesh-constant</param>
+      <param name="mesh">mesh-linear</param>
       <param name="Rank">Scalar</param>
       <param name="DataType">Double</param>
     </struct>
     <struct name="pressureDofLayout">
       <param name="Type">DofLayout</param>
-      <param name="mesh">mesh-constant</param>
+      <param name="mesh">mesh-linear</param>
       <list name="BaseVariables">
         <param>pressure</param>
       </list>
     </struct>
     <struct name="PressureField">
       <param name="Type">FeVariable</param>
-      <param name="FEMesh">mesh-constant</param>
+      <param name="FEMesh">mesh-linear</param>
       <param name="DofLayout">pressureDofLayout</param>
       <param name="LinkedDofInfo">pressureLinkedDofs</param>
     </struct>
@@ -329,6 +320,20 @@
       <param name="nonLinearTolerance">nonLinearTolerance</param>
       <param name="makeConvergenceFile">false</param>
     </struct>
+    <struct name="c_matrix">
+      <param name="Type">StiffnessMatrix</param>
+      <param name="RowVariable">PressureField</param>
+      <param name="ColumnVariable">PressureField</param>
+      <param name="RHS">cont_force</param>
+      <param name="allowZeroElementContributions">True</param>
+    </struct>
+    <struct name="mixedStabiliser">
+      <param name="Type">MixedStabiliserTerm</param>
+      <param name="Swarm">gaussSwarm</param>
+      <param name="picSwarm">picIntegrationPoints</param>
+      <param name="storeVisc">storeViscosity</param>
+      <param name="StiffnessMatrix">c_matrix</param>
+    </struct>
     <struct name="background">
       <param name="Type">Everywhere</param>
     </struct>
@@ -346,13 +351,6 @@
         <param>true</param>
       </list>
     </struct>
-    <struct name="pressureRemesher">
-      <param name="Type">CellRemesher</param>
-      <param name="mesh">mesh-constant</param>
-      <param name="meshType">regular</param>
-      <param name="dim">3</param>
-      <param name="cellMesh">mesh-linear</param>
-    </struct>
 
     <struct name="boxShape">
       <param name="Type">Box</param>
@@ -440,7 +438,8 @@
       <param name="Swarm">picIntegrationPoints</param>
       <param name="DomainShape">chamberShape</param>
       <param name="GeometryMesh">mesh-linear</param>
-      <param name="force">-2</param>
+      <param name="force_type">double</param>
+      <param name="force_value">-2</param>
     </struct>
 
 
@@ -448,7 +447,6 @@
   </struct>
   <list name="plugins">
 <!--     <param>Underworld_EulerDeform</param> -->
-    <param>Underworld_DumpSwarm</param>
     <param>Underworld_VTKOutput</param>
   </list>
   <param name="maxTimeSteps">10</param>
@@ -478,17 +476,6 @@
   <struct name="EulerDeform">
     <list name="systems">
       <struct>
-        <param name="mesh">mesh-constant</param>
-        <param name="remesher">pressureRemesher</param>
-        <param name="velocityField">VelocityField</param>
-        <list name="fields">
-          <struct>
-            <param name="field">PressureField</param>
-            <param name="variable">pressure</param>
-          </struct>
-        </list>
-      </struct>
-      <struct>
         <param name="mesh">mesh-linear</param>
         <param name="remesher">velocityRemesher</param>
         <param name="velocityField">VelocityField</param>
@@ -498,6 +485,10 @@
             <param name="field">VelocityField</param>
             <param name="variable">velocity</param>
           </struct>
+          <struct>
+            <param name="field">PressureField</param>
+            <param name="variable">pressure</param>
+          </struct>
         </list>
       </struct>
     </list>