[cig-commits] [commit] master: Removed a magic number with a reasonable one. (4af5e36)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed May 21 14:03:24 PDT 2014


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

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

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

commit 4af5e36f68982582cbf6212c141fd8a7c0646afe
Author: Rene Gassmoeller <R.Gassmoeller at mailbox.org>
Date:   Wed May 21 15:26:30 2014 -0500

    Removed a magic number with a reasonable one.


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

4af5e36f68982582cbf6212c141fd8a7c0646afe
 source/material_model/steinberger.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/material_model/steinberger.cc b/source/material_model/steinberger.cc
index 5adf275..47eb89e 100644
--- a/source/material_model/steinberger.cc
+++ b/source/material_model/steinberger.cc
@@ -345,6 +345,11 @@ namespace aspect
             return values[idx];
           }
 
+          int get_nslices()
+          {
+            return values.size();
+          }
+
         private:
           std::vector<double> values;
           double min_depth;
@@ -418,7 +423,7 @@ namespace aspect
                                   (new internal::MaterialLookup(datadirectory+material_file_names[i],interpolation)));
       lateral_viscosity_lookup.reset(new internal::LateralViscosityLookup(datadirectory+lateral_viscosity_file_name));
       radial_viscosity_lookup.reset(new internal::RadialViscosityLookup(datadirectory+radial_viscosity_file_name));
-      avg_temp.resize(1000);
+      avg_temp.resize(lateral_viscosity_lookup->get_nslices());
     }
 
 



More information about the CIG-COMMITS mailing list