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

Add integer property ISOLNUM

Browse Source
This commit is contained in:
Joakim Hove
2019-12-23 12:21:53 +01:00
parent 99791032b3
commit b95f7bd6bf
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/opm/parser/eclipse/EclipseState/Eclipse3DProperties.cpp
View File

@@ -213,6 +213,7 @@ namespace Opm {
GridProperties< int >::SupportedKeywordInfo( "EQLNUM" , 1, "1", true ),
GridProperties< int >::SupportedKeywordInfo( "FLUXNUM", 1, "1", true ),
GridProperties< int >::SupportedKeywordInfo( "IMBNUM" , 1, "1", true ),
GridProperties< int >::SupportedKeywordInfo( "ISOLNUM", 1, "1", true ),
GridProperties< int >::SupportedKeywordInfo( "MISCNUM", 1, "1", true ),
GridProperties< int >::SupportedKeywordInfo( "MULTNUM", 1, "1", true ),
GridProperties< int >::SupportedKeywordInfo( "OPERNUM", 1, "1", true ),

3
src/opm/parser/eclipse/EclipseState/Grid/FieldProps.cpp
View File

@@ -84,6 +84,7 @@ static const std::map<std::string, int> int_scalar_init = {{"SATNUM", 1},
{"ENDNUM", 1},
{"EQLNUM", 1},
{"IMBNUM", 1},
{"ISOLNUM",1},
{"FIPNUM", 1}, // All FIPxxx keywords should (probably) be added with init==1
{"EQLNUM", 1},
{"PVTNUM", 1},
@@ -104,7 +105,7 @@ bool isFipxxx< int >(const std::string& keyword) {
namespace GRID {
static const std::set<std::string> double_keywords = {"MULTPV", "NTG", "PORO", "PERMX", "PERMY", "PERMZ", "THCONR", "MULTX", "MULTX-", "MULTY-", "MULTY", "MULTZ", "MULTZ-",
"THCONSF", "THCROCK", "THCOIL", "THCGAS", "THCWATER"}; // The THxxxx keywords are related to thermal properties - they are all E300 keywords.
static const std::set<std::string> int_keywords = {"ACTNUM", "FLUXNUM", "MULTNUM", "OPERNUM", "ROCKNUM"};
static const std::set<std::string> int_keywords = {"ACTNUM", "FLUXNUM", "ISOLNUM", "MULTNUM", "OPERNUM", "ROCKNUM"};
static const std::set<std::string> top_keywords = {"PORO", "PERMX", "PERMY", "PERMZ"};
}