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

get rid of deck usage setting up EclEpsConfig

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-09 10:11:08 +01:00
parent 8d07bef17c
commit 477f2cd425
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/material/fluidmatrixinteractions/EclEpsConfig.hpp
View File

@ -161,9 +161,8 @@ public:
*
* This requires that the opm-parser module is available.
*/
void initFromDeck(const Opm::Deck& deck OPM_UNUSED,
const Opm::EclipseState& eclState,
Opm::EclTwoPhaseSystemType twoPhaseSystemType)
void initFromState(const Opm::EclipseState& eclState,
Opm::EclTwoPhaseSystemType twoPhaseSystemType)
{
const auto& endscale = eclState.runspec().endpointScaling();
// find out if endpoint scaling is used in the first place

12
opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
View File

@ -127,7 +127,7 @@ public:
hasOil = ph.active(Phase::OIL);
hasWater = ph.active(Phase::WATER);
readGlobalEpsOptions_(deck, eclState);
readGlobalEpsOptions_(eclState);
readGlobalHysteresisOptions_(eclState);
readGlobalThreePhaseOptions_(eclState.runspec());
@ -135,8 +135,8 @@ public:
// deck.
gasOilConfig = std::make_shared<Opm::EclEpsConfig>();
oilWaterConfig = std::make_shared<Opm::EclEpsConfig>();
gasOilConfig->initFromDeck(deck, eclState, Opm::EclGasOilSystem);
oilWaterConfig->initFromDeck(deck, eclState, Opm::EclOilWaterSystem);
gasOilConfig->initFromState(eclState, Opm::EclGasOilSystem);
oilWaterConfig->initFromState(eclState, Opm::EclOilWaterSystem);
unscaledEpsInfo_.resize(numSatRegions);
const auto& stone1exTable = eclState.getTableManager().getStone1exTable();
@ -673,12 +673,12 @@ public:
}
private:
void readGlobalEpsOptions_(const Opm::Deck& deck, const Opm::EclipseState& eclState)
void readGlobalEpsOptions_(const Opm::EclipseState& eclState)
{
oilWaterEclEpsConfig_ = std::make_shared<Opm::EclEpsConfig>();
oilWaterEclEpsConfig_-> initFromDeck(deck, eclState, Opm::EclOilWaterSystem);
oilWaterEclEpsConfig_->initFromState(eclState, Opm::EclOilWaterSystem);
enableEndPointScaling_ = deck.hasKeyword("ENDSCALE");
enableEndPointScaling_ = eclState.getTableManager().hasTables("ENKRVD");
}
void readGlobalHysteresisOptions_(const Opm::EclipseState& state)