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

Get rid of deck usage in blackoilsolventmodules

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-03 16:01:23 +01:00
parent 913439ec28
commit cb2aaa3452
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/models/blackoil/blackoilsolventmodules.hh
View File

@ -101,14 +101,14 @@ public:
{ {
// some sanity checks: if solvents are enabled, the SOLVENT keyword must be // some sanity checks: if solvents are enabled, the SOLVENT keyword must be
// present, if solvents are disabled the keyword must not be present. // present, if solvents are disabled the keyword must not be present.
if (enableSolvent && !deck.hasKeyword("SOLVENT")) if (enableSolvent && !eclState.runspec().phases().active(Phase::SOLVENT))
throw std::runtime_error("Non-trivial solvent treatment requested at compile " throw std::runtime_error("Non-trivial solvent treatment requested at compile "
"time, but the deck does not contain the SOLVENT keyword"); "time, but the deck does not contain the SOLVENT keyword");
else if (!enableSolvent && deck.hasKeyword("SOLVENT")) else if (!enableSolvent && eclState.runspec().phases().active(Phase::SOLVENT))
throw std::runtime_error("Solvent treatment disabled at compile time, but the deck " throw std::runtime_error("Solvent treatment disabled at compile time, but the deck "
"contains the SOLVENT keyword"); "contains the SOLVENT keyword");
if (!deck.hasKeyword("SOLVENT")) if (!eclState.runspec().phases().active(Phase::SOLVENT))
return; // solvent treatment is supposed to be disabled return; // solvent treatment is supposed to be disabled
solventPvt_.initFromState(eclState, schedule); solventPvt_.initFromState(eclState, schedule);
@ -130,7 +130,7 @@ public:
// initialize the objects needed for miscible solvent and oil simulations // initialize the objects needed for miscible solvent and oil simulations
isMiscible_ = false; isMiscible_ = false;
if (deck.hasKeyword("MISCIBLE")) { if (!eclState.getTableManager().getMiscTables().empty()) {
isMiscible_ = true; isMiscible_ = true;
unsigned numMiscRegions = 1; unsigned numMiscRegions = 1;
@ -308,7 +308,7 @@ public:
// resize the attributes of the object // resize the attributes of the object
tlPMixTable_.resize(numMiscRegions); tlPMixTable_.resize(numMiscRegions);
if (deck.hasKeyword("TLPMIXPA")) { if (!eclState.getTableManager().getTlpmixpaTables().empty()) {
const auto& tlpmixparTables = tableManager.getTlpmixpaTables(); const auto& tlpmixparTables = tableManager.getTlpmixpaTables();
if (!tlpmixparTables.empty()) { if (!tlpmixparTables.empty()) {