From 7d1e237ad344b5459363dfbabbee075182cb223c Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 6 Feb 2024 14:47:31 +0100 Subject: [PATCH] rename TTag::EclFlowOilWaterPolymerProblem to TTag::FlowOilWaterPolymerProblem --- flow/flow_ebos_oilwater_polymer.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/flow/flow_ebos_oilwater_polymer.cpp b/flow/flow_ebos_oilwater_polymer.cpp index cc58eb705..e179dd13a 100644 --- a/flow/flow_ebos_oilwater_polymer.cpp +++ b/flow/flow_ebos_oilwater_polymer.cpp @@ -28,17 +28,17 @@ namespace Opm { namespace Properties { namespace TTag { -struct EclFlowOilWaterPolymerProblem { +struct FlowOilWaterPolymerProblem { using InheritsFrom = std::tuple; }; } template -struct EnablePolymer { +struct EnablePolymer { static constexpr bool value = true; }; //! The indices required by the model template -struct Indices +struct Indices { private: // it is unfortunately not possible to simply use 'TypeTag' here because this leads @@ -48,15 +48,15 @@ private: using FluidSystem = GetPropType; public: - typedef BlackOilTwoPhaseIndices(), - getPropValue(), - getPropValue(), - getPropValue(), - getPropValue(), - getPropValue(), - /*PVOffset=*/0, - /*disabledCompIdx=*/FluidSystem::gasCompIdx, - getPropValue()> type; + using type = BlackOilTwoPhaseIndices(), + getPropValue(), + getPropValue(), + getPropValue(), + getPropValue(), + getPropValue(), + /*PVOffset=*/0, + /*disabledCompIdx=*/FluidSystem::gasCompIdx, + getPropValue()>; }; }} @@ -69,14 +69,14 @@ int flowEbosOilWaterPolymerMain(int argc, char** argv, bool outputCout, bool out // with incorrect locale settings. resetLocale(); - FlowMain + FlowMain mainfunc {argc, argv, outputCout, outputFiles}; return mainfunc.execute(); } int flowEbosOilWaterPolymerMainStandalone(int argc, char** argv) { - using TypeTag = Properties::TTag::EclFlowOilWaterPolymerProblem; + using TypeTag = Properties::TTag::FlowOilWaterPolymerProblem; auto mainObject = std::make_unique(argc, argv); auto ret = mainObject->runStatic(); // Destruct mainObject as the destructor calls MPI_Finalize!