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

@@ -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);

src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPORV

@@ -3,7 +3,7 @@
   "sections": [
     "GRID"
   ],
-  "prohibits" : ["MINPV", "MINPVFIL"],
+  "prohibits" : ["MINPV"],
   "size": 1,
   "items": [
     {

src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPV

@@ -3,7 +3,7 @@
   "sections": [
     "GRID"
   ],
-  "prohibits" : ["MINPORV", "MINPVFIL"],
+  "prohibits" : ["MINPORV"],
   "size": 1,
   "items": [
     {

src/opm/input/eclipse/share/keywords/900_OPM/M/MINPVFIL

@@ -3,7 +3,6 @@
   "sections": [
     "GRID"
   ],
-  "prohibits" : ["MINPV", "MINPORV"],
   "size": 1,
   "items": [
     {