const settings and assert for construct_mg

diff --git a/include/deal.II/distributed/shared_tria.h b/include/deal.II/distributed/shared_tria.h
index c420786c92de74f4ffafd729ac56e9adf3ce7d8a..c1a53576b5f6c5ac372695669869726b7b975ddb 100644 (file)
--- a/include/deal.II/distributed/shared_tria.h
+++ b/include/deal.II/distributed/shared_tria.h
@@ -211,7 +211,7 @@ namespace parallel
       /**
        * Settings
        */
-      Settings settings;
+      const Settings settings;
 
       /**
        * A flag to decide whether or not artificial cells are allowed.

diff --git a/source/distributed/shared_tria.cc b/source/distributed/shared_tria.cc
index 31903f812b81389c23fbe3265f302fb8cdddf3a6..2c8c7b943136d88020c8963317e33a0368f281a0 100644 (file)
--- a/source/distributed/shared_tria.cc
+++ b/source/distributed/shared_tria.cc
@@ -46,7 +46,11 @@ namespace parallel
              (settings & (partition_metis | partition_zorder | partition_custom_signal)) == partition_zorder ||
              (settings & (partition_metis | partition_zorder | partition_custom_signal)) == partition_custom_signal,
              ExcMessage ("Settings must contain exactly one type of active cell partitioning scheme."))
-    }
+
+      if (settings & construct_multigrid_hierarchy)
+        Assert(allow_artificial_cells,
+               ExcMessage ("construct_multigrid_hierarchy requires allow_artificial_cells to be set to true."))
+      }