From: Daniel Arndt <arndtd@ornl.gov>
Date: Mon, 9 May 2022 12:42:30 +0000 (+0200)
Subject: Merge pull request #13414 from bangerth/ca-free
X-Git-Tag: v9.4.0-rc1~259
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7027faf67b36fa11be1a77394f4f94c86af3abc5;p=dealii.git

Merge pull request #13414 from bangerth/ca-free
---

7027faf67b36fa11be1a77394f4f94c86af3abc5
diff --cc source/base/mpi.cc
index 972f507a5b,3e5fb1a930..d5f7eef4c7
--- a/source/base/mpi.cc
+++ b/source/base/mpi.cc
@@@ -381,14 -432,19 +381,14 @@@ namespace Utilitie
        if (Utilities::MPI::min((my_destinations_are_unique ? 1 : 0), mpi_comm) ==
            1)
          {
-           return ConsensusAlgorithms::NBX<char, char>().run(
+           return ConsensusAlgorithms::nbx<char, char>(
              destinations, {}, {}, {}, mpi_comm);
          }
 -        // If that was not the case, we need to use the remainder of the code
 -        // below, i.e., just fall through the if condition above.
 -#  endif
 -
  
 -        // So we need to run a different algorithm, specifically one that
 -        // requires more memory -- MPI_Reduce_scatter_block will require memory
 -        // proportional to the number of processes involved; that function is
 -        // also only available for MPI 2.2 or later:
 -#  if DEAL_II_MPI_VERSION_GTE(2, 2)
 +      // So we need to run a different algorithm, specifically one that
 +      // requires more memory -- MPI_Reduce_scatter_block will require memory
 +      // proportional to the number of processes involved; that function is
 +      // available for MPI 2.2 or later:
        static CollectiveMutex      mutex;
        CollectiveMutex::ScopedLock lock(mutex, mpi_comm);