OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-13 09:22:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

drop using statement for flowPhaseToEbosPhaseIdx

Browse Source 
rather qualify member function calls with this->
This commit is contained in:
Arne Morten Kvarving committed 2021-09-07 11:23:24 +02:00
1 parent 35cc1b9a2a
commit 9ebb315002
2 files changed
+4 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/simulators/wells/StandardWell.hpp
-1
View File
@@ -262,7 +262,6 @@ namespace Opm
protected: protected:
// protected functions from the Base class // protected functions from the Base class
using Base::flowPhaseToEbosPhaseIdx;
using Base::ebosCompIdxToFlowCompIdx; using Base::ebosCompIdxToFlowCompIdx;
using Base::wsalt; using Base::wsalt;
using Base::wsolvent; using Base::wsolvent;
opm/simulators/wells/StandardWell_impl.hpp
+4 -4
View File
@@ -1471,14 +1471,14 @@ namespace Opm
const double well_tw_fraction = well_index_[perf] / total_tw; const double well_tw_fraction = well_index_[perf] / total_tw;
double total_mobility = 0.0; double total_mobility = 0.0;
for (int p = 0; p < np; ++p) { for (int p = 0; p < np; ++p) {
int ebosPhaseIdx = flowPhaseToEbosPhaseIdx(p); int ebosPhaseIdx = this->flowPhaseToEbosPhaseIdx(p);
total_mobility += fs.invB(ebosPhaseIdx).value() * intQuants.mobility(ebosPhaseIdx).value(); total_mobility += fs.invB(ebosPhaseIdx).value() * intQuants.mobility(ebosPhaseIdx).value();
} }
if constexpr (has_solvent) { if constexpr (has_solvent) {
total_mobility += intQuants.solventInverseFormationVolumeFactor().value() * intQuants.solventMobility().value(); total_mobility += intQuants.solventInverseFormationVolumeFactor().value() * intQuants.solventMobility().value();
} }
for (int p = 0; p < np; ++p) { for (int p = 0; p < np; ++p) {
int ebosPhaseIdx = flowPhaseToEbosPhaseIdx(p); int ebosPhaseIdx = this->flowPhaseToEbosPhaseIdx(p);
perfRates[perf * num_components_ + p] = well_tw_fraction * intQuants.mobility(ebosPhaseIdx).value() / total_mobility; perfRates[perf * num_components_ + p] = well_tw_fraction * intQuants.mobility(ebosPhaseIdx).value() / total_mobility;
} }
if constexpr (has_solvent) { if constexpr (has_solvent) {
@@ -2452,7 +2452,7 @@ namespace Opm
// the reciprocal FVF. // the reciprocal FVF.
const auto connMob = const auto connMob =
mobility[ this->flowPhaseToEbosCompIdx(p) ].value() mobility[ this->flowPhaseToEbosCompIdx(p) ].value()
* fs.invB(flowPhaseToEbosPhaseIdx(p)).value(); * fs.invB(this->flowPhaseToEbosPhaseIdx(p)).value();
connPI[p] = connPICalc(connMob); connPI[p] = connPICalc(connMob);
} }
@@ -2509,6 +2509,6 @@ namespace Opm
const auto zero = EvalWell { this->numWellEq_ + Indices::numEq, 0.0 }; const auto zero = EvalWell { this->numWellEq_ + Indices::numEq, 0.0 };
const auto mt = std::accumulate(mobility.begin(), mobility.end(), zero); const auto mt = std::accumulate(mobility.begin(), mobility.end(), zero);
connII[phase_pos] = connIICalc(mt.value() * fs.invB(flowPhaseToEbosPhaseIdx(phase_pos)).value()); connII[phase_pos] = connIICalc(mt.value() * fs.invB(this->flowPhaseToEbosPhaseIdx(phase_pos)).value());
} }
} // namespace Opm } // namespace Opm