From a2db252271fc449242d7b375f8eaadf08c82d911 Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Tue, 29 Oct 2019 15:49:02 +0100 Subject: [PATCH 1/2] Move BlackOilOnePhaseIndices to Opm namespace to make it consistent with the rest. OPM/opm-models#530 development must have been started before the renaming in OPM/opm-models#532 and somehow the old namespace survived. downstream PR of OPM/opm-models#577 --- flow/flow_onephase.cpp | 2 +- flow/flow_onephase_energy.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flow/flow_onephase.cpp b/flow/flow_onephase.cpp index b0521a8f8..b324a8086 100644 --- a/flow/flow_onephase.cpp +++ b/flow/flow_onephase.cpp @@ -38,7 +38,7 @@ private: typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem; public: - typedef Ewoms::BlackOilOnePhaseIndices Date: Wed, 30 Oct 2019 08:55:05 +0100 Subject: [PATCH 2/2] Fixed indentation of a2db252 --- flow/flow_onephase.cpp | 10 +++++----- flow/flow_onephase_energy.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flow/flow_onephase.cpp b/flow/flow_onephase.cpp index b324a8086..a7bd96562 100644 --- a/flow/flow_onephase.cpp +++ b/flow/flow_onephase.cpp @@ -39,11 +39,11 @@ private: public: typedef Opm::BlackOilOnePhaseIndices + GET_PROP_VALUE(TypeTag, EnablePolymer), + GET_PROP_VALUE(TypeTag, EnableEnergy), + GET_PROP_VALUE(TypeTag, EnableFoam), + /*PVOffset=*/0, + /*enebledCompIdx=*/FluidSystem::waterCompIdx> type; }; SET_PROP(EclFlowProblemSimple, FluidState) diff --git a/flow/flow_onephase_energy.cpp b/flow/flow_onephase_energy.cpp index 57d3c112e..65428c11a 100644 --- a/flow/flow_onephase_energy.cpp +++ b/flow/flow_onephase_energy.cpp @@ -40,11 +40,11 @@ private: public: typedef Opm::BlackOilOnePhaseIndices + GET_PROP_VALUE(TypeTag, EnablePolymer), + GET_PROP_VALUE(TypeTag, EnableEnergy), + GET_PROP_VALUE(TypeTag, EnableFoam), + /*PVOffset=*/0, + /*enebledCompIdx=*/FluidSystem::waterCompIdx> type; }; SET_PROP(EclFlowProblemSimple, FluidState)