From 5527912375e435d6f0ff2b8b32f1025230d7fa19 Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Fri, 8 Jul 2016 14:11:00 +0200 Subject: [PATCH] Tests: ::BlockGSStep -> BlockGSStep --- dune/solvers/test/cgsteptest.cc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dune/solvers/test/cgsteptest.cc b/dune/solvers/test/cgsteptest.cc index 5eacabce..6fe9b7a5 100644 --- a/dune/solvers/test/cgsteptest.cc +++ b/dune/solvers/test/cgsteptest.cc @@ -9,7 +9,7 @@ #include <dune/common/parallel/mpihelper.hh> #include <dune/solvers/solvers/loopsolver.hh> -#include <dune/solvers/iterationsteps/blockgsstep.hh> +#include <dune/solvers/iterationsteps/blockgssteps.hh> #include <dune/solvers/iterationsteps/cgstep.hh> #include <dune/solvers/solvers/cgsolver.hh> @@ -90,10 +90,11 @@ struct CGTestSuite typename Problem::Vector u_copy = p.u; typename Problem::Vector rhs_copy = p.rhs; - using BGS = - BlockGSStep<typename Problem::Matrix, typename Problem::Vector, - typename Problem::BitVector>; - BGS blockgs(BGS::Direction::SYMMETRIC); + auto blockgs = + Dune::Solvers::BlockGSStepFactory<typename Problem::Matrix, + typename Problem::Vector>:: + create(Dune::Solvers::BlockGS::LocalSolvers::gs(), + Dune::Solvers::BlockGS::Direction::SYMMETRIC); blockgs.ignoreNodes_ = new typename Problem::BitVector(p.u.size(), false); @@ -130,10 +131,11 @@ struct CGTestSuite typename Problem::Vector u_copy = p.u; typename Problem::Vector rhs_copy = p.rhs; - using BGS = - BlockGSStep<typename Problem::Matrix, typename Problem::Vector, - typename Problem::BitVector>; - BGS blockgs(BGS::Direction::SYMMETRIC); + auto blockgs = + Dune::Solvers::BlockGSStepFactory<typename Problem::Matrix, + typename Problem::Vector>:: + create(Dune::Solvers::BlockGS::LocalSolvers::gs(), + Dune::Solvers::BlockGS::Direction::SYMMETRIC); blockgs.ignoreNodes_ = new typename Problem::BitVector(p.u.size(), false); -- GitLab