EclSpecrockLaw(Params): some modernization

- typedef -> using
- fix includes

opm/material/thermal/EclSpecrockLaw.hpp

@@ -29,10 +29,9 @@
 
 #include "EclSpecrockLawParams.hpp"
 
-#include <opm/material/densead/Math.hpp>
-
 namespace Opm
 {
+
 /*!
  * \ingroup material
  *
@@ -45,8 +44,8 @@ template <class ScalarT,
 class EclSpecrockLaw
 {
 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].
@@ -58,6 +57,7 @@ public:
         return params.internalEnergyFunction().eval(T, /*extrapolate=*/true);
     }
 };
+
 } // namespace Opm
 
 #endif

opm/material/thermal/EclSpecrockLawParams.hpp

@@ -28,9 +28,10 @@
 #define OPM_ECL_SPECROCK_LAW_PARAMS_HPP
 
 #include <opm/material/common/EnsureFinalized.hpp>
-
 #include <opm/material/common/Tabulated1DFunction.hpp>
 
+#include <cassert>
+
 namespace Opm {
 
 /*!
@@ -40,10 +41,10 @@ namespace Opm {
 template <class ScalarT>
 class EclSpecrockLawParams : public EnsureFinalized
 {
-    typedef Tabulated1DFunction<ScalarT> InternalEnergyFunction;
+    using InternalEnergyFunction = Tabulated1DFunction<ScalarT>;
 
 public:
-    typedef ScalarT Scalar;
+    using Scalar = ScalarT;
 
     EclSpecrockLawParams(const EclSpecrockLawParams&) = default;