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

Merge 94419eecf7 into 9a0ccfd853

Browse Source
This commit is contained in:
Kai Bao 2023-11-26 10:49:07 +00:00 committed by GitHub
commit 49ede49d41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 157 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/opm/input/eclipse/Units/UnitSystem.cpp
View File

@ -1174,6 +1174,7 @@ namespace {
this->addDimension("SurfaceTension" , 1.0);
this->addDimension("Energy", 1.0);
this->addDimension("PPM", 1.0);
this->addDimension("Moles", 1.0);
this->addDimension("ContextDependent", 1.0);
}
@ -1213,6 +1214,7 @@ namespace {
this->addDimension("SurfaceTension" , PVT_M::SurfaceTension);
this->addDimension("Energy", PVT_M::Energy);
this->addDimension("PPM", PVT_M::PPM);
this->addDimension("Moles", PVT_M::Moles);
this->addDimension("ContextDependent", std::numeric_limits<double>::quiet_NaN());
this->addDimension("Ymodule", PVT_M::Ymodule);
}
@ -1253,6 +1255,7 @@ namespace {
this->addDimension("SurfaceTension" , Lab::SurfaceTension);
this->addDimension("Energy", Lab::Energy);
this->addDimension("PPM", Lab::PPM);
this->addDimension("Moles", Lab::Moles);
this->addDimension("ContextDependent", std::numeric_limits<double>::quiet_NaN());
this->addDimension("Ymodule", Lab::Ymodule);
}
@ -1294,6 +1297,7 @@ namespace {
this->addDimension("SurfaceTension" , Metric::SurfaceTension);
this->addDimension("Energy", Metric::Energy);
this->addDimension("PPM", Metric::PPM);
this->addDimension("Moles", Metric::Moles);
this->addDimension("ContextDependent", std::numeric_limits<double>::quiet_NaN());
this->addDimension("Ymodule", Metric::Ymodule);
}
@ -1333,6 +1337,7 @@ namespace {
this->addDimension("SurfaceTension" , Field::SurfaceTension);
this->addDimension("Energy", Field::Energy);
this->addDimension("PPM", Field::PPM);
this->addDimension("Moles", Field::Moles);
this->addDimension("ContextDependent", std::numeric_limits<double>::quiet_NaN());
this->addDimension("Ymodule", Field::Ymodule);
}

2
src/opm/input/eclipse/share/keywords/000_Eclipse100/T/TABDIMS
View File

@ -56,7 +56,7 @@
},
{
"item": 9,
"name": "NUM_EOS_RES",
"name": "NUM_STATE_EQ",
"value_type": "INT",
"default": 1,
"comment": "This item is ECLIPSE300 specific"

18
src/opm/input/eclipse/share/keywords/001_Eclipse300/A/ACF Normal file
View File

@ -0,0 +1,18 @@
{
"name": "ACF",
"sections": [
"PROPS"
],
"size": {
"keyword": "TABDIMS",
"item": "NUM_STATE_EQ"
},
"items": [
{
"name": "DATA",
"value_type": "DOUBLE",
"size_type": "ALL",
"dimension": "1"
}
]
}

19
src/opm/input/eclipse/share/keywords/001_Eclipse300/B/BIC Normal file
View File

@ -0,0 +1,19 @@
{
"name": "BIC",
"sections": [
"PROPS"
],
"size": {
"keyword": "TABDIMS",
"item": "NUM_STATE_EQ"
},
"items": [
{
"name": "DATA",
"value_type": "DOUBLE",
"size_type": "ALL",
"dimension": "1",
"default" : 0
}
]
}

18
src/opm/input/eclipse/share/keywords/001_Eclipse300/E/EOS Normal file
View File

@ -0,0 +1,18 @@
{
"name": "EOS",
"sections": [
"RUNSPEC",
"PROPS"
],
"size": {
"keyword": "TABDIMS",
"item": "NUM_STATE_EQ"
},
"items": [
{
"name": "EQUATION",
"value_type": "STRING",
"default": "PR"
}
]
}

9
src/opm/input/eclipse/share/keywords/001_Eclipse300/E/EOSNUM Normal file
View File

@ -0,0 +1,9 @@
{
"name": "EOSNUM",
"sections": [
"REGIONS"
],
"data": {
"value_type": "INT"
}
}

4
src/opm/input/eclipse/share/keywords/001_Eclipse300/M/MW
View File

@ -7,12 +7,12 @@
"keyword": "TABDIMS",
"item": "NUM_STATE_EQ"
},
"comment": "Also note that there is no dimension for this item because there is no unit for 'molar weight' yet",
"items": [
{
"name": "MOLAR_WEIGHT",
"value_type": "DOUBLE",
"size_type": "ALL"
"size_type": "ALL",
"dimension": "Mass/Moles"
}
]
}

