From 78b17fe0ffcd7fad791ee5604fcd8dad11eea28c Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Sat, 21 Mar 2015 11:46:28 +0000
Subject: [PATCH] Avoid warnings related to mpiHelper
[[Imported from SVN: r10100]]
---
dune/gfe/riemanniantrsolver.cc | 16 ++++++----------
dune/gfe/vtkfile.hh | 4 ++--
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/dune/gfe/riemanniantrsolver.cc b/dune/gfe/riemanniantrsolver.cc
index 3d58b88f..849e9447 100644
--- a/dune/gfe/riemanniantrsolver.cc
+++ b/dune/gfe/riemanniantrsolver.cc
@@ -1,6 +1,5 @@
#include <dune/common/bitsetvector.hh>
#include <dune/common/timer.hh>
-#include <dune/common/parallel/mpihelper.hh>
#include <dune/istl/io.hh>
@@ -301,10 +300,7 @@ setup(const GridType& grid,
template <class Basis, class TargetSpace>
void RiemannianTrustRegionSolver<Basis,TargetSpace>::solve()
{
- int argc = 0;
- char** argv;
- Dune::MPIHelper& mpiHelper = Dune::MPIHelper::instance(argc,argv);
- int rank = mpiHelper.rank();
+ int rank = grid_->comm().rank();
MonotoneMGStep<MatrixType,CorrectionType>* mgStep = NULL;
@@ -341,7 +337,7 @@ void RiemannianTrustRegionSolver<Basis,TargetSpace>::solve()
// /////////////////////////////////////////////////////
double oldEnergy = assembler_->computeEnergy(x_);
- oldEnergy = mpiHelper.getCollectiveCommunication().sum(oldEnergy);
+ oldEnergy = grid_->comm().sum(oldEnergy);
bool recomputeGradientHessian = true;
CorrectionType rhs;
@@ -451,7 +447,7 @@ void RiemannianTrustRegionSolver<Basis,TargetSpace>::solve()
}
// Distribute solution
- if (mpiHelper.size()>1 and rank==0)
+ if (grid_->comm().size()>1 and rank==0)
std::cout << "Transfer solution back to root process ..." << std::endl;
#if HAVE_MPI
@@ -462,7 +458,7 @@ void RiemannianTrustRegionSolver<Basis,TargetSpace>::solve()
// Make infinity norm of corr_global known on all processors
double corrNorm = corr.infinity_norm();
- double corrGlobalInfinityNorm = mpiHelper.getCollectiveCommunication().max(corrNorm);
+ double corrGlobalInfinityNorm = grid_->comm().max(corrNorm);
if (instrumented_) {
@@ -553,7 +549,7 @@ void RiemannianTrustRegionSolver<Basis,TargetSpace>::solve()
newIterate[j] = TargetSpace::exp(newIterate[j], corr[j]);
double energy = assembler_->computeEnergy(newIterate);
- energy = mpiHelper.getCollectiveCommunication().sum(energy);
+ energy = grid_->comm().sum(energy);
// compute the model decrease
// It is $ m(x) - m(x+s) = -<g,s> - 0.5 <s, Hs>
@@ -562,7 +558,7 @@ void RiemannianTrustRegionSolver<Basis,TargetSpace>::solve()
tmp = 0;
hessianMatrix_->umv(corr, tmp);
double modelDecrease = (rhs*corr) - 0.5 * (corr*tmp);
- modelDecrease = mpiHelper.getCollectiveCommunication().sum(modelDecrease);
+ modelDecrease = grid_->comm().sum(modelDecrease);
double relativeModelDecrease = modelDecrease / std::fabs(energy);
diff --git a/dune/gfe/vtkfile.hh b/dune/gfe/vtkfile.hh
index 509933b1..22e43ce5 100644
--- a/dune/gfe/vtkfile.hh
+++ b/dune/gfe/vtkfile.hh
@@ -35,7 +35,7 @@ namespace Dune {
void write(const std::string& filename) const
{
int argc = 0;
- char** argv;
+ char** argv = nullptr;
Dune::MPIHelper& mpiHelper = Dune::MPIHelper::instance(argc,argv);
std::string fullfilename = filename + ".vtu";
@@ -170,7 +170,7 @@ namespace Dune {
void read(const std::string& filename)
{
int argc = 0;
- char** argv;
+ char** argv = nullptr;
Dune::MPIHelper& mpiHelper = Dune::MPIHelper::instance(argc,argv);
std::string fullfilename = filename + ".vtu";
--
GitLab