From 9a636b28723e2374869cc8f7e987af13f9d5a12d Mon Sep 17 00:00:00 2001
From: Martin Schneider <martin.schneider@iws.uni-stuttgart.de>
Date: Fri, 21 Jun 2024 13:18:14 +0200
Subject: [PATCH] [flux][dispersion] Replace enums by constexpr
---
dumux/flux/box/dispersionflux.hh | 12 +++++-------
dumux/flux/cctpfa/dispersionflux.hh | 12 +++++-------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/dumux/flux/box/dispersionflux.hh b/dumux/flux/box/dispersionflux.hh
index 4b7601d3a1..160ea44bb4 100644
--- a/dumux/flux/box/dispersionflux.hh
+++ b/dumux/flux/box/dispersionflux.hh
@@ -57,13 +57,11 @@ class DispersionFluxImplementation<TypeTag, DiscretizationMethods::Box, referenc
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using Indices = typename ModelTraits::Indices;
- enum { dim = GridView::dimension} ;
- enum { dimWorld = GridView::dimensionworld} ;
- enum
- {
- numPhases = ModelTraits::numFluidPhases(),
- numComponents = ModelTraits::numFluidComponents()
- };
+ static constexpr int dim = GridView::dimension;
+ static constexpr int dimWorld = GridView::dimensionworld;
+
+ static constexpr int numPhases = ModelTraits::numFluidPhases();
+ static constexpr int numComponents = ModelTraits::numFluidComponents();
using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
using ComponentFluxVector = Dune::FieldVector<Scalar, numComponents>;
diff --git a/dumux/flux/cctpfa/dispersionflux.hh b/dumux/flux/cctpfa/dispersionflux.hh
index 0916f16992..92d7c7e9c0 100644
--- a/dumux/flux/cctpfa/dispersionflux.hh
+++ b/dumux/flux/cctpfa/dispersionflux.hh
@@ -58,13 +58,11 @@ class DispersionFluxImplementation<TypeTag, DiscretizationMethods::CCTpfa, refer
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using Indices = typename ModelTraits::Indices;
- enum { dim = GridView::dimension} ;
- enum { dimWorld = GridView::dimensionworld} ;
- enum
- {
- numPhases = ModelTraits::numFluidPhases(),
- numComponents = ModelTraits::numFluidComponents()
- };
+ static constexpr int dim = GridView::dimension;
+ static constexpr int dimWorld = GridView::dimensionworld;
+
+ static constexpr int numPhases = ModelTraits::numFluidPhases();
+ static constexpr int numComponents = ModelTraits::numFluidComponents();
using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
using ComponentFluxVector = Dune::FieldVector<Scalar, numComponents>;
--
GitLab