From 870cb04e6898e7b1f4884b25062dedb3d49aaba5 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_a_ rather qualify member variable with this-> --- opm/simulators/wells/StandardWell.hpp | 1 - opm/simulators/wells/StandardWell_impl.hpp | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/opm/simulators/wells/StandardWell.hpp b/opm/simulators/wells/StandardWell.hpp index 4f4aca729..bd83c797d 100644 --- a/opm/simulators/wells/StandardWell.hpp +++ b/opm/simulators/wells/StandardWell.hpp @@ -263,7 +263,6 @@ namespace Opm protected: // protected member variables from the Base class - using Base::ipr_a_; using Base::ipr_b_; Eval getPerfCellPressure(const FluidState& fs) const; diff --git a/opm/simulators/wells/StandardWell_impl.hpp b/opm/simulators/wells/StandardWell_impl.hpp index 3c88e155a..ffe5abd15 100644 --- a/opm/simulators/wells/StandardWell_impl.hpp +++ b/opm/simulators/wells/StandardWell_impl.hpp @@ -934,7 +934,7 @@ namespace Opm } // initialize all the values to be zero to begin with - std::fill(ipr_a_.begin(), ipr_a_.end(), 0.); + std::fill(this->ipr_a_.begin(), this->ipr_a_.end(), 0.); std::fill(ipr_b_.begin(), ipr_b_.end(), 0.); for (int perf = 0; perf < this->number_of_perforations_; ++perf) { @@ -977,7 +977,7 @@ namespace Opm // TODO: there might be some indices related problems here // phases vs components // ipr values for the perforation - std::vector ipr_a_perf(ipr_a_.size()); + std::vector ipr_a_perf(this->ipr_a_.size()); std::vector ipr_b_perf(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]; @@ -1007,11 +1007,11 @@ namespace Opm for (int p = 0; p < this->number_of_phases_; ++p) { // TODO: double check the indices here - ipr_a_[this->ebosCompIdxToFlowCompIdx(p)] += ipr_a_perf[p]; + this->ipr_a_[this->ebosCompIdxToFlowCompIdx(p)] += ipr_a_perf[p]; ipr_b_[this->ebosCompIdxToFlowCompIdx(p)] += ipr_b_perf[p]; } } - this->parallel_well_info_.communication().sum(ipr_a_.data(), ipr_a_.size()); + this->parallel_well_info_.communication().sum(this->ipr_a_.data(), this->ipr_a_.size()); this->parallel_well_info_.communication().sum(ipr_b_.data(), ipr_b_.size()); } @@ -1031,7 +1031,7 @@ namespace Opm // we need to check the BHP limit for (int p = 0; p < this->number_of_phases_; ++p) { - const double temp = ipr_a_[p] - ipr_b_[p] * bhp_limit; + const double temp = this->ipr_a_[p] - ipr_b_[p] * bhp_limit; if (temp < 0.) { this->operability_status_.operable_under_only_bhp_limit = false; break;