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

EclMaterialLawManager: slightly clean up the materialLawParams() methods

Browse Source
This commit is contained in:
Andreas Lauser 2015-08-07 18:21:47 +02:00
parent a82648a002
commit 89cbb8aab7
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,28 +206,22 @@ public:
MaterialLawParams& materialLawParams(int elemIdx)
{
assert(0 <= elemIdx && elemIdx < (int) materialLawParams_.size());
int paramIdx;
if (hasElementSpecificParameters())
paramIdx = elemIdx;
if (hasElementSpecificParameters()) {
assert(0 <= elemIdx && elemIdx < (int) materialLawParams_.size());
return *materialLawParams_[elemIdx];
}
else
paramIdx = satnumRegionIdx_[elemIdx];
return *materialLawParams_[paramIdx];
return *materialLawParams_[satnumRegionIdx_[elemIdx]];
}
const MaterialLawParams& materialLawParams(int elemIdx) const
{
assert(0 <= elemIdx && elemIdx < materialLawParams_.size());
int paramIdx;
if (hasElementSpecificParameters())
paramIdx = elemIdx;
if (hasElementSpecificParameters()) {
assert(0 <= elemIdx && elemIdx < (int) materialLawParams_.size());
return *materialLawParams_[elemIdx];
}
else
paramIdx = satnumRegionIdx_[elemIdx];
return *materialLawParams_[paramIdx];
return *materialLawParams_[satnumRegionIdx_[elemIdx]];
}
template <class FluidState>