[cig-commits] [commit] master: bugfix (27a3446)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Thu May 22 15:35:59 PDT 2014


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

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

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

commit 27a3446ed3b558f66d224798cb709ce992a2c814
Author: Siqi Zhang <siqi.zhang at mq.edu.au>
Date:   Thu May 22 15:56:34 2014 -0500

    bugfix


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

27a3446ed3b558f66d224798cb709ce992a2c814
 source/heating_model/radioactive_decay.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/heating_model/radioactive_decay.cc b/source/heating_model/radioactive_decay.cc
index 2fdac76..0da3bdb 100644
--- a/source/heating_model/radioactive_decay.cc
+++ b/source/heating_model/radioactive_decay.cc
@@ -127,28 +127,28 @@ namespace aspect
             n_radio_heating_elements= prm.get_integer ("Number of elements");
             radioactive_heating_rates=Utilities::string_to_double
                 (Utilities::split_string_list
-                (prm.get("Heating rate")));
+                (prm.get("Heating rates")));
             AssertThrow(radioactive_heating_rates.size()==n_radio_heating_elements,
                 ExcMessage("Number of heating rate entities does not match "
                            "the number of radioactive elements."));
                            
             half_decay_times=Utilities::string_to_double
                 (Utilities::split_string_list
-                 (prm.get("Half decay time")));
+                 (prm.get("Half decay times")));
             AssertThrow(half_decay_times.size()==n_radio_heating_elements,
                 ExcMessage("Number of half decay time entities does not match "
                            "the number of radioactive elements."));
                            
             radioactive_initial_concentrations_crust=Utilities::string_to_double
                 (Utilities::split_string_list
-                (prm.get("Initial concentration crust")));
+                (prm.get("Initial concentrations crust")));
             AssertThrow(radioactive_initial_concentrations_crust.size()==n_radio_heating_elements,
                         ExcMessage("Number of initial concentration entities in crust "
                                    "does not match the number of radioactive elements."));
                            
             radioactive_initial_concentrations_mantle=Utilities::string_to_double
                 (Utilities::split_string_list
-                (prm.get("Initial concentration mantle")));
+                (prm.get("Initial concentrations mantle")));
             AssertThrow(radioactive_initial_concentrations_mantle.size()==n_radio_heating_elements,
                         ExcMessage("Number of initial concentration entities in mantle "
                                    "does not match the number of radioactive elements."));



More information about the CIG-COMMITS mailing list