mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #764 from akva2/adjust_enums
Adjust to upstream enum entry changes
This commit is contained in:
commit
90df7fbe4b
@ -333,16 +333,16 @@ public:
|
||||
FluidSystem::setReferenceDensities(rhoRefO, rhoRefW, rhoRefG, /*regionIdx=*/0);
|
||||
|
||||
Opm::GasPvtMultiplexer<Scalar> *gasPvt = new Opm::GasPvtMultiplexer<Scalar>;
|
||||
gasPvt->setApproach(GasPvtApproach::DryGasPvt);
|
||||
auto& dryGasPvt = gasPvt->template getRealPvt<GasPvtApproach::DryGasPvt>();
|
||||
gasPvt->setApproach(GasPvtApproach::DryGas);
|
||||
auto& dryGasPvt = gasPvt->template getRealPvt<GasPvtApproach::DryGas>();
|
||||
dryGasPvt.setNumRegions(/*numPvtRegion=*/1);
|
||||
dryGasPvt.setReferenceDensities(/*regionIdx=*/0, rhoRefO, rhoRefG, rhoRefW);
|
||||
dryGasPvt.setGasFormationVolumeFactor(/*regionIdx=*/0, Bg);
|
||||
dryGasPvt.setGasViscosity(/*regionIdx=*/0, mug);
|
||||
|
||||
Opm::OilPvtMultiplexer<Scalar> *oilPvt = new Opm::OilPvtMultiplexer<Scalar>;
|
||||
oilPvt->setApproach(OilPvtApproach::LiveOilPvt);
|
||||
auto& liveOilPvt = oilPvt->template getRealPvt<OilPvtApproach::LiveOilPvt>();
|
||||
oilPvt->setApproach(OilPvtApproach::LiveOil);
|
||||
auto& liveOilPvt = oilPvt->template getRealPvt<OilPvtApproach::LiveOil>();
|
||||
liveOilPvt.setNumRegions(/*numPvtRegion=*/1);
|
||||
liveOilPvt.setReferenceDensities(/*regionIdx=*/0, rhoRefO, rhoRefG, rhoRefW);
|
||||
liveOilPvt.setSaturatedOilGasDissolutionFactor(/*regionIdx=*/0, Rs);
|
||||
@ -350,8 +350,8 @@ public:
|
||||
liveOilPvt.setSaturatedOilViscosity(/*regionIdx=*/0, muo);
|
||||
|
||||
Opm::WaterPvtMultiplexer<Scalar> *waterPvt = new Opm::WaterPvtMultiplexer<Scalar>;
|
||||
waterPvt->setApproach(WaterPvtApproach::ConstantCompressibilityWaterPvt);
|
||||
auto& ccWaterPvt = waterPvt->template getRealPvt<WaterPvtApproach::ConstantCompressibilityWaterPvt>();
|
||||
waterPvt->setApproach(WaterPvtApproach::ConstantCompressibilityWater);
|
||||
auto& ccWaterPvt = waterPvt->template getRealPvt<WaterPvtApproach::ConstantCompressibilityWater>();
|
||||
ccWaterPvt.setNumRegions(/*numPvtRegions=*/1);
|
||||
ccWaterPvt.setReferenceDensities(/*regionIdx=*/0, rhoRefO, rhoRefG, rhoRefW);
|
||||
ccWaterPvt.setViscosity(/*regionIdx=*/0, 9.6e-4);
|
||||
|
Loading…
Reference in New Issue
Block a user