From: Daniel Arndt <arndtd@ornl.gov>
Date: Mon, 2 May 2022 13:10:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into remove_even_more_deprecation
X-Git-Tag: v9.5.0-rc1~1061^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9937%2Fhead;p=dealii.git

Merge remote-tracking branch 'upstream/master' into remove_even_more_deprecation
---

3320bb5a6146d8a4468b8ac08c14c562e2a248de
diff --cc include/deal.II/lac/petsc_vector.h
index c1d851913e,bfcfb92179..aa090221a1
--- a/include/deal.II/lac/petsc_vector.h
+++ b/include/deal.II/lac/petsc_vector.h
@@@ -202,8 -200,26 +200,8 @@@ namespace PETScWrapper
        template <typename Number>
        explicit Vector(const MPI_Comm &              communicator,
                        const dealii::Vector<Number> &v,
-                       const size_type               local_size);
+                       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.
         *