supprot MESSAGES default vaule.

This commit is contained in:
Liu Ming 2016-10-20 15:54:02 +08:00
parent 93ffb318cd
commit 164f74c93c

View File

@ -141,12 +141,12 @@ namespace Opm
return EXIT_FAILURE; return EXIT_FAILURE;
} }
asImpl().setupOutput(); asImpl().setupOutput();
asImpl().setupLogging();
asImpl().readDeckInput(); asImpl().readDeckInput();
asImpl().setupGridAndProps(); asImpl().setupGridAndProps();
asImpl().setupState();
asImpl().setupLogging();
asImpl().extractMessages(); asImpl().extractMessages();
asImpl().runDiagnostics(); asImpl().runDiagnostics();
asImpl().setupState();
asImpl().writeInit(); asImpl().writeInit();
asImpl().distributeData(); asImpl().distributeData();
asImpl().setupOutputWriter(); asImpl().setupOutputWriter();
@ -423,8 +423,16 @@ namespace Opm
OpmLog::addBackend( "STREAMLOG", streamLog); OpmLog::addBackend( "STREAMLOG", streamLog);
std::shared_ptr<StreamLog> debugLog = std::make_shared<EclipsePRTLog>(debugFile, Log::DefaultMessageTypes, false, output_cout_); std::shared_ptr<StreamLog> debugLog = std::make_shared<EclipsePRTLog>(debugFile, Log::DefaultMessageTypes, false, output_cout_);
OpmLog::addBackend( "DEBUGLOG" , debugLog); OpmLog::addBackend( "DEBUGLOG" , debugLog);
const auto& msgLimits = eclipse_state_->getSchedule()->getMessageLimits();
const std::map<int64_t, int>limits = {{Log::MessageType::Note, msgLimits.getMessagePrintLimit(0)},
{Log::MessageType::Info, msgLimits.getMessagePrintLimit(0)},
{Log::MessageType::Warning, msgLimits.getWarningPrintLimit(0)},
{Log::MessageType::Error, msgLimits.getErrorPrintLimit(0)},
{Log::MessageType::Problem, msgLimits.getProblemPrintLimit(0)},
{Log::MessageType::Bug, msgLimits.getBugPrintLimit(0)}};
prtLog->setMessageLimiter(std::make_shared<MessageLimiter>(-1, limits));
prtLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(false)); prtLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(false));
streamLog->setMessageLimiter(std::make_shared<MessageLimiter>(10)); streamLog->setMessageLimiter(std::make_shared<MessageLimiter>(10, limits));
streamLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(true)); streamLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(true));
// Read parameters. // Read parameters.