[cig-commits] [commit] master: Put more descriptive output with the nonlinear itteration counter and removed braces (92afefd)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed May 21 08:55:16 PDT 2014


Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/dda1edd743a39bfe5b21db0f612927a420cf25c5...450a04072c3e64be3c5b43c961481ad07c80df06

>---------------------------------------------------------------

commit 92afefdbe9d4ba50ea62ae2be6375b5ea0f737fa
Author: MFraters <menno.fraters at hotmail.com>
Date:   Tue May 20 23:17:51 2014 +0200

    Put more descriptive output with the nonlinear itteration counter and removed braces


>---------------------------------------------------------------

92afefdbe9d4ba50ea62ae2be6375b5ea0f737fa
 source/simulator/core.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/simulator/core.cc b/source/simulator/core.cc
index b52b2e2..5fbf53a 100644
--- a/source/simulator/core.cc
+++ b/source/simulator/core.cc
@@ -1397,7 +1397,7 @@ namespace aspect
                 initial_stokes_residual = stokes_residual;
               else
                 {
-                  pcout << "      " << i+1 << ": residual: " << stokes_residual/initial_stokes_residual << std::endl;
+                  pcout << "Nonlinear iteration " << i+1 << "; residual: " << stokes_residual/initial_stokes_residual << std::endl;
                   if (stokes_residual/initial_stokes_residual < parameters.nonlinear_tolerance)
                     {
                       break; // convergence reached, exist nonlinear iteration.
@@ -1506,9 +1506,9 @@ namespace aspect
         if ((timestep_number == 0) &&
             (pre_refinement_step < parameters.initial_adaptive_refinement))
           {
-		  if(parameters.timing_output_frequency ==0){
+		  if(parameters.timing_output_frequency ==0)
 			computing_timer.print_summary ();
-			}
+			
             output_statistics();
 
             if (parameters.run_postprocessors_on_initial_refinement)



More information about the CIG-COMMITS mailing list