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

remove serialization templates from EclMaterialLawManager

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-09 10:31:26 +01:00
parent a2d52da69f
commit 91d4dcdf90
3 changed files with 0 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
opm/material/fluidmatrixinteractions/EclEpsConfig.hpp
View File

@ -221,41 +221,6 @@ public:
}
#endif
template<class Serializer>
std::size_t packSize(Serializer& serializer) const
{
return serializer.packSize(enableSatScaling_) +
serializer.packSize(enableThreePointKrSatScaling_) +
serializer.packSize(enablePcScaling_) +
serializer.packSize(enableLeverettScaling_) +
serializer.packSize(enableKrwScaling_) +
serializer.packSize(enableKrnScaling_);
}
template<class Serializer>
void pack(std::vector<char>& buffer, int& position,
Serializer& serializer) const
{
serializer.pack(enableSatScaling_, buffer, position);
serializer.pack(enableThreePointKrSatScaling_, buffer, position);
serializer.pack(enablePcScaling_, buffer, position);
serializer.pack(enableLeverettScaling_, buffer, position);
serializer.pack(enableKrwScaling_, buffer, position);
serializer.pack(enableKrnScaling_, buffer, position);
}
template<class Serializer>
void unpack(std::vector<char>& buffer, int& position,
Serializer& serializer)
{
serializer.unpack(enableSatScaling_, buffer, position);
serializer.unpack(enableThreePointKrSatScaling_, buffer, position);
serializer.unpack(enablePcScaling_, buffer, position);
serializer.unpack(enableLeverettScaling_, buffer, position);
serializer.unpack(enableKrwScaling_, buffer, position);
serializer.unpack(enableKrnScaling_, buffer, position);
}
private:
// enable scaling of the input saturations (i.e., rescale the x-Axis)
bool enableSatScaling_;

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

@ -127,32 +127,6 @@ public:
}
#endif
template<class Serializer>
std::size_t packSize(Serializer& serializer) const
{
return serializer.packSize(enableHysteresis_) +
serializer.packSize(pcHysteresisModel_) +
serializer.packSize(krHysteresisModel_);
}
template<class Serializer>
void pack(std::vector<char>& buffer, int& position,
Serializer& serializer) const
{
serializer.pack(enableHysteresis_, buffer, position);
serializer.pack(pcHysteresisModel_, buffer, position);
serializer.pack(krHysteresisModel_, buffer, position);
}
template<class Serializer>
void unpack(std::vector<char>& buffer, int& position,
Serializer& serializer)
{
serializer.unpack(enableHysteresis_, buffer, position);
serializer.unpack(pcHysteresisModel_, buffer, position);
serializer.unpack(krHysteresisModel_, buffer, position);
}
private:
// enable hysteresis at all
bool enableHysteresis_;

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

@ -612,64 +612,6 @@ public:
std::shared_ptr<EclEpsScalingPointsInfo<Scalar> >& oilWaterScaledEpsInfoDrainagePointerReferenceHack(unsigned elemIdx)
{ return oilWaterScaledEpsInfoDrainage_[elemIdx]; }
template<class Serializer>
std::size_t packSize(Serializer& serializer) const
{
return serializer.packSize(enableEndPointScaling_) +
hysteresisConfig_->packSize(serializer) +
oilWaterEclEpsConfig_->packSize(serializer) +
serializer.packSize(unscaledEpsInfo_) +
serializer.packSize(threePhaseApproach_) +
serializer.packSize(twoPhaseApproach_) +
gasOilConfig->packSize(serializer) +
oilWaterConfig->packSize(serializer) +
serializer.packSize(stoneEtas) +
serializer.packSize(hasGas) +
serializer.packSize(hasOil) +
serializer.packSize(hasWater);
}
template<class Serializer>
void pack(std::vector<char>& buffer, int& position,
Serializer& serializer) const
{
serializer.pack(enableEndPointScaling_, buffer, position);
hysteresisConfig_->pack(buffer, position, serializer);
oilWaterEclEpsConfig_->pack(buffer, position, serializer);
serializer.pack(unscaledEpsInfo_, buffer, position);
serializer.pack(threePhaseApproach_, buffer, position);
serializer.pack(twoPhaseApproach_, buffer, position);
gasOilConfig->pack(buffer, position, serializer);
oilWaterConfig->pack(buffer, position, serializer);
serializer.pack(stoneEtas, buffer, position);
serializer.pack(hasGas, buffer, position);
serializer.pack(hasOil, buffer, position);
serializer.pack(hasWater, buffer, position);
}
template<class Serializer>
void unpack(std::vector<char>& buffer, int& position,
Serializer& serializer)
{
oilWaterEclEpsConfig_ = std::make_shared<Opm::EclEpsConfig>();
hysteresisConfig_ = std::make_shared<Opm::EclHysteresisConfig>();
gasOilConfig = std::make_shared<Opm::EclEpsConfig>();
oilWaterConfig = std::make_shared<Opm::EclEpsConfig>();
serializer.unpack(enableEndPointScaling_, buffer, position);
hysteresisConfig_->unpack(buffer, position, serializer);
oilWaterEclEpsConfig_->unpack(buffer, position, serializer);
serializer.unpack(unscaledEpsInfo_, buffer, position);
serializer.unpack(threePhaseApproach_, buffer, position);
serializer.unpack(twoPhaseApproach_, buffer, position);
gasOilConfig->unpack(buffer, position, serializer);
oilWaterConfig->unpack(buffer, position, serializer);
serializer.unpack(stoneEtas, buffer, position);
serializer.unpack(hasGas, buffer, position);
serializer.unpack(hasOil, buffer, position);
serializer.unpack(hasWater, buffer, position);
}
private:
void readGlobalEpsOptions_(const Opm::EclipseState& eclState)
{