[cig-commits] [commit] master: fix error check in assembly (8ede499)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Tue May 20 11:46:36 PDT 2014


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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/6204d1b7337a0741858189f8e4ee9cf2f447ebd6...8ede49902e2093f35fe062c7fc0f2339a96b9b57

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

commit 8ede49902e2093f35fe062c7fc0f2339a96b9b57
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 20 14:46:31 2014 -0400

    fix error check in assembly


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

8ede49902e2093f35fe062c7fc0f2339a96b9b57
 source/simulator/assembly.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/simulator/assembly.cc b/source/simulator/assembly.cc
index fe674a2..8f547fd 100644
--- a/source/simulator/assembly.cc
+++ b/source/simulator/assembly.cc
@@ -1568,7 +1568,8 @@ namespace aspect
             *
             (density_c_P + latent_heat_LHS);
 
-        AssertThrow(density_c_P + latent_heat_LHS, ExcMessage("mass matrix must be positive"));
+        AssertThrow(density_c_P + latent_heat_LHS > 0,
+            ExcMessage("Prefactor of the mass matrix must be positive."));
 
         const Tensor<1,dim> current_u = scratch.current_velocity_values[q];
         const double factor = (use_bdf2_scheme)? ((2*time_step + old_time_step) /



More information about the CIG-COMMITS mailing list