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

Tests: set ignoreNodes properly

parent 17ee591f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dune/solvers/test/cgsteptest.cc
+ 4
− 5
View file @ 2648cb15
...@@ -92,8 +92,7 @@ struct CGTestSuite ...@@ -92,8 +92,7 @@ struct CGTestSuite
typename Problem::Vector>:: typename Problem::Vector>::
create(Dune::Solvers::BlockGS::LocalSolvers::gs(), create(Dune::Solvers::BlockGS::LocalSolvers::gs(),
Dune::Solvers::BlockGS::Direction::SYMMETRIC); Dune::Solvers::BlockGS::Direction::SYMMETRIC);
blockgs.ignoreNodes_ = blockgs.setIgnore(p.ignore);
new typename Problem::BitVector(p.u.size(), false);
CGSolver<typename Problem::Matrix, typename Problem::Vector> solver( CGSolver<typename Problem::Matrix, typename Problem::Vector> solver(
&p.A, &u_copy, &rhs_copy, &blockgs, maxIterations, stepTol, &p.A, &u_copy, &rhs_copy, &blockgs, maxIterations, stepTol,
...@@ -113,6 +112,7 @@ struct CGTestSuite ...@@ -113,6 +112,7 @@ struct CGTestSuite
Dune::Solvers::CGStep<typename Problem::Matrix, Dune::Solvers::CGStep<typename Problem::Matrix,
typename Problem::Vector> cgStep(p.A, u_copy, typename Problem::Vector> cgStep(p.A, u_copy,
rhs_copy); rhs_copy);
cgStep.setIgnore(p.ignore);
::LoopSolver<typename Problem::Vector> solver( ::LoopSolver<typename Problem::Vector> solver(
&cgStep, maxIterations, stepTol, &p.energyNorm, verbosity, &cgStep, maxIterations, stepTol, &p.energyNorm, verbosity,
relativeErrors); relativeErrors);
...@@ -133,13 +133,12 @@ struct CGTestSuite ...@@ -133,13 +133,12 @@ struct CGTestSuite
typename Problem::Vector>:: typename Problem::Vector>::
create(Dune::Solvers::BlockGS::LocalSolvers::gs(), create(Dune::Solvers::BlockGS::LocalSolvers::gs(),
Dune::Solvers::BlockGS::Direction::SYMMETRIC); Dune::Solvers::BlockGS::Direction::SYMMETRIC);
blockgs.ignoreNodes_ = blockgs.setIgnore(p.ignore);
new typename Problem::BitVector(p.u.size(), false);
Dune::Solvers::CGStep<typename Problem::Matrix, Dune::Solvers::CGStep<typename Problem::Matrix,
typename Problem::Vector> cgStep(p.A, u_copy, typename Problem::Vector> cgStep(p.A, u_copy,
rhs_copy, rhs_copy,
blockgs); blockgs);
cgStep.setIgnore(p.ignore);
::LoopSolver<typename Problem::Vector> solver( ::LoopSolver<typename Problem::Vector> solver(
&cgStep, maxIterations, stepTol, &p.energyNorm, verbosity, &cgStep, maxIterations, stepTol, &p.energyNorm, verbosity,
relativeErrors); relativeErrors);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment