From 1656836f00c642b5cbde9db51732484484acb193 Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Tue, 7 Jun 2016 12:38:56 +0200 Subject: [PATCH] Change variable name along recommendation. --- opm/autodiff/NewtonIterationBlackoilCPR.cpp | 4 ++-- opm/autodiff/NewtonIterationBlackoilCPR.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opm/autodiff/NewtonIterationBlackoilCPR.cpp b/opm/autodiff/NewtonIterationBlackoilCPR.cpp index 939041922..f48fcf243 100644 --- a/opm/autodiff/NewtonIterationBlackoilCPR.cpp +++ b/opm/autodiff/NewtonIterationBlackoilCPR.cpp @@ -63,7 +63,7 @@ namespace Opm linear_solver_maxiter_( param.getDefault("linear_solver_maxiter", 50 ) ), linear_solver_restart_( param.getDefault("linear_solver_restart", 40 ) ), linear_solver_verbosity_( param.getDefault("linear_solver_verbosity", 0 )), - ignoreConvergenceFailure_(param.getDefault("linear_solver_ignoreconvergencefailure", ignoreConvergenceFailure_)) + linear_solver_ignoreconvergencefailure_(param.getDefault("linear_solver_ignoreconvergencefailure", ignoreConvergenceFailure_)) { } @@ -168,7 +168,7 @@ namespace Opm iterations_ = result.iterations; // Check for failure of linear solver. - if (!result.converged && !ignoreConvergenceFailure_) { + if (!result.converged && !linear_solver_ignoreconvergencefailure_) { OPM_THROW(LinearSolverProblem, "Convergence failure for linear solver."); } diff --git a/opm/autodiff/NewtonIterationBlackoilCPR.hpp b/opm/autodiff/NewtonIterationBlackoilCPR.hpp index b6b069ed0..e9c024ba7 100644 --- a/opm/autodiff/NewtonIterationBlackoilCPR.hpp +++ b/opm/autodiff/NewtonIterationBlackoilCPR.hpp @@ -128,7 +128,7 @@ namespace Opm const int linear_solver_maxiter_; const int linear_solver_restart_; const int linear_solver_verbosity_; - const bool ignoreConvergenceFailure_; + const bool linear_solver_ignoreconvergencefailure_; }; } // namespace Opm