Remove MatrixFree::AdditionalData::level_mg_handler

diff --git a/doc/news/changes/incompatibilities/20210525Munch b/doc/news/changes/incompatibilities/20210525Munch
new file mode 100644 (file)
index 0000000..5de7d7b
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20210525Munch
@@ -0,0 +1,4 @@
+Removed: The deprecated member field 
+MatrixFree::AdditionalData::level_mg_handler.
+<br>
+(Peter Munch, 2021/05/25)

diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h
index 53fe0202befc1c1d777588206f28156964906f44..b3d12e7a745ea2a750020cae672ad077ea814b21 100644 (file)
--- a/include/deal.II/matrix_free/matrix_free.h
+++ b/include/deal.II/matrix_free/matrix_free.h
@@ -208,9 +208,6 @@ public:
       color = internal::MatrixFreeFunctions::TaskInfo::color
     };
 
-    // remove with level_mg_handler
-    DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
-
     /**
      * Constructor for AdditionalData.
      */
@@ -236,7 +233,6 @@ public:
       , mapping_update_flags_inner_faces(mapping_update_flags_inner_faces)
       , mapping_update_flags_faces_by_cells(mapping_update_flags_faces_by_cells)
       , mg_level(mg_level)
-      , level_mg_handler(this->mg_level)
       , store_plain_indices(store_plain_indices)
       , initialize_indices(initialize_indices)
       , initialize_mapping(initialize_mapping)
@@ -260,7 +256,6 @@ public:
       , mapping_update_flags_faces_by_cells(
           other.mapping_update_flags_faces_by_cells)
       , mg_level(other.mg_level)
-      , level_mg_handler(this->mg_level)
       , store_plain_indices(other.store_plain_indices)
       , initialize_indices(other.initialize_indices)
       , initialize_mapping(other.initialize_mapping)
@@ -273,9 +268,6 @@ public:
       , communicator_sm(other.communicator_sm)
     {}
 
-    // remove with level_mg_handler
-    DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
-
     /**
      * Copy assignment.
      */
@@ -447,13 +439,6 @@ public:
      */
     unsigned int mg_level;
 
-    /**
-     * Alias for mg_level
-     *
-     * @deprecated Use mg_level instead.
-     */
-    DEAL_II_DEPRECATED unsigned int &level_mg_handler;
-
     /**
      * Controls whether to enable reading from vectors without resolving
      * constraints, i.e., just read the local values of the vector. By

diff --git a/tests/matrix_free/additional_data_copy.cc b/tests/matrix_free/additional_data_copy.cc
index 8d102576d688bd776937422db1f7aa9df0904011..34b529014568db76263ab1e50943d8f4e7387734 100644 (file)
--- a/tests/matrix_free/additional_data_copy.cc
+++ b/tests/matrix_free/additional_data_copy.cc
@@ -36,7 +36,6 @@ operator==(const T &lhs, const T &rhs)
          lhs.mapping_update_flags_faces_by_cells ==
            rhs.mapping_update_flags_faces_by_cells &&
          lhs.mg_level == rhs.mg_level &&
-         lhs.level_mg_handler == rhs.level_mg_handler &&
          lhs.store_plain_indices == rhs.store_plain_indices &&
          lhs.initialize_indices == rhs.initialize_indices &&
          lhs.initialize_mapping == rhs.initialize_mapping &&
@@ -64,7 +63,6 @@ main()
   ad.mapping_update_flags_boundary_faces  = update_values;
   ad.mapping_update_flags_inner_faces     = update_values;
   ad.mapping_update_flags_faces_by_cells  = update_values;
-  ad.mg_level                             = 10;
   ad.store_plain_indices                  = false;
   ad.initialize_indices                   = false;
   ad.initialize_mapping                   = false;

diff --git a/tests/matrix_free/parallel_multigrid_mf_02.cc b/tests/matrix_free/parallel_multigrid_mf_02.cc
index a4da1a6c499aaa22d457f01a7964468466d841bb..718fb06dd6a8d50e0e66a63fe596fd950600167a 100644 (file)
--- a/tests/matrix_free/parallel_multigrid_mf_02.cc
+++ b/tests/matrix_free/parallel_multigrid_mf_02.cc
@@ -157,7 +157,7 @@ do_test(const DoFHandler<dim> &dof)
       mg_additional_data.tasks_parallel_scheme =
         MatrixFree<dim, number>::AdditionalData::none;
       mg_additional_data.tasks_block_size = 3;
-      mg_additional_data.level_mg_handler = level;
+      mg_additional_data.mg_level         = level;
 
       AffineConstraints<double> level_constraints;
       IndexSet                  relevant_dofs;