Remove MGLevelObject::clear()

diff --git a/doc/news/changes/incompatibilities/20200326DanielArndt-1 b/doc/news/changes/incompatibilities/20200326DanielArndt-1
new file mode 100644 (file)
index 0000000..1f0b580
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20200326DanielArndt-1
@@ -0,0 +1,4 @@
+Removed: The deprecated function MGLevelObject::clear() has been removed.
+Use MGLevelObject::clear_elements() instead.
+<br>
+(Daniel Arndt, 2020/03/26)

diff --git a/include/deal.II/base/mg_level_object.h b/include/deal.II/base/mg_level_object.h
index 08548cc8e0069b428acf04fa086be8074e5290be..6a6ef15bc7b391877063196dfe9b3128439766ff 100644 (file)
--- a/include/deal.II/base/mg_level_object.h
+++ b/include/deal.II/base/mg_level_object.h
@@ -108,20 +108,6 @@ public:
   MGLevelObject<Object> &
   operator=(const double d);
 
-  /**
-   * Call @p clear on all objects stored by this object. This function
-   * is only implemented for some @p Object classes, e.g., matrix
-   * types or the PreconditionBlockSOR and similar classes. Using this
-   * function will fail with a compiler error if the @p Object
-   * template type to this class does not provide a
-   * <code>clear()</code> member function.
-   *
-   * @deprecated Use clear_elements () instead
-   */
-  DEAL_II_DEPRECATED
-  void
-  clear();
-
   /**
    * Call @p clear on all objects stored by this object. This function
    * is only implemented for some @p Object classes, e.g., matrix
@@ -237,15 +223,6 @@ MGLevelObject<Object>::operator=(const double d)
 }
 
 
-template <class Object>
-void
-MGLevelObject<Object>::clear() // DEPRECATED
-{
-  // Avoid code duplication in deprecated call by calling replacing function
-  clear_elements();
-}
-
-
 template <class Object>
 void
 MGLevelObject<Object>::clear_elements()

diff --git a/tests/mpi/step-39-block.cc b/tests/mpi/step-39-block.cc
index 85e27dc7eeae0f6d6f4156df353d64ab1c6a428d..c566ebfbf38342161aed6fc5760ae815bb8306cc 100644 (file)
--- a/tests/mpi/step-39-block.cc
+++ b/tests/mpi/step-39-block.cc
@@ -478,11 +478,11 @@ namespace Step39
 
     const unsigned int n_levels = triangulation.n_global_levels();
     mg_matrix.resize(0, n_levels - 1);
-    mg_matrix.clear();
+    mg_matrix.clear_elements();
     mg_matrix_dg_up.resize(0, n_levels - 1);
-    mg_matrix_dg_up.clear();
+    mg_matrix_dg_up.clear_elements();
     mg_matrix_dg_down.resize(0, n_levels - 1);
-    mg_matrix_dg_down.clear();
+    mg_matrix_dg_down.clear_elements();
 
     for (unsigned int level = mg_matrix.min_level();
          level <= mg_matrix.max_level();