OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

BlackoilPropsAdFromDeck: let the BlackOilFluidSystem manage the low level PVT objects

Browse Source 
this makes it easier to migrate code away from BlackoilPropsAdFromDeck.
This commit is contained in:
Andreas Lauser
2016-12-13 13:47:23 +01:00
parent ef731672c9
commit 66decb4bda
2 changed files with 17 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilPropsAdFromDeck.hpp
View File

@@ -62,6 +62,7 @@ namespace Opm
{
friend class BlackoilPropsDataHandle;
public:
typedef FluidSystems::BlackOil<double> FluidSystem;
typedef Opm::GasPvtMultiplexer<double> GasPvt;
typedef Opm::OilPvtMultiplexer<double> OilPvt;
typedef Opm::WaterPvtMultiplexer<double> WaterPvt;
@@ -413,18 +414,11 @@ namespace Opm
// The PVT region which is to be used for each cell
std::vector<int> cellPvtRegionIdx_;
// Densities, one std::array per PVT region.
std::vector<std::array<double, BlackoilPhases::MaxNumPhases> > surfaceDensity_;
// VAPPARS
double vap1_;
double vap2_;
std::vector<double> satOilMax_;
double vap_satmax_guard_; //Threshold value to promote stability
std::shared_ptr<GasPvt> gasPvt_;
std::shared_ptr<OilPvt> oilPvt_;
std::shared_ptr<WaterPvt> waterPvt_;
};
} // namespace Opm