From 824232b7c97d16837af305948064d798f478ff12 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 6 Sep 2021 12:58:16 +0200 Subject: [PATCH] drop using statement for ipr_b_ rather qualify member variable with this-> --- opm/simulators/wells/MultisegmentWell.hpp | 2 -- opm/simulators/wells/MultisegmentWell_impl.hpp | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/opm/simulators/wells/MultisegmentWell.hpp b/opm/simulators/wells/MultisegmentWell.hpp index 54f91426a..bfedd1470 100644 --- a/opm/simulators/wells/MultisegmentWell.hpp +++ b/opm/simulators/wells/MultisegmentWell.hpp @@ -180,8 +180,6 @@ namespace Opm // multi-phase flow model WellSegments::MultiPhaseModel multiphaseModel() const; - using Base::ipr_b_; - // protected functions from the Base class using Base::phaseUsage; using Base::name; diff --git a/opm/simulators/wells/MultisegmentWell_impl.hpp b/opm/simulators/wells/MultisegmentWell_impl.hpp index 9fe1493ae..f7b151b22 100644 --- a/opm/simulators/wells/MultisegmentWell_impl.hpp +++ b/opm/simulators/wells/MultisegmentWell_impl.hpp @@ -852,7 +852,7 @@ namespace Opm double temp = 0; for (int p = 0; p < this->number_of_phases_; ++p) { - temp += this->ipr_a_[p] - ipr_b_[p] * bhp_limit; + temp += this->ipr_a_[p] - this->ipr_b_[p] * bhp_limit; } if (temp < 0.) { this->operability_status_.operable_under_only_bhp_limit = false; @@ -904,7 +904,7 @@ namespace Opm // initialize all the values to be zero to begin with std::fill(this->ipr_a_.begin(), this->ipr_a_.end(), 0.); - std::fill(ipr_b_.begin(), ipr_b_.end(), 0.); + std::fill(this->ipr_b_.begin(), this->ipr_b_.end(), 0.); const int nseg = this->numberOfSegments(); double seg_bhp_press_diff = 0; @@ -961,7 +961,7 @@ namespace Opm // phases vs components // ipr values for the perforation std::vector ipr_a_perf(this->ipr_a_.size()); - std::vector ipr_b_perf(ipr_b_.size()); + std::vector ipr_b_perf(this->ipr_b_.size()); for (int p = 0; p < this->number_of_phases_; ++p) { const double tw_mob = tw_perf * mob[p].value() * b_perf[p]; ipr_a_perf[p] += tw_mob * pressure_diff; @@ -991,7 +991,7 @@ namespace Opm for (int p = 0; p < this->number_of_phases_; ++p) { // TODO: double check the indices here this->ipr_a_[ebosCompIdxToFlowCompIdx(p)] += ipr_a_perf[p]; - ipr_b_[ebosCompIdxToFlowCompIdx(p)] += ipr_b_perf[p]; + this->ipr_b_[ebosCompIdxToFlowCompIdx(p)] += ipr_b_perf[p]; } } }