OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -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 7609f7e1f7
commit ce4028b2f0
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/wells/MultisegmentWell.hpp
View File

@@ -180,9 +180,6 @@ namespace Opm
// multi-phase flow model
WellSegments::MultiPhaseModel multiphaseModel() const;
// protected functions from the Base class
using Base::getAllowCrossFlow;
// the intial amount of fluids in each segment under surface condition
std::vector<std::vector<double> > segment_fluid_initial_;

6
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@@ -1198,7 +1198,7 @@ namespace Opm
//
// but for the top segment, the pressure equation will be the well control equation, and the other three will be the same.
const bool allow_cf = getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebosSimulator);
const bool allow_cf = this->getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebosSimulator);
const int nseg = this->numberOfSegments();
@@ -1348,7 +1348,7 @@ namespace Opm
MultisegmentWell<TypeTag>::
openCrossFlowAvoidSingularity(const Simulator& ebos_simulator) const
{
return !getAllowCrossFlow() && allDrawDownWrongDirection(ebos_simulator);
return !this->getAllowCrossFlow() && allDrawDownWrongDirection(ebos_simulator);
}
@@ -1524,7 +1524,7 @@ namespace Opm
{
// Calculate the rates that follow from the current primary variables.
std::vector<EvalWell> well_q_s(this->num_components_, 0.0);
const bool allow_cf = getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebosSimulator);
const bool allow_cf = this->getAllowCrossFlow() || openCrossFlowAvoidSingularity(ebosSimulator);
const int nseg = this->numberOfSegments();
for (int seg = 0; seg < nseg; ++seg) {
// calculating the perforation rate for each perforation that belongs to this segment