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

get rid of deck usage setting up GasPvtMultiplexer

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-02-06 13:19:03 +01:00
parent 6524ed889a
commit 5f36812707
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp
View File

@ -128,15 +128,15 @@ public:
*/
void initFromDeck(const Deck& deck, const EclipseState& eclState)
{
bool enableGas = deck.hasKeyword("GAS");
if (!enableGas)
const auto& phases = eclState.runspec().phases();
if (!phases.active(Phase::GAS))
return;
if (enableThermal && (deck.hasKeyword("THERMAL") || deck.hasKeyword("TEMP")))
if (enableThermal && eclState.getSimulationConfig().isThermal())
setApproach(ThermalGasPvt);
else if (deck.hasKeyword("PVTG"))
else if (!eclState.getTableManager().getPvtgTables().empty())
setApproach(WetGasPvt);
else if (deck.hasKeyword("PVDG"))
else if (eclState.getTableManager().hasTables("PVDG"))
setApproach(DryGasPvt);
OPM_GAS_PVT_MULTIPLEXER_CALL(pvtImpl.initFromDeck(deck, eclState));