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

drop using statement for wsolvent

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 2c0743c888
commit fd2185d3f9
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::wsolvent;
using Base::wpolymer; using Base::wpolymer;
using Base::wfoam; using Base::wfoam;
using Base::mostStrictBhpFromBhpLimits; using Base::mostStrictBhpFromBhpLimits;

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

@ -133,8 +133,8 @@ namespace Opm
if constexpr (has_zFraction) { if constexpr (has_zFraction) {
if (this->isInjector()) { if (this->isInjector()) {
const unsigned gasCompIdx = Indices::canonicalToActiveComponentIndex(FluidSystem::gasCompIdx); const unsigned gasCompIdx = Indices::canonicalToActiveComponentIndex(FluidSystem::gasCompIdx);
b_perfcells_dense[gasCompIdx] *= (1.0 - wsolvent()); b_perfcells_dense[gasCompIdx] *= (1.0 - this->wsolvent());
b_perfcells_dense[gasCompIdx] += wsolvent()*intQuants.zPureInvFormationVolumeFactor().value(); b_perfcells_dense[gasCompIdx] += this->wsolvent()*intQuants.zPureInvFormationVolumeFactor().value();
} }
} }
@ -200,8 +200,8 @@ namespace Opm
if constexpr (has_zFraction) { if constexpr (has_zFraction) {
if (this->isInjector()) { if (this->isInjector()) {
const unsigned gasCompIdx = Indices::canonicalToActiveComponentIndex(FluidSystem::gasCompIdx); const unsigned gasCompIdx = Indices::canonicalToActiveComponentIndex(FluidSystem::gasCompIdx);
b_perfcells_dense[gasCompIdx] *= (1.0 - wsolvent()); b_perfcells_dense[gasCompIdx] *= (1.0 - this->wsolvent());
b_perfcells_dense[gasCompIdx] += wsolvent()*intQuants.zPureInvFormationVolumeFactor().value(); b_perfcells_dense[gasCompIdx] += this->wsolvent()*intQuants.zPureInvFormationVolumeFactor().value();
} }
} }
@ -665,7 +665,7 @@ namespace Opm
const unsigned gasCompIdx = Indices::canonicalToActiveComponentIndex(FluidSystem::gasCompIdx); const unsigned gasCompIdx = Indices::canonicalToActiveComponentIndex(FluidSystem::gasCompIdx);
cq_s_zfrac_effective = cq_s[gasCompIdx]; cq_s_zfrac_effective = cq_s[gasCompIdx];
if (this->isInjector()) { if (this->isInjector()) {
cq_s_zfrac_effective *= wsolvent(); cq_s_zfrac_effective *= this->wsolvent();
} else if (cq_s_zfrac_effective.value() != 0.0) { } else if (cq_s_zfrac_effective.value() != 0.0) {
const double dis_gas_frac = perf_dis_gas_rate / cq_s_zfrac_effective.value(); const double dis_gas_frac = perf_dis_gas_rate / cq_s_zfrac_effective.value();
cq_s_zfrac_effective *= this->extendEval(dis_gas_frac*intQuants.xVolume() + (1.0-dis_gas_frac)*intQuants.yVolume()); cq_s_zfrac_effective *= this->extendEval(dis_gas_frac*intQuants.xVolume() + (1.0-dis_gas_frac)*intQuants.yVolume());