From 4dc472fa7c6e6e82574ae4307500716b7217ef42 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 6 Feb 2024 14:47:31 +0100 Subject: [PATCH] rename TTag::EclFlowGasWaterDissolutionProblem to TTag::FlowGasWaterDissolutionProblem --- flow/flow_ebos_gaswater_dissolution.cpp | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flow/flow_ebos_gaswater_dissolution.cpp b/flow/flow_ebos_gaswater_dissolution.cpp index 994cb1e15..1bfffb7f6 100644 --- a/flow/flow_ebos_gaswater_dissolution.cpp +++ b/flow/flow_ebos_gaswater_dissolution.cpp @@ -34,33 +34,33 @@ namespace Opm { namespace Properties { namespace TTag { -struct EclFlowGasWaterDissolutionProblem { +struct FlowGasWaterDissolutionProblem { using InheritsFrom = std::tuple; }; } template -struct Linearizer { using type = TpfaLinearizer; }; +struct Linearizer { using type = TpfaLinearizer; }; template -struct LocalResidual { using type = BlackOilLocalResidualTPFA; }; +struct LocalResidual { using type = BlackOilLocalResidualTPFA; }; template -struct EnableDiffusion { static constexpr bool value = false; }; +struct EnableDiffusion { static constexpr bool value = false; }; template -struct EnableDisgasInWater { +struct EnableDisgasInWater { static constexpr bool value = true; }; template -struct EnableVapwat { +struct EnableVapwat { 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 @@ -70,15 +70,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()>; }; }} @@ -92,14 +92,14 @@ int flowEbosGasWaterDissolutionMain(int argc, char** argv, bool outputCout, bool // with incorrect locale settings. resetLocale(); - FlowMain + FlowMain mainfunc {argc, argv, outputCout, outputFiles} ; return mainfunc.execute(); } int flowEbosGasWaterDissolutionMainStandalone(int argc, char** argv) { - using TypeTag = Properties::TTag::EclFlowGasWaterDissolutionProblem; + using TypeTag = Properties::TTag::FlowGasWaterDissolutionProblem; auto mainObject = std::make_unique(argc, argv); auto ret = mainObject->runStatic(); // Destruct mainObject as the destructor calls MPI_Finalize!