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

Accept default values when parsing MULTREGT keyword

Browse Source
This commit is contained in:
Joakim Hove
2018-08-31 15:47:28 +02:00
parent a2394c06f5
commit 4d5ef337ec
3 changed files with 80 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
tests/parser/MULTREGTScannerTests.cpp
View File

@@ -161,12 +161,6 @@ static Opm::Deck createNotSupportedMULTREGTDeck() {
"1 2 0.50 X NOAQUNNC F / -- Not support NOAQUNNC behaviour \n"
"/\n"
"MULTREGT\n"
"* 2 0.50 X ALL M / -- Defaulted from region value \n"
"/\n"
"MULTREGT\n"
"2 * 0.50 X ALL M / -- Defaulted to region value \n"
"/\n"
"MULTREGT\n"
"2 2 0.50 X ALL M / -- Region values equal \n"
"/\n"
"EDIT\n"
@@ -193,26 +187,78 @@ BOOST_AUTO_TEST_CASE(NotSupported) {
keywords0.push_back( &multregtKeyword0 );
BOOST_CHECK_THROW( Opm::MULTREGTScanner scanner( props, keywords0 ); , std::invalid_argument );
// Defaulted from value - not supported
// srcValue == targetValue - not supported
std::vector<const Opm::DeckKeyword*> keywords1;
const auto& multregtKeyword1 = deck.getKeyword( "MULTREGT", 1 );
const Opm::DeckKeyword& multregtKeyword1 = deck.getKeyword( "MULTREGT", 1 );
keywords1.push_back( &multregtKeyword1 );
BOOST_CHECK_THROW( Opm::MULTREGTScanner scanner( props, keywords1 ); , std::invalid_argument );
// Defaulted to value - not supported
std::vector<const Opm::DeckKeyword*> keywords2;
const auto& multregtKeyword2 = deck.getKeyword( "MULTREGT", 2 );
keywords2.push_back( &multregtKeyword2 );
BOOST_CHECK_THROW( Opm::MULTREGTScanner scanner( props, keywords2 ); , std::invalid_argument );
// srcValue == targetValue - not supported
std::vector<const Opm::DeckKeyword*> keywords3;
const Opm::DeckKeyword& multregtKeyword3 = deck.getKeyword( "MULTREGT", 3 );
keywords3.push_back( &multregtKeyword3 );
BOOST_CHECK_THROW( Opm::MULTREGTScanner scanner( props, keywords3 ); , std::invalid_argument );
}
static Opm::Deck createDefaultedRegions() {
const char* deckData =
"RUNSPEC\n"
"\n"
"DIMENS\n"
" 3 3 2 /\n"
"GRID\n"
"DX\n"
"18*0.25 /\n"
"DY\n"
"18*0.25 /\n"
"DZ\n"
"18*0.25 /\n"
"TOPS\n"
"9*0.25 /\n"
"FLUXNUM\n"
"1 1 2\n"
"1 1 2\n"
"1 1 2\n"
"3 4 5\n"
"3 4 5\n"
"3 4 5\n"
"/\n"
"MULTREGT\n"
"3 4 1.25 XYZ ALL F /\n"
"* 2 0.50 XYZ ALL F / -- Defaulted from region value \n"
"/\n"
"MULTREGT\n"
"2 * 0.75 XYZ ALL F / -- Defaulted to region value \n"
"/\n"
"EDIT\n"
"\n";
Opm::Parser parser;
return parser.parseString(deckData, Opm::ParseContext()) ;
}
BOOST_AUTO_TEST_CASE(DefaultedRegions) {
Opm::Deck deck = createDefaultedRegions();
Opm::EclipseGrid grid( deck );
Opm::TableManager tm(deck);
Opm::EclipseGrid eg( deck );
Opm::Eclipse3DProperties props(deck, tm, eg);
std::vector<const Opm::DeckKeyword*> keywords0;
const auto& multregtKeyword0 = deck.getKeyword( "MULTREGT", 0 );
keywords0.push_back( &multregtKeyword0 );
Opm::MULTREGTScanner scanner0(props, keywords0);
BOOST_CHECK_EQUAL( scanner0.getRegionMultiplier(grid.getGlobalIndex(0,0,1), grid.getGlobalIndex(1,0,1), Opm::FaceDir::XPlus ), 1.25);
BOOST_CHECK_EQUAL( scanner0.getRegionMultiplier(grid.getGlobalIndex(1,0,0), grid.getGlobalIndex(2,0,0), Opm::FaceDir::XPlus ), 0.50);
BOOST_CHECK_EQUAL( scanner0.getRegionMultiplier(grid.getGlobalIndex(2,0,1), grid.getGlobalIndex(2,0,0), Opm::FaceDir::ZMinus ), 0.50);
std::vector<const Opm::DeckKeyword*> keywords1;
const Opm::DeckKeyword& multregtKeyword1 = deck.getKeyword( "MULTREGT", 1 );
keywords1.push_back( &multregtKeyword1 );
Opm::MULTREGTScanner scanner1( props, keywords1 );
BOOST_CHECK_EQUAL( scanner1.getRegionMultiplier(grid.getGlobalIndex(2,0,0), grid.getGlobalIndex(1,0,0), Opm::FaceDir::XMinus ), 0.75);
BOOST_CHECK_EQUAL( scanner1.getRegionMultiplier(grid.getGlobalIndex(2,0,0), grid.getGlobalIndex(2,0,1), Opm::FaceDir::ZPlus), 0.75);
}
static Opm::Deck createCopyMULTNUMDeck() {
const char* deckData =
"RUNSPEC\n"