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

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/input/benchmarks/circular_inclusion/circular_inclusion.xml
Log:
 r2483 at dante:  boo | 2009-01-28 10:26:18 -0800
 Add missing stabilization term to circular_inclusion and generally clean it up



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

Modified: long/3D/Gale/trunk/input/benchmarks/circular_inclusion/circular_inclusion.xml
===================================================================
--- long/3D/Gale/trunk/input/benchmarks/circular_inclusion/circular_inclusion.xml	2009-02-04 19:23:08 UTC (rev 14018)
+++ long/3D/Gale/trunk/input/benchmarks/circular_inclusion/circular_inclusion.xml	2009-02-04 19:23:13 UTC (rev 14019)
@@ -273,7 +273,6 @@
     </struct>
     <struct name="uzawa">
       <param name="Type">Stokes_SLE_UzawaSolver</param>
-<!--       <param name="velocitySolver">matrixSolver</param> -->
       <param name="Preconditioner">preconditioner</param>
       <param name="tolerance">linearTolerance</param>
       <param name="maxIterations">5000</param>
@@ -295,6 +294,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="backgroundShape">
       <param name="Type">Everywhere</param>
     </struct>
@@ -359,15 +372,6 @@
         <param>true</param>
       </list>
     </struct>
-    <struct name="matrixSolver">
-      <param name="Type"> PETScMGSolver </param>
-      <param name="levels"> mgLevels </param>
-      <param name="opGenerator"> mgOpGenerator </param>
-    </struct>
-    <struct name="mgOpGenerator">
-      <param name="Type"> DistortedOpGenerator </param>
-      <param name="fineVariable"> VelocityField </param>
-    </struct>
     <struct name="conditionFunctions">
       <param name="Type">StgFEM_StandardConditionFunctions</param>
     </struct>
@@ -383,8 +387,8 @@
   <param name="minX">0.0f</param>
   <param name="minY">0.0f</param>
   <param name="minZ">0.0f</param>
-  <param name="maxX">8.0f</param>
-  <param name="maxY">8.0f</param>
+  <param name="maxX">1.0f</param>
+  <param name="maxY">1.0f</param>
   <param name="maxZ">0.5f</param>
   <param name="elementResI">64</param>
   <param name="elementResJ">64</param>
@@ -490,9 +494,4 @@
   <param name="ExtensionFactor">-1</param>
   <param name="ExtensionCentreX">0</param>
   <param name="linearTolerance">1.0e-7</param>
-
-  <param name="journal.info">True</param>
-  <param name="journal.debug">True</param>
-  <param name="journal-level.info">2</param>
-  <param name="journal-level.debug">2</param>
 </StGermainData>