[cig-commits] commit: Merge in Underworld 1.4.1
Mercurial
hg at geodynamics.org
Tue Mar 23 10:36:10 PDT 2010
changeset: 841:c36fbf63edbe
tag: tip
parent: 829:3bb9aae4d6a1
parent: 840:fd07ed2308dc
user: Walter Landry <wlandry at caltech.edu>
date: Tue Mar 23 08:16:53 2010 -0700
files: Rheology/src/Arrhenius.meta Rheology/src/DepthDependentViscosity.meta Rheology/src/Director.meta Rheology/src/DruckerPrager.meta Rheology/src/FrankKamenetskii.meta Rheology/src/MultiRheologyMaterial.meta Rheology/src/NonNewtonian.meta Rheology/src/StrainWeakening.meta Rheology/src/VonMises.meta
description:
Merge in Underworld 1.4.1
diff -r 3bb9aae4d6a1 -r c36fbf63edbe .hgtags
--- a/.hgtags Tue Mar 16 16:03:48 2010 -0700
+++ b/.hgtags Tue Mar 23 08:16:53 2010 -0700
@@ -1,1 +1,7 @@ aa60a67892ba12806ce0ac5c060100d3af298439
aa60a67892ba12806ce0ac5c060100d3af298439 v1.2.0
+c731a9489a82aee55d521b6f968db3939ba36108 1.4.0
+863463922d6dfc502ed0cccb1bb1ae0aa93f7659 1.4.1
+863463922d6dfc502ed0cccb1bb1ae0aa93f7659 1.4.1
+0000000000000000000000000000000000000000 1.4.1
+0000000000000000000000000000000000000000 1.4.1
+69e1cdf7d177a1d7242c86b91dd1d1954398126c 1.4.1
diff -r 3bb9aae4d6a1 -r c36fbf63edbe Rheology/src/Arrhenius.meta
--- a/Rheology/src/Arrhenius.meta Tue Mar 16 16:03:48 2010 -0700
+++ b/Rheology/src/Arrhenius.meta Tue Mar 23 08:16:53 2010 -0700
@@ -2,67 +2,66 @@
<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
-<param name="Name">Arrhenius</param>
-<param name="Author">...</param>
-<param name="Organisation">MCC</param>
-<param name="Project">Underworld</param>
-<param name="Location">./Underworld/Rheology/src/</param>
-<param name="Project Web">http://www.mcc.monash.edu.au/Software/Underworld</param>
-<param name="Copyright">Copyright (c) 2005, Monash Cluster Computing</param>
-<param name="License">http://www.opensource.org/licenses/bsd-license.php</param>
-<param name="Parent">Rheology</param>
-<param name="Reference">...</param>
-<param name="Summary">...</param>
-<param name="Description">A temperature dependent rheology.</param>
-<param name="Equation">$\\eta = \\eta_0 \\exp \\left( \\frac {E + V d} {T + T_0} \\right)$</param>
+ <param name="Name">Arrhenius</param>
+ <param name="Author">...</param>
+ <param name="Organisation">MCC</param>
+ <param name="Project">Underworld</param>
+ <param name="Location">./Underworld/Rheology/src/</param>
+ <param name="Project Web">http://www.mcc.monash.edu.au/Software/Underworld</param>
+ <param name="Copyright">Copyright (c) 2005, Monash Cluster Computing</param>
+ <param name="License">http://www.opensource.org/licenses/bsd-license.php</param>
+ <param name="Parent">Rheology</param>
+ <param name="Reference">...</param>
+ <param name="Summary">...</param>
+ <param name="Description">A temperature dependent rheology.</param>
+ <param name="Equation">$\eta = \eta_0 \exp \left( \frac {E + V d} {T + T_0} \right)$</param>
-<!--Now the interesting stuff-->
-<list name="Params">
- <struct>
- <param name="Name">eta0</param>
- <param name="Type">Double</param>
- <param name="Default">1.0</param>
- <param name="Description">This is the $\\eta_0$ in the equation above.</param>
- </struct>
- <struct>
- <param name="Name">activationEnergy</param>
- <param name="Type">Double</param>
- <param name="Default">0.0</param>
- <param name="Description">This is the $E$ in the equation above.</param>
- </struct>
- <struct>
- <param name="Name">activationVolume</param>
- <param name="Type">Double</param>
- <param name="Default">0.0</param>
- <param name="Description">This is the $V$ in the equation above.</param>
- </struct>
- <struct>
- <param name="Name">referenceTemperature</param>
- <param name="Type">Double</param>
- <param name="Default">1.0</param>
- <param name="Description">This is the $T_0$ in the equation above.</param>
- </struct>
+ <!--Now the interesting stuff-->
+ <list name="Params">
+ <struct>
+ <param name="Name">eta0</param>
+ <param name="Type">Double</param>
+ <param name="Default">1.0</param>
+ <param name="Description">This is the $\eta_0$ in the equation above.</param>
+ </struct>
+ <struct>
+ <param name="Name">activationEnergy</param>
+ <param name="Type">Double</param>
+ <param name="Default">0.0</param>
+ <param name="Description">This is the $E$ in the equation above.</param>
+ </struct>
+ <struct>
+ <param name="Name">activationVolume</param>
+ <param name="Type">Double</param>
+ <param name="Default">0.0</param>
+ <param name="Description">This is the $V$ in the equation above.</param>
+ </struct>
+ <struct>
+ <param name="Name">referenceTemperature</param>
+ <param name="Type">Double</param>
+ <param name="Default">1.0</param>
+ <param name="Description">This is the $T_0$ in the equation above.</param>
+ </struct>
+ </list>
-</list>
+ <list name="Dependencies">
+ <struct>
+ <param name="Essential">True</param>
+ <param name="Name">TemperatureField</param>
+ <param name="Type">FeVariable</param>
+ <param name="Description">The TemperatureField that provides the $T$ in the equation above.</param>
+ </struct>
+ </list>
-<list name="Dependencies">
- <struct>
- <param name="Essential">True</param>
- <param name="Name">TemperatureField</param>
- <param name="Type">FeVariable</param>
- <param name="Description">The TemperatureField that provides the $T$ in the equation above.</param>
- </struct>
-</list>
-
-<!-- Add an exmaple XML if possible -->
-<param name="Example"><![CDATA[
- <struct name="temperatureDependence">
- <param name="Type">Arrhenius</param>
- <param name="TemperatureField">TemperatureField</param>
- <param name="eta0">1.0e-6</param>
- <param name="activationEnergy">27.63102112</param>
- <param name="activationVolume">0.0</param>
- </struct>]]>
-</param>
+ <!-- Add an exmaple XML if possible -->
+ <param name="Example"><![CDATA[
+ <struct name="temperatureDependence">
+ <param name="Type">Arrhenius</param>
+ <param name="TemperatureField">TemperatureField</param>
+ <param name="eta0">1.0e-6</param>
+ <param name="activationEnergy">27.63102112</param>
+ <param name="activationVolume">0.0</param>
+ </struct>]]>
+ </param>
</StGermainData>
diff -r 3bb9aae4d6a1 -r c36fbf63edbe Rheology/src/DepthDependentViscosity.meta
--- a/Rheology/src/DepthDependentViscosity.meta Tue Mar 16 16:03:48 2010 -0700
+++ b/Rheology/src/DepthDependentViscosity.meta Tue Mar 23 08:16:53 2010 -0700
@@ -14,7 +14,7 @@
<param name="Reference">...</param>
<param name="Summary">...</param>
<param name="Description">A rheology that varies exponentially in one direction.</param>
- <param name="Equation">$\\eta = \\eta_0 \\exp \\left( \\gamma ( y - y_0 ) \\right)$</param>
+ <param name="Equation">$\eta = \eta_0 \exp \left( \gamma ( y - y_0 ) \right)$</param>
<!--Now the interesting stuff-->
<list name="Params">
@@ -34,7 +34,7 @@
<param name="Name">gamma</param>
<param name="Type">Double</param>
<param name="Default">0.0</param>
- <param name="Description">This is the $\\gamma$ in the equation above.</param>
+ <param name="Description">This is the $\gamma$ in the equation above.</param>
</struct>
<struct>
<param name="Name">referencePoint</param>
diff -r 3bb9aae4d6a1 -r c36fbf63edbe Rheology/src/Director.meta
--- a/Rheology/src/Director.meta Tue Mar 16 16:03:48 2010 -0700
+++ b/Rheology/src/Director.meta Tue Mar 23 08:16:53 2010 -0700
@@ -14,7 +14,7 @@
<param name="Reference">...</param>
<param name="Summary">...</param>
<param name="Description">This component allows to add a vector to a material points and to update it with respect to the deformation.</param>
- <param name="Equation">Director Evolution Equation: $\\dot n_i = -L_{ji} n_j, n_i \\rightarrow \\frac{n_i}{|n|}$</param>
+ <param name="Equation">Director Evolution Equation: $\dot n_i = -L_{ji} n_j, n_i \rightarrow \frac{n_i}{|n|}$</param>
<!--Now the interesting stuff-->
<list name="Params">
diff -r 3bb9aae4d6a1 -r c36fbf63edbe Rheology/src/DruckerPrager.meta
--- a/Rheology/src/DruckerPrager.meta Tue Mar 16 16:03:48 2010 -0700
+++ b/Rheology/src/DruckerPrager.meta Tue Mar 23 08:16:53 2010 -0700
@@ -14,7 +14,7 @@
<param name="Reference">...</param>
<param name="Summary">...</param>
<param name="Description">Implements a Drucker-Prager yield Rheology. The parameters of this criterion are calibrated so that the yield surface coincides with the Mohr Coulomb one for the condition of a compression test. </param>
- <param name="Equation">Yield Surface: $f = \\sqrt{3} \\bar{\\tau} - \\alpha p - k \\le 0, \\alpha = \\frac{6 \\sin\\varphi}{3 - \\sin\\varphi}, k = \\frac{6 c \\cos\\varphi}{3 - \\sin\\varphi}$</param>
+ <param name="Equation">Yield Surface: $f = \sqrt{3} \bar{\tau} - \alpha p - k \le 0, \alpha = \frac{6 \sin\varphi}{3 - \sin\varphi}, k = \frac{6 c \cos\varphi}{3 - \sin\varphi}$</param>
<!--Now the interesting stuff-->
diff -r 3bb9aae4d6a1 -r c36fbf63edbe Rheology/src/FrankKamenetskii.meta
--- a/Rheology/src/FrankKamenetskii.meta Tue Mar 16 16:03:48 2010 -0700
+++ b/Rheology/src/FrankKamenetskii.meta Tue Mar 23 08:16:53 2010 -0700
@@ -14,7 +14,7 @@
<param name="Reference">...</param>
<param name="Summary">...</param>
<param name="Description">An approximation to the Arrhenius temperature dependent rheology.</param>
- <param name="Equation">$\\eta = \\eta_0 \\exp\\left(-\\theta T\\right)$</param>
+ <param name="Equation">$\eta = \eta_0 \exp\left(-\theta T\right)$</param>
<!--Now the interesting stuff-->
@@ -23,13 +23,13 @@
<param name="Name">eta0</param>
<param name="Type">Double</param>
<param name="Default">1.0</param>
- <param name="Description">This is the $\\eta_0$ in the equation in the description.</param>
+ <param name="Description">This is the $\eta_0$ in the equation in the description.</param>
</struct>
<struct>
<param name="Name">theta</param>
<param name="Type">Double</param>
<param name="Default">0.0</param>
- <param name="Description">This is the $\\theta$ in the equation in the description.</param>
+ <param name="Description">This is the $\theta$ in the equation in the description.</param>
</struct>
</list>
diff -r 3bb9aae4d6a1 -r c36fbf63edbe Rheology/src/MultiRheologyMaterial.meta
--- a/Rheology/src/MultiRheologyMaterial.meta Tue Mar 16 16:03:48 2010 -0700
+++ b/Rheology/src/MultiRheologyMaterial.meta Tue Mar 23 08:16:53 2010 -0700
@@ -13,7 +13,7 @@
<param name="Parent">RheologyMaterial</param>
<param name="Reference">...</param>
<param name="Summary">...</param>
-<param name="Description">This allows for multiple rheologies to be applied to a material. The resultant isotropic material will have a effective viscosity defined as $\\frac{1}{n_{eff}} = \\sum_{i=0}^n \\frac{1}{n_{i}}$, where $n_i$ is the isotropic vicosities of the input rheologies. <br/><br/>
+ <param name="Description">This allows for multiple rheologies to be applied to a material. The resultant isotropic material will have a effective viscosity defined as $\frac{1}{n_{eff}} = \sum_{i=0}^n \frac{1}{n_{i}}$, where $n_i$ is the isotropic vicosities of the input rheologies. <br/><br/>
The input rheologies must be defined in a rheology list, see example</param>
<list name="Params">
diff -r 3bb9aae4d6a1 -r c36fbf63edbe Rheology/src/NonNewtonian.meta
--- a/Rheology/src/NonNewtonian.meta Tue Mar 16 16:03:48 2010 -0700
+++ b/Rheology/src/NonNewtonian.meta Tue Mar 23 08:16:53 2010 -0700
@@ -14,7 +14,7 @@
<param name="Reference">...</param>
<param name="Summary">...</param>
<param name="Description">Models rheology with dislocation creep (non-Newtonian Stress Dependent viscosity)</param>
-<param name="Equation">Constitutive Equation: $\\eta = \\eta_{0} \\tau^{1-n}$.\\\\* How this is implemented in the code: $\\eta = (2\\dot\\epsilon)^\\frac{1-n}{n} \\eta_{0}^\\frac{1}{n}$</param>
+ <param name="Equation">Constitutive Equation: $\eta = \eta_{0} \tau^{1-n}$.\* How this is implemented in the code: $\eta = (2\dot\epsilon)^\frac{1-n}{n} \eta_{0}^\frac{1}{n}$</param>
<!--Now the interesting stuff-->
<list name="Params">
@@ -31,7 +31,7 @@
<param name="Essential">True</param>
<param name="Name">StrainRateInvariantField</param>
<param name="Type">FeVariable</param>
- <param name="Description">The field that provides the $\\dot\epsilon$ in the equation above.</param>
+ <param name="Description">The field that provides the $\dot\epsilon$ in the equation above.</param>
</struct>
</list>
diff -r 3bb9aae4d6a1 -r c36fbf63edbe Rheology/src/StrainWeakening.meta
--- a/Rheology/src/StrainWeakening.meta Tue Mar 16 16:03:48 2010 -0700
+++ b/Rheology/src/StrainWeakening.meta Tue Mar 23 08:16:53 2010 -0700
@@ -42,7 +42,7 @@
<param name="Type">Double</param>
<param name="Default">-1.0</param>
<param name="Description">This parameter is used to set the way the initial randomly oriented damage is distributed in space
- $\\phi = \\cos^2 k_I x_I$. The way the damage evolves often makes it a good idea to keep shear bands away from boundaries,
+ $\phi = \cos^2 k_I x_I$. The way the damage evolves often makes it a good idea to keep shear bands away from boundaries,
especially where the mesh-stretching boundary condition is applied. In this case, make sure $k_I = n / L_I$ where $n$ is
an integer, and $L_I$ is the length of the box in the $I$ direction.</param>
</struct>
@@ -51,7 +51,7 @@
<param name="Type">Double</param>
<param name="Default">-1.0</param>
<param name="Description">This parameter is used to set the way the initial randomly oriented damage is distributed in space
- $\\phi = \\sin^2 k_I x_I$. The way the damage evolves often makes it a good idea to keep shear bands away from boundaries,
+ $\phi = \sin^2 k_I x_I$. The way the damage evolves often makes it a good idea to keep shear bands away from boundaries,
especially where the mesh-stretching boundary condition is applied. In this case, make sure $k_I = n / L_I$ where $n$ is
an integer, and $L_I$ is the length of the box in the $I$ direction.</param>
</struct>
@@ -60,7 +60,7 @@
<param name="Type">Double</param>
<param name="Default">-1.0</param>
<param name="Description">This parameter is used to set the way the initial randomly oriented damage is distributed in space
- $\\phi = \\cos^2 k_I x_I$. The way the damage evolves often makes it a good idea to keep shear bands away from boundaries,
+ $\phi = \cos^2 k_I x_I$. The way the damage evolves often makes it a good idea to keep shear bands away from boundaries,
especially where the mesh-stretching boundary condition is applied. In this case, make sure $k_I = n / L_I$ where $n$ is
an integer, and $L_I$ is the length of the box in the $I$ direction.</param>
</struct>
@@ -69,7 +69,7 @@
<param name="Type">Double</param>
<param name="Default">-1.0</param>
<param name="Description">>This parameter is used to set the way the initial randomly oriented damage is distributed in space
- $\\phi = \\sin^2 k_K x_K$. The way the damage evolves often makes it a good idea to keep shear bands away from boundaries,
+ $\phi = \sin^2 k_K x_K$. The way the damage evolves often makes it a good idea to keep shear bands away from boundaries,
especially where the mesh-stretching boundary condition is applied. In this case, make sure $k_K = n / L_K$ where $n$ is
an integer, and $L_K$ is the length of the box in the $K$ direction.</param>
</struct>
@@ -78,7 +78,7 @@
<param name="Type">Double</param>
<param name="Default">-1.0</param>
<param name="Description">This parameter is used to set the way the initial randomly oriented damage is distributed in space
- $\\phi = \\cos^2 k_K x_K$. The way the damage evolves often makes it a good idea to keep shear bands away from boundaries,
+ $\phi = \cos^2 k_K x_K$. The way the damage evolves often makes it a good idea to keep shear bands away from boundaries,
especially where the mesh-stretching boundary condition is applied. In this case, make sure $k_K = n / L_K$ where $n$ is
an integer, and $L_K$ is the length of the box in the $K$ direction.</param>
</struct>
diff -r 3bb9aae4d6a1 -r c36fbf63edbe Rheology/src/VonMises.meta
--- a/Rheology/src/VonMises.meta Tue Mar 16 16:03:48 2010 -0700
+++ b/Rheology/src/VonMises.meta Tue Mar 23 08:16:53 2010 -0700
@@ -14,7 +14,7 @@
<param name="Reference">...</param>
<param name="Summary">...</param>
<param name="Description">A basic yielding model.</param>
- <param name="Equation">$\\tau_{yield} = c_0$</param>
+ <param name="Equation">$\tau_{yield} = c_0$</param>
<!--Now the interesting stuff-->
<list name="Params">
@@ -43,7 +43,7 @@
<param name="Essential">True</param>
<param name="Name">StrainRateField</param>
<param name="Type">FeVariable</param>
- <param name="Description">The field that provides the $\\dot\\epsilon$ in the equation above.</param>
+ <param name="Description">The field that provides the $\dot\epsilon$ in the equation above.</param>
</struct>
</list>
diff -r 3bb9aae4d6a1 -r c36fbf63edbe SysTest/PerformanceTests/testAll.py
--- a/SysTest/PerformanceTests/testAll.py Tue Mar 16 16:03:48 2010 -0700
+++ b/SysTest/PerformanceTests/testAll.py Tue Mar 23 08:16:53 2010 -0700
@@ -40,12 +40,20 @@ def runTests():
message += "--------------------------------------------------------\n" + \
"[SYS] Underworld Convergence Tests:\n" + \
"[SYS] Total Passes: (" + str(passed) + "/" + str(len( commands )) + ")\n" \
- "[SYS] Failed Commands:\n"
- for command in failed_commands:
- message += "[SYS] " + command + "\n"
+
+ if( len(failed_commands) > 0 ):
+ message += "[SYS] Failed Commands:\n"
+ for command in failed_commands:
+ message += "[SYS] " + command + "\n"
+
message += "--------------------------------------------------------\n"
FILE.write( message )
print message
FILE.close()
+ if failed > 0:
+ sys.exit(1)
+ else:
+ sys.exit(0)
+
runTests()
diff -r 3bb9aae4d6a1 -r c36fbf63edbe SysTest/RegressionTests/testAll-lowres.py
--- a/SysTest/RegressionTests/testAll-lowres.py Tue Mar 16 16:03:48 2010 -0700
+++ b/SysTest/RegressionTests/testAll-lowres.py Tue Mar 23 08:16:53 2010 -0700
@@ -46,13 +46,21 @@ def runTests():
message = ''
message += "--------------------------------------------------------\n" + \
"[SYS] Underworld Low-Res Integration Tests:\n" + \
- "[SYS] Total Passes: (" + str(passed) + "/" + str(len( commands )) + ")\n" \
- "[SYS] Failed Commands:\n"
- for command in failed_commands:
- message += "[SYS] " + command + "\n"
+ "[SYS] Total Passes: (" + str(passed) + "/" + str(len( commands )) + ")\n"
+
+ if( len(failed_commands) > 0 ):
+ message += "[SYS] Failed Commands:\n"
+ for command in failed_commands:
+ message += "[SYS] " + command + "\n"
+
message += "--------------------------------------------------------\n"
FILE.write( message )
print message
FILE.close()
+ if failed > 0:
+ sys.exit(1)
+ else:
+ sys.exit(0)
+
runTests()
diff -r 3bb9aae4d6a1 -r c36fbf63edbe SysTest/RegressionTests/testAll.py
--- a/SysTest/RegressionTests/testAll.py Tue Mar 16 16:03:48 2010 -0700
+++ b/SysTest/RegressionTests/testAll.py Tue Mar 23 08:16:53 2010 -0700
@@ -62,12 +62,20 @@ def runTests():
message += "--------------------------------------------------------\n" + \
"[SYS] Underworld Normal-Res Integration Tests:\n" + \
"[SYS] Total Passes: (" + str(passed) + "/" + str(len( commands )) + ")\n" \
- "[SYS] Failed Commands:\n"
- for command in failed_commands:
- message += "[SYS] " + command + "\n"
+
+ if( len(failed_commands) > 0 ):
+ message += "[SYS] Failed Commands:\n"
+ for command in failed_commands:
+ message += "[SYS] " + command + "\n"
+
message += "--------------------------------------------------------\n"
FILE.write( message )
print message
FILE.close()
+ if failed > 0:
+ sys.exit(1)
+ else:
+ sys.exit(0)
+
runTests()
diff -r 3bb9aae4d6a1 -r c36fbf63edbe libUnderworld/src/Init.c
--- a/libUnderworld/src/Init.c Tue Mar 16 16:03:48 2010 -0700
+++ b/libUnderworld/src/Init.c Tue Mar 23 08:16:53 2010 -0700
@@ -118,7 +118,6 @@ Bool Underworld_Init( int* argc, char**
ModulesManager_AddDirectory( "Underworld", LIB_DIR );
- ToolboxesManager_SetInitialised( stgToolboxesManager, "Underworld" );
return True;
}
return False;
More information about the CIG-COMMITS
mailing list