From 2648cb15bf7503d0e4a752e0f357b0af4857044a Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 11 Jul 2016 21:02:02 +0200
Subject: [PATCH] Tests: set ignoreNodes properly
---
dune/solvers/test/cgsteptest.cc | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dune/solvers/test/cgsteptest.cc b/dune/solvers/test/cgsteptest.cc
index 471b8c8a..5cda78ff 100644
--- a/dune/solvers/test/cgsteptest.cc
+++ b/dune/solvers/test/cgsteptest.cc
@@ -92,8 +92,7 @@ struct CGTestSuite
typename Problem::Vector>::
create(Dune::Solvers::BlockGS::LocalSolvers::gs(),
Dune::Solvers::BlockGS::Direction::SYMMETRIC);
- blockgs.ignoreNodes_ =
- new typename Problem::BitVector(p.u.size(), false);
+ blockgs.setIgnore(p.ignore);
CGSolver<typename Problem::Matrix, typename Problem::Vector> solver(
&p.A, &u_copy, &rhs_copy, &blockgs, maxIterations, stepTol,
@@ -113,6 +112,7 @@ struct CGTestSuite
Dune::Solvers::CGStep<typename Problem::Matrix,
typename Problem::Vector> cgStep(p.A, u_copy,
rhs_copy);
+ cgStep.setIgnore(p.ignore);
::LoopSolver<typename Problem::Vector> solver(
&cgStep, maxIterations, stepTol, &p.energyNorm, verbosity,
relativeErrors);
@@ -133,13 +133,12 @@ struct CGTestSuite
typename Problem::Vector>::
create(Dune::Solvers::BlockGS::LocalSolvers::gs(),
Dune::Solvers::BlockGS::Direction::SYMMETRIC);
- blockgs.ignoreNodes_ =
- new typename Problem::BitVector(p.u.size(), false);
-
+ blockgs.setIgnore(p.ignore);
Dune::Solvers::CGStep<typename Problem::Matrix,
typename Problem::Vector> cgStep(p.A, u_copy,
rhs_copy,
blockgs);
+ cgStep.setIgnore(p.ignore);
::LoopSolver<typename Problem::Vector> solver(
&cgStep, maxIterations, stepTol, &p.energyNorm, verbosity,
relativeErrors);
--
GitLab