[cig-commits] r13891 - in long/3D/Gale/trunk: . input/examples src/StgFEM/SLE/SystemSetup/src
walter at geodynamics.org
walter at geodynamics.org
Tue Jan 20 15:12:15 PST 2009
Author: walter
Date: 2009-01-20 15:12:15 -0800 (Tue, 20 Jan 2009)
New Revision: 13891
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/input/examples/tibet.xml
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
Log:
r2458 at dante: boo | 2009-01-12 16:42:10 -0800
Make tibet work with everything but yielding.
The required removing the step where the linear systems were being
rebuilt in SystemLinearEquations. The rebuilding was core dumping
when I added the temperature field to the buoyancy force. Rebuilding
was only required for the friction BC's, which don't work that well
right now anyway.
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2452
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2458
Modified: long/3D/Gale/trunk/input/examples/tibet.xml
===================================================================
--- long/3D/Gale/trunk/input/examples/tibet.xml 2009-01-20 16:22:10 UTC (rev 13890)
+++ long/3D/Gale/trunk/input/examples/tibet.xml 2009-01-20 23:12:15 UTC (rev 13891)
@@ -326,10 +326,10 @@
<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="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>
@@ -344,7 +344,7 @@
<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>
@@ -434,15 +434,15 @@
</struct>
<struct name="crustViscosity">
- <param name="Type">MaterialViscosity</param>
- <param name="eta0">0.1</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="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.31739465e26</param> -->
-<!-- <param name="theta">0.011512925465</param> -->
+ <param name="theta">0.011512925465</param>
</struct>
<struct name="strainWeakening">
@@ -499,13 +499,13 @@
</struct>
<struct name="mantleViscosity">
- <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="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">
@@ -529,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 -->
@@ -738,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> -->
- <!-- 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> -->
- <!-- 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> -->
+ <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>
+<!-- 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>
-<!-- <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/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c 2009-01-20 16:22:10 UTC (rev 13890)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c 2009-01-20 23:12:15 UTC (rev 13891)
@@ -673,7 +673,7 @@
if(stress!=NULL)
{
ParticleFeVariable_Update( stress );
- _SystemLinearEquations_Build(sle,_context);
+/* _SystemLinearEquations_Build(sle,_context); */
}
self->nonLinearIteration_I = 0;
More information about the CIG-COMMITS
mailing list