DeadOilPvt: some simplifications

remove unused constructors and explicit comparison operator
This commit is contained in:
Arne Morten Kvarving
2022-12-15 11:45:53 +01:00
parent e4814b0ad3
commit f6c3b61502

View File

@@ -46,17 +46,6 @@ class DeadOilPvt
public:
using TabulatedOneDFunction = Tabulated1DFunction<Scalar>;
DeadOilPvt() = default;
DeadOilPvt(const std::vector<Scalar>& oilReferenceDensity,
const std::vector<TabulatedOneDFunction>& inverseOilB,
const std::vector<TabulatedOneDFunction>& oilMu,
const std::vector<TabulatedOneDFunction>& inverseOilBMu)
: oilReferenceDensity_(oilReferenceDensity)
, inverseOilB_(inverseOilB)
, oilMu_(oilMu)
, inverseOilBMu_(inverseOilBMu)
{ }
#if HAVE_ECL_INPUT
/*!
* \brief Initialize the oil parameters via the data specified by the PVDO ECL keyword.
@@ -249,7 +238,7 @@ public:
throw std::runtime_error("Not implemented: The PVT model does not provide a diffusionCoefficient()");
}
const Scalar oilReferenceDensity(unsigned regionIdx) const
Scalar oilReferenceDensity(unsigned regionIdx) const
{ return oilReferenceDensity_[regionIdx]; }
const std::vector<TabulatedOneDFunction>& inverseOilB() const
@@ -261,14 +250,6 @@ public:
const std::vector<TabulatedOneDFunction>& inverseOilBMu() const
{ return inverseOilBMu_; }
bool operator==(const DeadOilPvt<Scalar>& data) const
{
return this->oilReferenceDensity_ == data.oilReferenceDensity_ &&
this->inverseOilB() == data.inverseOilB() &&
this->oilMu() == data.oilMu() &&
this->inverseOilBMu() == data.inverseOilBMu();
}
private:
std::vector<Scalar> oilReferenceDensity_;
std::vector<TabulatedOneDFunction> inverseOilB_;