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

Change DeckKeyword constructor

Browse Source 
The DeckKeyword::DeckKeyword(const std::string&) constructor has been removed
and the DeckKeyword now requires a ParserKeyword pointer in the constructor.
This commit is contained in:
Joakim Hove
2019-09-16 00:47:34 +02:00
parent c8919ba088
commit 3070bf4a31
10 changed files with 224 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/parser/TimeMapTest.cpp
View File

@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE( timeFromEclipseInputRecord ) {
Opm::DeckRecord startRecord;
Opm::DeckItem dayItem( "DAY", int() );
Opm::DeckItem monthItem( "MONTH", std::string() );
Opm::DeckItem yearItem("YEAR", int() );
Opm::DeckItem yearItem("YEAR", int());
Opm::DeckItem timeItem("TIME", std::string() );
dayItem.push_back( 10 );
@@ -181,16 +181,18 @@ BOOST_AUTO_TEST_CASE( timeFromEclipseInputRecord ) {
BOOST_AUTO_TEST_CASE( addDATESFromWrongKeywordThrows ) {
Opm::Parser parser;
Opm::TimeMap timeMap(startDateJan1st2010);
Opm::DeckKeyword deckKeyword("NOTDATES");
Opm::DeckKeyword deckKeyword(std::addressof(parser.getKeyword("GRID")));
BOOST_CHECK_THROW( timeMap.addFromDATESKeyword( deckKeyword ) , std::invalid_argument );
}
BOOST_AUTO_TEST_CASE( addTSTEPFromWrongKeywordThrows ) {
Opm::Parser parser;
Opm::TimeMap timeMap(startDateJan1st2010);
Opm::DeckKeyword deckKeyword("NOTTSTEP");
Opm::DeckKeyword deckKeyword(&parser.getKeyword("GRID"));
BOOST_CHECK_THROW( timeMap.addFromTSTEPKeyword( deckKeyword ) , std::invalid_argument );
}