diff --git a/dumux/flux/box/dispersionflux.hh b/dumux/flux/box/dispersionflux.hh index 4b7601d3a15e4d7cc1ecbb5014b5f706b48f3a71..160ea44bb412d78907a381f6d8052c9b61089d17 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 0916f169927d0596400b5f65212b1d47f5f10dad..92d7c7e9c0e8ace9c79750a90c162fd8fc40eaab 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>;