[cig-commits] commit: Make Q2Pm1 xml input files work with current code
Mercurial
hg at geodynamics.org
Sat Nov 19 10:34:49 PST 2011
changeset: 406:bc353ca03921
user: Walter Landry <wlandry at caltech.edu>
date: Sat Nov 19 10:31:59 2011 -0800
files: Q2Pm1_input/cookbook/template.xml Q2Pm1_input/cookbook/thermal.xml Q2Pm1_input/cookbook/tracers.xml Q2Pm1_input/cookbook/viscous.xml Q2Pm1_input/cookbook/viscous_bottom.xml Q2Pm1_input/cookbook/viscous_extension.xml Q2Pm1_input/cookbook/viscous_normal_stress.xml
description:
Make Q2Pm1 xml input files work with current code
diff -r 49344f43291d -r bc353ca03921 Q2Pm1_input/cookbook/template.xml
--- a/Q2Pm1_input/cookbook/template.xml Sat Nov 19 10:27:58 2011 -0800
+++ b/Q2Pm1_input/cookbook/template.xml Sat Nov 19 10:31:59 2011 -0800
@@ -147,14 +147,14 @@
<param name="StrainRateField">StrainRateField</param>
<param name="Context">context</param>
<param name="ConstitutiveMatrix">constitutiveMatrix</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="Mesh">mesh-Q2</param>
<param name="IC">stressICs</param>
</struct>
<struct name="ViscosityField">
<param name="Type">ViscosityField</param>
<param name="Context">context</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="Mesh">mesh-Q2</param>
<param name="ConstitutiveMatrix">constitutiveMatrix</param>
</struct>
@@ -327,7 +327,7 @@
<struct name="buoyancyForceTerm">
<param name="Type">BuoyancyForceTerm</param>
<param name="ForceVector">mom_force</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="gravity">gravity</param>
</struct>
<struct name="background">
diff -r 49344f43291d -r bc353ca03921 Q2Pm1_input/cookbook/thermal.xml
--- a/Q2Pm1_input/cookbook/thermal.xml Sat Nov 19 10:27:58 2011 -0800
+++ b/Q2Pm1_input/cookbook/thermal.xml Sat Nov 19 10:31:59 2011 -0800
@@ -147,14 +147,14 @@
<param name="StrainRateField">StrainRateField</param>
<param name="Context">context</param>
<param name="ConstitutiveMatrix">constitutiveMatrix</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="Mesh">mesh-Q2</param>
<param name="IC">stressICs</param>
</struct>
<struct name="ViscosityField">
<param name="Type">ViscosityField</param>
<param name="Context">context</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="Mesh">mesh-Q2</param>
<param name="ConstitutiveMatrix">constitutiveMatrix</param>
</struct>
@@ -172,10 +172,10 @@
<param name="ParticleLayout">particleLayout</param>
<param name="FeMesh">mesh-Q2</param>
<param name="TimeIntegrator">timeIntegrator</param>
- <param name="IntegrationPointMapper">nearestMapper</param>
+ <param name="IntegrationPointMapper">oneToManyMapper</param>
</struct>
- <struct name="nearestMapper">
- <param name="Type">NearestNeighborMapper</param>
+ <struct name="oneToManyMapper">
+ <param name="Type">OneToManyMapper</param>
<param name="IntegrationPointsSwarm">gaussSwarm</param>
<param name="MappedSwarm">picIntegrationPoints</param>
</struct>
@@ -328,7 +328,7 @@
<param name="Type">BuoyancyForceTerm</param>
<param name="ForceVector">mom_force</param>
<param name="TemperatureField">TemperatureField</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="gravity">gravity</param>
</struct>
<struct name="background">
@@ -496,7 +496,7 @@
<struct name="internalHeatingTerm">
<param name="Type">RadiogenicHeatingTerm</param>
<param name="ForceVector">residual</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
</struct>
</struct>
diff -r 49344f43291d -r bc353ca03921 Q2Pm1_input/cookbook/tracers.xml
--- a/Q2Pm1_input/cookbook/tracers.xml Sat Nov 19 10:27:58 2011 -0800
+++ b/Q2Pm1_input/cookbook/tracers.xml Sat Nov 19 10:31:59 2011 -0800
@@ -397,7 +397,10 @@
<param name="totalInitialParticles">1</param>
<list name="manualParticlePositions">
<asciidata>
- <columnDefinition name = "x" type="double"/>
+ <columnDefinition>
+ <param name="x"></param>
+ <param type="double"></param>
+ </columnDefinition>
<columnDefinition name = "y" type="double"/>
<columnDefinition name = "z" type="double"/>
1.0 .1 .1
@@ -489,8 +492,8 @@
<list name="variables">
<struct>
<param name="name">vx</param>
- <param name="type">func</param>
- <param name="value">Equation1</param>
+ <param name="type">equation</param>
+ <param name="value">r=hypot(x,y+3), step(3.35-r)*(y+3)</param>
</struct>
</list>
</struct>
@@ -511,13 +514,13 @@
<list name="variables">
<struct>
<param name="name">vy</param>
- <param name="type">func</param>
- <param name="value">Equation2</param>
+ <param name="type">equation</param>
+ <param name="value">r=hypot(x,y+3), -step(3.35-r)*x</param>
</struct>
<struct>
<param name="name">vx</param>
- <param name="type">func</param>
- <param name="value">Equation1</param>
+ <param name="type">equation</param>
+ <param name="value">r=hypot(x,y+3), step(3.35-r)*(y+3)</param>
</struct>
</list>
</struct>
diff -r 49344f43291d -r bc353ca03921 Q2Pm1_input/cookbook/viscous.xml
--- a/Q2Pm1_input/cookbook/viscous.xml Sat Nov 19 10:27:58 2011 -0800
+++ b/Q2Pm1_input/cookbook/viscous.xml Sat Nov 19 10:31:59 2011 -0800
@@ -147,14 +147,14 @@
<param name="StrainRateField">StrainRateField</param>
<param name="Context">context</param>
<param name="ConstitutiveMatrix">constitutiveMatrix</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="Mesh">mesh-Q2</param>
<param name="IC">stressICs</param>
</struct>
<struct name="ViscosityField">
<param name="Type">ViscosityField</param>
<param name="Context">context</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="Mesh">mesh-Q2</param>
<param name="ConstitutiveMatrix">constitutiveMatrix</param>
</struct>
@@ -327,7 +327,7 @@
<struct name="buoyancyForceTerm">
<param name="Type">BuoyancyForceTerm</param>
<param name="ForceVector">mom_force</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="gravity">gravity</param>
</struct>
<struct name="background">
diff -r 49344f43291d -r bc353ca03921 Q2Pm1_input/cookbook/viscous_bottom.xml
--- a/Q2Pm1_input/cookbook/viscous_bottom.xml Sat Nov 19 10:27:58 2011 -0800
+++ b/Q2Pm1_input/cookbook/viscous_bottom.xml Sat Nov 19 10:31:59 2011 -0800
@@ -308,7 +308,7 @@
<param name="tolerance">linearTolerance</param>
<param name="monitor">false</param>
<param name="maxIterations">5000</param>
- <param name="minIterations">1</param>
+ <param name="minIterations">100</param>
</struct>
<struct name="stokesEqn">
<param name="Type">Stokes_SLE</param>
@@ -328,7 +328,7 @@
<struct name="buoyancyForceTerm">
<param name="Type">BuoyancyForceTerm</param>
<param name="ForceVector">mom_force</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="gravity">gravity</param>
</struct>
<struct name="background">
@@ -385,8 +385,8 @@
<param name="ForceVector">mom_force</param>
<param name="Swarm">picIntegrationPoints</param>
<param name="wall">bottom</param>
- <param name="y_type">double</param>
- <param name="y_value">0.35</param>
+ <param name="normal_type">func</param>
+ <param name="normal_value">Equation1</param>
</struct>
</struct>
@@ -453,7 +453,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>
@@ -466,4 +466,5 @@
</struct>
<param name="checkpointEvery">1</param>
<param name="gravity">1.0</param>
+ <param name="Equation1">0.35-y</param>
</StGermainData>
diff -r 49344f43291d -r bc353ca03921 Q2Pm1_input/cookbook/viscous_extension.xml
--- a/Q2Pm1_input/cookbook/viscous_extension.xml Sat Nov 19 10:27:58 2011 -0800
+++ b/Q2Pm1_input/cookbook/viscous_extension.xml Sat Nov 19 10:31:59 2011 -0800
@@ -147,14 +147,14 @@
<param name="StrainRateField">StrainRateField</param>
<param name="Context">context</param>
<param name="ConstitutiveMatrix">constitutiveMatrix</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="Mesh">mesh-Q2</param>
<param name="IC">stressICs</param>
</struct>
<struct name="ViscosityField">
<param name="Type">ViscosityField</param>
<param name="Context">context</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="Mesh">mesh-Q2</param>
<param name="ConstitutiveMatrix">constitutiveMatrix</param>
</struct>
@@ -327,7 +327,7 @@
<struct name="buoyancyForceTerm">
<param name="Type">BuoyancyForceTerm</param>
<param name="ForceVector">mom_force</param>
- <param name="Swarm">picIntegrationPoints</param>
+ <param name="Swarm">gaussSwarm</param>
<param name="gravity">gravity</param>
</struct>
<struct name="background">
diff -r 49344f43291d -r bc353ca03921 Q2Pm1_input/cookbook/viscous_normal_stress.xml
--- a/Q2Pm1_input/cookbook/viscous_normal_stress.xml Sat Nov 19 10:27:58 2011 -0800
+++ b/Q2Pm1_input/cookbook/viscous_normal_stress.xml Sat Nov 19 10:31:59 2011 -0800
@@ -385,8 +385,8 @@
<param name="ForceVector">mom_force</param>
<param name="Swarm">picIntegrationPoints</param>
<param name="wall">bottom</param>
- <param name="y_type">double</param>
- <param name="y_value">0.35</param>
+ <param name="normal_type">func</param>
+ <param name="normal_value">Equation1</param>
</struct>
</struct>
@@ -466,4 +466,5 @@
</struct>
<param name="checkpointEvery">1</param>
<param name="gravity">1.0</param>
+ <param name="Equation1">0.35-y</param>
</StGermainData>
More information about the CIG-COMMITS
mailing list