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

Merge pull request #622 from joakim-hove/tlmixpar

Browse Source 
Use non table TLMIXPAR implementation
This commit is contained in:
Joakim Hove 2020-08-14 12:57:25 +02:00 committed by GitHub
commit 13661e7cd5
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,22 +284,17 @@ public:
setSgcmis(regionIdx, zero); setSgcmis(regionIdx, zero);
} }
const auto& tlmixpar = eclState.getTableManager().getTLMixpar();
if (!eclState.getTableManager().getTlmixparTable().empty()) { if (!tlmixpar.empty()) {
// resize the attributes of the object // resize the attributes of the object
tlMixParamViscosity_.resize(numMiscRegions); tlMixParamViscosity_.resize(numMiscRegions);
tlMixParamDensity_.resize(numMiscRegions); tlMixParamDensity_.resize(numMiscRegions);
const auto& tlmixparTable = eclState.getTableManager().getTlmixparTable(); assert(numMiscRegions == tlmixpar.size());
assert(numMiscRegions == tlmixparTable.size());
for (unsigned regionIdx = 0; regionIdx < numMiscRegions; ++regionIdx) { for (unsigned regionIdx = 0; regionIdx < numMiscRegions; ++regionIdx) {
// Copy data const auto& tlp = tlmixpar[regionIdx];
tlMixParamViscosity_[regionIdx] = tlmixparTable[regionIdx].viscosity; tlMixParamViscosity_[regionIdx] = tlp.viscosity_parameter;
if (tlmixparTable[regionIdx].density == 0.0) tlMixParamDensity_[regionIdx] = tlp.density_parameter;
tlMixParamDensity_[regionIdx] = tlMixParamViscosity_[regionIdx];
else
tlMixParamDensity_[regionIdx] = tlmixparTable[regionIdx].density;
} }
} }
else else