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

adding aquifer keywords to the summary_ALL test in SummaryConfigTests

Browse Source
This commit is contained in:
Kai Bao 2020-10-05 00:28:11 +02:00
parent 995316e97c
commit 31e5c494a8
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp
View File

@ -265,6 +265,11 @@ namespace {
return false; return false;
} }
bool is_aquifer(const std::string& keyword)
{
return (keyword[0] == 'A') && (keyword != "ALL");
}
bool is_node_keyword(const std::string& keyword) bool is_node_keyword(const std::string& keyword)
{ {
static const auto nodekw = keyword_set { static const auto nodekw = keyword_set {

18
tests/parser/SummaryConfigTests.cpp
View File

@ -82,6 +82,8 @@ static Deck createDeck( const std::string& summary ) {
" 10 10 10 /\n" " 10 10 10 /\n"
"REGDIMS\n" "REGDIMS\n"
" 3/\n" " 3/\n"
"AQUDIMS\n"
"1* 1* 1* 1* 3 200 1* 1* /\n"
"GRID\n" "GRID\n"
"DXV \n 10*400 /\n" "DXV \n 10*400 /\n"
"DYV \n 10*400 /\n" "DYV \n 10*400 /\n"
@ -100,6 +102,17 @@ static Deck createDeck( const std::string& summary ) {
"200*1 300*2 500*3 /\n" "200*1 300*2 500*3 /\n"
"FIPREG\n" "FIPREG\n"
"200*10 300*20 500*30 /\n" "200*10 300*20 500*30 /\n"
"SOLUTION\n"
"AQUCT\n"
"1 2040 1* 1000 .3 3.0e-5 1330 10 360.0 1 1* /\n"
"2 2040 1* 1000 .3 3.0e-5 1330 10 360.0 1 1* /\n"
"3 2040 1* 1000 .3 3.0e-5 1330 10 360.0 1 1* /\n"
"/\n"
"AQUANCON\n"
"1 1 10 10 2 10 10 'I-' 0.88 1 /\n"
"2 9 10 10 10 10 10 'I+' 0.88 1 /\n"
"3 9 9 8 10 9 8 'I+' 0.88 1 /\n"
"/\n"
"SCHEDULE\n" "SCHEDULE\n"
"WELSPECS\n" "WELSPECS\n"
" \'W_1\' \'OP\' 1 1 3.33 \'OIL\' 7* / \n" " \'W_1\' \'OP\' 1 1 3.33 \'OIL\' 7* / \n"
@ -425,6 +438,11 @@ BOOST_AUTO_TEST_CASE(summary_ALL) {
std::vector<std::string> all; std::vector<std::string> all;
for( std::string keyword: ALL_keywords ) { for( std::string keyword: ALL_keywords ) {
if(keyword[0]=='A' && keyword !="ALL") {
all.push_back(keyword + ":1");
all.push_back(keyword + ":2");
all.push_back(keyword + ":3");
}
if(keyword[0]=='F') { if(keyword[0]=='F') {
all.push_back(keyword); all.push_back(keyword);
} }