From 9dbadfdaaec6e9f7273095049e90223590c72232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ove=20S=C3=A6vareid?= <ovsa@norceresearch.no>
Date: Tue, 4 Apr 2023 16:27:50 +0200
Subject: [PATCH 1/2] Some support for WAG hysteresis.

---
 .../utils/PartiallySupportedFlowKeywords.cpp      | 15 +++++++++++++++
 opm/simulators/utils/UnsupportedFlowKeywords.cpp  |  1 -
 tests/test_RestartSerialization.cpp               |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp
index 306a1e961..40f727772 100644
--- a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp
+++ b/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",
             {
diff --git a/opm/simulators/utils/UnsupportedFlowKeywords.cpp b/opm/simulators/utils/UnsupportedFlowKeywords.cpp
index 82c02edf6..a13c8e018 100644
--- a/opm/simulators/utils/UnsupportedFlowKeywords.cpp
+++ b/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}},
diff --git a/tests/test_RestartSerialization.cpp b/tests/test_RestartSerialization.cpp
index a99cd64ce..686f7a0e9 100644
--- a/tests/test_RestartSerialization.cpp
+++ b/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>

From e1a1c7853736fdc6cf1ba2ff3cacf641ddf65504 Mon Sep 17 00:00:00 2001
From: Tor Harald Sandve <tosa@norceresearch.no>
Date: Thu, 15 Jun 2023 12:27:28 +0200
Subject: [PATCH 2/2] Add regression test wag hysteresis

---
 regressionTests.cmake | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/regressionTests.cmake b/regressionTests.cmake
index 7967179eb..62f0b6080 100644
--- a/regressionTests.cmake
+++ b/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