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

changed: check for SPECROCK in tables instead of checking deck for keyword

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-01-29 08:39:57 +01:00
parent 31d5347d73
commit e96c7d9cbc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/material/thermal/EclThermalLawManager.hpp
View File

@ -74,13 +74,14 @@ public:
const std::vector<int>& compressedToCartesianElemIdx) const std::vector<int>& compressedToCartesianElemIdx)
{ {
const auto& fp = eclState.fieldProps(); const auto& fp = eclState.fieldProps();
const auto& tableManager = eclState.getTableManager();
bool has_heatcr = fp.has_double("HEATCR"); bool has_heatcr = fp.has_double("HEATCR");
bool has_thconr = fp.has_double("THCONR"); bool has_thconr = fp.has_double("THCONR");
bool has_thc = fp.has_double("THCROCK") || fp.has_double("THCOIL") || fp.has_double("THCGAS") || fp.has_double("THCWATER"); bool has_thc = fp.has_double("THCROCK") || fp.has_double("THCOIL") || fp.has_double("THCGAS") || fp.has_double("THCWATER");
if (has_heatcr) if (has_heatcr)
initHeatcr_(deck, eclState, compressedToCartesianElemIdx); initHeatcr_(deck, eclState, compressedToCartesianElemIdx);
else if (deck.hasKeyword("SPECROCK")) else if (tableManager.hasTables("SPECROCK"))
initSpecrock_(deck, eclState, compressedToCartesianElemIdx); initSpecrock_(deck, eclState, compressedToCartesianElemIdx);
else else
initNullRockEnergy_(deck, eclState, compressedToCartesianElemIdx); initNullRockEnergy_(deck, eclState, compressedToCartesianElemIdx);