From 7b8c887a562b911ed65e9c085d95fefaca68a2c5 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 26 Mar 2020 12:49:12 -0400 Subject: [PATCH] Remove MGLevelObject::clear() --- .../incompatibilities/20200326DanielArndt-1 | 4 ++++ include/deal.II/base/mg_level_object.h | 23 ------------------- tests/mpi/step-39-block.cc | 6 ++--- 3 files changed, 7 insertions(+), 26 deletions(-) create mode 100644 doc/news/changes/incompatibilities/20200326DanielArndt-1 diff --git a/doc/news/changes/incompatibilities/20200326DanielArndt-1 b/doc/news/changes/incompatibilities/20200326DanielArndt-1 new file mode 100644 index 0000000000..1f0b58008d --- /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. +
+(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 08548cc8e0..6a6ef15bc7 100644 --- a/include/deal.II/base/mg_level_object.h +++ b/include/deal.II/base/mg_level_object.h @@ -108,20 +108,6 @@ public: MGLevelObject & 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 - * clear() 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::operator=(const double d) } -template -void -MGLevelObject::clear() // DEPRECATED -{ - // Avoid code duplication in deprecated call by calling replacing function - clear_elements(); -} - - template void MGLevelObject::clear_elements() diff --git a/tests/mpi/step-39-block.cc b/tests/mpi/step-39-block.cc index 85e27dc7ee..c566ebfbf3 100644 --- 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(); -- 2.39.5