Remove Utilities::MPI::Partitioner::get_communicator()

diff --git a/doc/news/changes/incompatibilities/20200326DanielArndt-3 b/doc/news/changes/incompatibilities/20200326DanielArndt-3
new file mode 100644 (file)
index 0000000..d3cae1d
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20200326DanielArndt-3
@@ -0,0 +1,5 @@
+Removed: The deprecated function Utilities::MPI_Partitioner::get_communicator()
+has been removed. Use Utilities::MPI::Partitioner::get_mpi_communicator()
+instead.
+<br>
+(Daniel Arndt, 2020/03/26)

diff --git a/include/deal.II/base/partitioner.h b/include/deal.II/base/partitioner.h
index 644805c7fd25f1081cf41f1a31e030dc64bff045..6c02dd94e8b03895fc4cc83432028e1fd48e87df 100644 (file)
--- a/include/deal.II/base/partitioner.h
+++ b/include/deal.II/base/partitioner.h
@@ -437,13 +437,6 @@ namespace Utilities
       unsigned int
       n_mpi_processes() const;
 
-      /**
-       * Return the MPI communicator underlying the partitioner object.
-       */
-      DEAL_II_DEPRECATED
-      const MPI_Comm &
-      get_communicator() const;
-
       /**
        * Return the MPI communicator underlying the partitioner object.
        */
@@ -944,14 +937,6 @@ namespace Utilities
 
 
 
-    inline const MPI_Comm &
-    Partitioner::get_communicator() const
-    {
-      return communicator;
-    }
-
-
-
     inline const MPI_Comm &
     Partitioner::get_mpi_communicator() const
     {

diff --git a/include/deal.II/lac/la_parallel_block_vector.templates.h b/include/deal.II/lac/la_parallel_block_vector.templates.h
index 9666fe25e0b4af3424cb463d3bb84b44336869be..6aea0feb696ea45a462c2b3157af334f5dd65be1 100644 (file)
--- a/include/deal.II/lac/la_parallel_block_vector.templates.h
+++ b/include/deal.II/lac/la_parallel_block_vector.templates.h
@@ -580,7 +580,7 @@ namespace LinearAlgebra
 
       if (this->block(0).partitioner->n_mpi_processes() > 1)
         return -Utilities::MPI::max(
-          local_result, this->block(0).partitioner->get_communicator());
+          local_result, this->block(0).partitioner->get_mpi_communicator());
       else
         return local_result;
     }
@@ -606,7 +606,7 @@ namespace LinearAlgebra
 
       if (this->block(0).partitioner->n_mpi_processes() > 1)
         return Utilities::MPI::sum(
-          local_result, this->block(0).partitioner->get_communicator());
+          local_result, this->block(0).partitioner->get_mpi_communicator());
       else
         return local_result;
     }
@@ -627,7 +627,8 @@ namespace LinearAlgebra
 
       if (this->block(0).partitioner->n_mpi_processes() > 1)
         return Utilities::MPI::sum(
-                 local_result, this->block(0).partitioner->get_communicator()) /
+                 local_result,
+                 this->block(0).partitioner->get_mpi_communicator()) /
                static_cast<real_type>(this->size());
       else
         return local_result / static_cast<real_type>(this->size());
@@ -647,7 +648,7 @@ namespace LinearAlgebra
 
       if (this->block(0).partitioner->n_mpi_processes() > 1)
         return Utilities::MPI::sum(
-          local_result, this->block(0).partitioner->get_communicator());
+          local_result, this->block(0).partitioner->get_mpi_communicator());
       else
         return local_result;
     }
@@ -666,7 +667,7 @@ namespace LinearAlgebra
 
       if (this->block(0).partitioner->n_mpi_processes() > 1)
         return Utilities::MPI::sum(
-          local_result, this->block(0).partitioner->get_communicator());
+          local_result, this->block(0).partitioner->get_mpi_communicator());
       else
         return local_result;
     }
@@ -693,10 +694,10 @@ namespace LinearAlgebra
         local_result += std::pow(this->block(i).lp_norm_local(p), p);
 
       if (this->block(0).partitioner->n_mpi_processes() > 1)
-        return std::pow(
-          Utilities::MPI::sum(local_result,
-                              this->block(0).partitioner->get_communicator()),
-          static_cast<real_type>(1.0 / p));
+        return std::pow(Utilities::MPI::sum(
+                          local_result,
+                          this->block(0).partitioner->get_mpi_communicator()),
+                        static_cast<real_type>(1.0 / p));
       else
         return std::pow(local_result, static_cast<real_type>(1.0 / p));
     }
@@ -716,7 +717,7 @@ namespace LinearAlgebra
 
       if (this->block(0).partitioner->n_mpi_processes() > 1)
         return Utilities::MPI::max(
-          local_result, this->block(0).partitioner->get_communicator());
+          local_result, this->block(0).partitioner->get_mpi_communicator());
       else
         return local_result;
     }
@@ -750,7 +751,7 @@ namespace LinearAlgebra
 
       if (this->block(0).partitioner->n_mpi_processes() > 1)
         return Utilities::MPI::sum(
-          local_result, this->block(0).partitioner->get_communicator());
+          local_result, this->block(0).partitioner->get_mpi_communicator());
       else
         return local_result;
     }