OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

style changes

Browse Source
This commit is contained in:
Franz G. Fuchs 2019-01-14 09:21:43 +01:00
parent f61e55995a
commit 70425a681f
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/simulators/gatherDeferredLogger.cpp
View File

@ -116,13 +116,13 @@ namespace Opm
// store number of messages;
int message_size = unsigned_int_mpi_pack_size;
// store 1 unsigned int for number of messages
// store 1 int64 per message for flag
message_size += num_messages*int64_mpi_pack_size;
// store 2 unsigned ints per message for length of tag and length of text
message_size += num_messages*2*unsigned_int_mpi_pack_size;
int string_mpi_pack_size;
for (const auto lm : local_deferredlogger.messages_) {
int string_mpi_pack_size;
MPI_Pack_size(lm.tag.size(), MPI_CHAR, MPI_COMM_WORLD, &string_mpi_pack_size);
message_size += string_mpi_pack_size;
MPI_Pack_size(lm.text.size(), MPI_CHAR, MPI_COMM_WORLD, &string_mpi_pack_size);
@ -152,9 +152,8 @@ namespace Opm
MPI_COMM_WORLD);
// Unpack.
std::vector<Opm::DeferredLogger::Message> m = unpackMessages(recv_buffer, displ);
Opm::DeferredLogger global_deferredlogger;
global_deferredlogger.messages_ = m;
global_deferredlogger.messages_ = unpackMessages(recv_buffer, displ);
return global_deferredlogger;
}

13
tests/test_gatherdeferredlogger.cpp
View File

@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE(NoMessages)
Opm::DeferredLogger global_deferredlogger = gatherDeferredLogger(local_deferredlogger);
if (cc.rank()==0) {
if (cc.rank() == 0) {
global_deferredlogger.logMessages();
@ -98,7 +98,6 @@ BOOST_AUTO_TEST_CASE(NoMessages)
std::string expected;
BOOST_CHECK_EQUAL(log_stream.str(), expected);
std::cerr<<""<<log_stream.str();
}
}
@ -110,10 +109,10 @@ BOOST_AUTO_TEST_CASE(VariableNumberOfMessages)
initLogger(log_stream);
Opm::DeferredLogger local_deferredlogger;
if (cc.rank()==1) {
if (cc.rank() == 1) {
local_deferredlogger.info("info from rank " + std::to_string(cc.rank()));
local_deferredlogger.warning("warning from rank " + std::to_string(cc.rank()));
} else if (cc.rank()==2) {
} else if (cc.rank() == 2) {
local_deferredlogger.bug("tagme", "bug from rank " + std::to_string(cc.rank()));
local_deferredlogger.bug("tagme", "bug from rank " + std::to_string(cc.rank()));
local_deferredlogger.bug("tagme", "bug from rank " + std::to_string(cc.rank()));
@ -122,7 +121,7 @@ BOOST_AUTO_TEST_CASE(VariableNumberOfMessages)
Opm::DeferredLogger global_deferredlogger = gatherDeferredLogger(local_deferredlogger);
if (cc.rank()==0) {
if (cc.rank() == 0) {
global_deferredlogger.logMessages();
@ -137,7 +136,6 @@ BOOST_AUTO_TEST_CASE(VariableNumberOfMessages)
+ Log::prefixMessage(Log::MessageType::Bug, "bug from rank 2") + "\n"
+ Log::prefixMessage(Log::MessageType::Bug, "Message limit reached for message tag: tagme") + "\n";
BOOST_CHECK_EQUAL(log_stream.str(), expected);
std::cerr<<""<<log_stream.str();
}
}
@ -153,7 +151,7 @@ BOOST_AUTO_TEST_CASE(AllHaveOneMessage)
Opm::DeferredLogger global_deferredlogger = gatherDeferredLogger(local_deferredlogger);
if (cc.rank()==0) {
if (cc.rank() == 0) {
global_deferredlogger.logMessages();
@ -165,7 +163,6 @@ BOOST_AUTO_TEST_CASE(AllHaveOneMessage)
expected += Log::prefixMessage(Log::MessageType::Info, "info from rank "+std::to_string(i)) + "\n";
}
BOOST_CHECK_EQUAL(log_stream.str(), expected);
std::cerr<<""<<log_stream.str();
}
}