Only initialize with ghost elements if partitioner provides ghost ind…

…ices.
dealii · Dec 10, 2022 · 1143a22 · 1143a22
1 parent 0d962c8
commit 1143a22
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 44 deletions.
diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h
@@ -405,18 +405,6 @@ namespace LinearAlgebra
         const std::shared_ptr<const Utilities::MPI::Partitioner> &partitioner,
         const MPI_Comm &comm_sm = MPI_COMM_SELF);
 
-      /**
-       * This function exists purely for reasons of compatibility with the
-       * PETScWrappers::MPI::Vector and TrilinosWrappers::MPI::Vector classes.
-       *
-       * It calls the function above, and ignores the parameter @p make_ghosted.
-       */
-      void
-      reinit(
-        const std::shared_ptr<const Utilities::MPI::Partitioner> &partitioner,
-        const bool                                                make_ghosted,
-        const MPI_Comm &comm_sm = MPI_COMM_SELF);
-
       /**
        * Initialize vector with @p local_size locally-owned and @p ghost_size
        * ghost degrees of freedoms.

diff --git a/include/deal.II/lac/la_parallel_vector.templates.h b/include/deal.II/lac/la_parallel_vector.templates.h
@@ -671,18 +671,6 @@ namespace LinearAlgebra
 
 
 
-    template <typename Number, typename MemorySpaceType>
-    void
-    Vector<Number, MemorySpaceType>::reinit(
-      const std::shared_ptr<const Utilities::MPI::Partitioner> &partitioner_in,
-      const bool /*make_ghosted*/,
-      const MPI_Comm &comm_sm)
-    {
-      this->reinit(partitioner_in, comm_sm);
-    }
-
-
-
     template <typename Number, typename MemorySpaceType>
     Vector<Number, MemorySpaceType>::Vector()
       : partitioner(std::make_shared<Utilities::MPI::Partitioner>())

diff --git a/include/deal.II/lac/petsc_vector.h b/include/deal.II/lac/petsc_vector.h
@@ -344,13 +344,12 @@ namespace PETScWrappers
        * Initialize the vector given to the parallel partitioning described in
        * @p partitioner.
        *
-       * You can decide whether your vector will contain ghost elements with
-       * @p make_ghosted.
+       * It will contain ghost elements only if the @p partitioner provides
+       * ghost indices.
        */
       void
       reinit(
-        const std::shared_ptr<const Utilities::MPI::Partitioner> &partitioner,
-        const bool make_ghosted = true);
+        const std::shared_ptr<const Utilities::MPI::Partitioner> &partitioner);
 
       /**
        * Return a reference to the MPI communicator object in use with this

diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h
@@ -605,16 +605,15 @@ namespace TrilinosWrappers
        * Initialize the vector given to the parallel partitioning described in
        * @p partitioner using the function above.
        *
-       * You can decide whether your vector will contain ghost elements with
-       * @p make_ghosted.
+       * It will contain ghost elements only if the @p partitioner provides
+       * ghost indices.
        *
        * The parameter @p vector_writable only has effect on ghosted vectors
        * and is ignored for non-ghosted vectors.
        */
       void
       reinit(
         const std::shared_ptr<const Utilities::MPI::Partitioner> &partitioner,
-        const bool make_ghosted    = true,
         const bool vector_writable = false);
 
       /**

diff --git a/source/lac/petsc_parallel_vector.cc b/source/lac/petsc_parallel_vector.cc
@@ -236,15 +236,10 @@ namespace PETScWrappers
 
     void
     Vector::reinit(
-      const std::shared_ptr<const Utilities::MPI::Partitioner> &partitioner,
-      const bool                                                make_ghosted)
+      const std::shared_ptr<const Utilities::MPI::Partitioner> &partitioner)
     {
-      if (make_ghosted)
+      if (partitioner->ghost_indices_initialized())
         {
-          Assert(partitioner->ghost_indices_initialized(),
-                 ExcMessage("You asked to create a ghosted vector, but the "
-                            "partitioner does not provide ghost indices."));
-
           this->reinit(partitioner->locally_owned_range(),
                        partitioner->ghost_indices(),
                        partitioner->get_mpi_communicator());

diff --git a/source/lac/trilinos_vector.cc b/source/lac/trilinos_vector.cc
@@ -410,15 +410,10 @@ namespace TrilinosWrappers
     void
     Vector::reinit(
       const std::shared_ptr<const Utilities::MPI::Partitioner> &partitioner,
-      const bool                                                make_ghosted,
       const bool                                                vector_writable)
     {
-      if (make_ghosted)
+      if (partitioner->ghost_indices_initialized())
         {
-          Assert(partitioner->ghost_indices_initialized(),
-                 ExcMessage("You asked to create a ghosted vector, but the "
-                            "partitioner does not provide ghost indices."));
-
           this->reinit(partitioner->locally_owned_range(),
                        partitioner->ghost_indices(),
                        partitioner->get_mpi_communicator(),