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

[walter at geodynamics.org]

Author: walter
Date: 2007-01-08 23:51:02 -0800 (Mon, 08 Jan 2007)
New Revision: 5712

Added:
   long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/Multigrid.xml
Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/StokesFlowUzawa.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempAdvDiff.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempDiffusionSolver.xml
Log:
 r930 at earth (orig r699):  LukeHodkinson | 2007-01-08 22:48:30 -0800
 Adding a multigrid XML file that, when included (along
 with a few other XML commands), enables multigrid.
 



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:698
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/branches/decomp3d:699
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669

Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/Multigrid.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/Multigrid.xml	2007-01-09 07:50:59 UTC (rev 5711)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/Multigrid.xml	2007-01-09 07:51:02 UTC (rev 5712)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+<!-- A StGermain input file -->
+<!-- DTD to validate against -->
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+	<struct name="components" mergeType="merge">
+		<struct name="matrixSolver">
+			<param name="Type"> MultigridSolver </param>
+			<param name="levels"> mgLevels </param>
+			<param name="opGenerator"> mgOpGenerator </param>
+		</struct>
+	</struct>
+
+</StGermainData>

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/StokesFlowUzawa.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/StokesFlowUzawa.xml	2007-01-09 07:50:59 UTC (rev 5711)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/StokesFlowUzawa.xml	2007-01-09 07:51:02 UTC (rev 5712)
@@ -71,6 +71,7 @@
 
 		<struct name="uzawa">
 			<param name="Type">Stokes_SLE_UzawaSolver</param>
+			<param name="velSolver">matrixSolver</param>
 			<param name="Preconditioner">preconditioner</param>
 			<param name="tolerance">1.0e-5</param>
 			<param name="maxIterations">5000</param>

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempAdvDiff.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempAdvDiff.xml	2007-01-09 07:50:59 UTC (rev 5711)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempAdvDiff.xml	2007-01-09 07:51:02 UTC (rev 5712)
@@ -12,10 +12,10 @@
 		<struct name="massMatrix">
 			<param name="Type">ForceVector</param>
 			<param name="FeVariable">TemperatureField</param>
-		</struct>		
+		</struct>
 		<struct name="predictorMulticorrector">
 			<param name="Type">AdvDiffMulticorrector</param>
-		</struct>		
+		</struct>
 		<struct name="EnergyEqn">
 			<param name="Type">AdvectionDiffusionSLE</param>
 			<param name="SLE_Solver">predictorMulticorrector</param> 

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempDiffusionSolver.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempDiffusionSolver.xml	2007-01-09 07:50:59 UTC (rev 5711)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempDiffusionSolver.xml	2007-01-09 07:51:02 UTC (rev 5712)
@@ -31,6 +31,7 @@
 
 		<struct name="energySolver">
 			<param name="Type">Energy_SLE_Solver</param>
+			<param name="matrixSolver">matrixSolver</param>
 		</struct>
 			
 		<struct name="energySLE">