From d7bf7a594b2a0512248f2868a328ef687cb5377b Mon Sep 17 00:00:00 2001 From: Ivan Buntic Date: Fri, 17 Sep 2021 15:15:42 +0200 Subject: [PATCH] [disc][porousmediumflow][porenetwork][2p] Use discretization tag instead of enum as template argument. --- dumux/porenetwork/2p/model.hh | 4 ++-- dumux/porousmediumflow/2p/model.hh | 5 ++--- dumux/porousmediumflow/2p/saturationreconstruction.hh | 4 ++-- dumux/porousmediumflow/2p2c/model.hh | 8 ++++---- dumux/porousmediumflow/2pnc/model.hh | 4 ++-- dumux/porousmediumflow/2pncmin/model.hh | 4 ++-- dumux/porousmediumflow/co2/model.hh | 4 ++-- 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dumux/porenetwork/2p/model.hh b/dumux/porenetwork/2p/model.hh index 16591c003b..dc62bdea76 100644 --- a/dumux/porenetwork/2p/model.hh +++ b/dumux/porenetwork/2p/model.hh @@ -108,7 +108,7 @@ private: using MT = GetPropType; using PT = typename GetPropType::PermeabilityType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of non-wetting phase saturations using SR = TwoPScvSaturationReconstruction; @@ -196,7 +196,7 @@ private: using SST = GetPropType; using MT = GetPropType; using PT = typename GetPropType::PermeabilityType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of non-wetting phase saturations using SR = Dumux::TwoPScvSaturationReconstruction; diff --git a/dumux/porousmediumflow/2p/model.hh b/dumux/porousmediumflow/2p/model.hh index da5b73bd5c..861af18674 100644 --- a/dumux/porousmediumflow/2p/model.hh +++ b/dumux/porousmediumflow/2p/model.hh @@ -179,8 +179,7 @@ private: using SST = GetPropType; using MT = GetPropType; using PT = typename GetPropType::PermeabilityType; - - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of nonwetting phase saturations using SR = TwoPScvSaturationReconstruction; @@ -221,7 +220,7 @@ private: using SST = GetPropType; using MT = GetPropType; using PT = typename GetPropType::PermeabilityType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of nonwetting phase saturations using SR = TwoPScvSaturationReconstruction; diff --git a/dumux/porousmediumflow/2p/saturationreconstruction.hh b/dumux/porousmediumflow/2p/saturationreconstruction.hh index 7a94627486..1ca95906d8 100644 --- a/dumux/porousmediumflow/2p/saturationreconstruction.hh +++ b/dumux/porousmediumflow/2p/saturationreconstruction.hh @@ -38,7 +38,7 @@ namespace Dumux { * freedom lie on material interfaces. There the nonwetting phase saturation is * generally discontinuous. */ -template +template class TwoPScvSaturationReconstruction { public: @@ -67,7 +67,7 @@ public: //! Specialization for the box scheme with the interface solver enabled template<> -class TwoPScvSaturationReconstruction +class TwoPScvSaturationReconstruction { public: /*! diff --git a/dumux/porousmediumflow/2p2c/model.hh b/dumux/porousmediumflow/2p2c/model.hh index 1c7e87633c..b5128343d3 100644 --- a/dumux/porousmediumflow/2p2c/model.hh +++ b/dumux/porousmediumflow/2p2c/model.hh @@ -144,7 +144,7 @@ private: using SST = GetPropType; using PT = typename GetPropType::PermeabilityType; using MT = GetPropType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); static_assert(FSY::numComponents == 2, "Only fluid systems with 2 components are supported by the 2p2c model!"); static_assert(FSY::numPhases == 2, "Only fluid systems with 2 phases are supported by the 2p2c model!"); @@ -195,7 +195,7 @@ private: using SST = GetPropType; using PT = typename GetPropType::PermeabilityType; using MT = GetPropType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of nonwetting phase saturations using SR = TwoPScvSaturationReconstruction; @@ -298,7 +298,7 @@ private: using SST = GetPropType; using PT = typename GetPropType::PermeabilityType; using MT = GetPropType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of nonwetting phase saturations using SR = TwoPScvSaturationReconstruction; @@ -368,7 +368,7 @@ private: using SST = GetPropType; using MT = GetPropType; using PT = typename GetPropType::PermeabilityType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of nonwetting phase saturations using SR = TwoPScvSaturationReconstruction; diff --git a/dumux/porousmediumflow/2pnc/model.hh b/dumux/porousmediumflow/2pnc/model.hh index bc16441281..ea496490a7 100644 --- a/dumux/porousmediumflow/2pnc/model.hh +++ b/dumux/porousmediumflow/2pnc/model.hh @@ -173,7 +173,7 @@ private: using SST = GetPropType; using PT = typename GetPropType::PermeabilityType; using MT = GetPropType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of nonwetting phase saturations using SR = TwoPScvSaturationReconstruction; @@ -271,7 +271,7 @@ private: using SST = GetPropType; using PT = typename GetPropType::PermeabilityType; using MT = GetPropType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of nonwetting phase saturations using SR = TwoPScvSaturationReconstruction; diff --git a/dumux/porousmediumflow/2pncmin/model.hh b/dumux/porousmediumflow/2pncmin/model.hh index 3a73d713b7..9b76c16e99 100644 --- a/dumux/porousmediumflow/2pncmin/model.hh +++ b/dumux/porousmediumflow/2pncmin/model.hh @@ -136,7 +136,7 @@ private: using SST = GetPropType; using PT = typename GetPropType::PermeabilityType; using MT = GetPropType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of nonwetting phase saturations using SR = TwoPScvSaturationReconstruction; @@ -212,7 +212,7 @@ private: using SST = GetPropType; using PT = typename GetPropType::PermeabilityType; using MT = GetPropType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of nonwetting phase saturations using SR = TwoPScvSaturationReconstruction; diff --git a/dumux/porousmediumflow/co2/model.hh b/dumux/porousmediumflow/co2/model.hh index bc48834f91..79be63bace 100644 --- a/dumux/porousmediumflow/co2/model.hh +++ b/dumux/porousmediumflow/co2/model.hh @@ -69,7 +69,7 @@ private: using SST = GetPropType; using PT = typename GetPropType::PermeabilityType; using MT = GetPropType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of nonwetting phase saturations using SR = TwoPScvSaturationReconstruction; @@ -99,7 +99,7 @@ private: using SST = GetPropType; using PT = typename GetPropType::PermeabilityType; using MT = GetPropType; - static constexpr auto DM = GetPropType::discMethod; + using DM = typename GetPropType::DiscretizationMethod; static constexpr bool enableIS = getPropValue(); // class used for scv-wise reconstruction of nonwetting phase saturations using SR = TwoPScvSaturationReconstruction; -- GitLab