[cig-commits] [commit] master: Document variables and remove a now unnecessary variable. (b66ab7e)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue May 20 13:45:07 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/4f4b96e0569b8be211d2d72b283391b5d08b4e1d...0586ab6f9cf6ec525c331a8c0113ca155a3f1f87
>---------------------------------------------------------------
commit b66ab7e3a63167c433539c8947d1d929bfa0b44d
Author: Rene Gassmoeller <R.Gassmoeller at mailbox.org>
Date: Tue May 20 15:30:50 2014 -0500
Document variables and remove a now unnecessary variable.
>---------------------------------------------------------------
b66ab7e3a63167c433539c8947d1d929bfa0b44d
.../aspect/material_model/simple_compressible.h | 22 ++++++++++++++++++++--
source/material_model/simple_compressible.cc | 6 ------
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/include/aspect/material_model/simple_compressible.h b/include/aspect/material_model/simple_compressible.h
index 4167e3b..dc0b7f3 100644
--- a/include/aspect/material_model/simple_compressible.h
+++ b/include/aspect/material_model/simple_compressible.h
@@ -180,15 +180,33 @@ namespace aspect
*/
private:
+ /**
+ * The reference surface temperature
+ */
double reference_rho;
- double reference_T;
+
+ /**
+ * The constant viscosity
+ */
double eta;
+
+ /**
+ * The constant thermal expansivity
+ */
double thermal_alpha;
+
+ /**
+ * The constant specific heat
+ */
double reference_specific_heat;
+
+ /**
+ * The constant compressibility.
+ */
double reference_compressibility;
/**
- * The thermal conductivity.
+ * The constant thermal conductivity.
*/
double k_value;
diff --git a/source/material_model/simple_compressible.cc b/source/material_model/simple_compressible.cc
index 81b0a40..3a525cf 100644
--- a/source/material_model/simple_compressible.cc
+++ b/source/material_model/simple_compressible.cc
@@ -223,10 +223,6 @@ namespace aspect
prm.declare_entry ("Reference density", "3300",
Patterns::Double (0),
"Reference density $\\rho_0$. Units: $kg/m^3$.");
- prm.declare_entry ("Reference temperature", "293",
- Patterns::Double (0),
- "The reference temperature $T_0$. The reference temperature is used "
- "in both the density and viscosity formulas. Units: $K$.");
prm.declare_entry ("Viscosity", "1e21",
Patterns::Double (0),
"The value of the constant viscosity $\\eta_0$. Units: $kg/m/s$.");
@@ -263,13 +259,11 @@ namespace aspect
prm.enter_subsection("Simple compressible model");
{
reference_rho = prm.get_double ("Reference density");
- reference_T = prm.get_double ("Reference temperature");
eta = prm.get_double ("Viscosity");
k_value = prm.get_double ("Thermal conductivity");
reference_specific_heat = prm.get_double ("Reference specific heat");
thermal_alpha = prm.get_double ("Thermal expansion coefficient");
reference_compressibility = prm.get_double ("Reference compressibility");
-
}
prm.leave_subsection();
}
More information about the CIG-COMMITS
mailing list