From: Timo Heister Date: Wed, 2 Mar 2022 18:45:20 +0000 (-0500) Subject: MPI 3: minor edits X-Git-Tag: v9.4.0-rc1~420^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dff91f4ab43116ff5a6b61937ecce59944e73d9;p=dealii.git MPI 3: minor edits --- diff --git a/examples/step-76/step-76.cc b/examples/step-76/step-76.cc index 161257e241..b49d0a784b 100644 --- a/examples/step-76/step-76.cc +++ b/examples/step-76/step-76.cc @@ -510,7 +510,7 @@ namespace Euler_DG EulerOperator::EulerOperator(TimerOutput &timer) : timer(timer) { -#if DEAL_II_MPI_VERSION_GTE(3, 0) +#ifdef DEAL_II_WITH_MPI if (group_size == 1) { this->subcommunicator = MPI_COMM_SELF; diff --git a/source/base/mpi.cc b/source/base/mpi.cc index b15e272cee..c40b6e2aae 100644 --- a/source/base/mpi.cc +++ b/source/base/mpi.cc @@ -285,7 +285,6 @@ namespace Utilities # ifdef DEBUG MPI_Count size64; - // this function is only available starting with MPI 3.0: ierr = MPI_Type_size_x(result, &size64); AssertThrowMPI(ierr); @@ -367,7 +366,7 @@ namespace Utilities // 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: + // available for MPI 2.2 or later: static CollectiveMutex mutex; CollectiveMutex::ScopedLock lock(mutex, mpi_comm);