From 31c7641fac353f623ac5babb5786d003026a7290 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 3 Aug 2022 08:26:43 +0200 Subject: [PATCH] EclThwLaw(Params): some modernization - typedef -> using - use constexpr where appropriate - fix includes --- opm/material/thermal/EclThcLaw.hpp | 12 ++++++------ opm/material/thermal/EclThcLawParams.hpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/opm/material/thermal/EclThcLaw.hpp b/opm/material/thermal/EclThcLaw.hpp index fbd738cf0..67dbc45d0 100644 --- a/opm/material/thermal/EclThcLaw.hpp +++ b/opm/material/thermal/EclThcLaw.hpp @@ -29,10 +29,9 @@ #include "EclThcLawParams.hpp" -#include - namespace Opm { + /*! * \ingroup material * @@ -42,12 +41,12 @@ namespace Opm * keywords. */ template > + class ParamsT = EclThcLawParams> class EclThcLaw { public: - typedef ParamsT Params; - typedef typename Params::Scalar Scalar; + using Params = ParamsT; + using Scalar = typename Params::Scalar; /*! * \brief Given a fluid state, return the total thermal conductivity [W/m^2 / (K/m)] of the porous @@ -68,7 +67,7 @@ public: // incorrectness. // // TODO: also follow their fine leadership in the twophase case. - Scalar numPhases = 3.0; + constexpr const Scalar numPhases = 3.0; Scalar thconAvg = poro*(params.thcoil() + params.thcgas() + params.thcwater()) / numPhases + (1.0 - poro)*params.thcrock(); @@ -76,6 +75,7 @@ public: return thconAvg; } }; + } // namespace Opm #endif diff --git a/opm/material/thermal/EclThcLawParams.hpp b/opm/material/thermal/EclThcLawParams.hpp index eaf797ee3..bfce0ef70 100644 --- a/opm/material/thermal/EclThcLawParams.hpp +++ b/opm/material/thermal/EclThcLawParams.hpp @@ -39,7 +39,7 @@ template class EclThcLawParams : public EnsureFinalized { public: - typedef ScalarT Scalar; + using Scalar = ScalarT; EclThcLawParams(const EclThcLawParams&) = default;