Use constructor for EclEpsGridProperties

opm/material/fluidmatrixinteractions/EclEpsGridProperties.hpp

@@ -65,9 +65,9 @@ class EclEpsGridProperties
 
 public:
 #if HAVE_ECL_INPUT
-    void initFromDeck(const Opm::Deck& /* deck */,
-                      const Opm::EclipseState& eclState,
-                      bool useImbibition)
+
+    EclEpsGridProperties(const Opm::EclipseState& eclState,
+                         bool useImbibition)
     {
         std::string kwPrefix = useImbibition?"I":"";
 
@@ -142,5 +142,6 @@ private:
     }
 #endif
 };
-#endif
 }
+#endif
+

opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp

@@ -525,10 +525,8 @@ private:
             oilWaterScaledImbPointsVector.resize(numCompressedElems);
         }
 
-        EclEpsGridProperties epsGridProperties, epsImbGridProperties;
-        epsGridProperties.initFromDeck(deck, eclState, /*imbibition=*/false);
-        if (enableHysteresis())
-            epsImbGridProperties.initFromDeck(deck, eclState, /*imbibition=*/true);
+        EclEpsGridProperties epsGridProperties(eclState, false);
+
         for (unsigned elemIdx = 0; elemIdx < numCompressedElems; ++elemIdx) {
             unsigned cartElemIdx = static_cast<unsigned>(compressedToCartesianElemIdx[elemIdx]);
             readGasOilScaledPoints_(gasOilScaledInfoVector,
@@ -547,6 +545,8 @@ private:
                                       cartElemIdx);
 
             if (enableHysteresis()) {
+                EclEpsGridProperties epsImbGridProperties(eclState, true);
+
                 readGasOilScaledPoints_(gasOilScaledImbInfoVector,
                                         gasOilScaledImbPointsVector,
                                         gasOilConfig,
@@ -554,6 +554,7 @@ private:
                                         epsImbGridProperties,
                                         elemIdx,
                                         cartElemIdx);
+
                 readOilWaterScaledPoints_(oilWaterScaledImbInfoVector,
                                           oilWaterScaledImbPointsVector,
                                           oilWaterConfig,