[cig-commits] [commit] master: move Assert (cee8e19)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/76d4275352ef2cae5de9a073acd1c03a92c2670c...4f3d06fd1f3754419813db37ec9ef7f0f6f3cb15

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

commit cee8e191de141a8c153e033179d551bfe0337b02
Author: Timo Heister <timo.heister at gmail.com>
Date:   Mon May 19 18:07:16 2014 -0400

    move Assert


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

cee8e191de141a8c153e033179d551bfe0337b02
 source/simulator/helper_functions.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/simulator/helper_functions.cc b/source/simulator/helper_functions.cc
index d6f3204..dd153a1 100644
--- a/source/simulator/helper_functions.cc
+++ b/source/simulator/helper_functions.cc
@@ -783,13 +783,13 @@ namespace aspect
     if (parameters.use_locally_conservative_discretization)
       AssertThrow(false, ExcNotImplemented());
 
-    // TODO: currently does not work if velocity and
-    // pressure are in the same block.
-    Assert(introspection.block_indices.velocities != introspection.block_indices.pressure,
-        ExcNotImplemented());
-
     if (do_pressure_rhs_compatibility_modification)
       {
+        // TODO: currently does not work if velocity and
+        // pressure are in the same block.
+        Assert(introspection.block_indices.velocities != introspection.block_indices.pressure,
+            ExcNotImplemented());
+
         const double mean       = vector.block(introspection.block_indices.pressure).mean_value();
         const double correction = -mean*vector.block(introspection.block_indices.pressure).size()/global_volume;