[cig-commits] r13856 - in long/3D/Gale/trunk: . input/examples src/Underworld/plugins/EulerDeform
walter at geodynamics.org
walter at geodynamics.org
Mon Jan 12 16:03:43 PST 2009
Author: walter
Date: 2009-01-12 16:03:43 -0800 (Mon, 12 Jan 2009)
New Revision: 13856
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/input/examples/tibet.xml
long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c
Log:
r2452 at dante: boo | 2009-01-12 16:02:28 -0800
Make tibet work without temperature (awful hack)
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2451
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2452
Modified: long/3D/Gale/trunk/input/examples/tibet.xml
===================================================================
--- long/3D/Gale/trunk/input/examples/tibet.xml 2009-01-13 00:03:40 UTC (rev 13855)
+++ long/3D/Gale/trunk/input/examples/tibet.xml 2009-01-13 00:03:43 UTC (rev 13856)
@@ -116,7 +116,6 @@
<param name="DofLayout">pressureDofLayout</param>
<param name="LinkedDofInfo">pressureLinkedDofs</param>
</struct>
-
<struct name="StressField">
<param name="Type">StressField</param>
<param name="StrainRateField">StrainRateField</param>
@@ -132,7 +131,7 @@
<param name="Swarm">picIntegrationPoints</param>
<param name="Mesh">mesh-linear</param>
<param name="ConstitutiveMatrix">constitutiveMatrix</param>
- </struct>
+ </struct>
<struct name="cellLayout">
<param name="Type">SingleCellLayout</param>
</struct>
@@ -300,10 +299,11 @@
<param name="ContinuityForceVector">cont_force</param>
<param name="killNonConvergent">false</param>
<param name="nonLinearMaxIterations">nonLinearMaxIterations</param>
- <param name="nonLinearTolerance">1e-2</param>
+ <param name="nonLinearMinIterations">nonLinearMinIterations</param>
+ <param name="nonLinearTolerance">nonLinearTolerance</param>
<param name="makeConvergenceFile">false</param>
+ <param name="isNonLinear">true</param>
</struct>
-
<struct name="c_matrix">
<param name="Type">StiffnessMatrix</param>
<param name="RowVariable">PressureField</param>
@@ -318,33 +318,33 @@
<param name="storeVisc">storeViscosity</param>
<param name="StiffnessMatrix">c_matrix</param>
</struct>
-<!-- <struct name="hydrostaticTerm"> -->
-<!-- <param name="Type">HydrostaticTerm</param> -->
-<!-- <param name="upperDensity">2800</param> -->
-<!-- <param name="upperAlpha">3.0e-5</param> -->
-<!-- <param name="lowerDensity">3300</param> -->
-<!-- <param name="lowerAlpha">3.0e-5</param> -->
-<!-- <param name="height">maxY</param> -->
-<!-- <param name="materialBoundary">68000</param> -->
+ <struct name="hydrostaticTerm">
+ <param name="Type">HydrostaticTerm</param>
+ <param name="upperDensity">2800</param>
+ <param name="upperAlpha">3.0e-5</param>
+ <param name="lowerDensity">3300</param>
+ <param name="lowerAlpha">3.0e-5</param>
+ <param name="height">maxY</param>
+ <param name="materialBoundary">68000</param>
<!-- <param name="T_0">TemperatureProfileTop</param> -->
<!-- <param name="linearCoefficient">TemperatureProfileLinearCoefficient</param> -->
<!-- <param name="exponentialCoefficient1">TemperatureProfileExponentialCoefficient1</param> -->
<!-- <param name="exponentialCoefficient2">TemperatureProfileExponentialCoefficient2</param> -->
-<!-- <param name="gravity">gravity</param> -->
-<!-- </struct> -->
+ <param name="gravity">gravity</param>
+ </struct>
-<!-- <struct name="stressBC"> -->
-<!-- <param name="Type">StressBC</param> -->
-<!-- <param name="ForceVector">mom_force</param> -->
-<!-- <param name="Swarm">picIntegrationPoints</param> -->
-<!-- <param name="wall">top</param> -->
-<!-- <param name="y_type">HydrostaticTerm</param> -->
-<!-- <param name="y_value">hydrostaticTerm</param> -->
-<!-- </struct> -->
+ <struct name="stressBC">
+ <param name="Type">StressBC</param>
+ <param name="ForceVector">mom_force</param>
+ <param name="Swarm">picIntegrationPoints</param>
+ <param name="wall">top</param>
+ <param name="y_type">HydrostaticTerm</param>
+ <param name="y_value">hydrostaticTerm</param>
+ </struct>
<struct name="buoyancyForceTerm">
<param name="Type">BuoyancyForceTerm</param>
<param name="ForceVector">mom_force</param>
- <param name="TemperatureField">TemperatureField</param>
+<!-- <param name="TemperatureField">TemperatureField</param> -->
<param name="Swarm">picIntegrationPoints</param>
<param name="gravity">gravity</param>
<param name="HydrostaticTerm">hydrostaticTerm</param>
@@ -376,21 +376,21 @@
<param name="endZ">maxZ</param>
</struct>
- <struct name="surfaceAdaptor">
- <param name="Type">SurfaceAdaptor</param>
- <param name="mesh">mesh-linear</param>
- <param name="sourceGenerator">linearMesh-generator</param>
- <param name="surfaceType">plateau</param>
- <param name="x1">300000</param>
- <param name="x2">350000</param>
- <param name="x3">650000</param>
- <param name="x4">700000</param>
- <param name="z1">200000</param>
- <param name="z2">250000</param>
- <param name="z3">750000</param>
- <param name="z4">800000</param>
- <param name="height">3030.3030303</param>
- </struct>
+<!-- <struct name="surfaceAdaptor"> -->
+<!-- <param name="Type">SurfaceAdaptor</param> -->
+<!-- <param name="mesh">mesh-linear</param> -->
+<!-- <param name="sourceGenerator">linearMesh-generator</param> -->
+<!-- <param name="surfaceType">plateau</param> -->
+<!-- <param name="x1">300000</param> -->
+<!-- <param name="x2">350000</param> -->
+<!-- <param name="x3">650000</param> -->
+<!-- <param name="x4">700000</param> -->
+<!-- <param name="z1">200000</param> -->
+<!-- <param name="z2">250000</param> -->
+<!-- <param name="z3">750000</param> -->
+<!-- <param name="z4">800000</param> -->
+<!-- <param name="height">3030.3030303</param> -->
+<!-- </struct> -->
<struct name="boxShape">
<param name="Type">Box</param>
@@ -422,10 +422,10 @@
<columnDefinition name = "x" type="double"/>
<columnDefinition name = "y" type="double"/>
0 68000
- 300000 68000
- 350000 51030.3030303
- 650000 51030.3030303
- 700000 68000
+<!-- 300000 68000 -->
+<!-- 350000 51030.3030303 -->
+<!-- 650000 51030.3030303 -->
+<!-- 700000 68000 -->
1000000 68000
1000000 100000
0 100000
@@ -434,12 +434,15 @@
</struct>
<struct name="crustViscosity">
- <param name="Type">FrankKamenetskii</param>
- <param name="TemperatureField">TemperatureField</param>
+ <param name="Type">MaterialViscosity</param>
+ <param name="eta0">0.1</param>
+
+<!-- <param name="Type">FrankKamenetskii</param> -->
+<!-- <param name="TemperatureField">TemperatureField</param> -->
<!-- at T=273, viscosity=1e25, at T=1273, viscosity=1e20 -->
- <param name="eta0">2.31739465</param>
+<!-- <param name="eta0">2.31739465</param> -->
<!-- <param name="eta0">2.31739465e26</param> -->
- <param name="theta">0.011512925465</param>
+<!-- <param name="theta">0.011512925465</param> -->
</struct>
<struct name="strainWeakening">
@@ -452,19 +455,19 @@
<param name="initialDamageFactor">0.5</param>
<param name="healingRate">0.0</param>
</struct>
- <struct name="yielding">
- <param name="Type">MohrCoulomb</param>
- <param name="PressureField">PressureField</param>
- <param name="VelocityGradientsField">VelocityGradientsField</param>
- <param name="MaterialPointsSwarm">materialSwarm</param>
- <param name="Context">context</param>
- <param name="StrainWeakening">strainWeakening</param>
- <param name="cohesion">44e6</param>
- <param name="cohesionAfterSoftening">4e6</param>
- <param name="frictionCoefficient">0.57735026919</param>
- <param name="frictionCoefficientAfterSoftening">0.57735026919</param>
- <param name="HydrostaticTerm">hydrostaticTerm</param>
- </struct>
+<!-- <struct name="yielding"> -->
+<!-- <param name="Type">MohrCoulomb</param> -->
+<!-- <param name="PressureField">PressureField</param> -->
+<!-- <param name="VelocityGradientsField">VelocityGradientsField</param> -->
+<!-- <param name="MaterialPointsSwarm">materialSwarm</param> -->
+<!-- <param name="Context">context</param> -->
+<!-- <param name="StrainWeakening">strainWeakening</param> -->
+<!-- <param name="cohesion">44e6</param> -->
+<!-- <param name="cohesionAfterSoftening">4e6</param> -->
+<!-- <param name="frictionCoefficient">0.57735026919</param> -->
+<!-- <param name="frictionCoefficientAfterSoftening">0.57735026919</param> -->
+<!-- <param name="HydrostaticTerm">hydrostaticTerm</param> -->
+<!-- </struct> -->
<struct name="crustViscous">
<param name="Type">RheologyMaterial</param>
@@ -480,7 +483,7 @@
</list>
<list name="Rheology">
<param>crustViscosity</param>
- <param>yielding</param>
+<!-- <param>yielding</param> -->
<param>storeViscosity</param>
<param>storeStress</param>
</list>
@@ -496,11 +499,13 @@
</struct>
<struct name="mantleViscosity">
- <param name="Type">FrankKamenetskii</param>
- <param name="TemperatureField">TemperatureField</param>
- <param name="eta0">2.31739465</param>
+ <param name="Type">MaterialViscosity</param>
+ <param name="eta0">0.1</param>
+<!-- <param name="Type">FrankKamenetskii</param> -->
+<!-- <param name="TemperatureField">TemperatureField</param> -->
+<!-- <param name="eta0">2.31739465</param> -->
<!-- <param name="eta0">2.31739465e26</param> -->
- <param name="theta">0.011512925465</param>
+<!-- <param name="theta">0.011512925465</param> -->
</struct>
<struct name="mantleViscous">
@@ -524,40 +529,40 @@
<!-- Temperature components -->
- <struct name="temperature">
- <param name="Type">MeshVariable</param>
- <param name="Rank">Scalar</param>
- <param name="DataType">Double</param>
- <param name="mesh">mesh-linear</param>
- </struct>
- <struct name="temperatureBCs">
- <param name="Type">CompositeVC</param>
- <param name="Data">mesh-linear</param>
- </struct>
- <struct name="temperatureICs">
- <param name="Type">CompositeVC</param>
- <param name="Data">mesh-linear</param>
- </struct>
- <struct name="temperatureDofLayout">
- <param name="Type">DofLayout</param>
- <param name="mesh">mesh-linear</param>
- <list name="BaseVariables">
- <param>temperature</param>
- </list>
- </struct>
- <struct name="TemperatureField">
- <param name="Type">FeVariable</param>
- <param name="FEMesh">mesh-linear</param>
- <param name="DofLayout">temperatureDofLayout</param>
- <param name="BC">temperatureBCs</param>
- <param name="IC">temperatureICs</param>
- <param name="LinkedDofInfo">temperatureLinkedDofs</param>
- </struct>
- <struct name="TemperatureGradientsField">
- <param name="Type">OperatorFeVariable</param>
- <param name="Operator">Gradient</param>
- <param name="FeVariable">TemperatureField</param>
- </struct>
+<!-- <struct name="temperature"> -->
+<!-- <param name="Type">MeshVariable</param> -->
+<!-- <param name="Rank">Scalar</param> -->
+<!-- <param name="DataType">Double</param> -->
+<!-- <param name="mesh">mesh-linear</param> -->
+<!-- </struct> -->
+<!-- <struct name="temperatureBCs"> -->
+<!-- <param name="Type">CompositeVC</param> -->
+<!-- <param name="Data">mesh-linear</param> -->
+<!-- </struct> -->
+<!-- <struct name="temperatureICs"> -->
+<!-- <param name="Type">CompositeVC</param> -->
+<!-- <param name="Data">mesh-linear</param> -->
+<!-- </struct> -->
+<!-- <struct name="temperatureDofLayout"> -->
+<!-- <param name="Type">DofLayout</param> -->
+<!-- <param name="mesh">mesh-linear</param> -->
+<!-- <list name="BaseVariables"> -->
+<!-- <param>temperature</param> -->
+<!-- </list> -->
+<!-- </struct> -->
+<!-- <struct name="TemperatureField"> -->
+<!-- <param name="Type">FeVariable</param> -->
+<!-- <param name="FEMesh">mesh-linear</param> -->
+<!-- <param name="DofLayout">temperatureDofLayout</param> -->
+<!-- <param name="BC">temperatureBCs</param> -->
+<!-- <param name="IC">temperatureICs</param> -->
+<!-- <param name="LinkedDofInfo">temperatureLinkedDofs</param> -->
+<!-- </struct> -->
+<!-- <struct name="TemperatureGradientsField"> -->
+<!-- <param name="Type">OperatorFeVariable</param> -->
+<!-- <param name="Operator">Gradient</param> -->
+<!-- <param name="FeVariable">TemperatureField</param> -->
+<!-- </struct> -->
<!-- Energy Equation -->
@@ -638,6 +643,8 @@
<param name="velocityField">VelocityField</param>
<param name="wrapTop">True</param>
<param name="staticBottom">True</param>
+ <param name="staticLeftBottom">True</param>
+ <param name="staticRight">True</param>
<list name="fields">
<struct>
<param name="field">VelocityField</param>
@@ -720,7 +727,9 @@
<struct>
<param name="name">vy</param>
<param name="type">double</param>
- <param name="value">0.0</param>
+ <param name="value">4.17097919838e15</param>
+<!-- <param name="value">3.17097919838e15</param> -->
+<!-- <param name="value">0.0</param> -->
</struct>
</list>
</struct>
@@ -729,95 +738,95 @@
</list>
</struct>
- <struct name="temperatureBCs">
- <param name="type">CompositeVC</param>
- <list name="vcList">
- <struct>
- <param name="type">WallVC</param>
- <param name="wall">top</param>
- <list name="variables">
- <struct>
- <param name="name">temperature</param>
- <param name="type">double</param>
+<!-- <struct name="temperatureBCs"> -->
+<!-- <param name="type">CompositeVC</param> -->
+<!-- <list name="vcList"> -->
+<!-- <struct> -->
+<!-- <param name="type">WallVC</param> -->
+<!-- <param name="wall">top</param> -->
+<!-- <list name="variables"> -->
+<!-- <struct> -->
+<!-- <param name="name">temperature</param> -->
+<!-- <param name="type">double</param> -->
<!-- Remember to keep in sync with TemperatureProfileTop -->
- <param name="value">273</param>
- </struct>
- </list>
- </struct>
- <struct>
- <param name="type">WallVC</param>
- <param name="wall">bottom</param>
- <list name="variables">
- <struct>
- <param name="name">temperature</param>
- <param name="type">double</param>
+<!-- <param name="value">273</param> -->
+<!-- </struct> -->
+<!-- </list> -->
+<!-- </struct> -->
+<!-- <struct> -->
+<!-- <param name="type">WallVC</param> -->
+<!-- <param name="wall">bottom</param> -->
+<!-- <list name="variables"> -->
+<!-- <struct> -->
+<!-- <param name="name">temperature</param> -->
+<!-- <param name="type">double</param> -->
<!-- Remember to keep in sync with TemperatureProfile parameters -->
- <param name="value">1332.998763</param>
- </struct>
- </list>
- </struct>
- <struct>
- <param name="type">WallVC</param>
- <param name="wall">left</param>
- <list name="variables">
- <struct>
- <param name="name">temperature</param>
- <param name="type">func</param>
- <param name="value">TemperatureProfile</param>
- </struct>
- </list>
- </struct>
- <struct>
- <param name="type">WallVC</param>
- <param name="wall">right</param>
- <list name="variables">
- <struct>
- <param name="name">temperature</param>
- <param name="type">func</param>
- <param name="value">TemperatureProfile</param>
- </struct>
- </list>
- </struct>
- <struct>
- <param name="type">WallVC</param>
- <param name="wall">front</param>
- <list name="variables">
- <struct>
- <param name="name">temperature</param>
- <param name="type">func</param>
- <param name="value">TemperatureProfile</param>
- </struct>
- </list>
- </struct>
- <struct>
- <param name="type">WallVC</param>
- <param name="wall">back</param>
- <list name="variables">
- <struct>
- <param name="name">temperature</param>
- <param name="type">func</param>
- <param name="value">TemperatureProfile</param>
- </struct>
- </list>
- </struct>
- </list>
- </struct>
+<!-- <param name="value">1332.998763</param> -->
+<!-- </struct> -->
+<!-- </list> -->
+<!-- </struct> -->
+<!-- <struct> -->
+<!-- <param name="type">WallVC</param> -->
+<!-- <param name="wall">left</param> -->
+<!-- <list name="variables"> -->
+<!-- <struct> -->
+<!-- <param name="name">temperature</param> -->
+<!-- <param name="type">func</param> -->
+<!-- <param name="value">TemperatureProfile</param> -->
+<!-- </struct> -->
+<!-- </list> -->
+<!-- </struct> -->
+<!-- <struct> -->
+<!-- <param name="type">WallVC</param> -->
+<!-- <param name="wall">right</param> -->
+<!-- <list name="variables"> -->
+<!-- <struct> -->
+<!-- <param name="name">temperature</param> -->
+<!-- <param name="type">func</param> -->
+<!-- <param name="value">TemperatureProfile</param> -->
+<!-- </struct> -->
+<!-- </list> -->
+<!-- </struct> -->
+<!-- <struct> -->
+<!-- <param name="type">WallVC</param> -->
+<!-- <param name="wall">front</param> -->
+<!-- <list name="variables"> -->
+<!-- <struct> -->
+<!-- <param name="name">temperature</param> -->
+<!-- <param name="type">func</param> -->
+<!-- <param name="value">TemperatureProfile</param> -->
+<!-- </struct> -->
+<!-- </list> -->
+<!-- </struct> -->
+<!-- <struct> -->
+<!-- <param name="type">WallVC</param> -->
+<!-- <param name="wall">back</param> -->
+<!-- <list name="variables"> -->
+<!-- <struct> -->
+<!-- <param name="name">temperature</param> -->
+<!-- <param name="type">func</param> -->
+<!-- <param name="value">TemperatureProfile</param> -->
+<!-- </struct> -->
+<!-- </list> -->
+<!-- </struct> -->
+<!-- </list> -->
+<!-- </struct> -->
- <struct name="temperatureICs">
- <param name="type">CompositeVC</param>
- <list name="vcList">
- <struct>
- <param name="type">AllNodesVC</param>
- <list name="variables">
- <struct>
- <param name="name">temperature</param>
- <param name="type">func</param>
- <param name="value">TemperatureProfile</param>
- </struct>
- </list>
- </struct>
- </list>
- </struct>
+<!-- <struct name="temperatureICs"> -->
+<!-- <param name="type">CompositeVC</param> -->
+<!-- <list name="vcList"> -->
+<!-- <struct> -->
+<!-- <param name="type">AllNodesVC</param> -->
+<!-- <list name="variables"> -->
+<!-- <struct> -->
+<!-- <param name="name">temperature</param> -->
+<!-- <param name="type">func</param> -->
+<!-- <param name="value">TemperatureProfile</param> -->
+<!-- </struct> -->
+<!-- </list> -->
+<!-- </struct> -->
+<!-- </list> -->
+<!-- </struct> -->
<!-- These numbers have to be kept in sync with the top and bottom BC's. The
parser can not read the variables and use them there, so they have
Modified: long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c 2009-01-13 00:03:40 UTC (rev 13855)
+++ long/3D/Gale/trunk/src/Underworld/plugins/EulerDeform/EulerDeform.c 2009-01-13 00:03:43 UTC (rev 13856)
@@ -712,7 +712,7 @@
double x0,y0,x1,y1;
double x_fixed, delta;
int nn=Mesh_GetLocalSize( sys->mesh, MT_VERTEX )-1;
- x_fixed=2.0;
+ x_fixed=1000000.0;
x0=sys->mesh->verts[nn-1][0];
y0=sys->mesh->verts[nn-1][1];
More information about the CIG-COMMITS
mailing list