OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-07 15:03:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

drop using statement for getAllowCrossFlow

Browse Source 
rather qualify member function calls with this->
This commit is contained in:
Arne Morten Kvarving 2021-09-06 12:58:16 +02:00
parent 0aa60a6f7c
commit 48e282bd65
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/simulators/wells/StandardWell.hpp
View File

@ -262,7 +262,6 @@ namespace Opm
protected: protected:
// protected functions from the Base class // protected functions from the Base class
using Base::getAllowCrossFlow;
using Base::flowPhaseToEbosCompIdx; using Base::flowPhaseToEbosCompIdx;
using Base::flowPhaseToEbosPhaseIdx; using Base::flowPhaseToEbosPhaseIdx;
using Base::ebosCompIdxToFlowCompIdx; using Base::ebosCompIdxToFlowCompIdx;

10
opm/simulators/wells/StandardWell_impl.hpp
View File

@ -532,7 +532,7 @@ namespace Opm
EvalWell& cq_s_zfrac_effective, EvalWell& cq_s_zfrac_effective,
DeferredLogger& deferred_logger) const 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 EvalWell& bhp = this->getBhp();
const int cell_idx = well_cells_[perf]; const int cell_idx = well_cells_[perf];
const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));
@ -1191,7 +1191,7 @@ namespace Opm
StandardWell<TypeTag>:: StandardWell<TypeTag>::
openCrossFlowAvoidSingularity(const Simulator& ebos_simulator) const 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_; const int np = number_of_phases_;
well_flux.resize(np, 0.0); 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) { for (int perf = 0; perf < number_of_perforations_; ++perf) {
const int cell_idx = well_cells_[perf]; const int cell_idx = well_cells_[perf];
@ -1973,7 +1973,7 @@ namespace Opm
} }
// compute the well water velocity with out shear effects. // compute the well water velocity with out shear effects.
// TODO: do we need to turn on crossflow here? // 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(); const EvalWell& bhp = this->getBhp();
std::vector<EvalWell> cq_s(num_components_, {this->numWellEq_ + Indices::numEq, 0.}); std::vector<EvalWell> 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. // Calculate the rates that follow from the current primary variables.
std::vector<double> well_q_s(num_components_, 0.); std::vector<double> well_q_s(num_components_, 0.);
const EvalWell& bhp = this->getBhp(); 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) { for (int perf = 0; perf < number_of_perforations_; ++perf) {
const int cell_idx = well_cells_[perf]; const int cell_idx = well_cells_[perf];
const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); const auto& intQuants = *(ebosSimulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));