Skip to content
Permalink
Browse files

Merge pull request #12999 from permcody/ref_resid

Better formatting in ReferenceResidualProblem
  • Loading branch information...
lindsayad committed Mar 6, 2019
2 parents 1411bc3 + fd48384 commit 9a1294927fefd6cfa6b6c476fa1355049bb0451b
Showing with 5 additions and 5 deletions.
  1. +2 −2 framework/src/outputs/Console.C
  2. +3 −3 modules/contact/src/ReferenceResidualProblem.C
@@ -318,7 +318,7 @@ Console::output(const ExecFlagType & type)
if (_nonlinear_iter == 0)
_old_nonlinear_norm = std::numeric_limits<Real>::max();

_console << std::setw(2) << _nonlinear_iter
_console << std::right << std::setw(2) << _nonlinear_iter
<< " Nonlinear |R| = " << outputNorm(_old_nonlinear_norm, _norm) << '\n';

_old_nonlinear_norm = _norm;
@@ -330,7 +330,7 @@ Console::output(const ExecFlagType & type)
if (_linear_iter == 0)
_old_linear_norm = std::numeric_limits<Real>::max();

_console << std::setw(7) << _linear_iter
_console << std::right << std::setw(7) << _linear_iter
<< " Linear |R| = " << outputNorm(_old_linear_norm, _norm) << '\n';

_old_linear_norm = _norm;
@@ -349,7 +349,7 @@ ReferenceResidualProblem::checkNonlinearConvergence(std::string & msg,

if (_group_soln_var_names.size() > 0)
{
_console << "Solution, reference convergence variable norms:" << std::endl;
_console << " Solution, reference convergence variable norms:\n";
unsigned int maxwsv = 0;
unsigned int maxwrv = 0;
for (unsigned int i = 0; i < _group_soln_var_names.size(); ++i)
@@ -361,9 +361,9 @@ ReferenceResidualProblem::checkNonlinearConvergence(std::string & msg,
}

for (unsigned int i = 0; i < _group_soln_var_names.size(); ++i)
_console << std::setw(maxwsv + 2) << std::left << _group_soln_var_names[i] + ":"
_console << " " << std::setw(maxwsv + 2) << std::left << _group_soln_var_names[i] + ":"
<< _group_resid[i] << " " << std::setw(maxwrv + 2)
<< _group_ref_resid_var_names[i] + ":" << _group_ref_resid[i] << std::endl;
<< _group_ref_resid_var_names[i] + ":" << _group_ref_resid[i] << '\n';
}

NonlinearSystemBase & system = getNonlinearSystemBase();

0 comments on commit 9a12949

Please sign in to comment.
You can’t perform that action at this time.