Merge pull request #1003 from blattms/merge-only-created-parallel-files

Only try to merge files from a parallel run if ouptput requested.
This commit is contained in:
Atgeirr Flø Rasmussen
2017-01-12 17:00:12 +01:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -465,7 +465,7 @@ namespace Opm
// force closing of all log files. // force closing of all log files.
OpmLog::removeAllBackends(); OpmLog::removeAllBackends();
if( mpi_rank_ != 0 || !must_distribute_ ) if( mpi_rank_ != 0 || !must_distribute_ || !output_to_files_ )
{ {
return; return;
} }

View File

@@ -317,7 +317,7 @@ namespace Opm
// force closing of all log files. // force closing of all log files.
OpmLog::removeAllBackends(); OpmLog::removeAllBackends();
if( mpi_rank_ != 0 || !must_distribute_ ) if( mpi_rank_ != 0 || !must_distribute_ || !output_to_files_ )
{ {
return; return;
} }