Merge pull request #392 from akva2/cleanup_brine

some cleanups in ConstantCompressibilityBrinePvt
This commit is contained in:
Tor Harald Sandve 2020-02-17 14:13:55 +01:00 committed by GitHub
commit 517ce64f58

View File

@ -50,11 +50,9 @@ class WaterPvtMultiplexer;
template <class Scalar>
class ConstantCompressibilityBrinePvt
{
typedef Opm::Tabulated1DFunction<Scalar> TabulatedOneDFunction;
typedef typename Opm::Tabulated1DFunction<Scalar> TabulatedFunction;
typedef std::vector<std::pair<Scalar, Scalar> > SamplingPoints;
public:
typedef typename Opm::Tabulated1DFunction<Scalar> TabulatedFunction;
ConstantCompressibilityBrinePvt() = default;
ConstantCompressibilityBrinePvt(const std::vector<Scalar>& waterReferenceDensity,
const std::vector<Scalar>& referencePressure,
@ -236,12 +234,12 @@ public:
}
private:
std::vector<Scalar> waterReferenceDensity_;
std::vector<Scalar> referencePressure_;
std::vector<TabulatedFunction> formationVolumeTables_;
std::vector<TabulatedFunction> compressibilityTables_;
std::vector<TabulatedFunction> viscosityTables_;
std::vector<TabulatedFunction> viscosibilityTables_;
std::vector<Scalar> referencePressure_;
std::vector<Scalar> waterReferenceDensity_;
};