[cig-commits] [commit] master: Add more info with assert error (b945054)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/ed4caebc0ab942d8c7bc1a6a3ba70e37f93accde...dbe66e1b6d25d5ff21653c48f14f343e10ae69f4

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

commit b9450542a8db45d2738d8da8f87d3a8c517b5c85
Author: ian-r-rose <ian.r.rose at gmail.com>
Date:   Mon May 19 16:31:45 2014 -0500

    Add more info with assert error


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

b9450542a8db45d2738d8da8f87d3a8c517b5c85
 source/material_model/multicomponent.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/material_model/multicomponent.cc b/source/material_model/multicomponent.cc
index 2c004b8..97013cf 100644
--- a/source/material_model/multicomponent.cc
+++ b/source/material_model/multicomponent.cc
@@ -402,7 +402,7 @@ namespace aspect
           //Parse densities
           x_values = Utilities::string_to_double(Utilities::split_string_list(prm.get ("Densities")));
           AssertThrow(x_values.size() == 1u || (x_values.size() == n_fields), 
-                      ExcMessage("Length of list must be either one, or n_compositional_fields+1"));
+                      ExcMessage("Length of density list must be either one, or n_compositional_fields+1"));
           if(x_values.size() == 1) 
             densities.assign( n_fields , x_values[0]);
           else
@@ -411,7 +411,7 @@ namespace aspect
           //Parse viscosities
           x_values = Utilities::string_to_double(Utilities::split_string_list(prm.get ("Viscosities")));
           AssertThrow(x_values.size() == 1u || (x_values.size() == n_fields), 
-                      ExcMessage("Length of list must be either one, or n_compositional_fields+1"));
+                      ExcMessage("Length of viscosity list must be either one, or n_compositional_fields+1"));
           if(x_values.size() == 1) 
             viscosities.assign( n_fields , x_values[0]);
           else
@@ -420,7 +420,7 @@ namespace aspect
           //Parse thermal conductivities
           x_values = Utilities::string_to_double(Utilities::split_string_list(prm.get ("Thermal conductivities")));
           AssertThrow(x_values.size() == 1u || (x_values.size() == n_fields), 
-                      ExcMessage("Length of list must be either one, or n_compositional_fields+1"));
+                      ExcMessage("Length of thermal conductivity list must be either one, or n_compositional_fields+1"));
           if(x_values.size() == 1) 
             thermal_conductivities.assign( n_fields , x_values[0]);
           else
@@ -429,7 +429,7 @@ namespace aspect
           //Parse thermal expansivities
           x_values = Utilities::string_to_double(Utilities::split_string_list(prm.get ("Thermal expansivities")));
           AssertThrow(x_values.size() == 1u || (x_values.size() == n_fields), 
-                      ExcMessage("Length of list must be either one, or n_compositional_fields+1"));
+                      ExcMessage("Length of thermal expansivity list must be either one, or n_compositional_fields+1"));
           if(x_values.size() == 1) 
             thermal_expansivities.assign( n_fields , x_values[0]);
           else
@@ -438,7 +438,7 @@ namespace aspect
           //Parse specific heats
           x_values = Utilities::string_to_double(Utilities::split_string_list(prm.get ("Specific heats")));
           AssertThrow(x_values.size() == 1u || (x_values.size() == n_fields), 
-                      ExcMessage("Length of list must be either one, or n_compositional_fields+1"));
+                      ExcMessage("Length of specific heat list must be either one, or n_compositional_fields+1"));
           if(x_values.size() == 1) 
             specific_heats.assign( n_fields , x_values[0]);
           else