]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge pull request #13414 from bangerth/ca-free
authorDaniel Arndt <arndtd@ornl.gov>
Mon, 9 May 2022 12:42:30 +0000 (14:42 +0200)
committerGitHub <noreply@github.com>
Mon, 9 May 2022 12:42:30 +0000 (14:42 +0200)
1  2 
source/base/mpi.cc
source/grid/grid_tools.cc

index 972f507a5bd9b23d16a33182a4b5dd53f5912853,3e5fb1a930b2e0b99460c62d7e8c754241b27d5b..d5f7eef4c74691c8b1b0de47b3ab320cedde26bc
@@@ -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);
  
Simple merge

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.