Merge pull request #4710 from totto82/wagHysteresis

Wag hysteresis

opm/simulators/utils/PartiallySupportedFlowKeywords.cpp

@@ -251,6 +251,15 @@ partiallySupported()
                {11,{true, allow_values<std::string> {"N"}, "UDQDIMS(RSEED): option is not supported use default"}}, // RESTART_NEW_SEED
             },
          },
+         {
+            "WAGHYSTR",
+            {
+               {3,{true, allow_values<std::string> {"YES"}, "WAGHYSTR(GAS_MODEL): only the YES option is supported – will STOP"}}, // GAS_MODEL
+               {4,{true, allow_values<std::string> {"NO"}, "WAGHYSTR(RES_OIL): only the NO option is supported – will STOP"}}, // RES_OIL
+               {5,{true, allow_values<std::string> {"NO"}, "WAGHYSTR(WATER_MODEL): only the NO option is supported – will STOP"}}, // WATER_MODEL
+            },
+         },
+
          {
             "WCONHIST",
             {
@@ -627,6 +636,12 @@ partiallySupported()
                {3,{true, allow_values<double> {}, "VISCREF(API): API tracking option is not supported"}}, // API_GRAVITY
             },
          },
+         {
+            "WAGHYSTR",
+            {
+               {8,{false, allow_values<double> {}, "WAGHYSTR(RES_OIL_MOD_FRACTION): Residual oil modification for STONE1 not supported - value ignored"}}, // RES_OIL_MOD_FRACTION
+            },
+         },
          {
             "WCONHIST",
             {

opm/simulators/utils/UnsupportedFlowKeywords.cpp

@@ -669,7 +669,6 @@ const KeywordValidation::UnsupportedKeywords& unsupportedKeywords()
         {"VISCD", {true, std::nullopt}},
         {"VISDATES", {true, std::nullopt}},
         {"VISOPTS", {true, std::nullopt}},
-        {"WAGHYSTR", {true, std::nullopt}},
         {"WAITBAL", {true, std::nullopt}},
         {"WALKALIN", {true, std::nullopt}},
         {"WALQCALC", {true, std::nullopt}},

regressionTests.cmake

@@ -444,6 +444,20 @@ add_test_compareECLFiles(CASENAME pinch_multzm_all_barrier
                          REL_TOL ${rel_tol}
                          DIR pinch)
 
+add_test_compareECLFiles(CASENAME waghyst1
+                         FILENAME WAGHYSTR-01
+                         SIMULATOR flow
+                         ABS_TOL ${abs_tol}
+                         REL_TOL ${rel_tol}
+                         DIR waghystr)
+
+add_test_compareECLFiles(CASENAME waghyst2
+                         FILENAME WAGHYSTR-02
+                         SIMULATOR flow
+                         ABS_TOL ${abs_tol}
+                         REL_TOL ${rel_tol}
+                         DIR waghystr)
+
 set(_pinch_cases
   T1A_GAP T1A_NOGAP T1A_NOPINCH
   T1A1_NOGAP

tests/test_RestartSerialization.cpp

@@ -32,6 +32,7 @@
 
 #include <opm/output/eclipse/Inplace.hpp>
 
+#include <opm/input/eclipse/EclipseState/WagHysteresisConfig.hpp>
 #include <opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLawParams.hpp>
 
 #include <opm/models/blackoil/blackoilprimaryvariables.hh>