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

Replaced references to logger with OpmLog::addMessage()

Browse Source
This commit is contained in:
Joakim Hove
2015-01-16 14:51:57 +01:00
parent f3419e8e61
commit 9fb229ccd7
19 changed files with 318 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
opm/parser/eclipse/IntegrationTests/CheckDeckValidity.cpp
View File

@@ -50,8 +50,7 @@ BOOST_AUTO_TEST_CASE( KeywordInCorrectSection ) {
"SCHEDULE\n";
auto deck = parser->parseString(correctDeckString);
Opm::CounterLogPtr logger(new Opm::CounterLog());
BOOST_CHECK(Opm::checkDeck(deck, logger));
BOOST_CHECK(Opm::checkDeck(deck));
}
{
@@ -64,9 +63,8 @@ BOOST_AUTO_TEST_CASE( KeywordInCorrectSection ) {
"SCHEDULE\n";
auto deck = parser->parseString(correctDeckString);
Opm::CounterLogPtr logger(new Opm::CounterLog());
BOOST_CHECK(!Opm::checkDeck(deck, logger));
BOOST_CHECK(Opm::checkDeck(deck, logger, ~Opm::SectionTopology));
BOOST_CHECK(!Opm::checkDeck(deck));
BOOST_CHECK(Opm::checkDeck(deck, ~Opm::SectionTopology));
}
{
@@ -91,14 +89,13 @@ BOOST_AUTO_TEST_CASE( KeywordInCorrectSection ) {
"SCHEDULE\n";
auto deck = parser->parseString(incorrectDeckString);
Opm::CounterLogPtr logger(new Opm::CounterLog());
BOOST_CHECK(!Opm::checkDeck(deck, logger));
BOOST_CHECK(!Opm::checkDeck(deck));
// this is supposed to succeed as we don't ensure that all keywords are in the
// correct section
BOOST_CHECK(Opm::checkDeck(deck, logger, Opm::SectionTopology));
BOOST_CHECK(Opm::checkDeck(deck, Opm::SectionTopology));
// this fails because of the incorrect BOX keyword
BOOST_CHECK(!Opm::checkDeck(deck, logger, Opm::SectionTopology | Opm::KeywordSection));
BOOST_CHECK(!Opm::checkDeck(deck, Opm::SectionTopology | Opm::KeywordSection));
}
}