EclSolidEnergyLawMultiplexer(Params): some modernization

- typedef -> using
- fix includes

opm/material/thermal/EclSolidEnergyLawMultiplexer.hpp

@@ -33,7 +33,8 @@
 #include "EclSpecrockLaw.hpp"
 #include "NullSolidEnergyLaw.hpp"
 
-#include <opm/material/densead/Math.hpp>
+#include <string>
+#include <stdexcept>
 
 namespace Opm
 {
@@ -49,13 +50,13 @@ class EclSolidEnergyLawMultiplexer
 {
     enum { numPhases = FluidSystem::numPhases };
 
-    typedef EclHeatcrLaw<ScalarT, FluidSystem, typename ParamsT::HeatcrLawParams> HeatcrLaw;
-    typedef EclSpecrockLaw<ScalarT, typename ParamsT::SpecrockLawParams> SpecrockLaw;
-    typedef NullSolidEnergyLaw<ScalarT> NullLaw;
+    using HeatcrLaw = EclHeatcrLaw<ScalarT, FluidSystem, typename ParamsT::HeatcrLawParams>;
+    using SpecrockLaw = EclSpecrockLaw<ScalarT, typename ParamsT::SpecrockLawParams>;
+    using NullLaw = NullSolidEnergyLaw<ScalarT>;
 
 public:
-    typedef ParamsT Params;
-    typedef typename Params::Scalar Scalar;
+    using Params = ParamsT;
+    using Scalar = typename Params::Scalar;
 
     /*!
      * \brief Given a fluid state, compute the volumetric internal energy of the rock [W/m^3].
@@ -81,6 +82,7 @@ public:
         }
     }
 };
+
 } // namespace Opm
 
 #endif

opm/material/thermal/EclSolidEnergyLawMultiplexerParams.hpp

@@ -32,7 +32,9 @@
 
 #include <opm/material/common/EnsureFinalized.hpp>
 
-#include <memory>
+#include <cassert>
+#include <stdexcept>
+#include <type_traits>
 
 namespace Opm {
 
@@ -43,10 +45,10 @@ namespace Opm {
 template <class ScalarT>
 class EclSolidEnergyLawMultiplexerParams : public EnsureFinalized
 {
-    typedef void* ParamPointerType;
+    using ParamPointerType = void*;
 
 public:
-    typedef ScalarT Scalar;
+    using Scalar = ScalarT;
 
     enum SolidEnergyApproach {
         undefinedApproach,
@@ -55,8 +57,8 @@ public:
         nullApproach, // (no keywords)
     };
 
-    typedef EclHeatcrLawParams<ScalarT> HeatcrLawParams;
-    typedef EclSpecrockLawParams<ScalarT> SpecrockLawParams;
+    using HeatcrLawParams = EclHeatcrLawParams<ScalarT>;
+    using SpecrockLawParams = EclSpecrockLawParams<ScalarT>;
 
     EclSolidEnergyLawMultiplexerParams(const EclSolidEnergyLawMultiplexerParams&) = default;