From c32749b129539671e914b19c03733d851591d865 Mon Sep 17 00:00:00 2001 From: Robert Kloefkorn Date: Wed, 16 Sep 2015 14:36:28 +0200 Subject: [PATCH] SolverFullyImpl: avoid multiple output of redundant information in parallel. --- opm/autodiff/BlackoilModelBase_impl.hpp | 4 +++- opm/autodiff/SimulatorBase_impl.hpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/opm/autodiff/BlackoilModelBase_impl.hpp b/opm/autodiff/BlackoilModelBase_impl.hpp index e017d2c26..c4dbf9f49 100644 --- a/opm/autodiff/BlackoilModelBase_impl.hpp +++ b/opm/autodiff/BlackoilModelBase_impl.hpp @@ -1481,7 +1481,9 @@ namespace detail { } while (it < 15); if (converged) { - std::cout << "well converged iter: " << it << std::endl; + if ( terminal_output_ ) { + std::cout << "well converged iter: " << it << std::endl; + } const int nw = wells().number_of_wells; { // We will set the bhp primary variable to the new ones, diff --git a/opm/autodiff/SimulatorBase_impl.hpp b/opm/autodiff/SimulatorBase_impl.hpp index 49e19354c..c08908d78 100644 --- a/opm/autodiff/SimulatorBase_impl.hpp +++ b/opm/autodiff/SimulatorBase_impl.hpp @@ -92,7 +92,7 @@ namespace Opm std::unique_ptr< AdaptiveTimeStepping > adaptiveTimeStepping; if( param_.getDefault("timestep.adaptive", true ) ) { - adaptiveTimeStepping.reset( new AdaptiveTimeStepping( param_, solver_.parallelInformation() ) ); + adaptiveTimeStepping.reset( new AdaptiveTimeStepping( param_, solver_.parallelInformation(), terminal_output_ ) ); } // init output writer