From 0267ed71b35f393235224df309c9a30aee725881 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 22 Jun 2022 12:45:19 -0400 Subject: [PATCH] Remove deprecated SparseVanka constructors --- .../changes/incompatibilities/20220622Arndt-1 | 4 ++ include/deal.II/lac/sparse_vanka.h | 37 ------------------- include/deal.II/lac/sparse_vanka.templates.h | 30 --------------- 3 files changed, 4 insertions(+), 67 deletions(-) create mode 100644 doc/news/changes/incompatibilities/20220622Arndt-1 diff --git a/doc/news/changes/incompatibilities/20220622Arndt-1 b/doc/news/changes/incompatibilities/20220622Arndt-1 new file mode 100644 index 0000000000..819913adc2 --- /dev/null +++ b/doc/news/changes/incompatibilities/20220622Arndt-1 @@ -0,0 +1,4 @@ +Removed: The deprecated constructors for SparseVanka and SparseBlockVanka +have been removed. +
+(Daniel Arndt, 2022/06/22) diff --git a/include/deal.II/lac/sparse_vanka.h b/include/deal.II/lac/sparse_vanka.h index 06b1d56814..6e72f8c291 100644 --- a/include/deal.II/lac/sparse_vanka.h +++ b/include/deal.II/lac/sparse_vanka.h @@ -150,18 +150,6 @@ public: */ SparseVanka(); - /** - * Constructor which also takes two deprecated inputs. - * - * @deprecated The use of the last two parameters is deprecated. They are - * currently ignored. - */ - DEAL_II_DEPRECATED - SparseVanka(const SparseMatrix &M, - const std::vector & selected, - const bool conserve_memory, - const unsigned int n_threads = MultithreadInfo::n_threads()); - /** * Constructor. Gets the matrix for preconditioning and a bit vector with * entries @p true for all rows to be updated. A reference to this vector @@ -192,17 +180,6 @@ public: */ explicit AdditionalData(const std::vector &selected); - /** - * Constructor. For the parameters' description, see below. - * - * @deprecated The use of this constructor is deprecated - the second and - * third parameters are ignored. - */ - DEAL_II_DEPRECATED - AdditionalData(const std::vector &selected, - const bool conserve_memory, - const unsigned int n_threads = MultithreadInfo::n_threads()); - /** * Indices of those degrees of freedom that we shall work on. */ @@ -520,20 +497,6 @@ public: adaptive }; - /** - * Constructor. Pass all arguments except for @p n_blocks to the base class. - * - * @deprecated This constructor is deprecated. The values passed to the last - * two arguments are ignored. - */ - DEAL_II_DEPRECATED - SparseBlockVanka(const SparseMatrix &M, - const std::vector & selected, - const unsigned int n_blocks, - const BlockingStrategy blocking_strategy, - const bool conserve_memory, - const unsigned int n_threads = MultithreadInfo::n_threads()); - /** * Constructor. Pass all arguments except for @p n_blocks to the base class. */ diff --git a/include/deal.II/lac/sparse_vanka.templates.h b/include/deal.II/lac/sparse_vanka.templates.h index 9e5316703d..f6381ed7f4 100644 --- a/include/deal.II/lac/sparse_vanka.templates.h +++ b/include/deal.II/lac/sparse_vanka.templates.h @@ -41,14 +41,6 @@ SparseVanka::SparseVanka() , _n(0) {} -template -SparseVanka::SparseVanka(const SparseMatrix &M, - const std::vector & selected_dofs, - const bool /*conserve_mem*/, - const unsigned int /*n_threads*/) - : SparseVanka(M, selected_dofs) -{} - template SparseVanka::SparseVanka(const SparseMatrix &M, const std::vector & selected_dofs) @@ -387,16 +379,6 @@ SparseVanka::AdditionalData::AdditionalData( {} - -template -SparseVanka::AdditionalData::AdditionalData( - const std::vector &selected, - const bool /*conserve_mem*/, - const unsigned int /*n_threads*/) - : AdditionalData(selected) -{} - - //--------------------------------------------------------------------------- @@ -414,18 +396,6 @@ SparseBlockVanka::SparseBlockVanka( } -template -SparseBlockVanka::SparseBlockVanka( - const SparseMatrix &M, - const std::vector & selected, - const unsigned int n_blocks, - const BlockingStrategy blocking_strategy, - const bool /*conserve_memory*/, - const unsigned int /*n_threads*/) - : SparseBlockVanka(M, selected, n_blocks, blocking_strategy) -{} - - template void SparseBlockVanka::compute_dof_masks( -- 2.39.5