Skip to content
Snippets Groups Projects
Commit 8a34ba60 authored by Jonathan Youett's avatar Jonathan Youett
Browse files

Don't use deprecated setter taking raw pointer

parent 9a36ed2d
No related branches found
No related tags found
No related merge requests found
...@@ -157,7 +157,7 @@ class ObstacleTNNMGStep ...@@ -157,7 +157,7 @@ class ObstacleTNNMGStep
temp_.resize(x_->size()); temp_.resize(x_->size());
linearMGStep_.setTransferOperators(transfer_); linearMGStep_.setTransferOperators(transfer_);
linearMGStep_.setSmoother(&linearSmoother_); linearMGStep_.setSmoother(linearSmoother_);
linearMGStep_.setBaseSolver(baseSolver_); linearMGStep_.setBaseSolver(baseSolver_);
linearMGStep_.setMGType(1, linearPreSmoothingSteps_, linearPostSmoothingSteps_); linearMGStep_.setMGType(1, linearPreSmoothingSteps_, linearPostSmoothingSteps_);
......
...@@ -49,7 +49,6 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat ...@@ -49,7 +49,6 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat
Solver::QUIET); Solver::QUIET);
// Make pre and postsmoothers // Make pre and postsmoothers
ProjectedBlockGSStep<MatrixType, VectorType> smoother;
MonotoneMGStep<MatrixType, VectorType> mmgStep; MonotoneMGStep<MatrixType, VectorType> mmgStep;
...@@ -57,7 +56,7 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat ...@@ -57,7 +56,7 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat
mmgStep.setMGType(1, 3, 3); mmgStep.setMGType(1, 3, 3);
mmgStep.setIgnore(ignore); mmgStep.setIgnore(ignore);
mmgStep.setBaseSolver(baseSolver); mmgStep.setBaseSolver(baseSolver);
mmgStep.setSmoother(&smoother); mmgStep.setSmoother(ProjectedBlockGSStep<MatrixType, VectorType>{});
mmgStep.setObstacleRestrictor(MandelObstacleRestrictor<VectorType>()); mmgStep.setObstacleRestrictor(MandelObstacleRestrictor<VectorType>());
mmgStep.setHasObstacles(Dune::BitSetVector<blockSize>(x.size(),true)); mmgStep.setHasObstacles(Dune::BitSetVector<blockSize>(x.size(),true));
......
...@@ -80,7 +80,7 @@ struct MultigridTestSuite ...@@ -80,7 +80,7 @@ struct MultigridTestSuite
MGStep mgStep; MGStep mgStep;
mgStep.setTransferOperators(transfer); mgStep.setTransferOperators(transfer);
mgStep.setProblem(p.A,p.u,p.rhs); mgStep.setProblem(p.A,p.u,p.rhs);
mgStep.setSmoother(&smoother); mgStep.setSmoother(smoother);
mgStep.setMGType(1,3,3); mgStep.setMGType(1,3,3);
mgStep.setIgnore(p.ignore); mgStep.setIgnore(p.ignore);
mgStep.setBaseSolver(basesolver); mgStep.setBaseSolver(basesolver);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment