[cig-commits] [commit] master: revert edbe217c3 (9426f36)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/b2eaff9e459f8351633e8b4b43c1284c90373873...9426f368c65e0bdeb35a670fbb60f450e51ba1ac

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

commit 9426f368c65e0bdeb35a670fbb60f450e51ba1ac
Author: Timo Heister <timo.heister at gmail.com>
Date:   Tue May 20 15:21:02 2014 -0400

    revert edbe217c3
    
    The check for rho c_p to be strictly positive breaks all sol_* tests
    because they set c_p to 0. Instead of fixing all this, we allow it to be
    0. (Note that this commit was redundant, because there already is an
    assert that checks exactly that a couple of lines above).


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

9426f368c65e0bdeb35a670fbb60f450e51ba1ac
 source/simulator/assembly.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/source/simulator/assembly.cc b/source/simulator/assembly.cc
index 8f547fd..da8082a 100644
--- a/source/simulator/assembly.cc
+++ b/source/simulator/assembly.cc
@@ -1568,9 +1568,6 @@ namespace aspect
             *
             (density_c_P + latent_heat_LHS);
 
-        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) /
                                                   (time_step + old_time_step)) : 1.0;