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

Merge pull request #3071 from OPMUSER/MINPORV

Browse Source 
Support MINPORV
This commit is contained in:
Bård Skaflestad 2022-07-12 14:12:34 +02:00 committed by GitHub
commit 5cca4b0be0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,15 +345,22 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
} }
if (deck.hasKeyword<ParserKeywords::MINPV>() && deck.hasKeyword<ParserKeywords::MINPVFIL>()) { if (deck.hasKeyword<ParserKeywords::MINPV>() && deck.hasKeyword<ParserKeywords::MINPVFIL>()) {
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<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); m_minpvVector.resize(getCartesianSize(), 0.0);
if (deck.hasKeyword<ParserKeywords::MINPV>()) { if (deck.hasKeyword<ParserKeywords::MINPV>()) {
const auto& record = deck.get<ParserKeywords::MINPV>( ).back().getRecord(0); const auto& record = deck.get<ParserKeywords::MINPV>( ).back().getRecord(0);
const auto& item = record.getItem<ParserKeywords::MINPV::VALUE>( ); const auto& item = record.getItem<ParserKeywords::MINPV::VALUE>( );
std::fill(m_minpvVector.begin(), m_minpvVector.end(), item.getSIDouble(0)); std::fill(m_minpvVector.begin(), m_minpvVector.end(), item.getSIDouble(0));
m_minpvMode = MinpvMode::ModeEnum::EclSTD; m_minpvMode = MinpvMode::ModeEnum::EclSTD;
} else if (deck.hasKeyword<ParserKeywords::MINPORV>()) {
const auto& record = deck.get<ParserKeywords::MINPORV>( ).back().getRecord(0);
const auto& item = record.getItem<ParserKeywords::MINPORV::VALUE>( );
std::fill(m_minpvVector.begin(), m_minpvVector.end(), item.getSIDouble(0));
m_minpvMode = MinpvMode::ModeEnum::EclSTD;
} else if(deck.hasKeyword<ParserKeywords::MINPVV>()) { } else if(deck.hasKeyword<ParserKeywords::MINPVV>()) {
// We should use the grid properties to support BOX, but then we need the eclipseState // We should use the grid properties to support BOX, but then we need the eclipseState
const auto& record = deck.get<ParserKeywords::MINPVV>( ).back().getRecord(0); const auto& record = deck.get<ParserKeywords::MINPVV>( ).back().getRecord(0);

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

@ -3,11 +3,12 @@
"sections": [ "sections": [
"GRID" "GRID"
], ],
"prohibits" : ["MINPV"],
"size": 1, "size": 1,
"items": [ "items": [
{ {
"name": "MIN_PORE_VOL", "name": "VALUE",
"value_type": "DOUBLE", "value_type": "DOUBLE",
"dimension": "ReservoirVolume", "dimension": "ReservoirVolume",
"default": 1e-06 "default": 1e-06
} }

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

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