From 8a34ba60cbdd762c8408d66ef93f67a3ebae0ee1 Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Thu, 18 Oct 2018 11:50:07 +0200
Subject: [PATCH] Don't use deprecated setter taking raw pointer
---
dune/solvers/iterationsteps/obstacletnnmgstep.hh | 2 +-
dune/solvers/test/mmgtest.cc | 3 +--
dune/solvers/test/multigridtest.cc | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dune/solvers/iterationsteps/obstacletnnmgstep.hh b/dune/solvers/iterationsteps/obstacletnnmgstep.hh
index 009ffcf3..27b31aeb 100644
--- a/dune/solvers/iterationsteps/obstacletnnmgstep.hh
+++ b/dune/solvers/iterationsteps/obstacletnnmgstep.hh
@@ -157,7 +157,7 @@ class ObstacleTNNMGStep
temp_.resize(x_->size());
linearMGStep_.setTransferOperators(transfer_);
- linearMGStep_.setSmoother(&linearSmoother_);
+ linearMGStep_.setSmoother(linearSmoother_);
linearMGStep_.setBaseSolver(baseSolver_);
linearMGStep_.setMGType(1, linearPreSmoothingSteps_, linearPostSmoothingSteps_);
diff --git a/dune/solvers/test/mmgtest.cc b/dune/solvers/test/mmgtest.cc
index cc005693..ae5268f0 100644
--- a/dune/solvers/test/mmgtest.cc
+++ b/dune/solvers/test/mmgtest.cc
@@ -49,7 +49,6 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat
Solver::QUIET);
// Make pre and postsmoothers
- ProjectedBlockGSStep<MatrixType, VectorType> smoother;
MonotoneMGStep<MatrixType, VectorType> mmgStep;
@@ -57,7 +56,7 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat
mmgStep.setMGType(1, 3, 3);
mmgStep.setIgnore(ignore);
mmgStep.setBaseSolver(baseSolver);
- mmgStep.setSmoother(&smoother);
+ mmgStep.setSmoother(ProjectedBlockGSStep<MatrixType, VectorType>{});
mmgStep.setObstacleRestrictor(MandelObstacleRestrictor<VectorType>());
mmgStep.setHasObstacles(Dune::BitSetVector<blockSize>(x.size(),true));
diff --git a/dune/solvers/test/multigridtest.cc b/dune/solvers/test/multigridtest.cc
index ea5fa69b..43eb2094 100644
--- a/dune/solvers/test/multigridtest.cc
+++ b/dune/solvers/test/multigridtest.cc
@@ -80,7 +80,7 @@ struct MultigridTestSuite
MGStep mgStep;
mgStep.setTransferOperators(transfer);
mgStep.setProblem(p.A,p.u,p.rhs);
- mgStep.setSmoother(&smoother);
+ mgStep.setSmoother(smoother);
mgStep.setMGType(1,3,3);
mgStep.setIgnore(p.ignore);
mgStep.setBaseSolver(basesolver);
--
GitLab