[cig-commits] [commit] master: leave more asserts (5418344)

[cig_noreply at geodynamics.org]

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

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

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

commit 5418344312878a5073c9a3c45fa8b33f67453773
Author: Timo Heister <timo.heister at gmail.com>
Date:   Mon May 19 11:23:29 2014 -0400

    leave more asserts


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

5418344312878a5073c9a3c45fa8b33f67453773
 source/simulator/helper_functions.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/source/simulator/helper_functions.cc b/source/simulator/helper_functions.cc
index 3bfb383..d6f3204 100644
--- a/source/simulator/helper_functions.cc
+++ b/source/simulator/helper_functions.cc
@@ -722,6 +722,11 @@ namespace aspect
     if (parameters.pressure_normalization == "no")
       return;
 
+    // TODO: pressure normalization currently does not work if velocity and
+    // pressure are in the same block.
+    Assert(introspection.block_indices.velocities != introspection.block_indices.pressure,
+        ExcNotImplemented());
+
     if (parameters.use_locally_conservative_discretization == false)
       vector.block (1).add (-1.0 * pressure_adjustment);
     else
@@ -778,6 +783,11 @@ 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)
       {
         const double mean       = vector.block(introspection.block_indices.pressure).mean_value();