Merge pull request #9937 from masterleinad/remove_even_more_deprecation

Remove PETScWrappers deprecations
dealii · Jul 27, 2022 · 664a66f · 664a66f
2 parents d1475a1 + 3320bb5
commit 664a66f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 38 deletions.
diff --git a/doc/news/changes/incompatibilities/20200421DanielArndt b/doc/news/changes/incompatibilities/20200421DanielArndt
@@ -0,0 +1,5 @@
+Removed: Deprecated constructors for PETScWrappers::MPI::SparseMatrix,
+a deprecated overload for PETScWrappers::MatrixBase::add and a deprecated
+constructor for PETScWrappers::MPI::Vector have been removed.
+<br>
+(Daniel Arndt, 2020/04/21)
diff --git a/include/deal.II/lac/petsc_vector.h b/include/deal.II/lac/petsc_vector.h
@@ -203,24 +203,6 @@ namespace PETScWrappers
                       const dealii::Vector<Number> &v,
                       const size_type               locally_owned_size);
 
-
-      /**
-       * Copy-constructor the values from a PETSc wrapper vector class.
-       *
-       * @arg local_size denotes the size of the chunk that shall be stored on
-       * the present process.
-       *
-       * @arg communicator denotes the MPI communicator over which the
-       * different parts of the vector shall communicate
-       *
-       * @deprecated The use of objects that are explicitly of type VectorBase
-       * is deprecated: use PETScWrappers::MPI::Vector instead.
-       */
-      DEAL_II_DEPRECATED
-      explicit Vector(const MPI_Comm &  communicator,
-                      const VectorBase &v,
-                      const size_type   local_size);
-
       /**
        * Construct a new parallel ghosted PETSc vector from IndexSets.
        *

diff --git a/source/lac/petsc_matrix_base.cc b/source/lac/petsc_matrix_base.cc
@@ -428,6 +428,7 @@ namespace PETScWrappers
   }
 
 
+
   MatrixBase &
   MatrixBase::add(const PetscScalar factor, const MatrixBase &other)
   {

diff --git a/source/lac/petsc_parallel_sparse_matrix.cc b/source/lac/petsc_parallel_sparse_matrix.cc
@@ -132,6 +132,8 @@ namespace PETScWrappers
                 preset_nonzero_locations);
     }
 
+
+
     template <typename SparsityPatternType>
     void
     SparseMatrix::reinit(const IndexSet &           local_rows,

diff --git a/source/lac/petsc_parallel_vector.cc b/source/lac/petsc_parallel_vector.cc
@@ -49,26 +49,6 @@ namespace PETScWrappers
 
 
 
-    Vector::Vector(const MPI_Comm &  communicator,
-                   const VectorBase &v,
-                   const size_type   locally_owned_size)
-      : VectorBase(v)
-      , communicator(communicator)
-    {
-      // In the past (before it was deprecated) this constructor did a
-      // byte-for-byte copy of v. This choice resulted in two problems:
-      // 1. The created vector will have the same size as v, not local size.
-      // 2. Since both the created vector and v maintain ownership of the same
-      // PETSc Vec, both will try to destroy it: this does not make sense.
-      //
-      // For the sake of backwards compatibility, preserve the behavior of the
-      // copy, but correct the ownership bug. Note that in both this (and the
-      // original) implementation locally_owned_size is ultimately unused.
-      (void)locally_owned_size;
-    }
-
-
-
     Vector::Vector(const IndexSet &local,
                    const IndexSet &ghost,
                    const MPI_Comm &communicator)