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

extra keywords

Browse Source
This commit is contained in:
goncalvesmachadoc 2023-03-16 10:50:59 +01:00
parent 728d021e3d
commit f6402e2bc8
5 changed files with 87 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/opm/input/eclipse/EclipseState/Runspec.cpp
View File

@ -49,12 +49,11 @@ namespace {
{
return {
deck.hasKeyword<Opm::ParserKeywords::OIL>(),
deck.hasKeyword<Opm::ParserKeywords::GAS>(),
deck.hasKeyword<Opm::ParserKeywords::WATER>(),
deck.hasKeyword<Opm::ParserKeywords::GAS>() || deck.hasKeyword<Opm::ParserKeywords::GASWAT>(),
deck.hasKeyword<Opm::ParserKeywords::WATER>() || deck.hasKeyword<Opm::ParserKeywords::GASWAT>(),
deck.hasKeyword<Opm::ParserKeywords::SOLVENT>(),
deck.hasKeyword<Opm::ParserKeywords::POLYMER>(),
deck.hasKeyword<Opm::ParserKeywords::THERMAL>() ||
deck.hasKeyword<Opm::ParserKeywords::TEMP>(),
deck.hasKeyword<Opm::ParserKeywords::THERMAL>() || deck.hasKeyword<Opm::ParserKeywords::TEMP>(),
deck.hasKeyword<Opm::ParserKeywords::POLYMW>(),
deck.hasKeyword<Opm::ParserKeywords::FOAM>(),
deck.hasKeyword<Opm::ParserKeywords::BRINE>(),
@ -81,9 +80,9 @@ namespace {
inferKeywordFamily(const Opm::Deck& deck)
{
const auto phases = inferActivePhases(deck);
const auto wat = phases.active(Opm::Phase::WATER) || deck.hasKeyword<Opm::ParserKeywords::GASWAT>();
const auto wat = phases.active(Opm::Phase::WATER);
const auto oil = phases.active(Opm::Phase::OIL);
const auto gas = phases.active(Opm::Phase::GAS) || deck.hasKeyword<Opm::ParserKeywords::GASWAT>();
const auto gas = phases.active(Opm::Phase::GAS);
const auto threeP = gas && oil && wat;
const auto twoP = (!gas && oil && wat) || (gas && oil && !wat);
@ -607,9 +606,6 @@ Runspec::Runspec( const Deck& deck )
std::string msg = "The CO2 storage option is given. PVT properties from the Brine-CO2 system is used \n"
"See the OPM manual for details on the used models.";
OpmLog::note(msg);
} else if (runspecSection.hasKeyword<ParserKeywords::GASWAT>()) {
// TODO: Make sure gas and water phases are actived internally
throw std::runtime_error("The CO2 storage option is given with GASWAT activated. Activate GAS and WATER instead.");
} else {
throw std::runtime_error("The CO2 storage option is given. Activate GAS, plus WATER or OIL ");
}

67
src/opm/input/eclipse/share/keywords/001_Eclipse300/F/FIELDSEP Normal file
View File

@ -0,0 +1,67 @@
{
"name": "FIELDSEP",
"sections": [
"SOLUTION"
],
"items": [
{
"item": 1,
"name": "STAGE",
"value_type": "INT"
},
{
"item": 2,
"name": "TEMPERATURE",
"value_type": "DOUBLE",
"dimension": "Temperature",
"default": 15.56
},
{
"item": 3,
"name": "PRESSURE",
"value_type": "DOUBLE",
"dimension": "Pressure",
"default": 1.01325
},
{
"item": 4,
"name": "LIQ_DESTINATION",
"value_type": "INT"
},
{
"item": 5,
"name": "VAP_DESTINATION",
"value_type": "INT"
},
{
"item": 6,
"name": "KVALUE",
"value_type": "DOUBLE",
"dimension": "1",
"default": 0
},
{
"item": 7,
"name": "TABLE_NUM",
"value_type": "INT",
"default": 0
},
{
"item": 8,
"name": "EOS_NUM",
"value_type": "INT"
},
{
"item": 9,
"name": "REF_TEMP",
"value_type": "DOUBLE",
"dimension": "Temperature"
},
{
"item": 10,
"name": "REF_PRESS",
"value_type": "DOUBLE",
"dimension": "Pressure"
}
]
}

6
src/opm/input/eclipse/share/keywords/001_Eclipse300/H/HWELLS Normal file
View File

@ -0,0 +1,6 @@
{
"name": "HWELLS",
"sections": [
"RUNSPEC"
]
}

6
src/opm/input/eclipse/share/keywords/001_Eclipse300/S/SOLID Normal file
View File

@ -0,0 +1,6 @@
{
"name": "SOLID",
"sections": [
"RUNSPEC"
]
}

3
src/opm/input/eclipse/share/keywords/keyword_list.cmake
View File

@ -1055,12 +1055,14 @@ set( keywords
001_Eclipse300/D/DREF
001_Eclipse300/D/DREFS
001_Eclipse300/D/DZV
001_Eclipse300/F/FIELDSEP
001_Eclipse300/G/GASVISCT
001_Eclipse300/G/GASWAT
001_Eclipse300/G/GCONPROD
001_Eclipse300/G/GSF
001_Eclipse300/H/HEATCR
001_Eclipse300/H/HEATCRT
001_Eclipse300/H/HWELLS
001_Eclipse300/L/LIVEOIL
001_Eclipse300/M/MW
001_Eclipse300/M/MWS
@ -1073,6 +1075,7 @@ set( keywords
001_Eclipse300/P/PREFS
001_Eclipse300/R/REGION2REGION_PROBE_E300
001_Eclipse300/S/SALINITY
001_Eclipse300/S/SOLID
001_Eclipse300/S/STCOND
001_Eclipse300/T/TEMPI
001_Eclipse300/T/TEMPVD