18
src/opm/input/eclipse/share/keywords/001_Eclipse300/P/PCRIT Normal file
View File

@ -0,0 +1,18 @@
{
"name": "PCRIT",
"sections": [
"PROPS"
],
"size": {
"keyword": "TABDIMS",
"item": "NUM_STATE_EQ"
},
"items": [
{
"name": "DATA",
"value_type": "DOUBLE",
"size_type": "ALL",
"dimension": "Pressure"
}
]
}

18
src/opm/input/eclipse/share/keywords/001_Eclipse300/T/TCRIT Normal file
View File

@ -0,0 +1,18 @@
{
"name": "TCRIT",
"sections": [
"PROPS"
],
"size": {
"keyword": "TABDIMS",
"item": "NUM_STATE_EQ"
},
"items": [
{
"name": "DATA",
"value_type": "DOUBLE",
"size_type": "ALL",
"dimension": "Temperature"
}
]
}

18
src/opm/input/eclipse/share/keywords/001_Eclipse300/V/VCRIT Normal file
View File

@ -0,0 +1,18 @@
{
"name": "VCRIT",
"sections": [
"PROPS"
],
"size": {
"keyword": "TABDIMS",
"item": "NUM_STATE_EQ"
},
"items": [
{
"name": "DATA",
"value_type": "DOUBLE",
"size_type": "ALL",
"dimension": "GeometricVolume/Moles"
}
]
}

11
src/opm/input/eclipse/share/keywords/001_Eclipse300/X/XMF Normal file
View File

@ -0,0 +1,11 @@
{
"name": "XMF",
"sections": [
"SOLUTION"
],
"data": {
"value_type": "DOUBLE",
"dimension": "1"
}
}

11
src/opm/input/eclipse/share/keywords/001_Eclipse300/Y/YMF Normal file
View File

@ -0,0 +1,11 @@
{
"name": "YMF",
"sections": [
"SOLUTION"
],
"data": {
"value_type": "DOUBLE",
"dimension": "1"
}
}

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

@ -1045,6 +1045,8 @@ set( keywords
000_Eclipse100/Z/ZIPPY2
000_Eclipse100/Z/ZIPP2OFF
001_Eclipse300/A/ACF
001_Eclipse300/B/BIC
001_Eclipse300/B/BLOCK_PROBE300
001_Eclipse300/C/CIRCLE
001_Eclipse300/C/CNAMES
@ -1057,6 +1059,8 @@ set( keywords
001_Eclipse300/D/DREF
001_Eclipse300/D/DREFS
001_Eclipse300/D/DZV
001_Eclipse300/E/EOS
001_Eclipse300/E/EOSNUM
001_Eclipse300/F/FIELDSEP
001_Eclipse300/G/GASVISCT
001_Eclipse300/G/GASWAT
@ -1072,12 +1076,14 @@ set( keywords
001_Eclipse300/O/OILMW
001_Eclipse300/O/OILVTIM
001_Eclipse300/O/OPTIONS3
001_Eclipse300/P/PCRIT
001_Eclipse300/P/PREF
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/TCRIT
001_Eclipse300/T/TEMPI
001_Eclipse300/T/TEMPVD
001_Eclipse300/T/THCGAS
@ -1088,12 +1094,15 @@ set( keywords
001_Eclipse300/T/THERMAL
001_Eclipse300/T/TREF
001_Eclipse300/T/TREFS
001_Eclipse300/V/VCRIT
001_Eclipse300/W/WELLSTRE
001_Eclipse300/W/WELL_PROBE_COMP
001_Eclipse300/W/WINJGAS
001_Eclipse300/W/WINJTEMP
001_Eclipse300/W/WATDENT
001_Eclipse300/W/WSF
001_Eclipse300/X/XMF
001_Eclipse300/Y/YMF
001_Eclipse300/Z/ZFACT1
001_Eclipse300/Z/ZFACT1S
001_Eclipse300/Z/ZFACTOR