diff --git a/dune/gfe/mixedlocalgfeadolcstiffness.hh b/dune/gfe/mixedlocalgfeadolcstiffness.hh index 3198cf0508666981591d42d6350439c626ca61f6..40afdad805870d4b037cee14fee930f8b761d229 100644 --- a/dune/gfe/mixedlocalgfeadolcstiffness.hh +++ b/dune/gfe/mixedlocalgfeadolcstiffness.hh @@ -86,7 +86,7 @@ energy(const typename Basis::LocalView& localView, const std::vector<TargetSpace0>& localConfiguration0, const std::vector<TargetSpace1>& localConfiguration1) const { - int rank = Dune::MPIHelper::getCollectiveCommunication().rank(); + int rank = Dune::MPIHelper::getCommunication().rank(); double pureEnergy; std::vector<ATargetSpace0> localAConfiguration0(localConfiguration0.size()); @@ -202,7 +202,7 @@ assembleGradientAndHessian(const typename Basis::LocalView& localView, std::vector<typename TargetSpace0::TangentVector>& localGradient0, std::vector<typename TargetSpace1::TangentVector>& localGradient1) { - int rank = Dune::MPIHelper::getCollectiveCommunication().rank(); + int rank = Dune::MPIHelper::getCommunication().rank(); // Tape energy computation. We may not have to do this every time, but it's comparatively cheap. energy(localView, localConfiguration0, localConfiguration1); diff --git a/dune/gfe/mixedriemanniantrsolver.cc b/dune/gfe/mixedriemanniantrsolver.cc index 4bae4f0e4e368b1d78d8bea8244ed152fd9e9464..532a06a7fbcfbc25df78608260ba8e28c49bb8b7 100644 --- a/dune/gfe/mixedriemanniantrsolver.cc +++ b/dune/gfe/mixedriemanniantrsolver.cc @@ -317,7 +317,7 @@ void MixedRiemannianTrustRegionSolver<GridType,Basis,Basis0,TargetSpace0,Basis1, using namespace Dune::TypeTree::Indices; double oldEnergy = assembler_->computeEnergy(x_[_0], x_[_1]); - oldEnergy = mpiHelper.getCollectiveCommunication().sum(oldEnergy); + oldEnergy = mpiHelper.getCommunication().sum(oldEnergy); bool recomputeGradientHessian = true; CorrectionType rhs; @@ -498,7 +498,7 @@ void MixedRiemannianTrustRegionSolver<GridType,Basis,Basis0,TargetSpace0,Basis1, } if (solvedByInnerSolver) { - energy = mpiHelper.getCollectiveCommunication().sum(energy); + energy = mpiHelper.getCommunication().sum(energy); // compute the model decrease // It is $ m(x) - m(x+s) = -<g,s> - 0.5 <s, Hs> @@ -506,7 +506,7 @@ void MixedRiemannianTrustRegionSolver<GridType,Basis,Basis0,TargetSpace0,Basis1, CorrectionType tmp(corr); hessianMatrix_->mv(corr,tmp); modelDecrease = rhs*corr - 0.5 * (corr*tmp); - modelDecrease = mpiHelper.getCollectiveCommunication().sum(modelDecrease); + modelDecrease = mpiHelper.getCommunication().sum(modelDecrease); double relativeModelDecrease = modelDecrease / std::fabs(energy);