OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-16 16:11:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #581 from joakim-hove/refactor-get-tl-parameters

Browse Source 
Use DeckItem::hasValue() before accessing Todd Langstaff parameters
This commit is contained in:
Atgeirr Flø Rasmussen 2019-11-18 09:15:45 +01:00 committed by GitHub
commit fcc86d71c8
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
opm/models/blackoil/blackoilsolventmodules.hh
View File

@ -294,16 +294,18 @@ public:
for (unsigned regionIdx = 0; regionIdx < numMiscRegions; ++regionIdx) { for (unsigned regionIdx = 0; regionIdx < numMiscRegions; ++regionIdx) {
const auto& tlmixparRecord = deck.getKeyword("TLMIXPAR").getRecord(regionIdx); const auto& tlmixparRecord = deck.getKeyword("TLMIXPAR").getRecord(regionIdx);
const auto& mixParamsViscosity = tlmixparRecord.getItem("TL_VISCOSITY_PARAMETER").getSIDoubleData(); const auto& mixParamsViscosityItem = tlmixparRecord.getItem("TL_VISCOSITY_PARAMETER");
tlMixParamViscosity_[regionIdx] = mixParamsViscosity[0]; const auto& mixParamsDensityItem = tlmixparRecord.getItem("TL_DENSITY_PARAMETER");
const auto& mixParamsDensity = tlmixparRecord.getItem("TL_DENSITY_PARAMETER").getSIDoubleData();
const int numDensityItems = mixParamsDensity.size(); if (mixParamsViscosityItem.hasValue(0))
if (numDensityItems == 0) tlMixParamViscosity_[regionIdx] = mixParamsViscosityItem.getSIDouble(0);
tlMixParamDensity_[regionIdx] = tlMixParamViscosity_[regionIdx];
else if (numDensityItems == 1)
tlMixParamDensity_[regionIdx] = mixParamsDensity[0];
else else
throw std::runtime_error("Only one value can be entered for the TL parameter pr MISC region."); throw std::invalid_argument("The TL_VISCOSITY parameter can not be defaulted");
if (mixParamsDensityItem.hasValue(0))
tlMixParamDensity_[regionIdx] = mixParamsDensityItem.getSIDouble(0);
else
tlMixParamDensity_[regionIdx] = tlMixParamViscosity_[regionIdx];
} }
} }
else else