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

Whitespace and other formatting changes

Browse Source
This commit is contained in:
Markus Blatt 2016-10-05 10:53:28 +02:00
parent d86f552a76
commit ab05cb66d9
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opm/autodiff/FlowMain.hpp
View File

@ -40,7 +40,7 @@
#include <opm/autodiff/GridHelpers.hpp> #include <opm/autodiff/GridHelpers.hpp>
#include <opm/autodiff/createGlobalCellArray.hpp> #include <opm/autodiff/createGlobalCellArray.hpp>
#include <opm/autodiff/GridInit.hpp> #include <opm/autodiff/GridInit.hpp>
#include <opm/simulators/ParallelFileMerger.hpp > #include <opm/simulators/ParallelFileMerger.hpp>
#include <opm/core/wells.h> #include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp> #include <opm/core/wells/WellsManager.hpp>
@ -426,6 +426,7 @@ namespace Opm
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));
streamLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(true)); streamLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(true));
// Read parameters. // Read parameters.
if ( output_cout_ ) if ( output_cout_ )
{ {
@ -433,6 +434,10 @@ namespace Opm
} }
} }
void mergeParallelLogFiles() void mergeParallelLogFiles()
{ {
// force closing of all log files. // force closing of all log files.
@ -681,7 +686,9 @@ namespace Opm
void extractMessages() void extractMessages()
{ {
if ( !output_cout_ ) if ( !output_cout_ )
{
return; return;
}
auto extractMessage = [](const Message& msg) { auto extractMessage = [](const Message& msg) {
auto log_type = detail::convertMessageType(msg.mtype); auto log_type = detail::convertMessageType(msg.mtype);

7
opm/simulators/ParallelFileMerger.hpp
View File

@ -71,7 +71,6 @@ public:
{ {
std::string rank = boost::regex_replace(filename, regex, "\\1"); std::string rank = boost::regex_replace(filename, regex, "\\1");
if( boost::regex_match(filename, logFileRegex_) ) if( boost::regex_match(filename, logFileRegex_) )
{ {
appendFile(*logStream_, file, rank); appendFile(*logStream_, file, rank);
@ -101,9 +100,9 @@ private:
{ {
if( fs::file_size(file) ) if( fs::file_size(file) )
{ {
std::cerr<<"WARNING: There has been logging out by non-root process " std::cerr << "WARNING: There has been logging out by non-root process "
<<rank<<std::endl<<"Please report this in the issue tracker!" << rank << std::endl<<"Please report this in the issue tracker!"
<<std::endl; << std::endl;
fs::ifstream in(file); fs::ifstream in(file);
of<<std::endl<< std::endl; of<<std::endl<< std::endl;
of<<"======================================================="; of<<"=======================================================";