[cig-commits] r5575 - long/3D/Gale/trunk
walter at geodynamics.org
walter at geodynamics.org
Sun Dec 10 01:39:02 PST 2006
Author: walter
Date: 2006-12-10 01:39:02 -0800 (Sun, 10 Dec 2006)
New Revision: 5575
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/fountain.xml
Log:
r1205 at earth: boo | 2005-05-05 00:09:30 -0700
Make fountain.xml work
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1204
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1205
Modified: long/3D/Gale/trunk/fountain.xml
===================================================================
--- long/3D/Gale/trunk/fountain.xml 2006-12-10 09:38:53 UTC (rev 5574)
+++ long/3D/Gale/trunk/fountain.xml 2006-12-10 09:39:02 UTC (rev 5575)
@@ -1,94 +1,45 @@
<?xml version="1.0"?>
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<struct name="components">
- <struct name="conditionFunctions">
- <param name="Type">StgFEM_StandardConditionFunctions</param>
- </struct>
- <struct name="geometry">
- <param name="Type">MeshGeometry</param>
- <param name="mesh">mesh-linear</param>
- <param name="decomp">decomp-linear</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">HexaEL</param>
- <param name="Topology">elementTopology</param>
- <param name="Geometry">geometry</param>
- </struct>
- <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>
+ <param name="Type">FeMesh</param>
+ <param name="elementType">constant</param>
+ <param name="elementMesh">mesh-linear</param>
</struct>
- <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 name="constantMesh-generator">
+ <param name="Type">C0Generator</param>
+ <param name="mesh">mesh-constant</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>
+ <param name="Type">FeMesh</param>
+ <param name="elementType">linear</param>
</struct>
+ <struct name="linearMesh-generator">
+ <param name="Type">CartesianGenerator</param>
+ <param name="mesh">mesh-linear</param>
+ <param name="dim">dim</param>
+ <param name="shadowDepth">shadowDepth</param>
+ <list name="size">
+ <param>elementResI</param>
+ <param>elementResJ</param>
+ <param>elementResK</param>
+ </list>
+ <list name="minCoord">
+ <param>minX</param>
+ <param>minY</param>
+ <param>minZ</param>
+ </list>
+ <list name="maxCoord">
+ <param>maxX</param>
+ <param>maxY</param>
+ <param>maxZ</param>
+ </list>
+ </struct>
<struct name="velocity">
- <param name="Type">Variable</param>
+ <param name="Type">MeshVariable</param>
+ <param name="mesh">mesh-linear</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>
@@ -106,7 +57,7 @@
</struct>
<struct name="velocityDofLayout">
<param name="Type">DofLayout</param>
- <param name="Count">decomp-linear-nodeDomainCount</param>
+ <param name="mesh">mesh-linear</param>
<param name="BaseVariableCount">dim</param>
<list name="BaseVariables">
<param>vx</param>
@@ -132,6 +83,11 @@
<param name="Operator">Gradient</param>
<param name="FeVariable">VelocityField</param>
</struct>
+ <struct name="VelocityGradientsInvariantField">
+ <param name="Type">OperatorFeVariable</param>
+ <param name="Operator">TensorInvariant</param>
+ <param name="FeVariable">VelocityGradientsField</param>
+ </struct>
<struct name="VelocityXXField">
<param name="Type">OperatorFeVariable</param>
<param name="Operator">TakeFirstComponent</param>
@@ -168,15 +124,14 @@
<param name="FeVariable">StrainRateField</param>
</struct>
<struct name="pressure">
- <param name="Type">Variable</param>
+ <param name="Type">MeshVariable</param>
+ <param name="mesh">mesh-constant</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>
+ <param name="mesh">mesh-constant</param>
<list name="BaseVariables">
<param>pressure</param>
</list>
@@ -184,7 +139,6 @@
<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>
@@ -198,7 +152,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">cellLayout</param>
<param name="ParticleLayout">particleLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">gaussMapper</param>
</struct>
@@ -214,7 +168,7 @@
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">cellLayout</param>
<param name="ParticleLayout">backgroundLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
</struct>
<struct name="timeIntegrator">
<param name="Type">TimeIntegrator</param>
@@ -242,7 +196,7 @@
<param name="Type">IntegrationPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">localLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
<param name="WeightsCalculator">weights</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="IntegrationPointMapper">mapper</param>
@@ -253,15 +207,14 @@
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="materialSwarmParticleLayout">
- <param name="Type">MeshParticleLayout</param>
- <param name="mesh">mesh-linear</param>
- <param name="cellParticleCount">particlesPerCell</param>
+ <param name="Type">SpaceFillerParticleLayout</param>
+ <param name="averageInitialParticlesPerCell">particlesPerCell</param>
</struct>
<struct name="materialSwarm">
<param name="Type">MaterialPointsSwarm</param>
<param name="CellLayout">elementCellLayout</param>
<param name="ParticleLayout">materialSwarmParticleLayout</param>
- <param name="FiniteElement_Mesh">mesh-linear</param>
+ <param name="FeMesh">mesh-linear</param>
<param name="SplittingRoutine">splittingRoutine</param>
<param name="RemovalRoutine">removalRoutine</param>
<param name="EscapedRoutine">escapedRoutine</param>
@@ -367,6 +320,9 @@
<!-- <param name="Swarm">picIntegrationPoints</param> -->
<!-- <param name="gravity">gravity</param> -->
<!-- </struct> -->
+ <struct name="conditionFunctions">
+ <param name="Type">StgFEM_StandardConditionFunctions</param>
+ </struct>
<struct name="stressBC">
<param name="Type">StressBC</param>
<param name="ForceVector">mom_force</param>
@@ -406,10 +362,6 @@
<param>storeViscosity</param>
</list>
</struct>
- <struct name="cartesianGenerator">
- <param name="Type">CartesianGenerator</param>
- <param name="decomp">decomp-linear</param>
- </struct>
<struct name="escapedRoutine">
<param name="Type">EscapedRoutine</param>
<param name="idealParticleCount">0</param>
@@ -421,6 +373,7 @@
<list name="dims">
<param>true</param>
<param>true</param>
+ <param>true</param>
</list>
</struct>
<struct name="pressureRemesher">
@@ -435,11 +388,9 @@
<param>Underworld_EulerDeform</param>
</list>
<param name="maxTimeSteps">500</param>
- <param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
<param name="outputPath">./output.fountain</param>
<param name="dim">2</param>
- <param name="numPartitionedDims">1</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
<param name="minY">0.0f</param>
@@ -450,14 +401,10 @@
<param name="elementResI">32</param>
<param name="elementResJ">16</param>
<param name="elementResK">3</param>
- <param name="allowUnbalancing">True</param>
- <param name="buildNodeNeighbourTbl">True</param>
- <param name="buildElementNeighbourTbl">True</param>
- <param name="particlesPerCell">30</param>
- <param name="seed">13</param>
<param name="gaussParticlesX">2</param>
<param name="gaussParticlesY">2</param>
<param name="gaussParticlesZ">2</param>
+ <param name="particlesPerCell">30</param>
<struct name="EulerDeform">
<list name="systems">
<struct>
More information about the cig-commits
mailing list