Skip to content
Snippets Groups Projects
Commit 472ad0c1 authored by Elias Pipping's avatar Elias Pipping
Browse files

::TruncatedBlockGSStep -> BlockGSStep

parent 6bf1bc5c
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// dune-solver includes // dune-solver includes
#include <dune/solvers/iterationsteps/iterationstep.hh> #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/projectedblockgsstep.hh>
#include <dune/solvers/iterationsteps/multigridstep.hh> #include <dune/solvers/iterationsteps/multigridstep.hh>
...@@ -72,7 +72,10 @@ class ObstacleTNNMGStep ...@@ -72,7 +72,10 @@ class ObstacleTNNMGStep
protected: protected:
typedef ProjectedBlockGSStep<Matrix, Vector> NonlinearSmoother; 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 MultigridStep<Matrix, Vector, BitVector> LinearMultigridStep;
typedef EnergyNorm<Matrix, Vector> LinearBaseSolverEnergyNorm; typedef EnergyNorm<Matrix, Vector> LinearBaseSolverEnergyNorm;
typedef ::LoopSolver<Vector> LinearBaseSolver; typedef ::LoopSolver<Vector> LinearBaseSolver;
...@@ -107,6 +110,8 @@ class ObstacleTNNMGStep ...@@ -107,6 +110,8 @@ class ObstacleTNNMGStep
transfer_(transfer), transfer_(transfer),
nonlinearSmoother_(mat_, *x_, rhs_), nonlinearSmoother_(mat_, *x_, rhs_),
truncationTol_(truncationTol), truncationTol_(truncationTol),
linearSmoother_(Dune::Solvers::BlockGS::LocalSolvers::gs()),
baseSolverStep_(Dune::Solvers::BlockGS::LocalSolvers::gs()),
baseSolverNorm_(baseSolverStep_), baseSolverNorm_(baseSolverStep_),
baseSolver_(&baseSolverStep_, 100, 1e-8, &baseSolverNorm_, LinearBaseSolver::QUIET), baseSolver_(&baseSolverStep_, 100, 1e-8, &baseSolverNorm_, LinearBaseSolver::QUIET),
preSmoothingSteps_(3), preSmoothingSteps_(3),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment