From da98f18f807e6f5a474bdccc73932d6c695b40ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Tue, 26 May 2015 02:00:46 +0200 Subject: [PATCH] Use base class version of parameter accessors. --- opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp b/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp index 255d4d93d..5dd23d62c 100644 --- a/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp +++ b/opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp @@ -172,6 +172,11 @@ namespace Opm { using Base::transMult; using Base::updatePrimalVariableFromState; using Base::updatePhaseCondFromPrimalVariable; + using Base::dpMaxRel; + using Base::dsMax; + using Base::drMaxRel; + using Base::maxResidualAllowed; + void makeConstantState(SolutionState& state) const; @@ -237,12 +242,6 @@ namespace Opm { std::vector& maxNormWell, int nc, int nw) const; - - double dpMaxRel() const { return this->param_.dp_max_rel_; } - double dsMax() const { return this->param_.ds_max_; } - double drMaxRel() const { return this->param_.dr_max_rel_; } - double maxResidualAllowed() const { return this->param_.max_residual_allowed_; } - };