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

[walter at geodynamics.org]

Author: walter
Date: 2008-12-01 10:56:55 -0800 (Mon, 01 Dec 2008)
New Revision: 13427

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/input/cookbook/viscous_extension.xml
Log:
 r2380 at dante:  boo | 2008-11-29 22:50:20 -0800
 Make viscous_extension work with linear pressure elements



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

Modified: long/3D/Gale/trunk/input/cookbook/viscous_extension.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_extension.xml	2008-12-01 17:06:27 UTC (rev 13426)
+++ long/3D/Gale/trunk/input/cookbook/viscous_extension.xml	2008-12-01 18:56:55 UTC (rev 13427)
@@ -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,42 +99,23 @@
     </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>
-    <struct name="nodalPressure">
-      <param name="Type">MeshVariable</param>
-      <param name="mesh">mesh-linear</param>
-      <param name="Rank">Scalar</param>
-      <param name="DataType">Double</param>
-    </struct>
-    <struct name="nodalPressureDofLayout">
-      <param name="Type">DofLayout</param>
-      <param name="mesh">mesh-linear</param>
-      <list name="BaseVariables">
-        <param>nodalPressure</param>
-      </list>
-    </struct>
-    <struct name="NodalPressureField">
-      <param name="Type">FeVariable</param>
-      <param name="FEMesh">mesh-linear</param>
-      <param name="DofLayout">nodalPressureDofLayout</param>
-      <param name="LinkedDofInfo">nodalPressureLinkedDofs</param>
-    </struct>
     <struct name="StressField">
       <param name="Type">StressField</param>
       <param name="StrainRateField">StrainRateField</param>
@@ -309,7 +281,7 @@
     <struct name="uzawa">
       <param name="Type">Stokes_SLE_UzawaSolver</param>
       <param name="Preconditioner">preconditioner</param>
-      <param name="tolerance">1.0e-5</param>
+      <param name="tolerance">linearTolerance</param>
       <param name="maxIterations">5000</param>
     </struct>
     <struct name="stokesEqn">
@@ -326,9 +298,26 @@
       <param name="ContinuityForceVector">cont_force</param>
       <param name="killNonConvergent">false</param>
       <param name="nonLinearMaxIterations">nonLinearMaxIterations</param>
+      <param name="nonLinearMinIterations">nonLinearMinIterations</param>
       <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="buoyancyForceTerm">
       <param name="Type">BuoyancyForceTerm</param>
       <param name="ForceVector">mom_force</param>
@@ -352,13 +341,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>
@@ -425,17 +407,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>
@@ -445,6 +416,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>