diff --git a/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp b/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp index 75b1a84db9d803a7ad0261ecd25cb47df314322d..c8b821d09f192d93f0e181582a822962473082c6 100644 --- a/MathLib/LinAlg/PETSc/PETScLinearSolver.cpp +++ b/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(); diff --git a/MathLib/LinAlg/PETSc/PETScLinearSolver.h b/MathLib/LinAlg/PETSc/PETScLinearSolver.h index d67b26ea24835489d9658266d54d13dabe7e1d51..783c774cc4645c7680c2ded2978b550cf1947363 100644 --- a/MathLib/LinAlg/PETSc/PETScLinearSolver.h +++ b/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); } diff --git a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp index f578847886d9860d67a668de05ca341f486c6d3b..8c08439f28dd9a6673a87f2e0cfb793c6e8f769c 100644 --- a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp +++ b/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) diff --git a/NumLib/ODESolver/NonlinearSolver.cpp b/NumLib/ODESolver/NonlinearSolver.cpp index 05803638013ce1d3c2f468e5c7946fb9ad6d64f8..bf702cabc88e3cc3133e05a423647c17dac8b937 100644 --- a/NumLib/ODESolver/NonlinearSolver.cpp +++ b/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. } } diff --git a/ProcessLib/Output.cpp b/ProcessLib/Output.cpp index a9b1c05ad2db08f9291021f796d0e2f6a60b6d5a..ac4b0eebdda486a3653e210c2de934346bb5c15b 100644 --- a/ProcessLib/Output.cpp +++ b/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,