[cig-commits] [commit] master: Add lines accidently removed by the past commits (7e18bb7)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/4a5e27e5690a0e0c1e13e19100af7398e37f36b8...d31f4e9435a1c12781f5b673b672cbd29c41c2c2

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

commit 7e18bb775d3f85dd92a24fe5b4330ca5a48cbb30
Author: Siqi Zhang <siqi.zhang at mq.edu.au>
Date:   Thu May 22 09:34:30 2014 -0500

    Add lines accidently removed by the past commits


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

7e18bb775d3f85dd92a24fe5b4330ca5a48cbb30
 source/heating_model/radioactive_decay.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/source/heating_model/radioactive_decay.cc b/source/heating_model/radioactive_decay.cc
index bf8993e..ee31050 100644
--- a/source/heating_model/radioactive_decay.cc
+++ b/source/heating_model/radioactive_decay.cc
@@ -62,6 +62,7 @@ namespace aspect
                 timedependent_radioactive_heating_rate+=
                     radioactive_heating_rate[i_radio]
                     *(radioactive_initial_concentration_mantle[i_radio]*(1-crust_percent)
+                    +radioactive_initial_concentration_crust[i_radio]*crust_percent)*1e-6
                     *std::pow(0.5,time/half_decay_time[i_radio]);
         }
         return (timedependent_radioactive_heating_rate);
@@ -146,11 +147,13 @@ namespace aspect
                            "the number of radioactive elements."));
                            
             radioactive_initial_concentration_crust=Utilities::string_to_double
+                (Utilities::split_string_list
                 (prm.get("Initial concentration crust")));
             AssertThrow(radioactive_initial_concentration_crust.size()==n_radio_heating_elements,
                            "the number of radioactive elements."));
                            
             radioactive_initial_concentration_mantle=Utilities::string_to_double
+                (Utilities::split_string_list
                 (prm.get("Initial concentration mantle")));
             AssertThrow(radioactive_initial_concentration_mantle.size()==n_radio_heating_elements,
                            "the number of radioactive elements."));
@@ -174,11 +177,9 @@ namespace aspect
   {
     ASPECT_REGISTER_HEATING_MODEL(RadioactiveDecay,
                                   "radioactive decay",
-                                  "Implementation of a model in which the heating "
-                                  "rate is decaying exponentially over time \n"
-                                  "The formula is interpreted as having units "
-                                  "W/kg."
-                                  "\n\n")
+                                  "Implementation of a model in which the internal "
+                                  "heating rate is decaying exponentially over time \n"
+                                  "The formula is interpreted as having units W/kg. \n\n")
   }                                              
 }