[cig-commits] r6015 - in long/3D/Gale/trunk: . input input/cookbook
walter at geodynamics.org
walter at geodynamics.org
Tue Feb 13 16:21:03 PST 2007
Author: walter
Date: 2007-02-13 16:21:03 -0800 (Tue, 13 Feb 2007)
New Revision: 6015
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/viscous.xml
long/3D/Gale/trunk/input/cookbook/viscous_extension.xml
long/3D/Gale/trunk/input/cookbook/viscous_inflow.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/viscous_stressbc.xml
long/3D/Gale/trunk/input/cookbook/yielding.xml
long/3D/Gale/trunk/input/extension.xml
long/3D/Gale/trunk/input/shortening.xml
long/3D/Gale/trunk/input/sinusoid.xml
long/3D/Gale/trunk/input/subduction.xml
Log:
r1559 at earth: boo | 2007-02-13 16:18:47 -0800
Make multi_material and yielding cookbooks work, and add VTKOutput to everything
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1556
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1559
Modified: long/3D/Gale/trunk/input/cookbook/multi_material.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/multi_material.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/cookbook/multi_material.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -346,6 +346,23 @@
<param name="Type">StoreVisc</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
+
+
+ <struct name="sphereShape">
+ <param name="Type">Sphere</param>
+ <param name="CentreX">1.0</param>
+ <param name="CentreY">0.15</param>
+ <param name="radius">0.1</param>
+ </struct>
+
+ <struct name="nonSphereShape">
+ <param name="Type">Intersection</param>
+ <list name="shapes">
+ <param>boxShape</param>
+ <param>!sphereShape</param>
+ </list>
+ </struct>
+
<struct name="viscous">
<param name="Type">RheologyMaterial</param>
<param name="Shape">nonSphereShape</param>
@@ -356,16 +373,9 @@
</list>
</struct>
- <struct name="sphereShape">
- <param name="Type">Sphere</param>
- <param name="CentreX">1.0</param>
- <param name="CentreY">1.5</param>
- <param name="radius">1.0</param>
- </struct>
-
<struct name="sphereViscosity">
<param name="Type">MaterialViscosity</param>
- <param name="eta0">2.0</param>
+ <param name="eta0">10.0</param>
</struct>
<struct name="sphereViscous">
@@ -378,18 +388,11 @@
</list>
</struct>
- <struct name="nonSphereShape">
- <param name="Type">Intersection</param>
- <list name="shapes">
- <param>boxShape</param>
- <param>!sphereShape</param>
- </list>
- </struct>
-
</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>
Modified: long/3D/Gale/trunk/input/cookbook/template.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/template.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/cookbook/template.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -332,6 +332,7 @@
<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>
Modified: long/3D/Gale/trunk/input/cookbook/viscous.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/cookbook/viscous.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -360,6 +360,7 @@
<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>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_extension.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_extension.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/cookbook/viscous_extension.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -360,6 +360,7 @@
<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>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_inflow.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_inflow.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/cookbook/viscous_inflow.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -371,6 +371,7 @@
<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>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_sinusoid.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_sinusoid.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/cookbook/viscous_sinusoid.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -372,6 +372,7 @@
<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>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_split.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_split.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/cookbook/viscous_split.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -360,6 +360,7 @@
<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>
Modified: long/3D/Gale/trunk/input/cookbook/viscous_stressbc.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/viscous_stressbc.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/cookbook/viscous_stressbc.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -369,6 +369,7 @@
<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>
Modified: long/3D/Gale/trunk/input/cookbook/yielding.xml
===================================================================
--- long/3D/Gale/trunk/input/cookbook/yielding.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/cookbook/yielding.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -346,21 +346,12 @@
<param name="Type">StoreVisc</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
- <struct name="viscous">
- <param name="Type">RheologyMaterial</param>
- <param name="Shape">nonSphereShape</param>
- <param name="density">1.0</param>
- <list name="Rheology">
- <param>backgroundViscosity</param>
- <param>storeViscosity</param>
- </list>
- </struct>
<struct name="sphereShape">
<param name="Type">Sphere</param>
<param name="CentreX">1.0</param>
- <param name="CentreY">1.5</param>
- <param name="radius">1.0</param>
+ <param name="CentreY">0.15</param>
+ <param name="radius">0.10</param>
</struct>
<struct name="sphereViscosity">
@@ -403,7 +394,7 @@
<param name="MaterialPointsSwarm">materialSwarm</param>
<param name="Context">context</param>
<param name="StrainWeakening">strainWeakening</param>
- <param name="cohesion">10.0</param>
+ <param name="cohesion">1.0</param>
<param name="cohesionAfterSoftening">0.0001</param>
<param name="frictionCoefficient">0.0</param>
<param name="frictionCoefficientAfterSoftening">0.0</param>
@@ -423,6 +414,7 @@
<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>
Modified: long/3D/Gale/trunk/input/extension.xml
===================================================================
--- long/3D/Gale/trunk/input/extension.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/extension.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -394,6 +394,7 @@
<list name="plugins">
<param>Underworld_EulerDeform</param>
<param>Underworld_DumpSwarm</param>
+ <param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">500</param>
<param name="dumpEvery">1</param>
@@ -407,8 +408,8 @@
<param name="maxY">0.35f</param>
<param name="maxZ">1.0f</param>
<param name="elementResI">16</param>
- <param name="elementResJ">6</param>
- <param name="elementResK">3</param>
+ <param name="elementResJ">8</param>
+ <param name="elementResK">4</param>
<param name="allowUnbalancing">True</param>
<param name="buildNodeNeighbourTbl">True</param>
<param name="buildElementNeighbourTbl">True</param>
@@ -527,7 +528,6 @@
<param name="StepFunctionLessThan">False</param>
<param name="checkpointEvery">1</param>
-
<!-- <param name="journal.info">True</param> -->
<!-- <param name="journal.debug">True</param> -->
<!-- <param name="journal-level.info">2</param> -->
Modified: long/3D/Gale/trunk/input/shortening.xml
===================================================================
--- long/3D/Gale/trunk/input/shortening.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/shortening.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -405,6 +405,7 @@
<list name="plugins">
<param>Underworld_EulerDeform</param>
<param>Underworld_DumpSwarm</param>
+ <param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">500</param>
<param name="outputEvery">1</param>
Modified: long/3D/Gale/trunk/input/sinusoid.xml
===================================================================
--- long/3D/Gale/trunk/input/sinusoid.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/sinusoid.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -369,6 +369,7 @@
<list name="plugins">
<param>Underworld_EulerDeform</param>
<param>Underworld_DumpSwarm</param>
+ <param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">500</param>
<param name="outputEvery">1</param>
Modified: long/3D/Gale/trunk/input/subduction.xml
===================================================================
--- long/3D/Gale/trunk/input/subduction.xml 2007-02-14 00:18:52 UTC (rev 6014)
+++ long/3D/Gale/trunk/input/subduction.xml 2007-02-14 00:21:03 UTC (rev 6015)
@@ -494,12 +494,13 @@
<list name="plugins">
<param>Underworld_EulerDeform</param>
<param>Underworld_DumpSwarm</param>
+ <param>Underworld_VTKOutput</param>
</list>
<param name="maxTimeSteps">250</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
<param name="outputPath">./output.subduction</param>
- <param name="dim">2</param>
+ <param name="dim">3</param>
<param name="shadowDepth">1</param>
<param name="minX">0.0f</param>
<param name="minY">0.0f</param>
More information about the cig-commits
mailing list