use hysteresis config from state

opm/material/fluidmatrixinteractions/EclHysteresisConfig.hpp

@@ -113,62 +113,17 @@ public:
      *
      * This requires that the opm-parser module is available.
      */
-    void initFromDeck(const Opm::Deck& deck)
+    void initFromState(const Opm::Runspec& runspec)
     {
         enableHysteresis_ = false;
 
-        if (!deck.hasKeyword("SATOPTS"))
+        enableHysteresis_ = runspec.hysterPar().active();
-            return;
-
-        const auto& satoptsItem = deck.getKeyword("SATOPTS").getRecord(0).getItem(0);
-        for (unsigned i = 0; i < satoptsItem.data_size(); ++i) {
-            std::string satoptsValue = satoptsItem.get< std::string >(0);
-            std::transform(satoptsValue.begin(),
-                           satoptsValue.end(),
-                           satoptsValue.begin(),
-                           ::toupper);
-
-            if (satoptsValue == "HYSTER")
-                enableHysteresis_ = true;
-        }
-
-        // check for the (deprecated) HYST keyword
-        if (deck.hasKeyword("HYST"))
-            enableHysteresis_ = true;
 
         if (!enableHysteresis_)
             return;
 
-        if (!deck.hasKeyword("EHYSTR"))
+        krHysteresisModel_ = runspec.hysterPar().krHysteresisModel();
-            throw std::runtime_error("Enabling hysteresis via the HYST parameter for SATOPTS requires the "
+        pcHysteresisModel_ = runspec.hysterPar().pcHysteresisModel();
-                                     "presence of the EHYSTR keyword");
-
-        const auto& ehystrKeyword = deck.getKeyword("EHYSTR");
-        if (deck.hasKeyword("NOHYKR"))
-            krHysteresisModel_ = -1;
-        else {
-            krHysteresisModel_ = ehystrKeyword.getRecord(0).getItem("relative_perm_hyst").get<int>(0);
-
-            if (krHysteresisModel_ != 0 && krHysteresisModel_ != 1)
-                throw std::runtime_error(
-                    "Only the Carlson relative permeability hystersis models (indicated by '0' or "
-                    "'1' for the second item of the 'EHYSTR' keyword) are supported");
-        }
-
-        // this is slightly screwed: it is possible to specify contradicting hysteresis
-        // models with HYPC/NOHYPC and the fifth item of EHYSTR. Let's ignore that for
-        // now.
-        std::string whereFlag =
-            ehystrKeyword.getRecord(0).getItem("limiting_hyst_flag").getTrimmedString(0);
-        if (deck.hasKeyword("NOHYPC") || whereFlag == "KR")
-            pcHysteresisModel_ = -1;
-        else {
-            // if capillary pressure hysteresis is enabled, Eclipse always uses the
-            // Killough model
-            pcHysteresisModel_ = 0;
-
-            throw std::runtime_error("Capillary pressure hysteresis is not supported yet");
-        }
     }
 #endif
 

opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp

@@ -128,7 +128,7 @@ public:
         hasWater = ph.active(Phase::WATER);
 
         readGlobalEpsOptions_(deck, eclState);
-        readGlobalHysteresisOptions_(deck);
+        readGlobalHysteresisOptions_(eclState);
         readGlobalThreePhaseOptions_(deck);
 
         // read the end point scaling configuration. this needs to be done only once per
@@ -681,10 +681,10 @@ private:
         enableEndPointScaling_ = deck.hasKeyword("ENDSCALE");
     }
 
-    void readGlobalHysteresisOptions_(const Opm::Deck& deck)
+    void readGlobalHysteresisOptions_(const Opm::EclipseState& state)
     {
         hysteresisConfig_ = std::make_shared<Opm::EclHysteresisConfig>();
-        hysteresisConfig_->initFromDeck(deck);
+        hysteresisConfig_->initFromState(state.runspec());
     }
 
     void readGlobalThreePhaseOptions_(const Opm::Deck& deck)