diff --git a/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp b/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp index 5ac6fe76b..7c1f07398 100644 --- a/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp +++ b/src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp @@ -345,15 +345,22 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum) } if (deck.hasKeyword() && deck.hasKeyword()) { - throw std::invalid_argument("Can not have both MINPV and MINPVFIL in deck."); + throw std::invalid_argument("Can not have both MINPV and MINPVFIL in the deck."); + } else if(deck.hasKeyword() && deck.hasKeyword()) { + throw std::invalid_argument("Can not have both MINPORV and MINPVFIL in the deck."); } - + m_minpvVector.resize(getCartesianSize(), 0.0); if (deck.hasKeyword()) { const auto& record = deck.get( ).back().getRecord(0); const auto& item = record.getItem( ); std::fill(m_minpvVector.begin(), m_minpvVector.end(), item.getSIDouble(0)); m_minpvMode = MinpvMode::ModeEnum::EclSTD; + } else if (deck.hasKeyword()) { + const auto& record = deck.get( ).back().getRecord(0); + const auto& item = record.getItem( ); + std::fill(m_minpvVector.begin(), m_minpvVector.end(), item.getSIDouble(0)); + m_minpvMode = MinpvMode::ModeEnum::EclSTD; } else if(deck.hasKeyword()) { // We should use the grid properties to support BOX, but then we need the eclipseState const auto& record = deck.get( ).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 4f8f6ea12..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,11 +3,12 @@ "sections": [ "GRID" ], + "prohibits" : ["MINPV"], "size": 1, "items": [ { - "name": "MIN_PORE_VOL", - "value_type": "DOUBLE", + "name": "VALUE", + "value_type": "DOUBLE", "dimension": "ReservoirVolume", "default": 1e-06 } 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 8787949fb..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,6 +3,7 @@ "sections": [ "GRID" ], + "prohibits" : ["MINPORV"], "size": 1, "items": [ {