OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update EclipseGrid and JSON Definitions

Browse Source 
Update EclipseGrid with checks for MINPVFIL. For JSON definitions: remove MINPVFIL check in MINPV and MINPORV, and all checks from MINPVFIL.
This commit is contained in:
OPMUSER 2022-07-12 11:07:10 +08:00
parent 4fe559ba3c
commit a8a1d140d5
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

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

2
src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPORV
View File

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

2
src/opm/input/eclipse/share/keywords/000_Eclipse100/M/MINPV
View File

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

1
src/opm/input/eclipse/share/keywords/900_OPM/M/MINPVFIL
View File

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