[cig-commits] r6141 - in long/3D/Gale/trunk/src/StgFEM: . Apps/StgFEM_Components

[walter at geodynamics.org]

Author: walter
Date: 2007-03-01 11:36:27 -0800 (Thu, 01 Mar 2007)
New Revision: 6141

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/StokesFlowUzawa.xml
Log:
 r1028 at earth (orig r759):  LukeHodkinson | 2007-02-28 16:46:23 -0800
 Allowing different kinds of matrices to be swapped in
 and out of the stokes solver.
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:758
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:759
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/StokesFlowUzawa.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/StokesFlowUzawa.xml	2007-03-01 19:36:23 UTC (rev 6140)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/StokesFlowUzawa.xml	2007-03-01 19:36:27 UTC (rev 6141)
@@ -31,6 +31,7 @@
 		<!-- Matricies -->
 		<struct name="k_matrix">
 			<param name="Type">StiffnessMatrix</param>
+			<param name="matrix">kMat</param>
 			<param name="RowVariable">VelocityField</param>
 			<param name="ColumnVariable">VelocityField</param>
 			<param name="RHS">mom_force</param>
@@ -44,6 +45,7 @@
 		</struct>
 		<struct name="g_matrix">
 			<param name="Type">StiffnessMatrix</param>
+			<param name="matrix">gMat</param>
 			<param name="RowVariable">VelocityField</param>
 			<param name="ColumnVariable">PressureField</param>	
 			<param name="RHS">cont_force</param>
@@ -58,11 +60,12 @@
 		<!-- Solver Stuff -->
 		<struct name="preconditioner">
 			<param name="Type">StiffnessMatrix</param>
+			<param name="matrix">cMat</param>
 			<param name="RowVariable">PressureField</param>
 			<param name="ColumnVariable">PressureField</param>	
 			<param name="RHS">cont_force</param>
 			<param name="allowZeroElementContributions">True</param>
-		</struct>		
+		</struct>
 		<struct name="preconditionerTerm">
 			<param name="Type">UzawaPreconditionerTerm</param>
 			<param name="Swarm">gaussSwarm</param>