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

Merge pull request #3442 from goncalvesmachadoc/co2store

Browse Source 
CO2STORE + GASWAT parsing
This commit is contained in:
Bård Skaflestad
2023-03-16 15:22:09 +01:00
committed by GitHub
parent 9adb6d2586 f6402e2bc8
commit 5f55ffe21a
13 changed files with 204 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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>(),
@@ -608,7 +607,7 @@ Runspec::Runspec( const Deck& deck )
"See the OPM manual for details on the used models.";
OpmLog::note(msg);
} else {
throw std::runtime_error("The CO2 storage option is given. Activate GAS and WATER or OIL ");
throw std::runtime_error("The CO2 storage option is given. Activate GAS, plus WATER or OIL ");
}
}

9
src/opm/input/eclipse/share/keywords/001_Eclipse300/C/CNAMES Normal file
View File

@@ -0,0 +1,9 @@
{
"name": "CNAMES",
"sections": [
"PROPS"
],
"data": {
"value_type": "STRING"
}
}

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/G/GASWAT Normal file
View File

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

1
src/opm/input/eclipse/share/keywords/001_Eclipse300/G/GSF
View File

@@ -7,7 +7,6 @@
"keyword": "TABDIMS",
"item": "NTSFUN"
},
"requires": ["GAS"],
"prohibits": ["SGOF", "SLGOF", "SGFN"],
"items": [
{

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

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

13
src/opm/input/eclipse/share/keywords/001_Eclipse300/N/NCOMPS Normal file
View File

@@ -0,0 +1,13 @@
{
"name": "NCOMPS",
"sections": [
"PROPS"
],
"size": 1,
"items": [
{
"name": "NUM_COMPS",
"value_type": "INT"
}
]
}

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

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

25
src/opm/input/eclipse/share/keywords/001_Eclipse300/W/WELLSTRE Normal file
View File

@@ -0,0 +1,25 @@
{
"name": "WELLSTRE",
"sections": [
"SCHEDULE"
],
"items": [
{
"item": 1,
"name": "STREAM",
"value_type": "STRING"
},
{
"item": 2,
"name": "XMOLE1",
"value_type": "DOUBLE",
"dimension": "1"
},
{
"item": 3,
"name": "XMOLE2",
"value_type": "DOUBLE",
"dimension": "1"
}
]
}

36
src/opm/input/eclipse/share/keywords/001_Eclipse300/W/WINJGAS Normal file
View File

@@ -0,0 +1,36 @@
{
"name": "WINJGAS",
"sections": [
"SCHEDULE"
],
"items": [
{
"item": 1,
"name": "WELL",
"value_type": "STRING"
},
{
"item": 2,
"name": "FLUID",
"value_type": "STRING",
"default": "GRUP"
},
{
"item": 3,
"name": "STREAM",
"value_type": "STRING"
},
{
"item": 4,
"name": "MAKEUPGAS",
"value_type": "STRING"
},
{
"item": 5,
"name": "STAGE",
"value_type": "DOUBLE",
"dimension": "1",
"default": 0
}
]
}

1
src/opm/input/eclipse/share/keywords/001_Eclipse300/W/WSF
View File

@@ -7,7 +7,6 @@
"keyword": "TABDIMS",
"item": "NTSFUN"
},
"requires": ["WATER"],
"prohibits": ["SWOF", "SWFN"],
"items": [
{

23
src/opm/input/eclipse/share/keywords/001_Eclipse300/Z/ZMFVD Normal file
View File

@@ -0,0 +1,23 @@
{
"name": "ZMFVD",
"comment": "Hardcoded two components.",
"sections": [
"PROPS"
],
"size": {
"keyword": "EQLDIMS",
"item": "NTEQUL"
},
"items": [
{
"name": "DATA",
"value_type": "DOUBLE",
"size_type": "ALL",
"dimension": [
"Length",
"1",
"1"
]
}
]
}

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

@@ -1047,6 +1047,7 @@ set( keywords
001_Eclipse300/B/BLOCK_PROBE300
001_Eclipse300/C/CIRCLE
001_Eclipse300/C/CNAMES
001_Eclipse300/C/COMPS
001_Eclipse300/C/CO2STORE
001_Eclipse300/C/CREF
@@ -1054,14 +1055,18 @@ 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
001_Eclipse300/N/NCOMPS
001_Eclipse300/O/OILCOMPR
001_Eclipse300/O/OILMW
001_Eclipse300/O/OILVTIM
@@ -1070,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
@@ -1081,6 +1087,8 @@ set( keywords
001_Eclipse300/T/THERMAL
001_Eclipse300/T/TREF
001_Eclipse300/T/TREFS
001_Eclipse300/W/WELLSTRE
001_Eclipse300/W/WINJGAS
001_Eclipse300/W/WINJTEMP
001_Eclipse300/W/WATDENT
001_Eclipse300/W/WSF
@@ -1088,6 +1096,7 @@ set( keywords
001_Eclipse300/Z/ZFACT1S
001_Eclipse300/Z/ZFACTOR
001_Eclipse300/Z/ZFACTORS
001_Eclipse300/Z/ZMFVD
002_Frontsim/N/NOGRAV
900_OPM/B/BC