OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify Preferred Phase Extraction

Browse Source 
Well::getPreferredPhase() now knows that the preferred phase for
injectors is the injected phase.  There is no need to special-case
injectors here.
This commit is contained in:
Bård Skaflestad 2020-11-12 11:16:24 +01:00
parent c76878520a
commit 2fb768e727
1 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/opm/output/eclipse/AggregateWellData.cpp
View File

@ -234,7 +234,6 @@ namespace {
{
using PhaseVal = VI::IWell::Value::Preferred_Phase;
if (well.isProducer()) { // Preferred phase from WELSPECS
switch (well.getPreferredPhase()) {
case Opm::Phase::OIL: return PhaseVal::Oil;
case Opm::Phase::GAS: return PhaseVal::Gas;
@ -250,24 +249,6 @@ namespace {
};
}
}
else { // Injector. Preferred phase reset to injected phase.
using IType = Opm::InjectorType;
const auto& iprop = well.getInjectionProperties();
switch (iprop.injectorType) {
case IType::OIL: return PhaseVal::Oil;
case IType::GAS: return PhaseVal::Gas;
case IType::WATER: return PhaseVal::Water;
default:
throw std::invalid_argument {
"Unsupported Injector Type '" +
std::to_string(static_cast<int>(iprop.injectorType))
+ '\''
};
}
}
}
template <typename IWellArray>
void setHistoryControlMode(const Opm::Well& well,