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

8
opm/parser/eclipse/EclipseState/checkDeck.cpp
View File

@@ -18,10 +18,12 @@
*/
#include "checkDeck.hpp"
#include <opm/parser/eclipse/OpmLog/OpmLog.hpp>
#include <opm/parser/eclipse/Deck/Section.hpp>
namespace Opm {
bool checkDeck(DeckConstPtr deck, CounterLogPtr logger, size_t enabledChecks) {
bool checkDeck(DeckConstPtr deck, size_t enabledChecks) {
bool deckValid = true;
// make sure that the deck does not contain unknown keywords
@@ -31,7 +33,7 @@ bool checkDeck(DeckConstPtr deck, CounterLogPtr logger, size_t enabledChecks) {
const auto& keyword = deck->getKeyword(keywordIdx);
if (!keyword->hasParserKeyword()) {
std::string msg("Keyword '" + keyword->name() + "' is unknown.");
logger->addMessage(Log::MessageType::Warning , Log::fileMessage( keyword->getFileName(), keyword->getLineNumber(), msg));
OpmLog::addMessage(Log::MessageType::Warning , Log::fileMessage( keyword->getFileName(), keyword->getLineNumber(), msg));
deckValid = false;
}
}
@@ -40,7 +42,7 @@ bool checkDeck(DeckConstPtr deck, CounterLogPtr logger, size_t enabledChecks) {
// make sure all mandatory sections are present and that their order is correct
if (enabledChecks & SectionTopology) {
bool ensureKeywordSection = enabledChecks & KeywordSection;
deckValid = deckValid && Section::checkSectionTopology(deck, logger, ensureKeywordSection);
deckValid = deckValid && Section::checkSectionTopology(deck, ensureKeywordSection);
}
return deckValid;