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

Merge pull request #2060 from goncalvesmachadoc/outtemp

Browse Source 
add extra thermal summary keywords
This commit is contained in:
Joakim Hove 2020-10-28 14:26:22 +01:00 committed by GitHub
commit 03efa3d2e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/opm/output/eclipse/Summary.cpp
View File

@ -1016,6 +1016,7 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "WOIR", rate< rt::oil, injector > },
{ "WGIR", rate< rt::gas, injector > },
{ "WEIR", rate< rt::energy, injector > },
{ "WTIRHEA", rate< rt::energy, injector > },
{ "WNIR", rate< rt::solvent, injector > },
{ "WCIR", rate< rt::polymer, injector > },
{ "WSIR", rate< rt::brine, injector > },
@ -1028,6 +1029,7 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "WOIT", mul( rate< rt::oil, injector >, duration ) },
{ "WGIT", mul( rate< rt::gas, injector >, duration ) },
{ "WEIT", mul( rate< rt::energy, injector >, duration ) },
{ "WTITHEA", mul( rate< rt::energy, injector >, duration ) },
{ "WNIT", mul( rate< rt::solvent, injector >, duration ) },
{ "WCIT", mul( rate< rt::polymer, injector >, duration ) },
{ "WSIT", mul( rate< rt::brine, injector >, duration ) },
@ -1038,6 +1040,7 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "WOPR", rate< rt::oil, producer > },
{ "WGPR", rate< rt::gas, producer > },
{ "WEPR", rate< rt::energy, producer > },
{ "WTPRHEA", rate< rt::energy, producer > },
{ "WGLIR", glir},
{ "WNPR", rate< rt::solvent, producer > },
{ "WCPR", rate< rt::polymer, producer > },
@ -1063,6 +1066,7 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "WOPT", mul( rate< rt::oil, producer >, duration ) },
{ "WGPT", mul( rate< rt::gas, producer >, duration ) },
{ "WEPT", mul( rate< rt::energy, producer >, duration ) },
{ "WTPTHEA", mul( rate< rt::energy, producer >, duration ) },
{ "WNPT", mul( rate< rt::solvent, producer >, duration ) },
{ "WCPT", mul( rate< rt::polymer, producer >, duration ) },
{ "WSPT", mul( rate< rt::brine, producer >, duration ) },
@ -1099,6 +1103,8 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "WWVIR", rate< rt::reservoir_water, injector >},
{ "GOIR", rate< rt::oil, injector > },
{ "GGIR", rate< rt::gas, injector > },
{ "GEIR", rate< rt::energy, injector > },
{ "GTIRHEA", rate< rt::energy, injector > },
{ "GNIR", rate< rt::solvent, injector > },
{ "GCIR", rate< rt::polymer, injector > },
{ "GSIR", rate< rt::brine, injector > },
@ -1111,6 +1117,8 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "GWIT", mul( rate< rt::wat, injector >, duration ) },
{ "GOIT", mul( rate< rt::oil, injector >, duration ) },
{ "GGIT", mul( rate< rt::gas, injector >, duration ) },
{ "GEIT", mul( rate< rt::energy, injector >, duration ) },
{ "GTITHEA", mul( rate< rt::energy, injector >, duration ) },
{ "GNIT", mul( rate< rt::solvent, injector >, duration ) },
{ "GCIT", mul( rate< rt::polymer, injector >, duration ) },
{ "GSIT", mul( rate< rt::brine, injector >, duration ) },
@ -1120,6 +1128,8 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "GWPR", rate< rt::wat, producer > },
{ "GOPR", rate< rt::oil, producer > },
{ "GGPR", rate< rt::gas, producer > },
{ "GEPR", rate< rt::energy, producer > },
{ "GTPRHEA", rate< rt::energy, producer > },
{ "GGLIR", glir },
{ "GNPR", rate< rt::solvent, producer > },
{ "GCPR", rate< rt::polymer, producer > },
@ -1142,6 +1152,8 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "GWPT", mul( rate< rt::wat, producer >, duration ) },
{ "GOPT", mul( rate< rt::oil, producer >, duration ) },
{ "GGPT", mul( rate< rt::gas, producer >, duration ) },
{ "GEPT", mul( rate< rt::energy, producer >, duration ) },
{ "GTPTHEA", mul( rate< rt::energy, producer >, duration ) },
{ "GNPT", mul( rate< rt::solvent, producer >, duration ) },
{ "GCPT", mul( rate< rt::polymer, producer >, duration ) },
{ "GOPTS", mul( rate< rt::vaporized_oil, producer >, duration ) },
@ -1274,6 +1286,8 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "FWPR", rate< rt::wat, producer > },
{ "FOPR", rate< rt::oil, producer > },
{ "FGPR", rate< rt::gas, producer > },
{ "FEPR", rate< rt::energy, producer > },
{ "FTPRHEA", rate< rt::energy, producer > },
{ "FGLIR", glir },
{ "FNPR", rate< rt::solvent, producer > },
{ "FCPR", rate< rt::polymer, producer > },
@ -1291,6 +1305,8 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "FWPT", mul( rate< rt::wat, producer >, duration ) },
{ "FOPT", mul( rate< rt::oil, producer >, duration ) },
{ "FGPT", mul( rate< rt::gas, producer >, duration ) },
{ "FEPT", mul( rate< rt::energy, producer >, duration ) },
{ "FTPTHEA", mul( rate< rt::energy, producer >, duration ) },
{ "FNPT", mul( rate< rt::solvent, producer >, duration ) },
{ "FCPT", mul( rate< rt::polymer, producer >, duration ) },
{ "FSPT", mul( rate< rt::brine, producer >, duration ) },
@ -1308,6 +1324,8 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "FWIR", rate< rt::wat, injector > },
{ "FOIR", rate< rt::oil, injector > },
{ "FGIR", rate< rt::gas, injector > },
{ "FEIR", rate< rt::energy, injector > },
{ "FTIRHEA", rate< rt::energy, injector > },
{ "FNIR", rate< rt::solvent, injector > },
{ "FCIR", rate< rt::polymer, injector > },
{ "FCPR", rate< rt::polymer, producer > },
@ -1320,6 +1338,8 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "FWIT", mul( rate< rt::wat, injector >, duration ) },
{ "FOIT", mul( rate< rt::oil, injector >, duration ) },
{ "FGIT", mul( rate< rt::gas, injector >, duration ) },
{ "FEIT", mul( rate< rt::energy, injector >, duration ) },
{ "FTITHEA", mul( rate< rt::energy, injector >, duration ) },
{ "FNIT", mul( rate< rt::solvent, injector >, duration ) },
{ "FCIT", mul( rate< rt::polymer, injector >, duration ) },
{ "FCPT", mul( rate< rt::polymer, producer >, duration ) },

