mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #5608 from akva2/explicit_ctor_tabulated1d_function
adjust to constructor being marked explicit
This commit is contained in:
commit
1f81756a8d
@ -292,7 +292,7 @@ public:
|
|||||||
dryGasPvt.setNumRegions(/*numPvtRegion=*/1);
|
dryGasPvt.setNumRegions(/*numPvtRegion=*/1);
|
||||||
dryGasPvt.setReferenceDensities(/*regionIdx=*/0, rhoRefO, rhoRefG, rhoRefW);
|
dryGasPvt.setReferenceDensities(/*regionIdx=*/0, rhoRefO, rhoRefG, rhoRefW);
|
||||||
dryGasPvt.setGasFormationVolumeFactor(/*regionIdx=*/0, Bg);
|
dryGasPvt.setGasFormationVolumeFactor(/*regionIdx=*/0, Bg);
|
||||||
dryGasPvt.setGasViscosity(/*regionIdx=*/0, mug);
|
dryGasPvt.setGasViscosity(/*regionIdx=*/0, Opm::Tabulated1DFunction<Scalar>(mug));
|
||||||
|
|
||||||
Opm::OilPvtMultiplexer<Scalar> *oilPvt = new Opm::OilPvtMultiplexer<Scalar>;
|
Opm::OilPvtMultiplexer<Scalar> *oilPvt = new Opm::OilPvtMultiplexer<Scalar>;
|
||||||
oilPvt->setApproach(OilPvtApproach::LiveOil);
|
oilPvt->setApproach(OilPvtApproach::LiveOil);
|
||||||
|
@ -187,15 +187,16 @@ void initDefaultFluidSystem()
|
|||||||
dryGasPvt.setNumRegions(/*numPvtRegion=*/1);
|
dryGasPvt.setNumRegions(/*numPvtRegion=*/1);
|
||||||
dryGasPvt.setReferenceDensities(/*regionIdx=*/0, rhoRefO, rhoRefG, rhoRefW);
|
dryGasPvt.setReferenceDensities(/*regionIdx=*/0, rhoRefO, rhoRefG, rhoRefW);
|
||||||
dryGasPvt.setGasFormationVolumeFactor(/*regionIdx=*/0, Bg);
|
dryGasPvt.setGasFormationVolumeFactor(/*regionIdx=*/0, Bg);
|
||||||
dryGasPvt.setGasViscosity(/*regionIdx=*/0, mug);
|
dryGasPvt.setGasViscosity(/*regionIdx=*/0, Opm::Tabulated1DFunction<double>(mug));
|
||||||
|
|
||||||
auto oilPvt = std::make_shared<Opm::OilPvtMultiplexer<double>>();
|
auto oilPvt = std::make_shared<Opm::OilPvtMultiplexer<double>>();
|
||||||
oilPvt->setApproach(Opm::OilPvtApproach::DeadOil);
|
oilPvt->setApproach(Opm::OilPvtApproach::DeadOil);
|
||||||
auto& deadOilPvt = oilPvt->getRealPvt<Opm::OilPvtApproach::DeadOil>();
|
auto& deadOilPvt = oilPvt->getRealPvt<Opm::OilPvtApproach::DeadOil>();
|
||||||
deadOilPvt.setNumRegions(/*numPvtRegion=*/1);
|
deadOilPvt.setNumRegions(/*numPvtRegion=*/1);
|
||||||
deadOilPvt.setReferenceDensities(/*regionIdx=*/0, rhoRefO, rhoRefG, rhoRefW);
|
deadOilPvt.setReferenceDensities(/*regionIdx=*/0, rhoRefO, rhoRefG, rhoRefW);
|
||||||
deadOilPvt.setInverseOilFormationVolumeFactor(/*regionIdx=*/0, Bo);
|
deadOilPvt.setInverseOilFormationVolumeFactor(/*regionIdx=*/0,
|
||||||
deadOilPvt.setOilViscosity(/*regionIdx=*/0, muo);
|
Opm::Tabulated1DFunction<double>(Bo));
|
||||||
|
deadOilPvt.setOilViscosity(/*regionIdx=*/0, Opm::Tabulated1DFunction<double>(muo));
|
||||||
|
|
||||||
auto waterPvt = std::make_shared<Opm::WaterPvtMultiplexer<double>>();
|
auto waterPvt = std::make_shared<Opm::WaterPvtMultiplexer<double>>();
|
||||||
waterPvt->setApproach(Opm::WaterPvtApproach::ConstantCompressibilityWater);
|
waterPvt->setApproach(Opm::WaterPvtApproach::ConstantCompressibilityWater);
|
||||||
|
Loading…
Reference in New Issue
Block a user