diff --git a/opm/material/fluidsystems/BlackOilFluidSystem.hpp b/opm/material/fluidsystems/BlackOilFluidSystem.hpp index b1300aa3d..661054bdd 100644 --- a/opm/material/fluidsystems/BlackOilFluidSystem.hpp +++ b/opm/material/fluidsystems/BlackOilFluidSystem.hpp @@ -306,6 +306,19 @@ public: static void setWaterPvt(std::shared_ptr pvtObj) { waterPvt_ = pvtObj; } + static void setVapPars(const Scalar par1, const Scalar par2) + { + if (gasPvt_) { + gasPvt_->setVapPars(par1, par2); + } + if (oilPvt_) { + oilPvt_->setVapPars(par1, par2); + } + if (waterPvt_) { + waterPvt_->setVapPars(par1, par2); + } + } + /*! * \brief Initialize the values of the reference densities * diff --git a/opm/material/fluidsystems/blackoilpvt/BrineCo2Pvt.hpp b/opm/material/fluidsystems/blackoilpvt/BrineCo2Pvt.hpp index 41f071e38..9c4f94b23 100644 --- a/opm/material/fluidsystems/blackoilpvt/BrineCo2Pvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/BrineCo2Pvt.hpp @@ -104,6 +104,9 @@ public: salinity_.resize(numRegions); } + void setVapPars(const Scalar, const Scalar) + { + } /*! * \brief Initialize the reference densities of all fluids for a given PVT region diff --git a/opm/material/fluidsystems/blackoilpvt/BrineH2Pvt.hpp b/opm/material/fluidsystems/blackoilpvt/BrineH2Pvt.hpp index 321ca5e47..c458e2449 100644 --- a/opm/material/fluidsystems/blackoilpvt/BrineH2Pvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/BrineH2Pvt.hpp @@ -92,6 +92,10 @@ public: salinity_.resize(numRegions); } + void setVapPars(const Scalar, const Scalar) + { + } + /*! * \brief Initialize the reference densities of all fluids for a given PVT region */ diff --git a/opm/material/fluidsystems/blackoilpvt/Co2GasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/Co2GasPvt.hpp index dbe1196aa..ccd3b8844 100644 --- a/opm/material/fluidsystems/blackoilpvt/Co2GasPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/Co2GasPvt.hpp @@ -88,6 +88,9 @@ public: salinity_.resize(numRegions); } + void setVapPars(const Scalar, const Scalar) + { + } /*! * \brief Initialize the reference densities of all fluids for a given PVT region diff --git a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityBrinePvt.hpp b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityBrinePvt.hpp index 8171c3386..ed4ff5935 100644 --- a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityBrinePvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityBrinePvt.hpp @@ -68,6 +68,10 @@ public: } } + void setVapPars(const Scalar, const Scalar) + { + } + /*! * \brief Set the water reference density [kg / m^3] */ diff --git a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp index 9c4a23ab9..3d4be2368 100644 --- a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp @@ -71,6 +71,10 @@ public: } } + void setVapPars(const Scalar, const Scalar) + { + } + /*! * \brief Initialize the reference densities of all fluids for a given PVT region */ diff --git a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp index 48911539e..a3cad3388 100644 --- a/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp @@ -70,6 +70,10 @@ public: } } + void setVapPars(const Scalar, const Scalar) + { + } + /*! * \brief Set the water reference density [kg / m^3] */ diff --git a/opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp b/opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp index 331391194..8ea7dc3f9 100644 --- a/opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/DeadOilPvt.hpp @@ -55,6 +55,10 @@ public: void setNumRegions(size_t numRegions); + void setVapPars(const Scalar, const Scalar) + { + } + /*! * \brief Initialize the reference densities of all fluids for a given PVT region */ diff --git a/opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp index 3ca8a5ae1..103f28808 100644 --- a/opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/DryGasPvt.hpp @@ -63,6 +63,10 @@ public: void setNumRegions(size_t numRegions); + void setVapPars(const Scalar, const Scalar) + { + } + /*! * \brief Initialize the reference densities of all fluids for a given PVT region */ diff --git a/opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.hpp index 1ba8d3fe9..6eaa8e2a4 100644 --- a/opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/DryHumidGasPvt.hpp @@ -74,6 +74,11 @@ public: void setNumRegions(size_t numRegions); + void setVapPars(const Scalar par1, const Scalar) + { + vapPar1_ = par1; + } + /*! * \brief Initialize the reference densities of all fluids for a given PVT region */ diff --git a/opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp b/opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp index ffe30b50a..af9297026 100644 --- a/opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp +++ b/opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp @@ -216,6 +216,11 @@ public: unsigned numRegions() const { OPM_GAS_PVT_MULTIPLEXER_CALL(return pvtImpl.numRegions()); return 1; } + void setVapPars(const Scalar par1, const Scalar par2) + { + OPM_GAS_PVT_MULTIPLEXER_CALL(pvtImpl.setVapPars(par1, par2)); + } + /*! * \brief Return the reference density which are considered by this PVT-object. */ diff --git a/opm/material/fluidsystems/blackoilpvt/GasPvtThermal.hpp b/opm/material/fluidsystems/blackoilpvt/GasPvtThermal.hpp index 94261b329..ad54e2d0f 100644 --- a/opm/material/fluidsystems/blackoilpvt/GasPvtThermal.hpp +++ b/opm/material/fluidsystems/blackoilpvt/GasPvtThermal.hpp @@ -121,6 +121,11 @@ public: rhoRefO_.resize(numRegions); } + void setVapPars(const Scalar par1, const Scalar par2) + { + isothermalPvt_->setVapPars(par1, par2); + } + /*! * \brief Finish initializing the thermal part of the gas phase PVT properties. */ diff --git a/opm/material/fluidsystems/blackoilpvt/H2GasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/H2GasPvt.hpp index 3c770a249..e27caebda 100644 --- a/opm/material/fluidsystems/blackoilpvt/H2GasPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/H2GasPvt.hpp @@ -79,6 +79,10 @@ public: gasReferenceDensity_.resize(numRegions); } + void setVapPars(const Scalar, const Scalar) + { + } + /*! * \brief Initialize the reference densities of all fluids for a given PVT region @@ -228,4 +232,4 @@ private: } // end namspace Opm -#endif \ No newline at end of file +#endif diff --git a/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp b/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp index fcf5ca12f..5473d5e3c 100644 --- a/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/LiveOilPvt.hpp @@ -72,6 +72,11 @@ public: void setNumRegions(size_t numRegions); + void setVapPars(const Scalar, const Scalar par2) + { + vapPar2_ = par2; + } + /*! * \brief Initialize the reference densities of all fluids for a given PVT region */ diff --git a/opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.hpp b/opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.hpp index b2ad16483..adc9988b9 100644 --- a/opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.hpp +++ b/opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.hpp @@ -170,6 +170,11 @@ public: unsigned numRegions() const { OPM_OIL_PVT_MULTIPLEXER_CALL(return pvtImpl.numRegions()); return 1; } + void setVapPars(const Scalar par1, const Scalar par2) + { + OPM_OIL_PVT_MULTIPLEXER_CALL(pvtImpl.setVapPars(par1, par2)); + } + /*! * \brief Return the reference density which are considered by this PVT-object. */ diff --git a/opm/material/fluidsystems/blackoilpvt/OilPvtThermal.hpp b/opm/material/fluidsystems/blackoilpvt/OilPvtThermal.hpp index 4434469db..13a17616c 100644 --- a/opm/material/fluidsystems/blackoilpvt/OilPvtThermal.hpp +++ b/opm/material/fluidsystems/blackoilpvt/OilPvtThermal.hpp @@ -124,6 +124,11 @@ public: rhoRefG_.resize(numRegions); } + void setVapPars(const Scalar par1, const Scalar par2) + { + isothermalPvt_->setVapPars(par1, par2); + } + /*! * \brief Finish initializing the thermal part of the oil phase PVT properties. */ diff --git a/opm/material/fluidsystems/blackoilpvt/SolventPvt.hpp b/opm/material/fluidsystems/blackoilpvt/SolventPvt.hpp index fa7b1aea3..bb7adb609 100644 --- a/opm/material/fluidsystems/blackoilpvt/SolventPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/SolventPvt.hpp @@ -61,6 +61,10 @@ public: void setNumRegions(size_t numRegions); + void setVapPars(const Scalar, const Scalar) + { + } + /*! * \brief Initialize the reference density of the solvent gas for a given PVT region */ diff --git a/opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp b/opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp index 443f476b0..6c57f0dce 100644 --- a/opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp +++ b/opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp @@ -150,6 +150,11 @@ public: unsigned numRegions() const { OPM_WATER_PVT_MULTIPLEXER_CALL(return pvtImpl.numRegions()); return 1; } + void setVapPars(const Scalar par1, const Scalar par2) + { + OPM_WATER_PVT_MULTIPLEXER_CALL(pvtImpl.setVapPars(par1, par2)); + } + /*! * \brief Return the reference density which are considered by this PVT-object. */ diff --git a/opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.hpp b/opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.hpp index 31bd742c4..fd8b956e7 100644 --- a/opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.hpp +++ b/opm/material/fluidsystems/blackoilpvt/WaterPvtThermal.hpp @@ -132,6 +132,11 @@ public: internalEnergyCurves_.resize(numRegions); } + void setVapPars(const Scalar par1, const Scalar par2) + { + isothermalPvt_->setVapPars(par1, par2); + } + /*! * \brief Finish initializing the thermal part of the water phase PVT properties. */ diff --git a/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp index b17f8149e..1074840b9 100644 --- a/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/WetGasPvt.hpp @@ -74,6 +74,11 @@ public: void setNumRegions(size_t numRegions); + void setVapPars(const Scalar par1, const Scalar) + { + vapPar1_ = par1; + } + /*! * \brief Initialize the reference densities of all fluids for a given PVT region */ diff --git a/opm/material/fluidsystems/blackoilpvt/WetHumidGasPvt.hpp b/opm/material/fluidsystems/blackoilpvt/WetHumidGasPvt.hpp index e16cf4013..b712e9854 100644 --- a/opm/material/fluidsystems/blackoilpvt/WetHumidGasPvt.hpp +++ b/opm/material/fluidsystems/blackoilpvt/WetHumidGasPvt.hpp @@ -79,6 +79,11 @@ public: void setNumRegions(size_t numRegions); + void setVapPars(const Scalar par1, const Scalar) + { + vapPar1_ = par1; + } + /*! * \brief Initialize the reference densities of all fluids for a given PVT region */