[cig-commits] r13966 - in long/3D/Gale/trunk: . input/benchmarks/circular_inclusion input/benchmarks/sinusoid
walter at geodynamics.org
walter at geodynamics.org
Tue Jan 27 16:16:01 PST 2009
Author: walter
Date: 2009-01-27 16:16:01 -0800 (Tue, 27 Jan 2009)
New Revision: 13966
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/input/benchmarks/circular_inclusion/circular_inclusion.xml
long/3D/Gale/trunk/input/benchmarks/sinusoid/sinusoid.xml
Log:
r2474 at dante: boo | 2009-01-27 15:39:06 -0800
Make sinusoid and circular_inclusion work with linear elements
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2471
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2474
Modified: long/3D/Gale/trunk/input/benchmarks/circular_inclusion/circular_inclusion.xml
===================================================================
--- long/3D/Gale/trunk/input/benchmarks/circular_inclusion/circular_inclusion.xml 2009-01-28 00:01:32 UTC (rev 13965)
+++ long/3D/Gale/trunk/input/benchmarks/circular_inclusion/circular_inclusion.xml 2009-01-28 00:16:01 UTC (rev 13966)
@@ -1,15 +1,6 @@
<?xml version="1.0"?>
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<struct name="components">
- <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>
@@ -105,42 +96,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>
@@ -387,13 +359,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="matrixSolver">
<param name="Type"> PETScMGSolver </param>
<param name="levels"> mgLevels </param>
@@ -408,7 +373,6 @@
</struct>
</struct>
<list name="plugins">
-<!-- <param>Underworld_DumpSwarm</param> -->
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">1</param>
@@ -519,25 +483,7 @@
</list>
</struct>
- <struct name="stressICs">
- <param name="type">CompositeVC</param>
- <list name="vcList">
- <struct>
- <param name="type">AllNodesVC</param>
- <list name="variables">
- <struct>
- <param name="name">stress</param>
- <param name="type">double</param>
- <param name="value">0.0</param>
- </struct>
- </list>
- </struct>
- </list>
- </struct>
-
<param name="checkpointEvery">1</param>
- <param name="mgLevels">2</param>
- <param name="dtFactor">1.0</param>
<param name="SimpleShearFactor">1</param>
<param name="SimpleShearCentreY">0</param>
Modified: long/3D/Gale/trunk/input/benchmarks/sinusoid/sinusoid.xml
===================================================================
--- long/3D/Gale/trunk/input/benchmarks/sinusoid/sinusoid.xml 2009-01-28 00:01:32 UTC (rev 13965)
+++ long/3D/Gale/trunk/input/benchmarks/sinusoid/sinusoid.xml 2009-01-28 00:16:01 UTC (rev 13966)
@@ -1,15 +1,6 @@
<?xml version="1.0"?>
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<struct name="components">
- <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>
@@ -105,42 +96,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>
@@ -322,6 +294,20 @@
<param name="nonLinearTolerance">nonLinearTolerance</param>
<param name="makeConvergenceFile">false</param>
</struct>
+ <struct name="c_matrix">
+ <param name="Type">StiffnessMatrix</param>
+ <param name="RowVariable">PressureField</param>
+ <param name="ColumnVariable">PressureField</param>
+ <param name="RHS">cont_force</param>
+ <param name="allowZeroElementContributions">True</param>
+ </struct>
+ <struct name="mixedStabiliser">
+ <param name="Type">MixedStabiliserTerm</param>
+ <param name="Swarm">gaussSwarm</param>
+ <param name="picSwarm">picIntegrationPoints</param>
+ <param name="storeVisc">storeViscosity</param>
+ <param name="StiffnessMatrix">c_matrix</param>
+ </struct>
<struct name="buoyancyForceTerm">
<param name="Type">BuoyancyForceTerm</param>
<param name="ForceVector">mom_force</param>
@@ -387,20 +373,12 @@
<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="conditionFunctions">
<param name="Type">StgFEM_StandardConditionFunctions</param>
</struct>
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
- <param>Underworld_DumpSwarm</param>
<param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">50</param>
@@ -430,17 +408,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>
@@ -450,6 +417,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>
More information about the CIG-COMMITS
mailing list