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 #3792 from blattms/no-multiple-dbg-prt-files

Browse Source 
Prevent multiple *.?.dbg/prt files in production parallel runs.
This commit is contained in:
Bård Skaflestad
2022-01-30 23:10:14 +01:00
committed by GitHub
parent b263db1c84 4407fdd3db
commit cbcb5692a0
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opm/simulators/flow/Main.hpp
View File

@@ -440,11 +440,14 @@ private:
const bool init_from_restart_file = !EWOMS_GET_PARAM(PreTypeTag, bool, SchedRestart);
if (outputDir.empty())
outputDir = EWOMS_GET_PARAM(PreTypeTag, std::string, OutputDir);
const bool allRanksDbgPrtLog = EWOMS_GET_PARAM(PreTypeTag, bool,
EnableLoggingFalloutWarning);
outputMode = setupLogging(mpiRank,
deckFilename,
outputDir,
EWOMS_GET_PARAM(PreTypeTag, std::string, OutputMode),
outputCout_, "STDOUT_LOGGER");
outputCout_, "STDOUT_LOGGER", allRanksDbgPrtLog);
auto parseContext =
std::make_unique<ParseContext>(std::vector<std::pair<std::string , InputError::Action>>
{{ParseContext::PARSE_RANDOM_SLASH, InputError::IGNORE},

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

@@ -54,7 +54,7 @@ void ParallelFileMerger::operator()(const fs::path& file)
if ( std::regex_match(filename, matches, fileWarningRegex_) )
{
std::string rank = std::regex_replace(filename, fileWarningRegex_, "\\1");
std::string rank = std::regex_replace(filename, fileWarningRegex_, "$1");
if( std::regex_match(filename, logFileRegex_) )
{

7
opm/simulators/utils/readDeck.cpp
View File

@@ -343,7 +343,8 @@ Opm::setupLogging(const int mpi_rank_,
const std::string& cmdline_output_dir,
const std::string& cmdline_output,
const bool output_cout_,
const std::string& stdout_log_id)
const std::string& stdout_log_id,
const bool allRanksDbgLog)
{
if (!cmdline_output_dir.empty()) {
ensureOutputDirExists_(cmdline_output_dir);
@@ -402,6 +403,10 @@ Opm::setupLogging(const int mpi_rank_,
std::cerr << "Value " << cmdline_output
<< " is not a recognized output mode. Using \"all\" instead.\n";
}
if (!allRanksDbgLog && mpi_rank_ != 0)
{
output = FileOutputMode::OUTPUT_NONE;
}
}
if (output > FileOutputMode::OUTPUT_NONE) {

3
opm/simulators/utils/readDeck.hpp
View File

@@ -64,7 +64,8 @@ setupLogging(int mpi_rank_,
const std::string& cmdline_output_dir,
const std::string& cmdline_output,
bool output_cout_,
const std::string& stdout_log_id);
const std::string& stdout_log_id,
const bool allRanksDbgLog);
/// \brief Reads the deck and creates all necessary objects if needed
///