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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilPropsAdFromDeck.hpp
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;

2
opm/autodiff/FlowMain.hpp
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;

2
opm/core/simulator/EquilibrationHelpers.hpp
View File

@@ -87,7 +87,7 @@ namespace Opm
namespace EQUIL {
typedef Opm::FluidSystems::BlackOil<double> FluidSystemSimple;
typedef Opm::BlackOilFluidSystem<double> FluidSystemSimple;
// Adjust oil pressure according to gas saturation and cap pressure
typedef Opm::SimpleModularFluidState<double,