From 472ad0c1fbffb9ef0465f2a19c935ebf890904ab Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Fri, 8 Jul 2016 14:03:57 +0200 Subject: [PATCH] ::TruncatedBlockGSStep -> BlockGSStep --- dune/solvers/iterationsteps/obstacletnnmgstep.hh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dune/solvers/iterationsteps/obstacletnnmgstep.hh b/dune/solvers/iterationsteps/obstacletnnmgstep.hh index ebe8eac2..04d232e5 100644 --- a/dune/solvers/iterationsteps/obstacletnnmgstep.hh +++ b/dune/solvers/iterationsteps/obstacletnnmgstep.hh @@ -13,7 +13,7 @@ // dune-solver includes #include <dune/solvers/iterationsteps/iterationstep.hh> -#include <dune/solvers/iterationsteps/truncatedblockgsstep.hh> +#include <dune/solvers/iterationsteps/blockgssteps.hh> #include <dune/solvers/iterationsteps/projectedblockgsstep.hh> #include <dune/solvers/iterationsteps/multigridstep.hh> @@ -72,7 +72,10 @@ class ObstacleTNNMGStep protected: typedef ProjectedBlockGSStep<Matrix, Vector> NonlinearSmoother; - typedef TruncatedBlockGSStep<Matrix, Vector> LinearSmoother; + typedef Dune::Solvers::BlockGSStep< + Matrix, Vector, Dune::Solvers::DefaultBitVector_t<Vector>, + decltype(Dune::Solvers::BlockGS::LocalSolvers::gs())> + LinearSmoother; typedef MultigridStep<Matrix, Vector, BitVector> LinearMultigridStep; typedef EnergyNorm<Matrix, Vector> LinearBaseSolverEnergyNorm; typedef ::LoopSolver<Vector> LinearBaseSolver; @@ -107,6 +110,8 @@ class ObstacleTNNMGStep transfer_(transfer), nonlinearSmoother_(mat_, *x_, rhs_), truncationTol_(truncationTol), + linearSmoother_(Dune::Solvers::BlockGS::LocalSolvers::gs()), + baseSolverStep_(Dune::Solvers::BlockGS::LocalSolvers::gs()), baseSolverNorm_(baseSolverStep_), baseSolver_(&baseSolverStep_, 100, 1e-8, &baseSolverNorm_, LinearBaseSolver::QUIET), preSmoothingSteps_(3), -- GitLab