OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 02:00:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename variable verbosity_ to terminal_output_.

Browse Source
This commit is contained in:
Markus Blatt 2015-02-20 16:02:06 +01:00
parent 62507b9cf6
commit bcc3ab7d95
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@ -197,7 +197,7 @@ namespace Opm {
LinearisedBlackoilResidual residual_;
/// \brief Wether we print something to std::cout
bool verbosity_;
bool terminal_output_;
std::vector<int> primalVariable_;

10
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -212,7 +212,7 @@ namespace detail {
, residual_ ( { std::vector<ADB>(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<const ParallelISTLInformation&>(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) {

10
opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp
View File

@ -112,7 +112,7 @@ namespace Opm
std::vector<int> allcells_;
const bool has_disgas_;
const bool has_vapoil_;
bool verbosity_;
bool terminal_output_;
// eclipse_state
std::shared_ptr<EclipseState> 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<int>(AutoDiffGrid::numCells(grid_), 0)),
@ -203,7 +203,7 @@ namespace Opm
const ParallelISTLInformation& info =
boost::any_cast<const ParallelISTLInformation&>(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;
}