[cig-commits] commit: Make cookbooks use Equation and step()
Mercurial
hg at geodynamics.org
Mon May 16 20:56:33 PDT 2011
changeset: 350:2b4e95654359
user: Walter Landry <wlandry at caltech.edu>
date: Mon May 16 20:37:51 2011 -0700
files: input/cookbook/tracers.xml input/cookbook/viscous_deformed_bottom.xml input/cookbook/viscous_inflow.xml input/cookbook/viscous_split.xml
description:
Make cookbooks use Equation and step()
diff -r f23c3f78f319 -r 2b4e95654359 input/cookbook/tracers.xml
--- a/input/cookbook/tracers.xml Sun May 15 12:59:33 2011 -0700
+++ b/input/cookbook/tracers.xml Mon May 16 20:37:51 2011 -0700
@@ -540,12 +540,12 @@
<struct>
<param name="name">vx</param>
<param name="type">func</param>
- <param name="value">Velocity_PartialRotationX</param>
+ <param name="value">Equation1</param>
</struct>
<struct>
<param name="name">vy</param>
<param name="type">func</param>
- <param name="value">Velocity_PartialRotationY</param>
+ <param name="value">Equation2</param>
</struct>
</list>
</struct>
@@ -567,12 +567,12 @@
<struct>
<param name="name">vx</param>
<param name="type">func</param>
- <param name="value">Velocity_PartialRotationX</param>
+ <param name="value">Equation1</param>
</struct>
<struct>
<param name="name">vy</param>
<param name="type">func</param>
- <param name="value">Velocity_PartialRotationY</param>
+ <param name="value">Equation2</param>
</struct>
</list>
</struct>
@@ -581,13 +581,13 @@
<param name="checkpointEvery">1</param>
<param name="gravity">1.0</param>
- <param name="SolidBodyRotationOmega">-1</param>
<param name="SolidBodyRotationCentreX">0</param>
<param name="SolidBodyRotationCentreY">-3</param>
<param name="InnerRadiusCylinder">3.15</param>
<param name="CylinderMinX">0</param>
<param name="CylinderMaxX">0.960468635615</param>
- <param name="RadiusCylinder">3.35</param>
- <!-- <param name="journal.info">True</param> -->
+ <param name="Equation1">r=hypot(x,y+3), step(3.35-r)*(y+3)</param>
+ <param name="Equation2">r=hypot(x,y+3), -step(3.35-r)*x</param>
+ <param name="Equation3">Equation1</param>
</StGermainData>
diff -r f23c3f78f319 -r 2b4e95654359 input/cookbook/viscous_deformed_bottom.xml
--- a/input/cookbook/viscous_deformed_bottom.xml Sun May 15 12:59:33 2011 -0700
+++ b/input/cookbook/viscous_deformed_bottom.xml Mon May 16 20:37:51 2011 -0700
@@ -492,12 +492,12 @@
<struct>
<param name="name">vx</param>
<param name="type">func</param>
- <param name="value">Velocity_PartialRotationX</param>
+ <param name="value">Equation1</param>
</struct>
<struct>
<param name="name">vy</param>
<param name="type">func</param>
- <param name="value">Velocity_PartialRotationY</param>
+ <param name="value">Equation2</param>
</struct>
</list>
</struct>
@@ -519,12 +519,12 @@
<struct>
<param name="name">vx</param>
<param name="type">func</param>
- <param name="value">Velocity_PartialRotationX</param>
+ <param name="value">Equation1</param>
</struct>
<struct>
<param name="name">vy</param>
<param name="type">func</param>
- <param name="value">Velocity_PartialRotationY</param>
+ <param name="value">Equation2</param>
</struct>
</list>
</struct>
@@ -533,12 +533,13 @@
<param name="checkpointEvery">1</param>
<param name="gravity">1.0</param>
- <param name="SolidBodyRotationOmega">-1</param>
+ <param name="Equation1">r=hypot(x,y+3), step(3.35-r)*(y+3)</param>
+ <param name="Equation2">r=hypot(x,y+3), -step(3.35-r)*x</param>
+
<param name="SolidBodyRotationCentreX">0</param>
<param name="SolidBodyRotationCentreY">-3</param>
<param name="InnerRadiusCylinder">3.15</param>
<param name="CylinderMinX">0</param>
<param name="CylinderMaxX">0.960468635615</param>
- <param name="RadiusCylinder">3.35</param>
</StGermainData>
diff -r f23c3f78f319 -r 2b4e95654359 input/cookbook/viscous_inflow.xml
--- a/input/cookbook/viscous_inflow.xml Sun May 15 12:59:33 2011 -0700
+++ b/input/cookbook/viscous_inflow.xml Mon May 16 20:37:51 2011 -0700
@@ -480,7 +480,7 @@
<struct>
<param name="name">vx</param>
<param name="type">func</param>
- <param name="value">StepFunctionProduct3</param>
+ <param name="value">Equation1</param>
</struct>
</list>
</struct>
@@ -502,12 +502,12 @@
<struct>
<param name="name">vy</param>
<param name="type">func</param>
- <param name="value">StepFunctionProduct2</param>
+ <param name="value">Equation2</param>
</struct>
<struct>
<param name="name">vx</param>
<param name="type">func</param>
- <param name="value">StepFunctionProduct1</param>
+ <param name="value">Equation3</param>
</struct>
</list>
</struct>
@@ -515,16 +515,7 @@
</struct>
<param name="checkpointEvery">1</param>
<param name="gravity">1.0</param>
-
- <param name="StepFunctionProduct3Start">0.1</param>
- <param name="StepFunctionProduct3End">0.2</param>
- <param name="StepFunctionProduct3Value">1</param>
-
- <param name="StepFunctionProduct1Start">0.9</param>
- <param name="StepFunctionProduct1End">1.1</param>
- <param name="StepFunctionProduct1Value">1.0</param>
- <param name="StepFunctionProduct2Start">0.9</param>
- <param name="StepFunctionProduct2End">1.1</param>
- <param name="StepFunctionProduct2Value">-1.0</param>
-
+ <param name="Equation1">step(y-0.1)*step(0.2-y)</param>
+ <param name="Equation2">-step(x-0.9)*step(1.1-x)</param>
+ <param name="Equation3">step(x-0.9)*step(1.1-x)</param>
</StGermainData>
diff -r f23c3f78f319 -r 2b4e95654359 input/cookbook/viscous_split.xml
--- a/input/cookbook/viscous_split.xml Sun May 15 12:59:33 2011 -0700
+++ b/input/cookbook/viscous_split.xml Mon May 16 20:37:51 2011 -0700
@@ -500,5 +500,5 @@
<param name="checkpointEvery">1</param>
<param name="gravity">1.0</param>
- <param name="Equation1">if(x<1.0,0,1)</param>
+ <param name="Equation1">step(x-1)</param>
</StGermainData>
More information about the CIG-COMMITS
mailing list