From 01fecb51f462fcdaa06a191a31a5e664b48eff44 Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Mon, 20 Nov 2017 00:14:15 +0100 Subject: [PATCH] Addressed Denis' comments. --- include/deal.II/base/mpi.h | 4 +--- include/deal.II/base/mpi.templates.h | 14 ++++++-------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/deal.II/base/mpi.h b/include/deal.II/base/mpi.h index f50191b62b..6f64cb050d 100644 --- a/include/deal.II/base/mpi.h +++ b/include/deal.II/base/mpi.h @@ -517,9 +517,7 @@ namespace Utilities * argument. * * @param[in] comm MPI communicator. - * @param[in] objects_to_send A map of `rank:object`, where the key `rank` - * is the rank of the processor we want to send to, and `object` is the - * object to send + * @param[in] object_to_send A object to send to all other processes * * @param[out] A vector of objects, with size equal to the number of * processes in the MPI communicator. Each entry contains the object diff --git a/include/deal.II/base/mpi.templates.h b/include/deal.II/base/mpi.templates.h index 4fab76fcb2..2ee5ce7e67 100644 --- a/include/deal.II/base/mpi.templates.h +++ b/include/deal.II/base/mpi.templates.h @@ -201,8 +201,8 @@ namespace Utilities Assert (false, ExcMessage ("The function some_to_some doesn't make" "any sense if you do not have MPI enabled. ")); #else - auto n_procs = dealii::Utilities::MPI::n_mpi_processes(comm); - auto my_proc = dealii::Utilities::MPI::this_mpi_process(comm); + const auto n_procs = dealii::Utilities::MPI::n_mpi_processes(comm); + const auto my_proc = dealii::Utilities::MPI::this_mpi_process(comm); std::vector send_to(objects_to_send.size()); { @@ -235,11 +235,9 @@ namespace Utilities // Receiving buffers std::map received_objects; { - unsigned int i = 0; std::vector buffer; - // We do this on a first come/first served basis - while (i(buffer); - ++i; } } @@ -284,7 +282,7 @@ namespace Utilities Assert (false, ExcMessage ("The function all_gather doesn't make" "any sense if you do not have MPI enabled. ")); #else - auto n_procs = dealii::Utilities::MPI::n_mpi_processes(comm); + const auto n_procs = dealii::Utilities::MPI::n_mpi_processes(comm); std::vector buffer = Utilities::pack(object); -- 2.39.5