Adress PR review issues 2

This commit is contained in:
Tor Harald Sandve 2017-11-24 10:52:57 +01:00
parent 6862ed0b35
commit 85aa6d41cc

View File

@ -88,9 +88,9 @@ static void initDefaultFluidSystem() {
{ 6.21542e+07, 1 } { 6.21542e+07, 1 }
}; };
double rhoRefO = 700; // [kg] double rhoRefO = 700; // [kg/m3]
double rhoRefG = 1000; // [kg] double rhoRefG = 1000; // [kg/m3]
double rhoRefW = 1000; // [kg] double rhoRefW = 1000; // [kg/m3]
FluidSystem::initBegin(/*numPvtRegions=*/1); FluidSystem::initBegin(/*numPvtRegions=*/1);
FluidSystem::setEnableDissolvedGas(false); FluidSystem::setEnableDissolvedGas(false);
@ -125,17 +125,10 @@ static void initDefaultFluidSystem() {
oilPvt->initEnd(); oilPvt->initEnd();
waterPvt->initEnd(); waterPvt->initEnd();
typedef std::shared_ptr<Opm::GasPvtMultiplexer<double> > GasPvtSharedPtr; FluidSystem::setGasPvt(std::move(gasPvt));
FluidSystem::setGasPvt(GasPvtSharedPtr(gasPvt)); FluidSystem::setOilPvt(std::move(oilPvt));
FluidSystem::setWaterPvt(std::move(waterPvt));
typedef std::shared_ptr<Opm::OilPvtMultiplexer<double> > OilPvtSharedPtr;
FluidSystem::setOilPvt(OilPvtSharedPtr(oilPvt));
typedef std::shared_ptr<Opm::WaterPvtMultiplexer<double> > WaterPvtSharedPtr;
FluidSystem::setWaterPvt(WaterPvtSharedPtr(waterPvt));
FluidSystem::initEnd(); FluidSystem::initEnd();
} }
} }