adapt to the fluid system naming convention change in opm-material

note that almost the only thing which is affected is legacy code.
This commit is contained in:
Andreas Lauser
2018-07-27 12:54:02 +02:00
parent 285fb3b648
commit ac2bc410f3
6 changed files with 14 additions and 14 deletions

View File

@@ -62,7 +62,7 @@ namespace Opm
{
friend class BlackoilPropsDataHandle;
public:
typedef FluidSystems::BlackOil<double> FluidSystem;
typedef BlackOilFluidSystem<double> FluidSystem;
typedef Opm::GasPvtMultiplexer<double> GasPvt;
typedef Opm::OilPvtMultiplexer<double> OilPvt;
typedef Opm::WaterPvtMultiplexer<double> WaterPvt;

View File

@@ -636,7 +636,7 @@ namespace Opm
props.numPhases()));
typedef Opm::FluidSystems::BlackOil<double> FluidSystem;
typedef Opm::BlackOilFluidSystem<double> FluidSystem;
FluidSystem::initFromDeck(*deck_ , *eclipse_state_);
typedef EQUIL::DeckDependent::InitialStateComputer<FluidSystem> ISC;