OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-28 20:13:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2118 from blattms/fix-one-phase-namespace

Browse Source 
Move BlackOilOnePhaseIndices to Opm namespace
This commit is contained in:
Arne Morten Kvarving 2019-10-30 09:29:01 +01:00 committed by GitHub
commit dd2a360e10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flow/flow_onephase.cpp
View File

@ -38,12 +38,12 @@ private:
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem; typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
public: public:
typedef Ewoms::BlackOilOnePhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent), typedef Opm::BlackOilOnePhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
GET_PROP_VALUE(TypeTag, EnablePolymer), GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy), GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam), GET_PROP_VALUE(TypeTag, EnableFoam),
/*PVOffset=*/0, /*PVOffset=*/0,
/*enebledCompIdx=*/FluidSystem::waterCompIdx> /*enebledCompIdx=*/FluidSystem::waterCompIdx>
type; type;
}; };
SET_PROP(EclFlowProblemSimple, FluidState) SET_PROP(EclFlowProblemSimple, FluidState)

12
flow/flow_onephase_energy.cpp
View File

@ -39,12 +39,12 @@ private:
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem; typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
public: public:
typedef Ewoms::BlackOilOnePhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent), typedef Opm::BlackOilOnePhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
GET_PROP_VALUE(TypeTag, EnablePolymer), GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy), GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam), GET_PROP_VALUE(TypeTag, EnableFoam),
/*PVOffset=*/0, /*PVOffset=*/0,
/*enebledCompIdx=*/FluidSystem::waterCompIdx> /*enebledCompIdx=*/FluidSystem::waterCompIdx>
type; type;
}; };
SET_PROP(EclFlowProblemSimple, FluidState) SET_PROP(EclFlowProblemSimple, FluidState)