From fe13dfddfa467bf9b41a6a32ab87be84d06ced6d Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 6 Feb 2024 14:47:31 +0100 Subject: [PATCH] rename TTag::EclFlowGasWaterSaltprecVapwatProblem to TTag::FlowGasWaterSaltprecVapwatProblem --- flow/flow_ebos_gaswater_saltprec_vapwat.cpp | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/flow/flow_ebos_gaswater_saltprec_vapwat.cpp b/flow/flow_ebos_gaswater_saltprec_vapwat.cpp index b124eaee6..4d9d0ca6d 100644 --- a/flow/flow_ebos_gaswater_saltprec_vapwat.cpp +++ b/flow/flow_ebos_gaswater_saltprec_vapwat.cpp @@ -28,33 +28,33 @@ namespace Opm { namespace Properties { namespace TTag { -struct EclFlowGasWaterSaltprecVapwatProblem { +struct FlowGasWaterSaltprecVapwatProblem { using InheritsFrom = std::tuple; }; } template -struct EnableBrine { +struct EnableBrine { static constexpr bool value = true; }; template -struct EnableSaltPrecipitation { +struct EnableSaltPrecipitation { static constexpr bool value = true; }; template -struct EnableVapwat { +struct EnableVapwat { static constexpr bool value = true; }; template -struct EnableDisgasInWater { +struct EnableDisgasInWater { 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 @@ -64,15 +64,15 @@ private: using FluidSystem = GetPropType; public: - typedef BlackOilTwoPhaseIndices(), - getPropValue(), - getPropValue(), - getPropValue(), - getPropValue(), - getPropValue(), - /*PVOffset=*/0, - /*disabledCompIdx=*/FluidSystem::oilCompIdx, - getPropValue()> type; + using type = BlackOilTwoPhaseIndices(), + getPropValue(), + getPropValue(), + getPropValue(), + getPropValue(), + getPropValue(), + /*PVOffset=*/0, + /*disabledCompIdx=*/FluidSystem::oilCompIdx, + getPropValue()>; }; }} @@ -85,14 +85,14 @@ int flowEbosGasWaterSaltprecVapwatMain(int argc, char** argv, bool outputCout, b // with incorrect locale settings. resetLocale(); - FlowMain + FlowMain mainfunc {argc, argv, outputCout, outputFiles}; return mainfunc.execute(); } int flowEbosGasWaterSaltprecVapwatMainStandalone(int argc, char** argv) { - using TypeTag = Properties::TTag::EclFlowGasWaterSaltprecVapwatProblem; + using TypeTag = Properties::TTag::FlowGasWaterSaltprecVapwatProblem; auto mainObject = std::make_unique(argc, argv); auto ret = mainObject->runStatic(); // Destruct mainObject as the destructor calls MPI_Finalize!