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

EclMaterialLawManager: rename the *Pointer() methods to something more appropriate

Browse Source 
they are now called materialLawParamsPointerReferenceHack() and
oilWaterScaledEpsInfoDrainagePointerReferenceHack() which -- in my
opinion -- describes better what they do and which are also
sufficiently clunky and scary names to deter people from using them.
This commit is contained in:
Andreas Lauser
2016-07-06 12:57:51 +02:00
parent 7192a3495e
commit 0d4996f43f
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,18 +214,12 @@ public:
return *materialLawParams_[elemIdx];
}
std::shared_ptr<MaterialLawParams> materialLawParamsPointer(unsigned elemIdx)
std::shared_ptr<MaterialLawParams>& materialLawParamsPointerReferenceHack(unsigned elemIdx)
{
assert(0 <= elemIdx && elemIdx < materialLawParams_.size());
return materialLawParams_[elemIdx];
}
std::shared_ptr<const MaterialLawParams> materialLawParamsPointer(unsigned elemIdx) const
{
assert(0 <= elemIdx && elemIdx < materialLawParams_.size());
return materialLawParams_[elemIdx];
}
template <class FluidState>
void updateHysteresis(const FluidState& fluidState, unsigned elemIdx)
{
@@ -269,12 +263,7 @@ public:
return *oilWaterScaledEpsInfoDrainage_[elemIdx];
}
const std::shared_ptr<EclEpsScalingPointsInfo<Scalar> >& oilWaterScaledEpsInfoDrainagePointer(unsigned elemIdx) const
{
return oilWaterScaledEpsInfoDrainage_[elemIdx];
}
std::shared_ptr<EclEpsScalingPointsInfo<Scalar> >& oilWaterScaledEpsInfoDrainagePointer(unsigned elemIdx)
std::shared_ptr<EclEpsScalingPointsInfo<Scalar> >& oilWaterScaledEpsInfoDrainagePointerReferenceHack(unsigned elemIdx)
{
return oilWaterScaledEpsInfoDrainage_[elemIdx];
}