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

Merge pull request #4424 from akva2/cleanup_parallel_file_merger

Browse Source 
ParallelFileMerger: some cleanups
This commit is contained in:
Bård Skaflestad
2023-02-01 17:26:44 +01:00
committed by GitHub
parent 5daf355a7b cb14b1e690
commit e25cabd06c
2 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
opm/simulators/utils/ParallelFileMerger.cpp
View File

@@ -23,31 +23,29 @@
#endif // HAVE_CONFIG_H
#include <opm/simulators/utils/ParallelFileMerger.hpp>
#include <fstream>
#include <iostream>
namespace Opm
{
namespace detail
{
namespace Opm {
namespace detail {
ParallelFileMerger::ParallelFileMerger(const fs::path& output_dir,
const std::string& deckname,
bool show_fallout)
: debugFileRegex_(deckname+"\\.\\d+\\.DBG"),
logFileRegex_(deckname+"\\.\\d+\\.PRT"),
fileWarningRegex_(deckname+"\\.(\\d+)\\.[^.]+"),
show_fallout_(show_fallout)
: debugFileRegex_(deckname+"\\.\\d+\\.DBG")
, logFileRegex_(deckname+"\\.\\d+\\.PRT")
, fileWarningRegex_(deckname+"\\.(\\d+)\\.[^.]+")
, show_fallout_(show_fallout)
{
if ( show_fallout_ )
{
if (show_fallout_) {
auto debugPath = output_dir;
debugPath /= (deckname + ".DBG");
debugStream_.reset(new std::ofstream(debugPath,
std::ofstream::app));
debugStream_ = std::make_unique<std::ofstream>(debugPath,
std::ofstream::app);
auto logPath = output_dir;
logPath /= ( deckname + ".PRT");
logStream_.reset(new std::ofstream(logPath,
std::ofstream::app));
logStream_ = std::make_unique<std::ofstream>(logPath,
std::ofstream::app);
}
}
@@ -56,35 +54,28 @@ void ParallelFileMerger::operator()(const fs::path& file)
std::smatch matches;
std::string filename = file.filename().native();
if ( std::regex_match(filename, matches, fileWarningRegex_) )
{
if (std::regex_match(filename, matches, fileWarningRegex_)) {
std::string rank = std::regex_replace(filename, fileWarningRegex_, "$1");
if( std::regex_match(filename, logFileRegex_) )
{
if ( show_fallout_ ){
if (std::regex_match(filename, logFileRegex_)) {
if (show_fallout_) {
appendFile(*logStream_, file, rank);
}else{
} else {
fs::remove(file);
}
}
else
{
if (std::regex_match(filename, debugFileRegex_) )
{
if ( show_fallout_ ){
} else {
if (std::regex_match(filename, debugFileRegex_)) {
if (show_fallout_) {
appendFile(*debugStream_, file, rank);
}else{
} else {
fs::remove(file);
}
}
else
{
if ( show_fallout_ ){
} else {
if (show_fallout_) {
std::cerr << "WARNING: Unrecognized file with name "
<< filename
<< " that might stem from a parallel run."
<< std::endl;
<< filename
<< " that might stem from a parallel run."
<< std::endl;
}
}
}
@@ -93,8 +84,7 @@ void ParallelFileMerger::operator()(const fs::path& file)
void ParallelFileMerger::appendFile(std::ofstream& of, const fs::path& file, const std::string& rank)
{
if( fs::file_size(file) )
{
if (fs::file_size(file)) {
std::cerr << "WARNING: There has been logging to file "
<< file.string() <<" by process "
<< rank << std::endl;

11
opm/simulators/utils/ParallelFileMerger.hpp
View File

@@ -22,16 +22,13 @@
#define OPM_PARALLELFILEMERGER_HEADER_INCLUDED
#include <filesystem>
#include <fstream>
#include <iosfwd>
#include <memory>
#include <regex>
#include <string>
namespace Opm
{
namespace detail
{
namespace Opm {
namespace detail {
namespace fs = ::std::filesystem;
@@ -73,6 +70,8 @@ private:
/// \brief Whether to show any logging fallout
bool show_fallout_;
};
} // end namespace detail
} // end namespace Opm
#endif // end header guard