[cig-commits] r5788 - long/3D/Gale/trunk
walter at geodynamics.org
walter at geodynamics.org
Fri Jan 12 15:46:52 PST 2007
Author: walter
Date: 2007-01-12 15:46:51 -0800 (Fri, 12 Jan 2007)
New Revision: 5788
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/extension.xml
long/3D/Gale/trunk/fountain.xml
long/3D/Gale/trunk/shortening.xml
long/3D/Gale/trunk/sinusoid.xml
long/3D/Gale/trunk/subduction.xml
Log:
r1415 at earth: boo | 2007-01-12 15:45:12 -0800
Make the input files work in parallel (only extension tested)
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1414
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1415
Modified: long/3D/Gale/trunk/extension.xml
===================================================================
--- long/3D/Gale/trunk/extension.xml 2007-01-12 23:46:49 UTC (rev 5787)
+++ long/3D/Gale/trunk/extension.xml 2007-01-12 23:46:51 UTC (rev 5788)
@@ -17,7 +17,7 @@
<struct name="linearMesh-generator">
<param name="Type">CartesianGenerator</param>
<param name="mesh">mesh-linear</param>
- <param name="dim">dim</param>
+ <param name="dims">dim</param>
<param name="shadowDepth">shadowDepth</param>
<list name="size">
<param>elementResI</param>
@@ -187,8 +187,9 @@
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="materialSwarmParticleLayout">
- <param name="Type">SpaceFillerParticleLayout</param>
- <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+ <param name="Type">RandomParticleLayout</param>
+ <param name="seed">13</param>
+ <param name="cellParticleCount">particlesPerCell</param>
</struct>
<struct name="materialSwarm">
<param name="Type">MaterialPointsSwarm</param>
@@ -405,14 +406,18 @@
<param name="maxX">2.0f</param>
<param name="maxY">0.35f</param>
<param name="maxZ">1.0f</param>
- <param name="elementResI">32</param>
- <param name="elementResJ">16</param>
- <param name="elementResK">4</param>
+ <param name="elementResI">16</param>
+ <param name="elementResJ">6</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>
- <param name="seed">13</param>
<struct name="EulerDeform">
<list name="systems">
<struct>
Modified: long/3D/Gale/trunk/fountain.xml
===================================================================
--- long/3D/Gale/trunk/fountain.xml 2007-01-12 23:46:49 UTC (rev 5787)
+++ long/3D/Gale/trunk/fountain.xml 2007-01-12 23:46:51 UTC (rev 5788)
@@ -4,11 +4,11 @@
<struct name="mesh-constant">
<param name="Type">FeMesh</param>
<param name="elementType">constant</param>
- <param name="elementMesh">mesh-linear</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>
@@ -17,7 +17,7 @@
<struct name="linearMesh-generator">
<param name="Type">CartesianGenerator</param>
<param name="mesh">mesh-linear</param>
- <param name="dim">dim</param>
+ <param name="dims">dim</param>
<param name="shadowDepth">shadowDepth</param>
<list name="size">
<param>elementResI</param>
@@ -88,16 +88,6 @@
<param name="Operator">TensorInvariant</param>
<param name="FeVariable">VelocityGradientsField</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="StrainRateField">
<param name="Type">OperatorFeVariable</param>
<param name="Operator">TensorSymmetricPart</param>
@@ -113,16 +103,6 @@
<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="pressure">
<param name="Type">MeshVariable</param>
<param name="mesh">mesh-constant</param>
@@ -207,8 +187,9 @@
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="materialSwarmParticleLayout">
- <param name="Type">SpaceFillerParticleLayout</param>
- <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+ <param name="Type">RandomParticleLayout</param>
+ <param name="seed">13</param>
+ <param name="cellParticleCount">particlesPerCell</param>
</struct>
<struct name="materialSwarm">
<param name="Type">MaterialPointsSwarm</param>
@@ -380,7 +361,7 @@
<param name="Type">CellRemesher</param>
<param name="mesh">mesh-constant</param>
<param name="meshType">regular</param>
- <param name="dims">2</param>
+ <param name="dims">3</param>
<param name="cellMesh">mesh-linear</param>
</struct>
</struct>
@@ -401,6 +382,11 @@
<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>
@@ -504,5 +490,4 @@
<!-- <param name="journal.debug">True</param> -->
<!-- <param name="journal-level.info">2</param> -->
<!-- <param name="journal-level.debug">2</param> -->
-
</StGermainData>
Modified: long/3D/Gale/trunk/shortening.xml
===================================================================
--- long/3D/Gale/trunk/shortening.xml 2007-01-12 23:46:49 UTC (rev 5787)
+++ long/3D/Gale/trunk/shortening.xml 2007-01-12 23:46:51 UTC (rev 5788)
@@ -17,7 +17,7 @@
<struct name="linearMesh-generator">
<param name="Type">CartesianGenerator</param>
<param name="mesh">mesh-linear</param>
- <param name="dim">dim</param>
+ <param name="dims">dim</param>
<param name="shadowDepth">shadowDepth</param>
<list name="size">
<param>elementResI</param>
@@ -88,16 +88,6 @@
<param name="Operator">TensorInvariant</param>
<param name="FeVariable">VelocityGradientsField</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="StrainRateField">
<param name="Type">OperatorFeVariable</param>
<param name="Operator">TensorSymmetricPart</param>
@@ -113,16 +103,6 @@
<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="pressure">
<param name="Type">MeshVariable</param>
<param name="mesh">mesh-constant</param>
@@ -207,8 +187,9 @@
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="materialSwarmParticleLayout">
- <param name="Type">SpaceFillerParticleLayout</param>
- <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+ <param name="Type">RandomParticleLayout</param>
+ <param name="seed">13</param>
+ <param name="cellParticleCount">particlesPerCell</param>
</struct>
<struct name="materialSwarm">
<param name="Type">MaterialPointsSwarm</param>
@@ -443,12 +424,12 @@
<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>
- <param name="cellParticleCount">30</param>
- <param name="seed">13</param>
<struct name="EulerDeform">
<list name="systems">
<struct>
Modified: long/3D/Gale/trunk/sinusoid.xml
===================================================================
--- long/3D/Gale/trunk/sinusoid.xml 2007-01-12 23:46:49 UTC (rev 5787)
+++ long/3D/Gale/trunk/sinusoid.xml 2007-01-12 23:46:51 UTC (rev 5788)
@@ -17,7 +17,7 @@
<struct name="linearMesh-generator">
<param name="Type">CartesianGenerator</param>
<param name="mesh">mesh-linear</param>
- <param name="dim">dim</param>
+ <param name="dims">dim</param>
<param name="shadowDepth">shadowDepth</param>
<list name="size">
<param>elementResI</param>
@@ -187,8 +187,9 @@
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="materialSwarmParticleLayout">
- <param name="Type">SpaceFillerParticleLayout</param>
- <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+ <param name="Type">RandomParticleLayout</param>
+ <param name="seed">13</param>
+ <param name="cellParticleCount">particlesPerCell</param>
</struct>
<struct name="materialSwarm">
<param name="Type">MaterialPointsSwarm</param>
@@ -367,6 +368,7 @@
</struct>
<list name="plugins">
<param>Underworld_EulerDeform</param>
+ <param>Underworld_DumpSwarm</param>
</list>
<param name="maxTimeSteps">500</param>
<param name="outputEvery">1</param>
@@ -386,12 +388,12 @@
<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>
- <param name="cellParticleCount">30</param>
- <param name="seed">13</param>
<struct name="EulerDeform">
<list name="systems">
<struct>
Modified: long/3D/Gale/trunk/subduction.xml
===================================================================
--- long/3D/Gale/trunk/subduction.xml 2007-01-12 23:46:49 UTC (rev 5787)
+++ long/3D/Gale/trunk/subduction.xml 2007-01-12 23:46:51 UTC (rev 5788)
@@ -17,7 +17,7 @@
<struct name="linearMesh-generator">
<param name="Type">CartesianGenerator</param>
<param name="mesh">mesh-linear</param>
- <param name="dim">dim</param>
+ <param name="dims">dim</param>
<param name="shadowDepth">shadowDepth</param>
<list name="size">
<param>elementResI</param>
@@ -88,16 +88,6 @@
<param name="Operator">TensorInvariant</param>
<param name="FeVariable">VelocityGradientsField</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="StrainRateField">
<param name="Type">OperatorFeVariable</param>
<param name="Operator">TensorSymmetricPart</param>
@@ -113,16 +103,6 @@
<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="pressure">
<param name="Type">MeshVariable</param>
<param name="mesh">mesh-constant</param>
@@ -207,8 +187,9 @@
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
<struct name="materialSwarmParticleLayout">
- <param name="Type">SpaceFillerParticleLayout</param>
- <param name="averageInitialParticlesPerCell">particlesPerCell</param>
+ <param name="Type">RandomParticleLayout</param>
+ <param name="seed">13</param>
+ <param name="cellParticleCount">particlesPerCell</param>
</struct>
<struct name="materialSwarm">
<param name="Type">MaterialPointsSwarm</param>
@@ -495,12 +476,12 @@
<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>
- <param name="cellParticleCount">30</param>
- <param name="seed">13</param>
<struct name="EulerDeform">
<list name="systems">
<struct>
More information about the cig-commits
mailing list