[cig-commits] [commit] master: Bugfix (fd2bef0)

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


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

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

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

commit fd2bef017fa3e0cc71a912af5935ba89d8494b0a
Author: Siqi Zhang <siqi.zhang at mq.edu.au>
Date:   Thu May 22 09:39:53 2014 -0500

    Bugfix
    
    Same as last the commit


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

fd2bef017fa3e0cc71a912af5935ba89d8494b0a
 source/heating_model/radioactive_decay.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/heating_model/radioactive_decay.cc b/source/heating_model/radioactive_decay.cc
index ee31050..9ab8501 100644
--- a/source/heating_model/radioactive_decay.cc
+++ b/source/heating_model/radioactive_decay.cc
@@ -150,13 +150,15 @@ namespace aspect
                 (Utilities::split_string_list
                 (prm.get("Initial concentration crust")));
             AssertThrow(radioactive_initial_concentration_crust.size()==n_radio_heating_elements,
-                           "the number of radioactive elements."));
+                        ExcMessage("Number of initial concentration entities in crust "
+                                   "does not match 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."));
+                        ExcMessage("Number of initial concentration entities in mantle "
+                                   "does not match the number of radioactive elements."));
 
             is_crust_defined_by_composition = prm.get_bool    ("Crust defined by composition");
             crust_depth                     = prm.get_double  ("Crust depth");



More information about the CIG-COMMITS mailing list