From df9c62a7926acf9ef93e23b3191d41790c352725 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 7 Jun 2021 14:53:35 -0400 Subject: [PATCH] Remove remaining deprecations in release 9.2 --- .../incompatibilities/20210607DanielArndt-2 | 5 +++++ include/deal.II/base/parameter_handler.h | 10 ---------- include/deal.II/lac/sparsity_tools.h | 10 ---------- source/lac/sparsity_tools.cc | 15 --------------- 4 files changed, 5 insertions(+), 35 deletions(-) create mode 100644 doc/news/changes/incompatibilities/20210607DanielArndt-2 diff --git a/doc/news/changes/incompatibilities/20210607DanielArndt-2 b/doc/news/changes/incompatibilities/20210607DanielArndt-2 new file mode 100644 index 0000000000..cb653549b6 --- /dev/null +++ b/doc/news/changes/incompatibilities/20210607DanielArndt-2 @@ -0,0 +1,5 @@ +Removed: The deprecated exception ParameterHandler::ExcInvalidEntryForPatternXML +and the deprecated overload of SparsityTools::gather_sparsity_pattern() +have been removed. +
+(Daniel Arndt, 2021/06/07) diff --git a/include/deal.II/base/parameter_handler.h b/include/deal.II/base/parameter_handler.h index 1c6bf32af8..b98f216ec0 100644 --- a/include/deal.II/base/parameter_handler.h +++ b/include/deal.II/base/parameter_handler.h @@ -1699,16 +1699,6 @@ public: "The provided file could not be parsed as a " "ParameterHandler description."); - /** - * Exception for when an entry in an XML parameter file does not match the - * provided pattern. The arguments are, in order, the entry value, entry - * name, and a description of the pattern. - * - * @deprecated Use ExcValueDoesNotMatchPattern instead of ExcInvalidEntryForPatternXML. - */ - using ExcInvalidEntryForPatternXML DEAL_II_DEPRECATED = - ExcValueDoesNotMatchPattern; - /** * Exception for when the file given in an include statement cannot be * open. The arguments are, in order, the line number of the include diff --git a/include/deal.II/lac/sparsity_tools.h b/include/deal.II/lac/sparsity_tools.h index dced4cd969..fb046cab0b 100644 --- a/include/deal.II/lac/sparsity_tools.h +++ b/include/deal.II/lac/sparsity_tools.h @@ -349,16 +349,6 @@ namespace SparsityTools const MPI_Comm & mpi_comm, const IndexSet & locally_relevant_rows); - /** - * @deprecated Use the gather_sparsity_pattern() method with the index set - * for the present processor only. - */ - DEAL_II_DEPRECATED void - gather_sparsity_pattern(DynamicSparsityPattern & dsp, - const std::vector &owned_rows_per_processor, - const MPI_Comm & mpi_comm, - const IndexSet & ghost_range); - #endif diff --git a/source/lac/sparsity_tools.cc b/source/lac/sparsity_tools.cc index f825bb1586..5f297c05d1 100644 --- a/source/lac/sparsity_tools.cc +++ b/source/lac/sparsity_tools.cc @@ -912,21 +912,6 @@ namespace SparsityTools #ifdef DEAL_II_WITH_MPI - void - gather_sparsity_pattern(DynamicSparsityPattern & dsp, - const std::vector &owned_rows_per_processor, - const MPI_Comm & mpi_comm, - const IndexSet & ghost_range) - { - const unsigned int myid = Utilities::MPI::this_mpi_process(mpi_comm); - gather_sparsity_pattern(dsp, - owned_rows_per_processor[myid], - mpi_comm, - ghost_range); - } - - - void gather_sparsity_pattern(DynamicSparsityPattern &dsp, const IndexSet & locally_owned_rows, -- 2.39.5