From 31e5c494a878bf14c195bc57cc2043e15d1699f9 Mon Sep 17 00:00:00 2001 From: Kai Bao Date: Mon, 5 Oct 2020 00:28:11 +0200 Subject: [PATCH] adding aquifer keywords to the summary_ALL test in SummaryConfigTests --- .../SummaryConfig/SummaryConfig.cpp | 5 +++++ tests/parser/SummaryConfigTests.cpp | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp b/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp index fd66f87bf..30f719db0 100644 --- a/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp +++ b/src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp @@ -265,6 +265,11 @@ namespace { return false; } + bool is_aquifer(const std::string& keyword) + { + return (keyword[0] == 'A') && (keyword != "ALL"); + } + bool is_node_keyword(const std::string& keyword) { static const auto nodekw = keyword_set { diff --git a/tests/parser/SummaryConfigTests.cpp b/tests/parser/SummaryConfigTests.cpp index 6282ef4fb..457ff7c2c 100644 --- a/tests/parser/SummaryConfigTests.cpp +++ b/tests/parser/SummaryConfigTests.cpp @@ -82,6 +82,8 @@ static Deck createDeck( const std::string& summary ) { " 10 10 10 /\n" "REGDIMS\n" " 3/\n" + "AQUDIMS\n" + "1* 1* 1* 1* 3 200 1* 1* /\n" "GRID\n" "DXV \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" "FIPREG\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" "WELSPECS\n" " \'W_1\' \'OP\' 1 1 3.33 \'OIL\' 7* / \n" @@ -425,6 +438,11 @@ BOOST_AUTO_TEST_CASE(summary_ALL) { std::vector all; 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') { all.push_back(keyword); }