2
src/opm/parser/eclipse/EclipseState/Schedule/SummaryState.cpp
View File

@ -34,7 +34,7 @@ namespace {
static const std::vector<std::string> totals = {"OPT" , "GPT" , "WPT" , "GIT", "WIT", "OPTF" , "OPTS" , "OIT" , "OVPT" , "OVIT" , "MWT" ,
"WVPT" , "WVIT" , "GMT" , "GPTF" , "SGT" , "GST" , "FGT" , "GCT" , "GIMT" ,
"WGPT" , "WGIT" , "EGT" , "EXGT" , "GVPT" , "GVIT" , "LPT" , "VPT" , "VIT" , "NPT" , "NIT",
"CPT", "CIT", "SPT", "SIT", "EPT", "EIT"};
"CPT", "CIT", "SPT", "SIT", "EPT", "EIT", "TPTHEA", "TITHEA"};
auto sep_pos = key.find(':');

2
src/opm/parser/eclipse/share/keywords/000_Eclipse100/F/FIELD_PROBE
View File

@ -249,6 +249,8 @@
"FGQ",
"FEPR",
"FEPT",
"FEIR",
"FEIT",
"FCPR",
"FCPC",
"FCPT",

2
src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GROUP_PROBE
View File

@ -209,6 +209,8 @@
"GGQ",
"GEPR",
"GEPT",
"GEIR",
"GEIT",
"GESR",
"GEST",
"GEDC",