From 48e282bd65c08486136b541761e1fefd62fcceeb 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 getAllowCrossFlow rather qualify member function calls 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 aa31587b0..a2cc4249d 100644 --- a/opm/simulators/wells/StandardWell.hpp +++ b/opm/simulators/wells/StandardWell.hpp @@ -262,7 +262,6 @@ namespace Opm protected: // protected functions from the Base class - using Base::getAllowCrossFlow; using Base::flowPhaseToEbosCompIdx; using Base::flowPhaseToEbosPhaseIdx; using Base::ebosCompIdxToFlowCompIdx; diff --git a/opm/simulators/wells/StandardWell_impl.hpp b/opm/simulators/wells/StandardWell_impl.hpp index ae628f275..acbbcddca 100644 --- a/opm/simulators/wells/StandardWell_impl.hpp +++ b/opm/simulators/wells/StandardWell_impl.hpp @@ -532,7 +532,7 @@ namespace Opm EvalWell& cq_s_zfrac_effective, DeferredLogger& deferred_logger) const { - const bool allow_cf = getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebosSimulator); + const bool allow_cf = this->getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebosSimulator); const EvalWell& bhp = this->getBhp(); const int cell_idx = well_cells_[perf]; const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); @@ -1191,7 +1191,7 @@ namespace Opm StandardWell:: openCrossFlowAvoidSingularity(const Simulator& ebos_simulator) const { - return !getAllowCrossFlow() && allDrawDownWrongDirection(ebos_simulator); + return !this->getAllowCrossFlow() && allDrawDownWrongDirection(ebos_simulator); } @@ -1647,7 +1647,7 @@ namespace Opm const int np = number_of_phases_; well_flux.resize(np, 0.0); - const bool allow_cf = getAllowCrossFlow(); + const bool allow_cf = this->getAllowCrossFlow(); for (int perf = 0; perf < number_of_perforations_; ++perf) { const int cell_idx = well_cells_[perf]; @@ -1973,7 +1973,7 @@ namespace Opm } // compute the well water velocity with out shear effects. // TODO: do we need to turn on crossflow here? - const bool allow_cf = getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebos_simulator); + const bool allow_cf = this->getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebos_simulator); const EvalWell& bhp = this->getBhp(); std::vector cq_s(num_components_, {this->numWellEq_ + Indices::numEq, 0.}); @@ -2410,7 +2410,7 @@ namespace Opm // Calculate the rates that follow from the current primary variables. std::vector well_q_s(num_components_, 0.); const EvalWell& bhp = this->getBhp(); - const bool allow_cf = getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebosSimulator); + const bool allow_cf = this->getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebosSimulator); for (int perf = 0; perf < number_of_perforations_; ++perf) { const int cell_idx = well_cells_[perf]; const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));