Remove deprecated SparseVanka constructors

diff --git a/doc/news/changes/incompatibilities/20220622Arndt-1 b/doc/news/changes/incompatibilities/20220622Arndt-1
new file mode 100644 (file)
index 0000000..819913a
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20220622Arndt-1
@@ -0,0 +1,4 @@
+Removed: The deprecated constructors for SparseVanka and SparseBlockVanka
+have been removed.
+<br>
+(Daniel Arndt, 2022/06/22)

diff --git a/include/deal.II/lac/sparse_vanka.h b/include/deal.II/lac/sparse_vanka.h
index 06b1d568142bdf8675fb510450890894bb9e0a8c..6e72f8c29118fd37b6ee3e0c2355e3adb3c9f54f 100644 (file)
--- 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<number> &M,
-              const std::vector<bool> &   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<bool> &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<bool> &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<number> &M,
-                   const std::vector<bool> &   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 9e5316703d3e6d5b02212888e2330f8dba4c1071..f6381ed7f47841ce61a1eae2815cf6e90b6fe888 100644 (file)
--- a/include/deal.II/lac/sparse_vanka.templates.h
+++ b/include/deal.II/lac/sparse_vanka.templates.h
@@ -41,14 +41,6 @@ SparseVanka<number>::SparseVanka()
   , _n(0)
 {}
 
-template <typename number>
-SparseVanka<number>::SparseVanka(const SparseMatrix<number> &M,
-                                 const std::vector<bool> &   selected_dofs,
-                                 const bool /*conserve_mem*/,
-                                 const unsigned int /*n_threads*/)
-  : SparseVanka(M, selected_dofs)
-{}
-
 template <typename number>
 SparseVanka<number>::SparseVanka(const SparseMatrix<number> &M,
                                  const std::vector<bool> &   selected_dofs)
@@ -387,16 +379,6 @@ SparseVanka<number>::AdditionalData::AdditionalData(
 {}
 
 
-
-template <typename number>
-SparseVanka<number>::AdditionalData::AdditionalData(
-  const std::vector<bool> &selected,
-  const bool /*conserve_mem*/,
-  const unsigned int /*n_threads*/)
-  : AdditionalData(selected)
-{}
-
-
 //---------------------------------------------------------------------------
 
 
@@ -414,18 +396,6 @@ SparseBlockVanka<number>::SparseBlockVanka(
 }
 
 
-template <typename number>
-SparseBlockVanka<number>::SparseBlockVanka(
-  const SparseMatrix<number> &M,
-  const std::vector<bool> &   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 <typename number>
 void
 SparseBlockVanka<number>::compute_dof_masks(