Merge pull request #1623 from TomFischer/CleanupOutputMessages

Cleanup output messages

MathLib/LinAlg/PETSc/PETScLinearSolver.cpp

@@ -102,7 +102,7 @@ bool PETScLinearSolver::solve(PETScMatrix& A, PETScVector &b, PETScVector &x)
 
         PetscInt its;
         KSPGetIterationNumber(_solver, &its);
-        PetscPrintf(PETSC_COMM_WORLD,"\nConvergence in %d iterations.\n", its);
+        PetscPrintf(PETSC_COMM_WORLD,"\nconverged in %d iterations.", its);
         PetscPrintf(PETSC_COMM_WORLD,"\n================================================\n");
     }
     else if(reason == KSP_DIVERGED_ITS)
@@ -140,7 +140,7 @@ bool PETScLinearSolver::solve(PETScMatrix& A, PETScVector &b, PETScVector &x)
 
 #ifdef TEST_MEM_PETSC
     PetscMemoryGetCurrentUsage(&mem2);
-    PetscPrintf(PETSC_COMM_WORLD, "###Memory usage by solver. Before :%f After:%f Increase:%d\n", mem1, mem2, (int)(mem2 - mem1));
+    PetscPrintf(PETSC_COMM_WORLD, "###Memory usage by solver. Before: %f After: %f Increase: %d\n", mem1, mem2, (int)(mem2 - mem1));
 #endif
 
     _elapsed_ctime += wtimer.elapsed();

MathLib/LinAlg/PETSc/PETScLinearSolver.h

@@ -55,9 +55,6 @@ class PETScLinearSolver
 
         ~PETScLinearSolver()
         {
-            INFO("Time elapsed in PETSc ksp solver for equation: %g s.\n",
-                 _elapsed_ctime);
-
             KSPDestroy(&_solver);
         }
 

MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp

@@ -79,18 +79,18 @@ MeshLib::NodePartitionedMesh* NodePartitionedMeshReader::read(
 
     if(!BaseLib::IsFileExisting(fname_new)) // doesn't exist binary file.
     {
-        INFO("-->Reading ASCII mesh file ...");
+        INFO("Reading ASCII mesh file ...");
 
         mesh = readASCII(file_name_base);
     }
     else
     {
-        INFO("-->Reading binary mesh file ...");
+        INFO("Reading binary mesh file ...");
 
         mesh = readBinary(file_name_base);
     }
 
-    INFO("\t\n>>Total elapsed time in reading mesh:%f s\n", timer.elapsed());
+    INFO("[time] Reading the mesh took %f s.", timer.elapsed());
 
     MPI_Barrier(_mpi_comm);
 
@@ -353,8 +353,6 @@ MeshLib::NodePartitionedMesh* NodePartitionedMeshReader::readASCII(
     std::vector<unsigned long> glb_node_ids;
     std::vector<MeshLib::Element*> mesh_elems;
 
-    INFO("-->Reading partitioned mesh.");
-
     for(int i = 0; i < _mpi_comm_size; i++)
     {
         if(_mpi_rank == 0)

NumLib/ODESolver/NonlinearSolver.cpp

@@ -111,8 +111,7 @@ bool NonlinearSolver<NonlinearSolverTag::Picard>::solve(
                 case IterationResult::REPEAT_ITERATION:
                     INFO(
                         "Picard: The postIteration() hook decided that this "
-                        "iteration"
-                        " has to be repeated.");
+                        "iteration has to be repeated.");
                     continue;  // That throws the iteration result away.
             }
         }

ProcessLib/Output.cpp

@@ -122,7 +122,8 @@ void Output::doOutputAlways(Process const& process,
                     process.getSecondaryVariables(), process_output);
     spd.pvd_file.addVTUFile(output_file_name, t);
 
-    INFO("[time] Output took %g s.", time_output.elapsed());
+    INFO("[time] Output of timestep %d took %g s.", timestep,
+         time_output.elapsed());
 }
 
 void Output::doOutput(Process const& process,