[cig-commits] r13964 - in long/3D/Gale/trunk: . input/cookbook
walter at geodynamics.org
walter at geodynamics.org
Tue Jan 27 14:49:25 PST 2009
Author: walter
Date: 2009-01-27 14:49:24 -0800 (Tue, 27 Jan 2009)
New Revision: 13964
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/input/cookbook/multi_material.xml
long/3D/Gale/trunk/input/cookbook/template.xml
long/3D/Gale/trunk/input/cookbook/thermal.xml
long/3D/Gale/trunk/input/cookbook/viscous.xml
long/3D/Gale/trunk/input/cookbook/viscous_extension.xml
long/3D/Gale/trunk/input/cookbook/viscous_fixed.xml
long/3D/Gale/trunk/input/cookbook/viscous_inflow.xml
long/3D/Gale/trunk/input/cookbook/viscous_normal_stress.xml
long/3D/Gale/trunk/input/cookbook/viscous_sinusoid.xml
long/3D/Gale/trunk/input/cookbook/viscous_split.xml
long/3D/Gale/trunk/input/cookbook/yielding.xml
Log:
r2471 at dante: boo | 2009-01-27 14:47:32 -0800
Make all of the cookbooks work with linear elements
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2470
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2471
Modified: long/3D/Gale/trunk/input/cookbook/multi_material.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/multi_material.xml 2009-01-27 22:49:22 UTC (rev 13963)
+++ long/3D/Gale/trunk/input/cookbook/multi_material.xml 2009-01-27 22:49:24 UTC (rev 13964)
@@ -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>
@@ -329,11 +301,25 @@
<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>
<param name="Swarm">picIntegrationPoints</param>
- <param name="gravity">1.0</param>
+ <param name="gravity">gravity</param>
</struct>
<struct name="background">
<param name="Type">Everywhere</param>
@@ -352,13 +338,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>
@@ -428,13 +407,12 @@
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">10</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
- <param name="outputPath">./output.template</param>
+ <param name="outputPath">./output</param>
<param name="dim">2</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
@@ -458,17 +436,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>
@@ -478,6 +445,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>
@@ -543,4 +514,5 @@
</list>
</struct>
<param name="checkpointEvery">1</param>
+ <param name="gravity">1.0</param>
</StGermainData>
Modified: long/3D/Gale/trunk/input/cookbook/template.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/template.xml 2009-01-27 22:49:22 UTC (rev 13963)
+++ long/3D/Gale/trunk/input/cookbook/template.xml 2009-01-27 22:49:24 UTC (rev 13964)
@@ -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>
@@ -159,7 +131,7 @@
<param name="Swarm">picIntegrationPoints</param>
<param name="Mesh">mesh-linear</param>
<param name="ConstitutiveMatrix">constitutiveMatrix</param>
- </struct>
+ </struct>
<struct name="cellLayout">
<param name="Type">SingleCellLayout</param>
</struct>
@@ -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">
@@ -329,11 +301,25 @@
<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>
<param name="Swarm">picIntegrationPoints</param>
- <param name="gravity">1.0</param>
+ <param name="gravity">gravity</param>
</struct>
<struct name="background">
<param name="Type">Everywhere</param>
@@ -352,13 +338,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>
<struct name="storeViscosity">
<param name="Type">StoreVisc</param>
@@ -371,13 +350,12 @@
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">10</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
- <param name="outputPath">./output.template</param>
+ <param name="outputPath">./output</param>
<param name="dim">2</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
@@ -401,17 +379,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>
@@ -421,6 +388,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>
@@ -486,4 +457,5 @@
</list>
</struct>
<param name="checkpointEvery">1</param>
+ <param name="gravity">1.0</param>
</StGermainData>
Modified: long/3D/Gale/trunk/input/cookbook/thermal.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/thermal.xml 2009-01-27 22:49:22 UTC (rev 13963)
+++ long/3D/Gale/trunk/input/cookbook/thermal.xml 2009-01-27 22:49:24 UTC (rev 13964)
@@ -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,20 +99,20 @@
</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>
@@ -329,6 +320,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="buoyancyForceTerm">
<param name="Type">BuoyancyForceTerm</param>
<param name="ForceVector">mom_force</param>
@@ -353,13 +358,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>
@@ -404,7 +402,7 @@
<param name="Shape">nonSphereShape</param>
<param name="density">1.0</param>
<param name="alpha">1.0</param>
- <param name="diffusivity">1.0</param>
+ <param name="diffusivity">100.0</param>
<list name="heatingElements">
<struct>
<param name="Q">1.0</param>
@@ -428,7 +426,7 @@
<param name="Shape">sphereShape</param>
<param name="density">1.0</param>
<param name="alpha">10.0</param>
- <param name="diffusivity">10.0</param>
+ <param name="diffusivity">1000.0</param>
<list name="heatingElements">
<struct>
<param name="Q">1000.0</param>
@@ -525,13 +523,12 @@
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">10</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
- <param name="outputPath">./output.template</param>
+ <param name="outputPath">./output</param>
<param name="dim">2</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
@@ -555,17 +552,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>
@@ -575,6 +561,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>
@@ -676,19 +666,19 @@
</struct>
</list>
</struct>
+<!-- <struct> -->
+<!-- <param name="type">WallVC</param> -->
+<!-- <param name="wall">top</param> -->
+<!-- <list name="variables"> -->
+<!-- <struct> -->
+<!-- <param name="name">temperature</param> -->
+<!-- <param name="type">double</param> -->
+<!-- <param name="value">0.0</param> -->
+<!-- </struct> -->
+<!-- </list> -->
+<!-- </struct> -->
<struct>
<param name="type">WallVC</param>
- <param name="wall">top</param>
- <list name="variables">
- <struct>
- <param name="name">temperature</param>
- <param name="type">double</param>
- <param name="value">0.0</param>
- </struct>
- </list>
- </struct>
- <struct>
- <param name="type">WallVC</param>
<param name="wall">front</param>
<list name="variables">
<struct>
Modified: long/3D/Gale/trunk/input/cookbook/viscous.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous.xml 2009-01-27 22:49:22 UTC (rev 13963)
+++ long/3D/Gale/trunk/input/cookbook/viscous.xml 2009-01-27 22:49:24 UTC (rev 13964)
@@ -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">
@@ -329,11 +301,25 @@
<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>
<param name="Swarm">picIntegrationPoints</param>
- <param name="gravity">1.0</param>
+ <param name="gravity">gravity</param>
</struct>
<struct name="background">
<param name="Type">Everywhere</param>
@@ -352,13 +338,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>
@@ -395,13 +374,12 @@
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">10</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
- <param name="outputPath">./output.template</param>
+ <param name="outputPath">./output</param>
<param name="dim">2</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
@@ -425,17 +403,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 +412,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>
@@ -510,4 +481,5 @@
</list>
</struct>
<param name="checkpointEvery">1</param>
+ <param name="gravity">1.0</param>
</StGermainData>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_extension.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_extension.xml 2009-01-27 22:49:22 UTC (rev 13963)
+++ long/3D/Gale/trunk/input/cookbook/viscous_extension.xml 2009-01-27 22:49:24 UTC (rev 13964)
@@ -116,59 +116,6 @@
<param name="DofLayout">pressureDofLayout</param>
<param name="LinkedDofInfo">pressureLinkedDofs</param>
</struct>
-
- <struct name="backgroundDensity">
- <param name="Type">MeshVariable</param>
- <param name="mesh">mesh-linear</param>
- <param name="Rank">Scalar</param>
- <param name="DataType">Double</param>
- </struct>
- <struct name="backgroundDensityICs">
- <param name="Type">CompositeVC</param>
- <param name="Data">mesh-linear</param>
- </struct>
- <struct name="backgroundDensityDofLayout">
- <param name="Type">DofLayout</param>
- <param name="mesh">mesh-linear</param>
- <list name="BaseVariables">
- <param>backgroundDensity</param>
- </list>
- </struct>
- <struct name="backgroundDensityField">
- <param name="Type">FeVariable</param>
- <param name="FEMesh">mesh-linear</param>
- <param name="DofLayout">backgroundDensityDofLayout</param>
- <param name="LinkedDofInfo">backgroundDensityLinkedDofs</param>
- <param name="BC">backgroundDensityBCs</param>
- <param name="IC">backgroundDensityICs</param>
- </struct>
-
- <struct name="backgroundPressure">
- <param name="Type">MeshVariable</param>
- <param name="mesh">mesh-linear</param>
- <param name="Rank">Scalar</param>
- <param name="DataType">Double</param>
- </struct>
- <struct name="backgroundPressureICs">
- <param name="Type">CompositeVC</param>
- <param name="Data">mesh-linear</param>
- </struct>
- <struct name="backgroundPressureDofLayout">
- <param name="Type">DofLayout</param>
- <param name="mesh">mesh-linear</param>
- <list name="BaseVariables">
- <param>backgroundPressure</param>
- </list>
- </struct>
- <struct name="BackgroundPressureField">
- <param name="Type">FeVariable</param>
- <param name="FEMesh">mesh-linear</param>
- <param name="DofLayout">backgroundPressureDofLayout</param>
- <param name="LinkedDofInfo">backgroundPressureLinkedDofs</param>
- <param name="BC">backgroundPressureBCs</param>
- <param name="IC">backgroundPressureICs</param>
- </struct>
-
<struct name="StressField">
<param name="Type">StressField</param>
<param name="StrainRateField">StrainRateField</param>
@@ -351,11 +298,9 @@
<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>
@@ -374,8 +319,7 @@
<param name="Type">BuoyancyForceTerm</param>
<param name="ForceVector">mom_force</param>
<param name="Swarm">picIntegrationPoints</param>
- <param name="gravity">1.0</param>
- <param name="BackgroundDensityField">backgroundDensityField</param>
+ <param name="gravity">gravity</param>
</struct>
<struct name="background">
<param name="Type">Everywhere</param>
@@ -430,7 +374,6 @@
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">10</param>
@@ -537,46 +480,6 @@
</struct>
</list>
</struct>
-
- <struct name="backgroundDensityICs">
- <param name="type">CompositeVC</param>
- <list name="vcList">
- <struct>
- <param name="type">AllNodesVC</param>
- <list name="variables">
- <struct>
- <param name="name">backgroundDensity</param>
- <param name="type">double</param>
- <param name="value">1.0</param>
- </struct>
- </list>
- </struct>
- </list>
- </struct>
-
- <struct name="backgroundPressureICs">
- <param name="type">CompositeVC</param>
- <list name="vcList">
- <struct>
- <param name="type">AllNodesVC</param>
- <list name="variables">
- <struct>
- <param name="name">backgroundPressure</param>
- <param name="type">func</param>
- <param name="value">Velocity_SimpleShear</param>
- </struct>
- </list>
- </struct>
- </list>
- </struct>
-
-
<param name="checkpointEvery">1</param>
- <param name="SimpleShearFactor">-1</param>
- <param name="SimpleShearCentreY">0.35</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>
+ <param name="gravity">1.0</param>
</StGermainData>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_fixed.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_fixed.xml 2009-01-27 22:49:22 UTC (rev 13963)
+++ long/3D/Gale/trunk/input/cookbook/viscous_fixed.xml 2009-01-27 22:49:24 UTC (rev 13964)
@@ -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>
@@ -330,11 +302,25 @@
<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>
<param name="Swarm">picIntegrationPoints</param>
- <param name="gravity">1.0</param>
+ <param name="gravity">gravity</param>
</struct>
<struct name="background">
<param name="Type">Everywhere</param>
@@ -353,13 +339,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>
@@ -415,13 +394,12 @@
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">10</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
- <param name="outputPath">./output.template</param>
+ <param name="outputPath">./output</param>
<param name="dim">2</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
@@ -445,28 +423,22 @@
<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>
<param name="wrapTop">True</param>
<param name="staticLeft">True</param>
+ <param name="staticLeftTop">True</param>
<param name="staticBottom">True</param>
<list name="fields">
<struct>
<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>
@@ -505,6 +477,11 @@
<param name="type">func</param>
<param name="value">StepFunctionProduct3</param>
</struct>
+ <struct>
+ <param name="name">vy</param>
+ <param name="type">double</param>
+ <param name="value">0</param>
+ </struct>
</list>
</struct>
<struct>
@@ -554,6 +531,7 @@
</list>
</struct>
<param name="checkpointEvery">1</param>
+ <param name="gravity">1.0</param>
<param name="StepFunctionProduct3Start">0.1</param>
<param name="StepFunctionProduct3End">0.2</param>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_inflow.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_inflow.xml 2009-01-27 22:49:22 UTC (rev 13963)
+++ long/3D/Gale/trunk/input/cookbook/viscous_inflow.xml 2009-01-27 22:49:24 UTC (rev 13964)
@@ -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,20 +99,20 @@
</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>
@@ -330,11 +321,25 @@
<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>
<param name="Swarm">picIntegrationPoints</param>
- <param name="gravity">1.0</param>
+ <param name="gravity">gravity</param>
</struct>
<struct name="background">
<param name="Type">Everywhere</param>
@@ -353,13 +358,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>
@@ -406,13 +404,12 @@
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">10</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
- <param name="outputPath">./output.template</param>
+ <param name="outputPath">./output</param>
<param name="dim">2</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
@@ -436,28 +433,22 @@
<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>
<param name="wrapTop">True</param>
<param name="staticLeft">True</param>
+ <param name="staticLeftTop">True</param>
<param name="staticBottom">True</param>
<list name="fields">
<struct>
<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>
@@ -528,6 +519,7 @@
</list>
</struct>
<param name="checkpointEvery">1</param>
+ <param name="gravity">1.0</param>
<param name="StepFunctionProduct3Start">0.1</param>
<param name="StepFunctionProduct3End">0.2</param>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_normal_stress.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_normal_stress.xml 2009-01-27 22:49:22 UTC (rev 13963)
+++ long/3D/Gale/trunk/input/cookbook/viscous_normal_stress.xml 2009-01-27 22:49:24 UTC (rev 13964)
@@ -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,29 @@
</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="pressureBCs">
+ <param name="Type">CompositeVC</param>
+ <param name="Data">mesh-linear</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>
+ <param name="BC">pressureBCs</param>
+ <param name="IC">pressureICs</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>
@@ -330,11 +308,34 @@
<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="hydrostaticCorrection">
+ <param name="Type">HydrostaticCorrection</param>
+ <param name="ForceVector">cont_force</param>
+ <param name="Swarm">gaussSwarm</param>
+ <param name="picSwarm">picIntegrationPoints</param>
+ <param name="storeVisc">storeViscosity</param>
+ <param name="force_type">func</param>
+ <param name="force_value">Velocity_SimpleShear</param>
+ </struct>
<struct name="buoyancyForceTerm">
<param name="Type">BuoyancyForceTerm</param>
<param name="ForceVector">mom_force</param>
<param name="Swarm">picIntegrationPoints</param>
- <param name="gravity">1.0</param>
+ <param name="gravity">gravity</param>
</struct>
<struct name="background">
<param name="Type">Everywhere</param>
@@ -353,13 +354,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="bottomBoundaryShape">
<param name="Type">Box</param>
@@ -415,13 +409,12 @@
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">10</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
- <param name="outputPath">./output.template</param>
+ <param name="outputPath">./output</param>
<param name="dim">2</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
@@ -445,17 +438,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>
@@ -466,6 +448,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>
@@ -518,7 +504,7 @@
<struct>
<param name="name">vx</param>
<param name="type">double</param>
- <param name="value">1.0</param>
+ <param name="value">0.0</param>
</struct>
<struct>
<param name="name">vy</param>
@@ -530,4 +516,8 @@
</list>
</struct>
<param name="checkpointEvery">1</param>
+ <param name="gravity">1.0</param>
+
+ <param name="SimpleShearCentreY">0.35</param>
+ <param name="SimpleShearFactor">-1</param>
</StGermainData>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_sinusoid.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_sinusoid.xml 2009-01-27 22:49:22 UTC (rev 13963)
+++ long/3D/Gale/trunk/input/cookbook/viscous_sinusoid.xml 2009-01-27 22:49:24 UTC (rev 13964)
@@ -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,20 +99,20 @@
</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>
@@ -329,11 +320,25 @@
<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>
<param name="Swarm">picIntegrationPoints</param>
- <param name="gravity">1.0</param>
+ <param name="gravity">gravity</param>
</struct>
<struct name="background">
<param name="Type">Everywhere</param>
@@ -352,13 +357,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>
@@ -407,13 +405,12 @@
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">10</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
- <param name="outputPath">./output.template</param>
+ <param name="outputPath">./output</param>
<param name="dim">2</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
@@ -437,17 +434,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>
@@ -457,6 +443,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>
@@ -522,4 +512,5 @@
</list>
</struct>
<param name="checkpointEvery">1</param>
+ <param name="gravity">1.0</param>
</StGermainData>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_split.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_split.xml 2009-01-27 22:49:22 UTC (rev 13963)
+++ long/3D/Gale/trunk/input/cookbook/viscous_split.xml 2009-01-27 22:49:24 UTC (rev 13964)
@@ -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,20 +99,20 @@
</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>
@@ -329,11 +320,25 @@
<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>
<param name="Swarm">picIntegrationPoints</param>
- <param name="gravity">1.0</param>
+ <param name="gravity">gravity</param>
</struct>
<struct name="background">
<param name="Type">Everywhere</param>
@@ -352,13 +357,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>
@@ -395,13 +393,12 @@
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">10</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
- <param name="outputPath">./output.template</param>
+ <param name="outputPath">./output</param>
<param name="dim">2</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
@@ -425,17 +422,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 +431,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>
@@ -515,6 +505,8 @@
</list>
</struct>
<param name="checkpointEvery">1</param>
+ <param name="gravity">1.0</param>
+
<param name="StepFunctionLowerOffset">1.0</param>
<param name="StepFunctionUpperOffset">1.0</param>
<param name="StepFunctionValue">1.0</param>
Modified: long/3D/Gale/trunk/input/cookbook/yielding.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/yielding.xml 2009-01-27 22:49:22 UTC (rev 13963)
+++ long/3D/Gale/trunk/input/cookbook/yielding.xml 2009-01-27 22:49:24 UTC (rev 13964)
@@ -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">
@@ -329,11 +301,25 @@
<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>
<param name="Swarm">picIntegrationPoints</param>
- <param name="gravity">1.0</param>
+ <param name="gravity">gravity</param>
</struct>
<struct name="background">
<param name="Type">Everywhere</param>
@@ -352,13 +338,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,7 +404,7 @@
</struct>
<struct name="yielding">
<param name="Type">MohrCoulomb</param>
- <param name="PressureField">NodalPressureField</param>
+ <param name="PressureField">PressureField</param>
<param name="VelocityGradientsField">VelocityGradientsField</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
<param name="Context">context</param>
@@ -449,13 +428,12 @@
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">10</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
- <param name="outputPath">./output.template</param>
+ <param name="outputPath">./output</param>
<param name="dim">2</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
@@ -479,17 +457,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>
@@ -499,6 +466,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>
@@ -564,4 +535,5 @@
</list>
</struct>
<param name="checkpointEvery">1</param>
+ <param name="gravity">1.0</param>
</StGermainData>
More information about the CIG-COMMITS
mailing list