[cig-commits] [commit] master: Rename some variables for clarity. (f45252b)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed May 21 14:02:57 PDT 2014


Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/a7135c1f7697d39efff2f47a79ca1e1395cff504...73a71ba37f203bfed63bb8b602fdbd30ab99b1af

>---------------------------------------------------------------

commit f45252b940f6bd5fccdc00f5d485a68dd67fd9f0
Author: Rene Gassmoeller <R.Gassmoeller at mailbox.org>
Date:   Mon May 19 17:39:12 2014 -0500

    Rename some variables for clarity.


>---------------------------------------------------------------

f45252b940f6bd5fccdc00f5d485a68dd67fd9f0
 source/material_model/steinberger.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/material_model/steinberger.cc b/source/material_model/steinberger.cc
index 7cf1116..c989821 100644
--- a/source/material_model/steinberger.cc
+++ b/source/material_model/steinberger.cc
@@ -501,7 +501,8 @@ namespace aspect
     {
       const double rho = get_density(temperature,pressure,compositional_fields,position);
 
-      const double depth_rho = get_density(this->get_adiabatic_conditions().temperature(position),
+      const double adiabatic_temperature = this->get_adiabatic_conditions().temperature(position);
+      const double adiabatic_rho = get_density(adiabatic_temperature,
                                            pressure,
                                            compositional_fields,
                                            position);
@@ -512,7 +513,8 @@ namespace aspect
       const double surface_rho = get_density(surface_temperature,surface_pressure,compositional_fields,surface_point);
 
       //Return the density scaled to an incompressible profile
-      return (rho / depth_rho) * surface_rho;
+      const double scaled_density = (rho / adiabatic_rho) * surface_rho;
+      return scaled_density;
     }
 
 



More information about the CIG-COMMITS mailing list