[cig-commits] r4891 - in long/3D/Gale/trunk/src/StgFEM: . Apps
Apps/EnergySolver Apps/StgFEM_Components
Apps/StokesMomentumUzawa Apps/TempDiffusion Apps/ThermalConvection
walter at geodynamics.org
walter at geodynamics.org
Wed Oct 11 13:50:00 PDT 2006
Author: walter
Date: 2006-10-11 13:49:58 -0700 (Wed, 11 Oct 2006)
New Revision: 4891
Added:
long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/
long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/ConstantMesh.xml
long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/ElementLayout.xml
long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/GaussSwarm.xml
long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/LinearMesh.xml
long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/MultiGrid.xml
long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/PressureField.xml
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
long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TemperatureField.xml
long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TimeIntegrator.xml
long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TimeIntegratorSimultaneous.xml
long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/VelocityField.xml
Removed:
long/3D/Gale/trunk/src/StgFEM/Apps/Components/
Modified:
long/3D/Gale/trunk/src/StgFEM/
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/EnergySolver2D.xml
long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/LidDrivenConvection.xml
long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion.xml
long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml
long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml
Log:
r777 at earth: boo | 2006-10-11 13:49:33 -0700
r751 at earth (orig r630): JulianGiordani | 2006-08-30 02:09:40 -0700
Renaming the Components directory in StgFEM to StgFEM_Components. This is consistent with the other projects, which make porting xml files around easier.
Also modifing xml to this change.
Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
- 38867592-cf10-0410-9e16-a142ea72ac34:/cig:776
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:629
+ 38867592-cf10-0410-9e16-a142ea72ac34:/cig:777
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:630
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/EnergySolver2D.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/EnergySolver2D.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/EnergySolver2D.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -39,11 +39,11 @@
<param name="gaussParticlesY"> 2 </param>
<param name="gaussParticlesZ"> 2 </param>
- <include>../Components/ElementLayout.xml</include>
- <include>../Components/LinearMesh.xml</include>
- <include>../Components/VelocityField.xml</include>
- <include>../Components/TemperatureField.xml</include>
- <include>../Components/GaussSwarm.xml</include>
- <include>../Components/TempAdvDiff.xml</include>
+ <include>../StgFEM_Components/ElementLayout.xml</include>
+ <include>../StgFEM_Components/LinearMesh.xml</include>
+ <include>../StgFEM_Components/VelocityField.xml</include>
+ <include>../StgFEM_Components/TemperatureField.xml</include>
+ <include>../StgFEM_Components/GaussSwarm.xml</include>
+ <include>../StgFEM_Components/TempAdvDiff.xml</include>
</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/ConstantMesh.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/ConstantMesh.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/ConstantMesh.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,40 @@
+<?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">
+
+ <!-- Constant Mesh Stuff -->
+ <struct name="components" mergeType="merge">
+ <struct name="bodyNodeTopology">
+ <param name="Type">IJK6Topology</param>
+ <param name="sizeI">elementResI</param>
+ <param name="sizeJ">elementResJ</param>
+ <param name="sizeK">elementResK</param>
+ </struct>
+ <struct name="bodyNodeLayout">
+ <param name="Type">BodyNL</param>
+ <param name="ElementLayout">elementLayout</param>
+ <param name="Topology">bodyNodeTopology</param>
+ </struct>
+ <struct name="decomp-constant">
+ <param name="Type">HexaMD</param>
+ <param name="ElementLayout">elementLayout</param>
+ <param name="NodeLayout">bodyNodeLayout</param>
+ <param name="numPartitionedDims">numPartitionedDims</param>
+ </struct>
+ <struct name="meshLayout-constant">
+ <param name="Type">MeshLayout</param>
+ <param name="ElementLayout">elementLayout</param>
+ <param name="NodeLayout">bodyNodeLayout</param>
+ <param name="MeshDecomp">decomp-constant</param>
+ </struct>
+ <struct name="mesh-constant">
+ <param name="Type">FiniteElement_Mesh</param>
+ <param name="MeshLayout">meshLayout-constant</param>
+ <param name="ElementSize">8</param>
+ <param name="NodeSize">0</param>
+ </struct>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/ElementLayout.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/ElementLayout.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/ElementLayout.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,26 @@
+<?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="geometry">
+ <param name="Type">BlockGeometry</param>
+ <param name="sizeI"> elementResI </param>
+ <param name="sizeJ"> elementResJ </param>
+ <param name="sizeK"> elementResK </param>
+ <param name="sizeShift">+1</param>
+ </struct>
+ <struct name="elementTopology">
+ <param name="Type">IJK26Topology</param>
+ <param name="sizeI"> elementResI </param>
+ <param name="sizeJ"> elementResJ </param>
+ <param name="sizeK"> elementResK </param>
+ </struct>
+ <struct name="elementLayout">
+ <param name="Type">ParallelPipedHexaEL</param>
+ <param name="Topology">elementTopology</param>
+ <param name="Geometry">geometry</param>
+ </struct>
+ </struct>
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/GaussSwarm.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/GaussSwarm.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/GaussSwarm.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,22 @@
+<?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">
+
+ <!-- Gauss Swarm Stuff -->
+ <struct name="components" mergeType="merge">
+ <struct name="cellLayout">
+ <param name="Type">SingleCellLayout</param>
+ </struct>
+ <struct name="particleLayout">
+ <param name="Type">GaussParticleLayout</param>
+ </struct>
+ <struct name="gaussSwarm">
+ <param name="Type">Swarm</param>
+ <param name="CellLayout">cellLayout</param>
+ <param name="ParticleLayout">particleLayout</param>
+ </struct>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/LinearMesh.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/LinearMesh.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/LinearMesh.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,41 @@
+<?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">
+
+ <!-- Linear Mesh Stuff -->
+ <struct name="components" mergeType="merge">
+ <struct name="cornerNodeTopology">
+ <param name="Type">IJK6Topology</param>
+ <param name="sizeI">elementResI</param>
+ <param name="sizeJ">elementResJ</param>
+ <param name="sizeK">elementResK</param>
+ <param name="sizeShift">1</param>
+ </struct>
+ <struct name="cornerNodeLayout">
+ <param name="Type">CornerNL</param>
+ <param name="ElementLayout">elementLayout</param>
+ <param name="Topology">cornerNodeTopology</param>
+ </struct>
+ <struct name="decomp-linear">
+ <param name="Type">HexaMD</param>
+ <param name="ElementLayout">elementLayout</param>
+ <param name="NodeLayout">cornerNodeLayout</param>
+ <param name="numPartitionedDims">numPartitionedDims</param>
+ </struct>
+ <struct name="meshLayout-linear">
+ <param name="Type">MeshLayout</param>
+ <param name="ElementLayout">elementLayout</param>
+ <param name="NodeLayout">cornerNodeLayout</param>
+ <param name="MeshDecomp">decomp-linear</param>
+ </struct>
+ <struct name="mesh-linear">
+ <param name="Type">FiniteElement_Mesh</param>
+ <param name="MeshLayout">meshLayout-linear</param>
+ <param name="ElementSize">8</param>
+ <param name="NodeSize">0</param>
+ </struct>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/MultiGrid.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/MultiGrid.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/MultiGrid.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,32 @@
+<?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">
+
+ <list name="plugins" mergeType="merge">
+ <param>StG_FEM_MultiGrid</param>
+ </list>
+
+ <struct name="MultiGrid">
+ <list name="SLEsToConvert">
+ <struct>
+ <param name="SLE"> stokesEqn </param>
+ <param name="level"> 3 </param>
+ <struct name="level_0">
+ <param name="downIts"> 5 </param>
+ <param name="upIts"> 5 </param>
+ </struct>
+ <struct name="level_1">
+ <param name="downIts"> 5 </param>
+ <param name="upIts"> 5 </param>
+ </struct>
+ <struct name="level_2">
+ <param name="downIts"> 5 </param>
+ <param name="upIts"> 5 </param>
+ </struct>
+ </struct>
+ </list>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/PressureField.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/PressureField.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/PressureField.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,32 @@
+<?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">
+
+ <!-- PressureField Stuff -->
+ <struct name="components" mergeType="merge">
+ <struct name="pressure">
+ <param name="Type">Variable</param>
+ <param name="Rank">Scalar</param>
+ <param name="Dependency">decomp-constant</param>
+ <param name="DataType">Double</param>
+ <param name="Count">decomp-constant-nodeDomainCount</param>
+ </struct>
+ <struct name="pressureDofLayout">
+ <param name="Type">DofLayout</param>
+ <param name="Count">decomp-constant-nodeDomainCount</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="GeometryMesh">mesh-linear</param>
+ <param name="DofLayout">pressureDofLayout</param>
+ <param name="LinkedDofInfo">pressureLinkedDofs</param>
+ </struct>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/StokesFlowUzawa.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/StokesFlowUzawa.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/StokesFlowUzawa.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,97 @@
+<?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">
+
+ <!-- Stokes Flow Stuff -->
+ <struct name="components" mergeType="merge">
+ <!-- Solution Vectors -->
+ <struct name="solutionVelocity">
+ <param name="Type">SolutionVector</param>
+ <param name="FeVariable">VelocityField</param>
+ </struct>
+ <struct name="solutionPressure">
+ <param name="Type">SolutionVector</param>
+ <param name="FeVariable">PressureField</param>
+ </struct>
+
+ <!-- Force Vectors -->
+ <struct name="mom_force">
+ <param name="Type">ForceVector</param>
+ <param name="FeVariable">VelocityField</param>
+ <param name="ExtraInfo">context</param>
+ </struct>
+ <struct name="cont_force">
+ <param name="Type">ForceVector</param>
+ <param name="FeVariable">PressureField</param>
+ <param name="ExtraInfo">context</param>
+ </struct>
+
+ <!-- Matricies -->
+ <struct name="k_matrix">
+ <param name="Type">StiffnessMatrix</param>
+ <param name="RowVariable">VelocityField</param>
+ <param name="ColumnVariable">VelocityField</param>
+ <param name="RHS">mom_force</param>
+ <param name="allowZeroElementContributions">False</param>
+ </struct>
+ <struct name="isoviscousStressTensorTerm">
+ <param name="Type">IsoviscousStressTensorTerm</param>
+ <param name="Swarm">gaussSwarm</param>
+ <param name="viscosity">1.0</param>
+ <param name="StiffnessMatrix">k_matrix</param>
+ </struct>
+ <struct name="g_matrix">
+ <param name="Type">StiffnessMatrix</param>
+ <param name="RowVariable">VelocityField</param>
+ <param name="ColumnVariable">PressureField</param>
+ <param name="RHS">cont_force</param>
+ <param name="allowZeroElementContributions">False</param>
+ </struct>
+ <struct name="gradientStiffnessMatrixTerm">
+ <param name="Type">GradientStiffnessMatrixTerm</param>
+ <param name="Swarm">gaussSwarm</param>
+ <param name="StiffnessMatrix">g_matrix</param>
+ </struct>
+
+ <!-- Solver Stuff -->
+ <struct name="preconditioner">
+ <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="preconditionerTerm">
+ <param name="Type">UzawaPreconditionerTerm</param>
+ <param name="Swarm">gaussSwarm</param>
+ <param name="StiffnessMatrix">preconditioner</param>
+ </struct>
+
+ <struct name="uzawa">
+ <param name="Type">Stokes_SLE_UzawaSolver</param>
+ <param name="Preconditioner">preconditioner</param>
+ <param name="tolerance">1.0e-5</param>
+ <param name="maxIterations">5000</param>
+ </struct>
+
+ <struct name="stokesEqn">
+ <param name="Type">Stokes_SLE</param>
+ <param name="SLE_Solver">uzawa</param>
+ <param name="Context">context</param>
+ <param name="StressTensorMatrix">k_matrix</param>
+ <param name="GradientMatrix">g_matrix</param>
+ <param name="DivergenceMatrix"></param>
+ <param name="CompressibilityMatrix"></param>
+ <param name="VelocityVector">solutionVelocity</param>
+ <param name="PressureVector">solutionPressure</param>
+ <param name="ForceVector">mom_force</param>
+ <param name="ContinuityForceVector">cont_force</param>
+ <param name="killNonConvergent">false</param>
+ <param name="nonLinearMaxIterations">nonLinearMaxIterations</param>
+ <param name="nonLinearTolerance">nonLinearTolerance</param>
+ <param name="makeConvergenceFile">false</param>
+ </struct>
+ </struct>
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempAdvDiff.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempAdvDiff.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempAdvDiff.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,45 @@
+<?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="residual">
+ <param name="Type">ForceVector</param>
+ <param name="FeVariable">TemperatureField</param>
+ </struct>
+ <struct name="massMatrix">
+ <param name="Type">ForceVector</param>
+ <param name="FeVariable">TemperatureField</param>
+ </struct>
+ <struct name="predictorMulticorrector">
+ <param name="Type">AdvDiffMulticorrector</param>
+ </struct>
+ <struct name="EnergyEqn">
+ <param name="Type">AdvectionDiffusionSLE</param>
+ <param name="SLE_Solver">predictorMulticorrector</param>
+ <param name="Context">context</param>
+ <param name="PhiField">TemperatureField</param>
+ <param name="Residual">residual</param>
+ <param name="MassMatrix">massMatrix</param>
+ <param name="courantFactor">courantFactor</param>
+ </struct>
+ <struct name="lumpedMassMatrixForceTerm">
+ <param name="Type">LumpedMassMatrixForceTerm</param>
+ <param name="Swarm">gaussSwarm</param>
+ <param name="ForceVector">massMatrix</param>
+ </struct>
+ <struct name="defaultResidualForceTerm">
+ <param name="Type">AdvDiffResidualForceTerm</param>
+ <param name="Swarm">gaussSwarm</param>
+ <param name="ForceVector">residual</param>
+ <param name="ExtraInfo">EnergyEqn</param>
+ <param name="VelocityField">VelocityField</param>
+ <param name="defaultDiffusivity">defaultDiffusivity</param>
+ <!-- UpwindXiFunction can be 'Exact', 'DoublyAsymptoticAssumption' or 'CriticalAssumption' -->
+ <param name="UpwindXiFunction">Exact</param>
+ </struct>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempDiffusionSolver.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempDiffusionSolver.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TempDiffusionSolver.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,46 @@
+<?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="sVector">
+ <param name="Type">SolutionVector</param>
+ <param name="FeVariable">TemperatureField</param>
+ </struct>
+
+ <struct name="fVector">
+ <param name="Type">ForceVector</param>
+ <param name="FeVariable">TemperatureField</param>
+ </struct>
+
+ <struct name="kMatrix">
+ <param name="Type">StiffnessMatrix</param>
+ <param name="RowVariable">TemperatureField</param>
+ <param name="ColumnVariable">TemperatureField</param>
+ <param name="RHS">fVector</param>
+ <param name="allowZeroElementContributions">True</param>
+ </struct>
+
+ <struct name="laplacian">
+ <param name="Type">LaplacianStiffnessMatrixTerm</param>
+ <param name="StiffnessMatrix">kMatrix</param>
+ <param name="Swarm">gaussSwarm</param>
+ </struct>
+
+ <struct name="energySolver">
+ <param name="Type">Energy_SLE_Solver</param>
+ </struct>
+
+ <struct name="energySLE">
+ <param name="Type">Energy_SLE</param>
+ <param name="SLE_Solver">energySolver</param>
+ <param name="Context">context</param>
+ <param name="StiffnessMatrix">kMatrix</param>
+ <param name="ForceVector">fVector</param>
+ <param name="SolutionVector">sVector</param>
+ </struct>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TemperatureField.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TemperatureField.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TemperatureField.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,48 @@
+<?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">
+
+ <!-- TemperatureField Stuff -->
+ <struct name="components" mergeType="merge">
+ <struct name="temperature">
+ <param name="Type">Variable</param>
+ <param name="Rank">Scalar</param>
+ <param name="Dependency">decomp-linear</param>
+ <param name="DataType">Double</param>
+ <param name="Count">decomp-linear-nodeDomainCount</param>
+ </struct>
+ <struct name="temperatureBCs">
+ <param name="Type">CompositeVC</param>
+ <param name="Data">mesh-linear</param>
+ </struct>
+ <struct name="temperatureICs">
+ <param name="Type">CompositeVC</param>
+ <param name="Data">mesh-linear</param>
+ </struct>
+ <struct name="temperatureDofLayout">
+ <param name="Type">DofLayout</param>
+ <param name="Count">decomp-linear-nodeDomainCount</param>
+ <list name="BaseVariables">
+ <param>temperature</param>
+ </list>
+ </struct>
+ <struct name="TemperatureField">
+ <param name="Type">FeVariable</param>
+ <param name="FEMesh">mesh-linear</param>
+ <param name="DofLayout">temperatureDofLayout</param>
+ <param name="BC">temperatureBCs</param>
+ <param name="IC">temperatureICs</param>
+ <param name="LinkedDofInfo">temperatureLinkedDofs</param>
+ </struct>
+
+ <!-- Standard Operators on velocity field -->
+ <struct name="TemperatureGradientsField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">Gradient</param>
+ <param name="FeVariable">TemperatureField</param>
+ </struct>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TimeIntegrator.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TimeIntegrator.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TimeIntegrator.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,16 @@
+<?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="timeIntegrator" mergeType="replace">
+ <param name="Type">TimeIntegrator</param>
+ <param name="order">timeIntegratorOrder</param>
+ <param name="simultaneous">f</param>
+ <param name="Context">context</param>
+ </struct>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TimeIntegratorSimultaneous.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TimeIntegratorSimultaneous.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/TimeIntegratorSimultaneous.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,18 @@
+<?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="timeIntegrator" mergeType="replace">
+ <param name="Type">TimeIntegrator</param>
+ <!-- TODO : only use order 1 until someone fixes 2nd order simultaneous -->
+ <!--<param name="order">timeIntegratorOrder</param>-->
+ <param name="order">1</param>
+ <param name="simultaneous">t</param>
+ <param name="Context">context</param>
+ </struct>
+ </struct>
+
+</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/VelocityField.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/VelocityField.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/VelocityField.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -0,0 +1,111 @@
+<?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">
+
+ <!-- VelocityField Stuff -->
+ <struct name="components" mergeType="merge">
+ <struct name="velocity">
+ <param name="Type">Variable</param>
+ <param name="Rank">Vector</param>
+ <param name="Dependency">decomp-linear</param>
+ <param name="DataType">Double</param>
+ <param name="Count">decomp-linear-nodeDomainCount</param>
+ <param name="VectorComponentCount">dim</param>
+ <list name="names">
+ <param>vx</param>
+ <param>vy</param>
+ <param>vz</param>
+ </list>
+ </struct>
+ <struct name="velocityBCs">
+ <param name="Type">CompositeVC</param>
+ <param name="Data">mesh-linear</param>
+ </struct>
+ <struct name="velocityICs">
+ <param name="Type">CompositeVC</param>
+ <param name="Data">mesh-linear</param>
+ </struct>
+ <struct name="velocityDofLayout">
+ <param name="Type">DofLayout</param>
+ <param name="Count">decomp-linear-nodeDomainCount</param>
+ <param name="BaseVariableCount">dim</param>
+ <list name="BaseVariables">
+ <param>vx</param>
+ <param>vy</param>
+ <param>vz</param>
+ </list>
+ </struct>
+ <struct name="VelocityField">
+ <param name="Type">FeVariable</param>
+ <param name="FEMesh">mesh-linear</param>
+ <param name="DofLayout">velocityDofLayout</param>
+ <param name="BC">velocityBCs</param>
+ <param name="IC">velocityICs</param>
+ <param name="LinkedDofInfo">velocityLinkedDofs</param>
+ </struct>
+
+ <!-- Standard Operators on velocity field -->
+ <struct name="VelocityMagnitudeField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">Magnitude</param>
+ <param name="FeVariable">VelocityField</param>
+ </struct>
+ <struct name="VelocityGradientsField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">Gradient</param>
+ <param name="FeVariable">VelocityField</param>
+ </struct>
+ <struct name="VelocityXXField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeFirstComponent</param>
+ <param name="FeVariable">VelocityField</param>
+ </struct>
+ <struct name="VelocityYYField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeSecondComponent</param>
+ <param name="FeVariable">VelocityField</param>
+ </struct>
+ <!--
+ <struct name="VelocityZZField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeThirdComponent</param>
+ <param name="FeVariable">VelocityField</param>
+ </struct>
+ -->
+ <struct name="StrainRateField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TensorSymmetricPart</param>
+ <param name="FeVariable">VelocityGradientsField</param>
+ </struct>
+ <struct name="VorticityField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TensorAntisymmetricPart</param>
+ <param name="FeVariable">VelocityGradientsField</param>
+ </struct>
+ <struct name="StrainRateInvariantField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">SymmetricTensor_Invariant</param>
+ <param name="FeVariable">StrainRateField</param>
+ </struct>
+ <struct name="StrainRateXXField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeFirstComponent</param>
+ <param name="FeVariable">StrainRateField</param>
+ </struct>
+ <struct name="StrainRateYYField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeSecondComponent</param>
+ <param name="FeVariable">StrainRateField</param>
+ </struct>
+ <!--
+ <struct name="StrainRateZZField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TakeThirdComponent</param>
+ <param name="FeVariable">StrainRateField</param>
+ </struct>
+ -->
+ </struct>
+
+</StGermainData>
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/LidDrivenConvection.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/LidDrivenConvection.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/LidDrivenConvection.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -37,17 +37,17 @@
<param name="allowUnbalancing"> True </param>
<!-- Integration Scheme configuration -->
- <param name="gaussParticlesX"> 2 </param>
+ <!--param name="gaussParticlesX"> 2 </param>
<param name="gaussParticlesY"> 2 </param>
- <param name="gaussParticlesZ"> 2 </param>
+ <param name="gaussParticlesZ"> 2 </param-->
- <include>../Components/ElementLayout.xml </include>
- <include>../Components/ConstantMesh.xml </include>
- <include>../Components/LinearMesh.xml </include>
- <include>../Components/VelocityField.xml </include>
- <include>../Components/PressureField.xml </include>
- <include>../Components/GaussSwarm.xml </include>
- <include>../Components/StokesFlowUzawa.xml </include>
+ <include>../StgFEM_Components/ElementLayout.xml </include>
+ <include>../StgFEM_Components/ConstantMesh.xml </include>
+ <include>../StgFEM_Components/LinearMesh.xml </include>
+ <include>../StgFEM_Components/VelocityField.xml </include>
+ <include>../StgFEM_Components/PressureField.xml </include>
+ <include>../StgFEM_Components/GaussSwarm.xml </include>
+ <include>../StgFEM_Components/StokesFlowUzawa.xml </include>
<!-- Set up BCs -->
<include>lidDrivenBCs.xml</include>
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -48,10 +48,10 @@
<param>TemperatureField</param>
</list>
- <include>../Components/ElementLayout.xml </include>
- <include>../Components/LinearMesh.xml </include>
- <include>../Components/TemperatureField.xml </include>
- <include>../Components/GaussSwarm.xml </include>
- <include>../Components/TempDiffusionSolver.xml </include>
+ <include>../StgFEM_Components/ElementLayout.xml </include>
+ <include>../StgFEM_Components/LinearMesh.xml </include>
+ <include>../StgFEM_Components/TemperatureField.xml </include>
+ <include>../StgFEM_Components/GaussSwarm.xml </include>
+ <include>../StgFEM_Components/TempDiffusionSolver.xml </include>
</StGermainData>
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -395,9 +395,9 @@
</struct>
</struct>
- <include>../Components/TemperatureField.xml </include>
- <include>../Components/GaussSwarm.xml </include>
- <include>../Components/TempDiffusionSolver.xml </include>
+ <include>../StgFEM_Components/TemperatureField.xml </include>
+ <include>../StgFEM_Components/GaussSwarm.xml </include>
+ <include>../StgFEM_Components/TempDiffusionSolver.xml </include>
<!-- set up bcs -->
<struct name="temperatureBCs">
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml 2006-10-11 20:49:56 UTC (rev 4890)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml 2006-10-11 20:49:58 UTC (rev 4891)
@@ -49,15 +49,15 @@
<param name="gaussParticlesZ"> 2 </param>
<!-- Component Stuff -->
- <include>../Components/ElementLayout.xml </include>
- <include>../Components/ConstantMesh.xml </include>
- <include>../Components/LinearMesh.xml </include>
- <include>../Components/VelocityField.xml </include>
- <include>../Components/TemperatureField.xml </include>
- <include>../Components/PressureField.xml </include>
- <include>../Components/GaussSwarm.xml </include>
- <include>../Components/StokesFlowUzawa.xml </include>
- <include>../Components/TempAdvDiff.xml </include>
+ <include>../StgFEM_Components/ElementLayout.xml </include>
+ <include>../StgFEM_Components/ConstantMesh.xml </include>
+ <include>../StgFEM_Components/LinearMesh.xml </include>
+ <include>../StgFEM_Components/VelocityField.xml </include>
+ <include>../StgFEM_Components/TemperatureField.xml </include>
+ <include>../StgFEM_Components/PressureField.xml </include>
+ <include>../StgFEM_Components/GaussSwarm.xml </include>
+ <include>../StgFEM_Components/StokesFlowUzawa.xml </include>
+ <include>../StgFEM_Components/TempAdvDiff.xml </include>
<struct name="components" mergeType="merge">
<struct name="thermalForcingTerm">
<param name="Type">ThermalBuoyancyForceTerm</param>
More information about the cig-commits
mailing list