[cig-commits] [commit] master: Improved documentation and some code cleanup for steinberger material model. (a142193)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri May 23 07:30:55 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/1d916725840b7e74c3611154de2dcabdfa3dfdce...94ba440616a27b74d5b2b164192ead258cd6c3c2
>---------------------------------------------------------------
commit a142193bb8189be6acf3a2ad32f395c255278156
Author: Rene Gassmoeller <R.Gassmoeller at mailbox.org>
Date: Fri May 23 09:19:34 2014 -0500
Improved documentation and some code cleanup for steinberger material model.
>---------------------------------------------------------------
a142193bb8189be6acf3a2ad32f395c255278156
data/material-model/steinberger/description.txt | 14 +++++++-------
include/aspect/material_model/steinberger.h | 14 ++++++++------
source/material_model/steinberger.cc | 16 ++++++++--------
3 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/data/material-model/steinberger/description.txt b/data/material-model/steinberger/description.txt
index 232b097..5f1ff03 100644
--- a/data/material-model/steinberger/description.txt
+++ b/data/material-model/steinberger/description.txt
@@ -6,15 +6,15 @@ radial-visc.txt (lookup with depth)
vis_lateral:
temp-viscosity-prefactor.txt (with depth)
--> value / adiabatic_temperature * (horizontal_avg-temperature) / (temperature)
+-> value / adiabatic_temperature * (adiabatic_temperature-temperature) / (temperature)
-(steinberger/calderwood, Formula (6))
+(steinberger/calderwood, modification of Formula (6), we replaced the average_temperature by the adiabatic temperature, since the consequence that the viscosity stays constant although the temperature and the lateral averaged temperature increase does not seem to be reasonable for our models)
-thermal_expansivity:
+thermal_expansivity: lookup table
+specific heat: lookup table
+density: lookup table
+thermal conductivity: constant
-specific heat: constant
-
-density:
-?
+The provided lookup table was constructed with the software PERPLEX (Connolly, 2005) using the thermodynamic database by Stixrude (2011) and assuming a pyrolitic composition (Ringwood 1988).
diff --git a/include/aspect/material_model/steinberger.h b/include/aspect/material_model/steinberger.h
index 41b4eb5..06be810 100644
--- a/include/aspect/material_model/steinberger.h
+++ b/include/aspect/material_model/steinberger.h
@@ -41,9 +41,11 @@ namespace aspect
* A variable viscosity material model that reads the essential values of
* coefficients from tables in input files.
*
- * This model is based on the paper Steinberger/Calderwood 2006: "Models
- * of large-scale viscous flow in the Earth's mantle with contraints from
- * mineral physics and surface observations"
+ * The viscosity of this model is based on the paper
+ * Steinberger/Calderwood 2006: "Models of large-scale viscous flow in
+ * the Earth's mantle with contraints from mineral physics and surface
+ * observations". The thermal conductivity is constant and the other
+ * parameters are provided via lookup tables from the software PERPLEX.
*
* @ingroup MaterialModels
*/
@@ -271,11 +273,11 @@ namespace aspect
const Point<dim> &position) const;
/**
- * Pointer to an object that reads and processes data we get from
- * Perplex files.
+ * List of pointers to objects that read and process data we get from
+ * Perplex files. There is one pointer/object per compositional field
+ * data provided.
*/
std::vector<std_cxx1x::shared_ptr<internal::MaterialLookup> > material_lookup;
- //std_cxx1x::shared_ptr<internal::MaterialLookup> material_lookup;
/**
* Pointer to an object that reads and processes data for the lateral
diff --git a/source/material_model/steinberger.cc b/source/material_model/steinberger.cc
index 208237c..eb3fa9d 100644
--- a/source/material_model/steinberger.cc
+++ b/source/material_model/steinberger.cc
@@ -596,7 +596,7 @@ namespace aspect
Steinberger<dim>::
thermal_conductivity (const double,
const double,
- const std::vector<double> &, /*composition*/
+ const std::vector<double> &,
const Point<dim> &) const
{
return 4.7;
@@ -896,8 +896,8 @@ namespace aspect
prm.declare_entry ("Material file names", "pyr-ringwood88.txt",
Patterns::List (Patterns::Anything()),
"The file names of the material data. "
- "List with as many components as active"
- "compositional fields (material data is assumed to"
+ "List with as many components as active "
+ "compositional fields (material data is assumed to "
"be in order with the ordering of the fields). ");
prm.declare_entry ("Radial viscosity file name", "radial-visc.txt",
Patterns::Anything (),
@@ -911,8 +911,8 @@ namespace aspect
"material properties (slower but more accurate). ");
prm.declare_entry ("Latent heat", "false",
Patterns::Bool (),
- "Whether to include latent heat effects in the"
- "calculation of thermal expansivity and specific heat."
+ "Whether to include latent heat effects in the "
+ "calculation of thermal expansivity and specific heat. "
"Following the approach of Nakagawa et al. 2009. ");
prm.declare_entry ("Compressible", "false",
Patterns::Bool (),
@@ -980,8 +980,8 @@ namespace aspect
"\\url{http://dx.doi.org/10.1111/j.1365-246X.2006.03131.x}) and material "
"data from a database generated by the thermodynamics code \\texttt{Perplex}, "
"see \\url{http://www.perplex.ethz.ch/}. "
- "The database builds upon the thermodynamic database by "
- "Stixrude 2011 and assumes a pyrolitic composition by "
- "Ringwood 1988. ")
+ "The default example data builds upon the thermodynamic "
+ "database by Stixrude 2011 and assumes a pyrolitic composition by "
+ "Ringwood 1988 but is easily replaceable by other data files. ")
}
}
More information about the CIG-COMMITS
mailing list