From: Wolfgang Bangerth Date: Sat, 15 Jan 2022 05:23:57 +0000 (-0700) Subject: Rename a variable and update the documentation. X-Git-Tag: v9.4.0-rc1~592^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13257%2Fhead;p=dealii.git Rename a variable and update the documentation. --- diff --git a/include/deal.II/base/mpi_consensus_algorithms.h b/include/deal.II/base/mpi_consensus_algorithms.h index 27bb267166..c4285ebcc1 100644 --- a/include/deal.II/base/mpi_consensus_algorithms.h +++ b/include/deal.II/base/mpi_consensus_algorithms.h @@ -459,12 +459,9 @@ namespace Utilities std::vector> recv_buffers; /** - * Requests for sending requests and receiving answers to requests. - * The first half of the array is used for the receive-answer - * requests objects, the second half for the send-request request - * objects. + * MPI request objects for sending request messages. */ - std::vector send_request_and_recv_answer_requests; + std::vector send_request_requests; /** * Buffers for sending answers to requests. diff --git a/include/deal.II/base/mpi_consensus_algorithms.templates.h b/include/deal.II/base/mpi_consensus_algorithms.templates.h index b5e64a5811..7fd6d14c5f 100644 --- a/include/deal.II/base/mpi_consensus_algorithms.templates.h +++ b/include/deal.II/base/mpi_consensus_algorithms.templates.h @@ -488,7 +488,7 @@ namespace Utilities // 2) allocate memory recv_buffers.resize(n_targets); send_buffers.resize(n_targets); - send_request_and_recv_answer_requests.resize(n_targets); + send_request_requests.resize(n_targets); send_answer_requests.resize(n_sources); requests_buffers.resize(n_sources); @@ -510,7 +510,7 @@ namespace Utilities rank, tag_request, this->comm, - &send_request_and_recv_answer_requests[i]); + &send_request_requests[i]); AssertThrowMPI(ierr); } @@ -646,12 +646,11 @@ namespace Utilities #ifdef DEAL_II_WITH_MPI // Finalize all MPI_Request objects for both the // send-request and receive-answer operations. - if (send_request_and_recv_answer_requests.size() > 0) + if (send_request_requests.size() > 0) { - const int ierr = - MPI_Waitall(send_request_and_recv_answer_requests.size(), - send_request_and_recv_answer_requests.data(), - MPI_STATUSES_IGNORE); + const int ierr = MPI_Waitall(send_request_requests.size(), + send_request_requests.data(), + MPI_STATUSES_IGNORE); AssertThrowMPI(ierr); }