From 314a3ffec735852661f947b888d51b93e048e258 Mon Sep 17 00:00:00 2001 From: Liu Ming Date: Tue, 7 Jun 2016 14:08:33 +0200 Subject: [PATCH 1/6] Add a new message type that allows messages only go into print file. --- opm/common/OpmLog/LogUtil.cpp | 1 + opm/common/OpmLog/LogUtil.hpp | 6 ++++-- opm/common/OpmLog/Logger.cpp | 1 + opm/common/OpmLog/OpmLog.cpp | 13 +++++++++++++ opm/common/OpmLog/OpmLog.hpp | 2 ++ tests/test_OpmLog.cpp | 3 +++ 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/opm/common/OpmLog/LogUtil.cpp b/opm/common/OpmLog/LogUtil.cpp index 426d31f80..5827a1f82 100644 --- a/opm/common/OpmLog/LogUtil.cpp +++ b/opm/common/OpmLog/LogUtil.cpp @@ -52,6 +52,7 @@ namespace Log { prefix = "debug"; break; case MessageType::Info: + case MessageType::Prtinfo: prefix = "info"; break; case MessageType::Warning: diff --git a/opm/common/OpmLog/LogUtil.hpp b/opm/common/OpmLog/LogUtil.hpp index 76f4ccaa6..d593e9a32 100644 --- a/opm/common/OpmLog/LogUtil.hpp +++ b/opm/common/OpmLog/LogUtil.hpp @@ -32,10 +32,12 @@ namespace Log { const int64_t Error = 8; /* Error in the input data - should probably exit. */ const int64_t Problem = 16; /* Calculation problems - e.g. convergence failure. */ const int64_t Bug = 32; /* An inconsistent state has been encountered in the simulator - should probably exit. */ + const int64_t Prtinfo = 64; /* Information that should only go into print file.*/ } - const int64_t DefaultMessageTypes = MessageType::Debug + MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug; - const int64_t NoDebugMessageTypes = MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug; + const int64_t DefaultMessageTypes = MessageType::Debug + MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug + MessageType::Prtinfo; + const int64_t NoDebugMessageTypes = MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug + MessageType::Prtinfo; + const int64_t StdoutMessageTypes = MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug; /// Terminal codes for ANSI/vt100 compatible terminals. /// See for example http://ascii-table.com/ansi-escape-sequences.php diff --git a/opm/common/OpmLog/Logger.cpp b/opm/common/OpmLog/Logger.cpp index ead6efc3f..12fdb0806 100644 --- a/opm/common/OpmLog/Logger.cpp +++ b/opm/common/OpmLog/Logger.cpp @@ -36,6 +36,7 @@ namespace Opm { addMessageType( Log::MessageType::Error , "error"); addMessageType( Log::MessageType::Problem , "problem"); addMessageType( Log::MessageType::Bug , "bug"); + addMessageType( Log::MessageType::Prtinfo , "prtinfo"); } void Logger::addTaggedMessage(int64_t messageType, const std::string& tag, const std::string& message) const { diff --git a/opm/common/OpmLog/OpmLog.cpp b/opm/common/OpmLog/OpmLog.cpp index 9f67d8517..32203b655 100644 --- a/opm/common/OpmLog/OpmLog.cpp +++ b/opm/common/OpmLog/OpmLog.cpp @@ -81,6 +81,12 @@ namespace Opm { } + void OpmLog::prtinfo(const std::string& message) + { + addMessage(Log::MessageType::Prtinfo, message); + } + + void OpmLog::info(const std::string& tag, const std::string& message) { @@ -119,6 +125,13 @@ namespace Opm { + void OpmLog::prtinfo(const std::string& tag, const std::string& message) + { + addTaggedMessage(Log::MessageType::Prtinfo, tag, message); + } + + + bool OpmLog::enabledMessageType( int64_t messageType ) { if (m_logger) diff --git a/opm/common/OpmLog/OpmLog.hpp b/opm/common/OpmLog/OpmLog.hpp index 0f70e3996..c198b59b9 100644 --- a/opm/common/OpmLog/OpmLog.hpp +++ b/opm/common/OpmLog/OpmLog.hpp @@ -48,6 +48,7 @@ public: static void problem(const std::string& message); static void bug(const std::string& message); static void debug(const std::string& message); + static void prtinfo(const std::string& message); static void info(const std::string& tag, const std::string& message); static void warning(const std::string& tag, const std::string& message); @@ -55,6 +56,7 @@ public: static void problem(const std::string& tag, const std::string& message); static void bug(const std::string& tag, const std::string& message); static void debug(const std::string& tag, const std::string& message); + static void prtinfo(const std::string& tag, const std::string& message); static bool hasBackend( const std::string& backendName ); static void addBackend(const std::string& name , std::shared_ptr backend); diff --git a/tests/test_OpmLog.cpp b/tests/test_OpmLog.cpp index 1bce0c40c..a1bb9a942 100644 --- a/tests/test_OpmLog.cpp +++ b/tests/test_OpmLog.cpp @@ -169,10 +169,12 @@ BOOST_AUTO_TEST_CASE( CounterLogTesting) { counter.addMessage( Log::MessageType::Error , "This is an error ..."); counter.addMessage( Log::MessageType::Warning , "This is a warning"); + counter.addMessage( Log::MessageType::Prtinfo , "This is a info(prtinfo)"); BOOST_CHECK_EQUAL(1U , counter.numMessages( Log::MessageType::Error )); BOOST_CHECK_EQUAL(1U , counter.numMessages( Log::MessageType::Warning )); BOOST_CHECK_EQUAL(0 , counter.numMessages( Log::MessageType::Info )); + BOOST_CHECK_EQUAL(1U , counter.numMessages( Log::MessageType::Prtinfo )); { int64_t not_enabled = 4096; @@ -252,6 +254,7 @@ BOOST_AUTO_TEST_CASE(TestHelperFunctions) // prefixMessage BOOST_CHECK_EQUAL(prefixMessage(MessageType::Error, "message"), "error: message"); BOOST_CHECK_EQUAL(prefixMessage(MessageType::Info, "message"), "info: message"); + BOOST_CHECK_EQUAL(prefixMessage(MessageType::Prtinfo, "message"), "info: message"); // colorCode Message BOOST_CHECK_EQUAL(colorCodeMessage(MessageType::Info, "message"), "message"); From 3573ab01811746805c059d8ae2be75878d349ab7 Mon Sep 17 00:00:00 2001 From: Liu Ming Date: Tue, 7 Jun 2016 14:16:25 +0200 Subject: [PATCH 2/6] fix indentation. --- opm/common/OpmLog/LogUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/common/OpmLog/LogUtil.cpp b/opm/common/OpmLog/LogUtil.cpp index 5827a1f82..3557fc177 100644 --- a/opm/common/OpmLog/LogUtil.cpp +++ b/opm/common/OpmLog/LogUtil.cpp @@ -52,7 +52,7 @@ namespace Log { prefix = "debug"; break; case MessageType::Info: - case MessageType::Prtinfo: + case MessageType::Prtinfo: prefix = "info"; break; case MessageType::Warning: From aa51ea67bce12656cff7e23b701ec51709cf00ea Mon Sep 17 00:00:00 2001 From: Liu Ming Date: Wed, 8 Jun 2016 09:00:24 +0200 Subject: [PATCH 3/6] change Prtinfo to Note. --- opm/common/OpmLog/LogUtil.cpp | 3 ++- opm/common/OpmLog/LogUtil.hpp | 18 +++++++++--------- opm/common/OpmLog/Logger.cpp | 2 +- opm/common/OpmLog/OpmLog.cpp | 8 ++++---- opm/common/OpmLog/OpmLog.hpp | 4 ++-- tests/test_OpmLog.cpp | 6 +++--- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/opm/common/OpmLog/LogUtil.cpp b/opm/common/OpmLog/LogUtil.cpp index 3557fc177..854a1ad08 100644 --- a/opm/common/OpmLog/LogUtil.cpp +++ b/opm/common/OpmLog/LogUtil.cpp @@ -52,7 +52,7 @@ namespace Log { prefix = "debug"; break; case MessageType::Info: - case MessageType::Prtinfo: + case MessageType::Note: prefix = "info"; break; case MessageType::Warning: @@ -79,6 +79,7 @@ namespace Log { switch (messageType) { case MessageType::Debug: case MessageType::Info: + case MessageType::Note: return message; // No color coding, not even the code for default color. case MessageType::Warning: return AnsiTerminalColors::blue_strong + message + AnsiTerminalColors::none; diff --git a/opm/common/OpmLog/LogUtil.hpp b/opm/common/OpmLog/LogUtil.hpp index d593e9a32..8d6514e3d 100644 --- a/opm/common/OpmLog/LogUtil.hpp +++ b/opm/common/OpmLog/LogUtil.hpp @@ -26,17 +26,17 @@ namespace Opm { namespace Log { namespace MessageType { - const int64_t Debug = 1; /* Excessive information */ - const int64_t Info = 2; /* Normal status information */ - const int64_t Warning = 4; /* Input anomaly - possible error */ - const int64_t Error = 8; /* Error in the input data - should probably exit. */ - const int64_t Problem = 16; /* Calculation problems - e.g. convergence failure. */ - const int64_t Bug = 32; /* An inconsistent state has been encountered in the simulator - should probably exit. */ - const int64_t Prtinfo = 64; /* Information that should only go into print file.*/ + const int64_t Debug = 1; /* Excessive information */ + const int64_t Info = 2; /* Normal status information */ + const int64_t Warning = 4; /* Input anomaly - possible error */ + const int64_t Error = 8; /* Error in the input data - should probably exit. */ + const int64_t Problem = 16; /* Calculation problems - e.g. convergence failure. */ + const int64_t Bug = 32; /* An inconsistent state has been encountered in the simulator - should probably exit. */ + const int64_t Note = 64; /* Information that should only go into print file.*/ } - const int64_t DefaultMessageTypes = MessageType::Debug + MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug + MessageType::Prtinfo; - const int64_t NoDebugMessageTypes = MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug + MessageType::Prtinfo; + const int64_t DefaultMessageTypes = MessageType::Debug + MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug + MessageType::Note; + const int64_t NoDebugMessageTypes = MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug + MessageType::Note; const int64_t StdoutMessageTypes = MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug; /// Terminal codes for ANSI/vt100 compatible terminals. diff --git a/opm/common/OpmLog/Logger.cpp b/opm/common/OpmLog/Logger.cpp index 12fdb0806..10ec10776 100644 --- a/opm/common/OpmLog/Logger.cpp +++ b/opm/common/OpmLog/Logger.cpp @@ -36,7 +36,7 @@ namespace Opm { addMessageType( Log::MessageType::Error , "error"); addMessageType( Log::MessageType::Problem , "problem"); addMessageType( Log::MessageType::Bug , "bug"); - addMessageType( Log::MessageType::Prtinfo , "prtinfo"); + addMessageType( Log::MessageType::Note , "note"); } void Logger::addTaggedMessage(int64_t messageType, const std::string& tag, const std::string& message) const { diff --git a/opm/common/OpmLog/OpmLog.cpp b/opm/common/OpmLog/OpmLog.cpp index 32203b655..94c103427 100644 --- a/opm/common/OpmLog/OpmLog.cpp +++ b/opm/common/OpmLog/OpmLog.cpp @@ -81,9 +81,9 @@ namespace Opm { } - void OpmLog::prtinfo(const std::string& message) + void OpmLog::note(const std::string& message) { - addMessage(Log::MessageType::Prtinfo, message); + addMessage(Log::MessageType::Note, message); } @@ -125,9 +125,9 @@ namespace Opm { - void OpmLog::prtinfo(const std::string& tag, const std::string& message) + void OpmLog::note(const std::string& tag, const std::string& message) { - addTaggedMessage(Log::MessageType::Prtinfo, tag, message); + addTaggedMessage(Log::MessageType::Note, tag, message); } diff --git a/opm/common/OpmLog/OpmLog.hpp b/opm/common/OpmLog/OpmLog.hpp index c198b59b9..655da9da1 100644 --- a/opm/common/OpmLog/OpmLog.hpp +++ b/opm/common/OpmLog/OpmLog.hpp @@ -48,7 +48,7 @@ public: static void problem(const std::string& message); static void bug(const std::string& message); static void debug(const std::string& message); - static void prtinfo(const std::string& message); + static void note(const std::string& message); static void info(const std::string& tag, const std::string& message); static void warning(const std::string& tag, const std::string& message); @@ -56,7 +56,7 @@ public: static void problem(const std::string& tag, const std::string& message); static void bug(const std::string& tag, const std::string& message); static void debug(const std::string& tag, const std::string& message); - static void prtinfo(const std::string& tag, const std::string& message); + static void note(const std::string& tag, const std::string& message); static bool hasBackend( const std::string& backendName ); static void addBackend(const std::string& name , std::shared_ptr backend); diff --git a/tests/test_OpmLog.cpp b/tests/test_OpmLog.cpp index a1bb9a942..9701e4067 100644 --- a/tests/test_OpmLog.cpp +++ b/tests/test_OpmLog.cpp @@ -169,12 +169,12 @@ BOOST_AUTO_TEST_CASE( CounterLogTesting) { counter.addMessage( Log::MessageType::Error , "This is an error ..."); counter.addMessage( Log::MessageType::Warning , "This is a warning"); - counter.addMessage( Log::MessageType::Prtinfo , "This is a info(prtinfo)"); + counter.addMessage( Log::MessageType::Note , "This is a info(note)"); BOOST_CHECK_EQUAL(1U , counter.numMessages( Log::MessageType::Error )); BOOST_CHECK_EQUAL(1U , counter.numMessages( Log::MessageType::Warning )); BOOST_CHECK_EQUAL(0 , counter.numMessages( Log::MessageType::Info )); - BOOST_CHECK_EQUAL(1U , counter.numMessages( Log::MessageType::Prtinfo )); + BOOST_CHECK_EQUAL(1U , counter.numMessages( Log::MessageType::Note )); { int64_t not_enabled = 4096; @@ -254,7 +254,7 @@ BOOST_AUTO_TEST_CASE(TestHelperFunctions) // prefixMessage BOOST_CHECK_EQUAL(prefixMessage(MessageType::Error, "message"), "error: message"); BOOST_CHECK_EQUAL(prefixMessage(MessageType::Info, "message"), "info: message"); - BOOST_CHECK_EQUAL(prefixMessage(MessageType::Prtinfo, "message"), "info: message"); + BOOST_CHECK_EQUAL(prefixMessage(MessageType::Note, "message"), "info: message"); // colorCode Message BOOST_CHECK_EQUAL(colorCodeMessage(MessageType::Info, "message"), "message"); From 83db62517372ac599e2ee00bcfdb4ab97168ab7e Mon Sep 17 00:00:00 2001 From: Liu Ming Date: Wed, 8 Jun 2016 09:12:19 +0200 Subject: [PATCH 4/6] change the message type order. --- opm/common/OpmLog/LogUtil.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/opm/common/OpmLog/LogUtil.hpp b/opm/common/OpmLog/LogUtil.hpp index 8d6514e3d..06ce20ee4 100644 --- a/opm/common/OpmLog/LogUtil.hpp +++ b/opm/common/OpmLog/LogUtil.hpp @@ -27,12 +27,12 @@ namespace Opm { namespace Log { namespace MessageType { const int64_t Debug = 1; /* Excessive information */ - const int64_t Info = 2; /* Normal status information */ - const int64_t Warning = 4; /* Input anomaly - possible error */ - const int64_t Error = 8; /* Error in the input data - should probably exit. */ - const int64_t Problem = 16; /* Calculation problems - e.g. convergence failure. */ - const int64_t Bug = 32; /* An inconsistent state has been encountered in the simulator - should probably exit. */ - const int64_t Note = 64; /* Information that should only go into print file.*/ + const int64_t Note = 2; /* Information that should only go into print file.*/ + const int64_t Info = 4; /* Normal status information */ + const int64_t Warning = 8; /* Input anomaly - possible error */ + const int64_t Error = 16; /* Error in the input data - should probably exit. */ + const int64_t Problem = 32; /* Calculation problems - e.g. convergence failure. */ + const int64_t Bug = 64; /* An inconsistent state has been encountered in the simulator - should probably exit. */ } const int64_t DefaultMessageTypes = MessageType::Debug + MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug + MessageType::Note; From 2dce26c9f01629c9f371c3eedfe33d7cb1fc3a6c Mon Sep 17 00:00:00 2001 From: Liu Ming Date: Wed, 8 Jun 2016 10:52:23 +0200 Subject: [PATCH 5/6] fix indentation and order. --- opm/common/OpmLog/LogUtil.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/opm/common/OpmLog/LogUtil.hpp b/opm/common/OpmLog/LogUtil.hpp index 06ce20ee4..633795a7d 100644 --- a/opm/common/OpmLog/LogUtil.hpp +++ b/opm/common/OpmLog/LogUtil.hpp @@ -26,17 +26,17 @@ namespace Opm { namespace Log { namespace MessageType { - const int64_t Debug = 1; /* Excessive information */ - const int64_t Note = 2; /* Information that should only go into print file.*/ - const int64_t Info = 4; /* Normal status information */ - const int64_t Warning = 8; /* Input anomaly - possible error */ - const int64_t Error = 16; /* Error in the input data - should probably exit. */ - const int64_t Problem = 32; /* Calculation problems - e.g. convergence failure. */ - const int64_t Bug = 64; /* An inconsistent state has been encountered in the simulator - should probably exit. */ + const int64_t Debug = 1; /* Excessive information */ + const int64_t Note = 2; /* Information that should only go into print file.*/ + const int64_t Info = 4; /* Normal status information */ + const int64_t Warning = 8; /* Input anomaly - possible error */ + const int64_t Error = 16; /* Error in the input data - should probably exit. */ + const int64_t Problem = 32; /* Calculation problems - e.g. convergence failure. */ + const int64_t Bug = 64; /* An inconsistent state has been encountered in the simulator - should probably exit. */ } - const int64_t DefaultMessageTypes = MessageType::Debug + MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug + MessageType::Note; - const int64_t NoDebugMessageTypes = MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug + MessageType::Note; + const int64_t DefaultMessageTypes = MessageType::Debug + MessageType::Note + MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug; + const int64_t NoDebugMessageTypes = MessageType::Info + MessageType::Note + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug; const int64_t StdoutMessageTypes = MessageType::Info + MessageType::Warning + MessageType::Error + MessageType::Problem + MessageType::Bug; /// Terminal codes for ANSI/vt100 compatible terminals. From b4c9f82585aeddf7e528d3a9e06dba6678f51160 Mon Sep 17 00:00:00 2001 From: Liu Ming Date: Wed, 8 Jun 2016 10:55:38 +0200 Subject: [PATCH 6/6] Let Note has its own prefix. --- opm/common/OpmLog/LogUtil.cpp | 4 +++- tests/test_OpmLog.cpp | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/opm/common/OpmLog/LogUtil.cpp b/opm/common/OpmLog/LogUtil.cpp index 854a1ad08..2f97b6c5f 100644 --- a/opm/common/OpmLog/LogUtil.cpp +++ b/opm/common/OpmLog/LogUtil.cpp @@ -51,8 +51,10 @@ namespace Log { case MessageType::Debug: prefix = "debug"; break; - case MessageType::Info: case MessageType::Note: + prefix = "note"; + break; + case MessageType::Info: prefix = "info"; break; case MessageType::Warning: diff --git a/tests/test_OpmLog.cpp b/tests/test_OpmLog.cpp index 9701e4067..2d887f718 100644 --- a/tests/test_OpmLog.cpp +++ b/tests/test_OpmLog.cpp @@ -169,7 +169,7 @@ BOOST_AUTO_TEST_CASE( CounterLogTesting) { counter.addMessage( Log::MessageType::Error , "This is an error ..."); counter.addMessage( Log::MessageType::Warning , "This is a warning"); - counter.addMessage( Log::MessageType::Note , "This is a info(note)"); + counter.addMessage( Log::MessageType::Note , "This is a note"); BOOST_CHECK_EQUAL(1U , counter.numMessages( Log::MessageType::Error )); BOOST_CHECK_EQUAL(1U , counter.numMessages( Log::MessageType::Warning )); @@ -254,7 +254,7 @@ BOOST_AUTO_TEST_CASE(TestHelperFunctions) // prefixMessage BOOST_CHECK_EQUAL(prefixMessage(MessageType::Error, "message"), "error: message"); BOOST_CHECK_EQUAL(prefixMessage(MessageType::Info, "message"), "info: message"); - BOOST_CHECK_EQUAL(prefixMessage(MessageType::Note, "message"), "info: message"); + BOOST_CHECK_EQUAL(prefixMessage(MessageType::Note, "message"), "note: message"); // colorCode Message BOOST_CHECK_EQUAL(colorCodeMessage(MessageType::Info, "message"), "message");