From b2bded48c9255012caaa004fa81aec2cf65e4dc2 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 7 Aug 2020 09:18:26 +0200 Subject: [PATCH] STYLE: use Time::printExecutionTime() method - makes format of ExecutionTime = ... output configurable (#788) and reduces code clutter. STYLE: more consistent line-breaks after "End" tag --- .../solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C | 5 ++--- applications/solvers/combustion/chemFoam/chemFoam.C | 4 ++-- applications/solvers/combustion/fireFoam/fireFoam.C | 2 +- .../adjointOptimisationFoam/adjointOptimisationFoam.C | 3 ++- .../lagrangian/reactingParcelFoam/reactingParcelFoam.C | 2 +- .../lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C | 2 +- .../solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C | 5 ++--- .../reactingMultiphaseEulerFoam.C | 4 +--- applications/test/cyclic/Test-cyclic.C | 2 +- applications/test/delete/Test-delete.C | 2 +- applications/test/fvc/Test-fvc.C | 2 +- applications/test/fvc2D/Test-fvc2D.C | 2 +- applications/test/graph/Test-graph.C | 2 +- applications/test/graph/graphTest2.C | 2 +- applications/test/graphXi/Test-graphXi.C | 2 +- applications/utilities/mesh/conversion/datToFoam/datToFoam.C | 2 +- .../utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C | 2 +- .../lagrangian/steadyParticleTracks/steadyParticleTracks.C | 2 +- .../optimisation/computeSensitivities/computeSensitivities.C | 4 ++-- .../cumulativeDisplacement/cumulativeDisplacement.C | 2 +- applications/utilities/preProcessing/boxTurb/boxTurb.C | 2 +- 21 files changed, 26 insertions(+), 29 deletions(-) diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C index 6eacf64e08..603f21f214 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -144,9 +145,7 @@ int main(int argc, char *argv[]) runTime.write(); - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/combustion/chemFoam/chemFoam.C b/applications/solvers/combustion/chemFoam/chemFoam.C index 2e59f4889a..96b2aad2e9 100644 --- a/applications/solvers/combustion/chemFoam/chemFoam.C +++ b/applications/solvers/combustion/chemFoam/chemFoam.C @@ -93,8 +93,8 @@ int main(int argc, char *argv[]) runTime.printExecutionTime(Info); } - Info << "Number of steps = " << runTime.timeIndex() << endl; - Info << "End" << nl << endl; + Info<< "Number of steps = " << runTime.timeIndex() << nl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index 829322b267..eb0d669aa4 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/applications/solvers/combustion/fireFoam/fireFoam.C @@ -130,7 +130,7 @@ int main(int argc, char *argv[]) runTime.printExecutionTime(Info); } - Info<< "End" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/solvers/incompressible/adjointOptimisationFoam/adjointOptimisationFoam.C b/applications/solvers/incompressible/adjointOptimisationFoam/adjointOptimisationFoam.C index 3ba1833051..024a9a29ad 100644 --- a/applications/solvers/incompressible/adjointOptimisationFoam/adjointOptimisationFoam.C +++ b/applications/solvers/incompressible/adjointOptimisationFoam/adjointOptimisationFoam.C @@ -75,9 +75,10 @@ int main(int argc, char *argv[]) // Compute all sensitivities om.computeSensitivities(); } + Info<< "End\n" << endl; - return(0); + return 0; } diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index 9e912ce967..cdb809ae66 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) runTime.printExecutionTime(Info); } - Info<< "End" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C index 77ce0abeec..1dd66a18dd 100644 --- a/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) Info<< "End\n" << endl; - return(0); + return 0; } diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C index 3681d15bed..1b02eaa9ce 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -121,9 +122,7 @@ int main(int argc, char *argv[]) combustion->Qdot()().write(); } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/multiphase/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C index f80746acfb..74f0f85ff8 100644 --- a/applications/solvers/multiphase/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C @@ -130,9 +130,7 @@ int main(int argc, char *argv[]) runTime.write(); - Info<< "ExecutionTime = " - << runTime.elapsedCpuTime() - << " s\n\n" << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/test/cyclic/Test-cyclic.C b/applications/test/cyclic/Test-cyclic.C index 8af8d6b550..3c7daa7083 100644 --- a/applications/test/cyclic/Test-cyclic.C +++ b/applications/test/cyclic/Test-cyclic.C @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) Info<< fvc::div(U); - Info<< "End" << endl; + Info<< "End\n" << endl; } diff --git a/applications/test/delete/Test-delete.C b/applications/test/delete/Test-delete.C index 3e78341d4e..617a007b3f 100644 --- a/applications/test/delete/Test-delete.C +++ b/applications/test/delete/Test-delete.C @@ -56,7 +56,7 @@ int main() a = h + i + j; Info<< a << endl; - Info<< "End" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/fvc/Test-fvc.C b/applications/test/fvc/Test-fvc.C index 4e062bea80..14cac2e277 100644 --- a/applications/test/fvc/Test-fvc.C +++ b/applications/test/fvc/Test-fvc.C @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) Info<< (gradx4a - gradx4[i])/gradx4a << endl; } - Info<< "End" << endl; + Info<< "End\n" << endl; } diff --git a/applications/test/fvc2D/Test-fvc2D.C b/applications/test/fvc2D/Test-fvc2D.C index 828cdb536e..f4f00c7133 100644 --- a/applications/test/fvc2D/Test-fvc2D.C +++ b/applications/test/fvc2D/Test-fvc2D.C @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) mesh ); - Info<< "End" << endl; + Info<< "End\n" << endl; } diff --git a/applications/test/graph/Test-graph.C b/applications/test/graph/Test-graph.C index 38a1fda753..30739da80c 100644 --- a/applications/test/graph/Test-graph.C +++ b/applications/test/graph/Test-graph.C @@ -67,7 +67,7 @@ int main() ); phi.write("phi", "xmgr"); - Info<< "End" << endl; + Info<< "End\n" << endl; } diff --git a/applications/test/graph/graphTest2.C b/applications/test/graph/graphTest2.C index bd169fc44e..2e80e019b5 100644 --- a/applications/test/graph/graphTest2.C +++ b/applications/test/graph/graphTest2.C @@ -59,7 +59,7 @@ int main() "xmgr" ); - Info<< "End" << endl; + Info<< "End\n" << endl; } diff --git a/applications/test/graphXi/Test-graphXi.C b/applications/test/graphXi/Test-graphXi.C index b434a4a985..76b7d3d413 100644 --- a/applications/test/graphXi/Test-graphXi.C +++ b/applications/test/graphXi/Test-graphXi.C @@ -59,7 +59,7 @@ int main() graph("r", "x", "r", x, r).write("r", "xmgr"); - Info<< "End" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C index a25f1da9b3..0f7df2e8cf 100644 --- a/applications/utilities/mesh/conversion/datToFoam/datToFoam.C +++ b/applications/utilities/mesh/conversion/datToFoam/datToFoam.C @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) runTime.writeEndDivider(pFile); - Info<< "End" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C index cc48fc2531..5806a316f9 100644 --- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C +++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C @@ -146,7 +146,7 @@ int main(int argc, char *argv[]) refData.updateMesh(map); refData.write(); - Info<< "End" << nl << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C index 02e0b78e18..bc26c09774 100644 --- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C +++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C @@ -346,7 +346,7 @@ int main(int argc, char *argv[]) Info<< endl; } - Info<< "End" << nl << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/postProcessing/optimisation/computeSensitivities/computeSensitivities.C b/applications/utilities/postProcessing/optimisation/computeSensitivities/computeSensitivities.C index 9f955e30bc..b7ced6e309 100644 --- a/applications/utilities/postProcessing/optimisation/computeSensitivities/computeSensitivities.C +++ b/applications/utilities/postProcessing/optimisation/computeSensitivities/computeSensitivities.C @@ -66,9 +66,9 @@ int main(int argc, char *argv[]) runTime.printExecutionTime(Info); - Info<< "End" << endl; + Info<< "End\n" << endl; - return(0); + return 0; } diff --git a/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/cumulativeDisplacement.C b/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/cumulativeDisplacement.C index 86aacf01d8..f52862bad8 100644 --- a/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/cumulativeDisplacement.C +++ b/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/cumulativeDisplacement.C @@ -154,7 +154,7 @@ int main(int argc, char *argv[]) Info<< "End\n" << endl; - return(0); + return 0; } diff --git a/applications/utilities/preProcessing/boxTurb/boxTurb.C b/applications/utilities/preProcessing/boxTurb/boxTurb.C index 0c4b49d940..754e5039d0 100644 --- a/applications/utilities/preProcessing/boxTurb/boxTurb.C +++ b/applications/utilities/preProcessing/boxTurb/boxTurb.C @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) runTime.graphFormat() ); - Info<< "End" << nl << endl; + Info<< "End\n" << endl; return 0; }