From 6b695154b5dd3f5593ff67746c242555099766fe Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 11 Jul 2016 22:31:47 +0200
Subject: [PATCH] Tests: Use setIgnore
---
dune/solvers/test/gssteptest.cc | 2 +-
dune/solvers/test/multigridtest.cc | 2 +-
dune/solvers/test/projectedgradienttest.cc | 2 +-
dune/solvers/test/quadraticipoptsolvertest.cc | 2 +-
dune/solvers/test/umfpacksolvertest.cc | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dune/solvers/test/gssteptest.cc b/dune/solvers/test/gssteptest.cc
index 30b8e58b..2db92139 100644
--- a/dune/solvers/test/gssteptest.cc
+++ b/dune/solvers/test/gssteptest.cc
@@ -54,7 +54,7 @@ struct GSTestSuite {
auto solve = [&](Step* step, double stepTol, size_t maxIterations) {
Vector u_copy = p.u;
step->setProblem(p.A, u_copy, p.rhs);
- step->ignoreNodes_ = &p.ignore;
+ step->setIgnore(p.ignore);
LoopSolver solver(step, maxIterations, stepTol, &p.energyNorm, verbosity,
relativeErrors);
diff --git a/dune/solvers/test/multigridtest.cc b/dune/solvers/test/multigridtest.cc
index 653cb2bd..a61476aa 100644
--- a/dune/solvers/test/multigridtest.cc
+++ b/dune/solvers/test/multigridtest.cc
@@ -83,7 +83,7 @@ struct MultigridTestSuite
mgStep.setProblem(p.A,p.u,p.rhs);
mgStep.setSmoother(&smoother);
mgStep.setMGType(1,3,3);
- mgStep.ignoreNodes_ = &p.ignore;
+ mgStep.setIgnore(p.ignore);
mgStep.basesolver_ = &basesolver;
// create loop solver
diff --git a/dune/solvers/test/projectedgradienttest.cc b/dune/solvers/test/projectedgradienttest.cc
index df1fe346..7eeef5fd 100644
--- a/dune/solvers/test/projectedgradienttest.cc
+++ b/dune/solvers/test/projectedgradienttest.cc
@@ -38,7 +38,7 @@ bool solveObstacleProblemByProjectedGradientSolver(const MatrixType& mat, Vector
ProjectedGradientStep<MatrixType, VectorType> projGradStep(mat, x, rhs);
projGradStep.obstacles_ = &boxConstraints;
- projGradStep.ignoreNodes_ = &ignore;
+ projGradStep.setIgnore(ignore);
//projGrad.iterate();
EnergyNorm<MatrixType,VectorType>* h1SemiNorm = new EnergyNorm<MatrixType,VectorType>(mat);
diff --git a/dune/solvers/test/quadraticipoptsolvertest.cc b/dune/solvers/test/quadraticipoptsolvertest.cc
index 7024362a..b606782a 100644
--- a/dune/solvers/test/quadraticipoptsolvertest.cc
+++ b/dune/solvers/test/quadraticipoptsolvertest.cc
@@ -40,7 +40,7 @@ void solveObstacleProblemByQuadraticIPOptSolver(const GridType& grid, const Matr
// create solver
Solver solver(mat,x,rhs, NumProc::REDUCED);
- solver.ignoreNodes_ = &ignore;
+ solver.setIgnore(ignore);
solver.obstacles_ = &boxConstraints;
// solve problem
solver.solve();
diff --git a/dune/solvers/test/umfpacksolvertest.cc b/dune/solvers/test/umfpacksolvertest.cc
index be328f9b..545170c1 100644
--- a/dune/solvers/test/umfpacksolvertest.cc
+++ b/dune/solvers/test/umfpacksolvertest.cc
@@ -41,7 +41,7 @@ struct UMFPackSolverTestSuite
typedef Solvers::UMFPackSolver<typename Problem::Matrix,
typename Problem::Vector> Solver;
Solver solver(p.A,p.u,p.rhs);
- solver.ignoreNodes_ = &p.ignore;
+ solver.setIgnore(p.ignore);
// solve problem
solver.preprocess();
--
GitLab