From dea35c4c344448536fbd608e80bae65f3a59f33e Mon Sep 17 00:00:00 2001 From: Liu Ming Date: Tue, 7 Jun 2016 14:09:35 +0200 Subject: [PATCH] Add Prtinfo message type allows messages go into print file. --- opm/parser/eclipse/Parser/MessageContainer.cpp | 15 +++++++++++++++ opm/parser/eclipse/Parser/MessageContainer.hpp | 6 +++++- .../eclipse/Parser/tests/MessageContainerTest.cpp | 3 ++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/opm/parser/eclipse/Parser/MessageContainer.cpp b/opm/parser/eclipse/Parser/MessageContainer.cpp index 58eb3ec7e..5e8751b24 100644 --- a/opm/parser/eclipse/Parser/MessageContainer.cpp +++ b/opm/parser/eclipse/Parser/MessageContainer.cpp @@ -119,6 +119,21 @@ namespace Opm { m_messages.emplace_back( Message { Message::Problem, msg, {} } ); } + + void MessageContainer::prtinfo( const std::string& msg, + const std::string& filename, + const size_t lineno ) { + m_messages.emplace_back( + Message { Message::Prtinfo, msg, { filename, lineno } } + ); + } + + + void MessageContainer::prtinfo( const std::string& msg ) { + m_messages.emplace_back( Message { Message::Prtinfo, msg, {} } ); + } + + void MessageContainer::add( const Message& msg ) { this->m_messages.push_back( msg ); } diff --git a/opm/parser/eclipse/Parser/MessageContainer.hpp b/opm/parser/eclipse/Parser/MessageContainer.hpp index a76a3dcde..4e2d59ade 100644 --- a/opm/parser/eclipse/Parser/MessageContainer.hpp +++ b/opm/parser/eclipse/Parser/MessageContainer.hpp @@ -45,7 +45,8 @@ namespace Opm { Warning = 3, Error = 4, Problem = 5, - Bug = 6 + Bug = 6, + Prtinfo = 7 }; Message( type mt, const std::string& msg, Location&& loc ) : @@ -85,6 +86,9 @@ namespace Opm { void problem(const std::string& msg, const std::string& filename, const size_t lineno); void problem(const std::string& msg); + void prtinfo(const std::string& msg, const std::string& filename, const size_t lineno); + void prtinfo(const std::string& msg); + void add( const Message& ); void add( Message&& ); diff --git a/opm/parser/eclipse/Parser/tests/MessageContainerTest.cpp b/opm/parser/eclipse/Parser/tests/MessageContainerTest.cpp index 52c4a6b1a..58f56645b 100644 --- a/opm/parser/eclipse/Parser/tests/MessageContainerTest.cpp +++ b/opm/parser/eclipse/Parser/tests/MessageContainerTest.cpp @@ -47,7 +47,8 @@ BOOST_AUTO_TEST_CASE(TestIterator) { msgList.error("Error"); msgList.problem("Problem"); msgList.bug("Bug"); - std::vector msgString = {"Debug", "Info", "Warning", "Error", "Problem", "Bug"}; + msgList.info("Prtinfo"); + std::vector msgString = {"Debug", "Info", "Warning", "Error", "Problem", "Bug", "Prtinfo"}; int i = 0; for (const auto& msg : msgList) { BOOST_CHECK_EQUAL(msg.message, msgString[i]);