[cig-commits] [commit] master: New files instead of the old ones (4fc06d3)

[cig_noreply at geodynamics.org]

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

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

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

commit 4fc06d31510dcd9731d3b3dc193bfc0121c5d4cd
Author: MFraters <menno.fraters at hotmail.com>
Date:   Tue May 20 21:25:24 2014 +0200

    New files instead of the old ones


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

4fc06d31510dcd9731d3b3dc193bfc0121c5d4cd
 source/simulator/core.cc   | 7 ++++---
 source/simulator/solver.cc | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/simulator/core.cc b/source/simulator/core.cc
index b03bd94..b52b2e2 100644
--- a/source/simulator/core.cc
+++ b/source/simulator/core.cc
@@ -1389,7 +1389,6 @@ namespace aspect
                   (parameters.prescribed_velocity_boundary_indicators.size() > 0))
                 rebuild_stokes_matrix = rebuild_stokes_preconditioner = true;
 				
-				//pcout << i+1 << ": ";
               assemble_stokes_system();
               build_stokes_preconditioner();
               const double stokes_residual = solve_stokes();
@@ -1398,7 +1397,7 @@ namespace aspect
                 initial_stokes_residual = stokes_residual;
               else
                 {
-                  pcout << "      " << i+1 << " residual: " << stokes_residual/initial_stokes_residual << std::endl;
+                  pcout << "      " << 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.
@@ -1507,7 +1506,9 @@ namespace aspect
         if ((timestep_number == 0) &&
             (pre_refinement_step < parameters.initial_adaptive_refinement))
           {
+		  if(parameters.timing_output_frequency ==0){
 			computing_timer.print_summary ();
+			}
             output_statistics();
 
             if (parameters.run_postprocessors_on_initial_refinement)
@@ -1556,7 +1557,7 @@ namespace aspect
         if (((timestep_number > 0) && (parameters.timing_output_frequency != 0) &&
              (timestep_number % parameters.timing_output_frequency == 0))
             ||
-            (parameters.timing_output_frequency == 1))
+            (parameters.timing_output_frequency == 1)||(parameters.timing_output_frequency == 0))
           {
             computing_timer.print_summary ();
             output_statistics();
diff --git a/source/simulator/solver.cc b/source/simulator/solver.cc
index a97be0a..1023e42 100644
--- a/source/simulator/solver.cc
+++ b/source/simulator/solver.cc
@@ -537,7 +537,7 @@ namespace aspect
       pcout << solver_control_cheap.last_step() << '+'
             << solver_control_expensive.last_step() << " iterations.";
 	//time_t timediff = ; 
-	pcout << " Time: " << std::time(NULL)-starttime << "s."; // calculate and output the time it took to solve the stokes of this the nonlinear itteration
+	pcout << " Solve time: " << std::time(NULL)-starttime << " seconds."; // calculate and output the time it took to solve the stokes of this the nonlinear itteration
     pcout << std::endl;
 
     statistics.add_value("Iterations for Stokes solver",