From 6bf1bc5c84ae74cd72bfbd958db229dd2c851cc9 Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Fri, 8 Jul 2016 13:55:54 +0200 Subject: [PATCH] Tests: ::TruncatedBlockGSStep -> BlockGSStep --- dune/solvers/test/multigridtest.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dune/solvers/test/multigridtest.cc b/dune/solvers/test/multigridtest.cc index af1203a6..4e1af2f3 100644 --- a/dune/solvers/test/multigridtest.cc +++ b/dune/solvers/test/multigridtest.cc @@ -20,8 +20,8 @@ #include <dune/solvers/transferoperators/compressedmultigridtransfer.hh> #include <dune/solvers/norms/energynorm.hh> #include <dune/solvers/solvers/loopsolver.hh> +#include <dune/solvers/iterationsteps/blockgssteps.hh> #include <dune/solvers/iterationsteps/multigridstep.hh> -#include <dune/solvers/iterationsteps/truncatedblockgsstep.hh> #include "common.hh" @@ -54,7 +54,6 @@ struct MultigridTestSuite typedef MultigridStep<Matrix, Vector, BitVector> MGStep; typedef MultigridTransfer<Vector, BitVector, Matrix> Transfer; typedef CompressedMultigridTransfer<Vector, BitVector, Matrix> TransferImplementation; - typedef TruncatedBlockGSStep<Matrix, Vector> Smoother; // we need a vector of pointers to the transfer operator base class std::vector<Transfer*> transfer(grid.maxLevel()); @@ -67,7 +66,12 @@ struct MultigridTestSuite } // set up smoothers and basesolver - Smoother smoother, basesolver_step; + auto smoother = + Dune::Solvers::BlockGSStepFactory<Matrix, Vector>::create( + Dune::Solvers::BlockGS::LocalSolvers::gs()), + basesolver_step = + Dune::Solvers::BlockGSStepFactory<Matrix, Vector>::create( + Dune::Solvers::BlockGS::LocalSolvers::gs()); typename Problem::Norm basenorm(basesolver_step); -- GitLab