From 42cbf90c9e786ad5edf8cd03e1d22df30d3f23a0 Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Mon, 12 Nov 2018 09:54:01 +0100
Subject: [PATCH] Don't set smoother by handing over raw pointer
---
1badaptmeasure.cc | 2 +-
1bcontact.cc | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/1badaptmeasure.cc b/1badaptmeasure.cc
index a9d563a2..c8fb17ff 100644
--- a/1badaptmeasure.cc
+++ b/1badaptmeasure.cc
@@ -145,7 +145,7 @@ void compute (const GridType& grid,
multigridStep.setMGType(1, 3, 3); // A V(3,3) cycle
multigridStep.setIgnore(dirichletNodes);
multigridStep.setBaseSolver(baseSolver);
- multigridStep.setSmoother(&presmoother, &postsmoother);
+ multigridStep.setSmoother(presmoother, postsmoother);
multigridStep.setHasObstacle(obsNodes);
multigridStep.setObstacles(contactAssembler.getObstacles());
multigridStep.setVerbosity(NumProc::QUIET);
diff --git a/1bcontact.cc b/1bcontact.cc
index b7abc4c4..4a1962ec 100644
--- a/1bcontact.cc
+++ b/1bcontact.cc
@@ -231,15 +231,14 @@ int main (int argc, char *argv[]) try
QuadraticIPOptSolver<MatrixType,VectorType> baseSolver(baseTolerance, 100, NumProc::QUIET);
// Make pre and postsmoothers
- ProjectedBlockGSStep<MatrixType, VectorType> presmoother;
- ProjectedBlockGSStep<MatrixType, VectorType> postsmoother;
+ ProjectedBlockGSStep<MatrixType, VectorType> presmoother, postsmoother;
MonotoneMGStep<MatrixType, VectorType> multigridStep(stiffnessMatrix, x, rhs);
multigridStep.setMGType(mu, nu1, nu2);
multigridStep.setIgnore(dirichletNodes);
multigridStep.setBaseSolver(baseSolver);
- multigridStep.setSmoother(&presmoother, &postsmoother);
+ multigridStep.setSmoother(presmoother, postsmoother);
multigridStep.setHasObstacles(obsNodes);
multigridStep.setObstacles(contactAssembler.getObstacles());
multigridStep.setObstacleRestrictor(ContactObsRestriction<VectorType>());
--
GitLab