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

use STONE1EX from table manager

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-06 12:17:21 +01:00
parent 861a6ad4b4
commit 5f2d7c6308
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,12 +139,13 @@ public:
oilWaterConfig->initFromDeck(deck, eclState, Opm::EclOilWaterSystem); oilWaterConfig->initFromDeck(deck, eclState, Opm::EclOilWaterSystem);
unscaledEpsInfo_.resize(numSatRegions); unscaledEpsInfo_.resize(numSatRegions);
if (deck.hasKeyword("STONE1EX")) const auto& stone1exTable = eclState.getTableManager().getStone1exTable();
if (!stone1exTable.empty())
stoneEtas.resize(numSatRegions); stoneEtas.resize(numSatRegions);
for (unsigned satRegionIdx = 0; satRegionIdx < numSatRegions; ++satRegionIdx) { for (unsigned satRegionIdx = 0; satRegionIdx < numSatRegions; ++satRegionIdx) {
unscaledEpsInfo_[satRegionIdx].extractUnscaled(deck, eclState, satRegionIdx); unscaledEpsInfo_[satRegionIdx].extractUnscaled(deck, eclState, satRegionIdx);
if (!stoneEtas.empty()) if (!stoneEtas.empty())
stoneEtas[satRegionIdx] = deck.getKeyword("STONE1EX").getRecord(satRegionIdx).getItem(0).getSIDouble(0); stoneEtas[satRegionIdx] = stone1exTable[satRegionIdx].eta;
} }
} }