diff --git a/opm/autodiff/FullyImplicitBlackoilSolver.hpp b/opm/autodiff/FullyImplicitBlackoilSolver.hpp index e7e7d43b2..9cb118ea4 100644 --- a/opm/autodiff/FullyImplicitBlackoilSolver.hpp +++ b/opm/autodiff/FullyImplicitBlackoilSolver.hpp @@ -197,7 +197,7 @@ namespace Opm { LinearisedBlackoilResidual residual_; /// \brief Wether we print something to std::cout - bool verbosity_; + bool terminal_output_; std::vector primalVariable_; diff --git a/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp b/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp index b161e9449..f1907659b 100644 --- a/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp +++ b/opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp @@ -212,7 +212,7 @@ namespace detail { , residual_ ( { std::vector(fluid.numPhases(), ADB::null()), ADB::null(), ADB::null() } ) - , verbosity_ (true) + , terminal_output_ (true) { #if HAVE_MPI if(linsolver_.parallelInformation().type()==typeid(ParallelISTLInformation)) @@ -220,7 +220,7 @@ namespace detail { const ParallelISTLInformation& info = boost::any_cast(linsolver_.parallelInformation()); // Only rank 0 does print to std::cout - verbosity_= (info.communicator().rank()==0); + terminal_output_ = (info.communicator().rank()==0); } #endif } @@ -299,7 +299,7 @@ namespace detail { if (isOscillate) { omega -= relaxIncrement(); omega = std::max(omega, relaxMax()); - if (verbosity_) + if (terminal_output_) { std::cout << " Oscillating behavior detected: Relaxation set to " << omega << std::endl; } @@ -1126,7 +1126,7 @@ namespace detail { } if (ctrl_index != nwc) { // Constraint number ctrl_index was broken, switch to it. - if (verbosity_) + if (terminal_output_) { std::cout << "Switching control mode for well " << wells().name[w] << " from " << modestring[well_controls_iget_type(wc, current)] @@ -2009,7 +2009,7 @@ namespace detail { OPM_THROW(Opm::NumericalProblem,"One of the residuals is NaN or to large!"); } - if ( verbosity_ ) + if ( terminal_output_ ) { // Only rank 0 does print to std::cout if (iteration == 0) { diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp index b097160bf..1e5f71e39 100644 --- a/opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp +++ b/opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp @@ -112,7 +112,7 @@ namespace Opm std::vector allcells_; const bool has_disgas_; const bool has_vapoil_; - bool verbosity_; + bool terminal_output_; // eclipse_state std::shared_ptr eclipse_state_; // output_writer @@ -185,7 +185,7 @@ namespace Opm solver_(linsolver), has_disgas_(has_disgas), has_vapoil_(has_vapoil), - verbosity_(true), + terminal_output_(true), eclipse_state_(eclipse_state), output_writer_(output_writer), rateConverter_(props_, std::vector(AutoDiffGrid::numCells(grid_), 0)), @@ -203,7 +203,7 @@ namespace Opm const ParallelISTLInformation& info = boost::any_cast(solver_.parallelInformation()); // Only rank 0 does print to std::cout - verbosity_= (info.communicator().rank()==0); + terminal_output_= (info.communicator().rank()==0); } #endif } @@ -250,7 +250,7 @@ namespace Opm while (!timer.done()) { // Report timestep. step_timer.start(); - if ( verbosity_ ) + if ( terminal_output_ ) { timer.report(std::cout); } @@ -307,7 +307,7 @@ namespace Opm // Report timing. const double st = solver_timer.secsSinceStart(); - if ( verbosity_ ) + if ( terminal_output_ ) { std::cout << "Fully implicit solver took: " << st << " seconds." << std::endl; }