From a8a1d140d5ac9f5f1d9de8b4cb15f60b52e600a9 Mon Sep 17 00:00:00 2001
From: OPMUSER <opmuser0@gmail.com>
Date: Tue, 12 Jul 2022 11:07:10 +0800
Subject: [PATCH] Update EclipseGrid and JSON Definitions

Update EclipseGrid with checks for MINPVFIL. For JSON definitions: remove MINPVFIL check in MINPV and MINPORV, and all checks from MINPVFIL.
---
 src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp     | 6 ++++++
 .../input/eclipse/share/keywords/000_Eclipse100/M/MINPORV   | 2 +-
 src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPV | 2 +-
 src/opm/input/eclipse/share/keywords/900_OPM/M/MINPVFIL     | 1 -
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp b/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp
index 6d976b03d..7c1f07398 100644
--- a/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp
+++ b/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp
@@ -344,6 +344,12 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
             m_pinchGapMode = PinchMode::PinchModeFromString(pinchGapString);
         }
 
+        if (deck.hasKeyword<ParserKeywords::MINPV>() && deck.hasKeyword<ParserKeywords::MINPVFIL>()) {
+            throw std::invalid_argument("Can not have both MINPV and MINPVFIL in the deck.");
+        } else if(deck.hasKeyword<ParserKeywords::MINPORV>() && deck.hasKeyword<ParserKeywords::MINPVFIL>()) {   
+            throw std::invalid_argument("Can not have both MINPORV and MINPVFIL in the deck.");
+        }
+        
         m_minpvVector.resize(getCartesianSize(), 0.0);
         if (deck.hasKeyword<ParserKeywords::MINPV>()) {
             const auto& record = deck.get<ParserKeywords::MINPV>( ).back().getRecord(0);
diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPORV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPORV
index f8cd0bd2f..e6b133319 100644
--- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPORV
+++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPORV
@@ -3,7 +3,7 @@
   "sections": [
     "GRID"
   ],
-  "prohibits" : ["MINPV", "MINPVFIL"],
+  "prohibits" : ["MINPV"],
   "size": 1,
   "items": [
     {
diff --git a/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPV b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPV
index 228fe7576..d5e0c4b54 100644
--- a/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPV
+++ b/src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPV
@@ -3,7 +3,7 @@
   "sections": [
     "GRID"
   ],
-  "prohibits" : ["MINPORV", "MINPVFIL"],
+  "prohibits" : ["MINPORV"],
   "size": 1,
   "items": [
     {
diff --git a/src/opm/input/eclipse/share/keywords/900_OPM/M/MINPVFIL b/src/opm/input/eclipse/share/keywords/900_OPM/M/MINPVFIL
index e5b39a225..7ff5854f9 100644
--- a/src/opm/input/eclipse/share/keywords/900_OPM/M/MINPVFIL
+++ b/src/opm/input/eclipse/share/keywords/900_OPM/M/MINPVFIL
@@ -3,7 +3,6 @@
   "sections": [
     "GRID"
   ],
-  "prohibits" : ["MINPV", "MINPORV"],
   "size": 1,
   "items": [
     {