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

Rename terminalOutput() -> terminalOutputEnabled().

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2015-05-21 09:12:08 +02:00
parent cf3719d707
commit 1e6ecb173f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilModel.hpp
View File

@ -167,7 +167,7 @@ namespace Opm {
WellStateFullyImplicitBlackoil& well_state); WellStateFullyImplicitBlackoil& well_state);
/// Return true if output to cout is wanted. /// Return true if output to cout is wanted.
bool terminalOutput() const; bool terminalOutputEnabled() const;
/// Compute convergence based on total mass balance (tol_mb) and maximum /// Compute convergence based on total mass balance (tol_mb) and maximum
/// residual mass balance (tol_cnv). /// residual mass balance (tol_cnv).

2
opm/autodiff/BlackoilModel_impl.hpp
View File

@ -278,7 +278,7 @@ namespace detail {
template <class Grid> template <class Grid>
bool bool
BlackoilModel<Grid>:: BlackoilModel<Grid>::
terminalOutput() const terminalOutputEnabled() const
{ {
return terminal_output_; return terminal_output_;
} }

4
opm/autodiff/NewtonSolver_impl.hpp
View File

@ -92,7 +92,7 @@ namespace Opm
if (isOscillate) { if (isOscillate) {
omega -= relaxIncrement(); omega -= relaxIncrement();
omega = std::max(omega, relaxMax()); omega = std::max(omega, relaxMax());
if (model_.terminalOutput()) { if (model_.terminalOutputEnabled()) {
std::cout << " Oscillating behavior detected: Relaxation set to " << omega << std::endl; std::cout << " Oscillating behavior detected: Relaxation set to " << omega << std::endl;
} }
} }
@ -113,7 +113,7 @@ namespace Opm
} }
if (!converged) { if (!converged) {
if (model_.terminalOutput()) { if (model_.terminalOutputEnabled()) {
std::cerr << "WARNING: Failed to compute converged solution in " << iteration << " iterations." << std::endl; std::cerr << "WARNING: Failed to compute converged solution in " << iteration << " iterations." << std::endl;
} }
return -1; // -1 indicates that the solver has to be restarted return -1; // -1 indicates that the solver has to be restarted