From dd8341f659ef1bc4d2ec45fc7d0ed2e7fb0a6d38 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 27 Apr 2018 15:00:34 +0200 Subject: [PATCH] ENH: make format of ExecutionTime = ... output configurable (issue #788) - controlled by the the 'printExecutionFormat' InfoSwitch in etc/controlDict // Style for "ExecutionTime = " output // - 0 = seconds (with trailing 's') // - 1 = day-hh:mm:ss ExecutionTime = 112135.2 s ClockTime = 113017 s ExecutionTime = 1-07:08:55.20 ClockTime = 1-07:23:37 - Callable via the new Time::printExecutionTime() method, which also helps to reduce clutter in the applications. Eg, runTime.printExecutionTime(Info); vs Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; -- ENH: return elapsedClockTime() and clockTimeIncrement as double - previously returned as time_t, which is less portable. --- applications/solvers/DNS/dnsFoam/dnsFoam.C | 4 +- .../basic/laplacianFoam/laplacianFoam.C | 4 +- .../overLaplacianDyMFoam/laplacianDyMFoam.C | 4 +- .../overPotentialFoam/potentialFoam.C | 4 +- .../basic/potentialFoam/potentialFoam.C | 4 +- .../solvers/combustion/PDRFoam/PDRFoam.C | 4 +- .../combustion/PDRFoam/PDRFoamAutoRefine.C | 4 +- .../combustion/XiFoam/XiDyMFoam/XiDyMFoam.C | 4 +- .../solvers/combustion/XiFoam/XiFoam.C | 4 +- .../solvers/combustion/chemFoam/chemFoam.C | 4 +- .../coldEngineFoam/coldEngineFoam.C | 4 +- .../combustion/engineFoam/engineFoam.C | 4 +- .../solvers/combustion/fireFoam/fireFoam.C | 4 +- .../combustion/reactingFoam/reactingFoam.C | 4 +- .../rhoReactingBuoyantFoam.C | 4 +- .../rhoReactingFoam/rhoReactingFoam.C | 4 +- .../rhoCentralDyMFoam/rhoCentralDyMFoam.C | 4 +- .../rhoCentralFoam/rhoCentralFoam.C | 4 +- .../rhoPimpleAdiabaticFoam.C | 4 +- .../overRhoPimpleDyMFoam/rhoPimpleDyMFoam.C | 4 +- .../rhoPimpleDyMFoam/rhoPimpleDyMFoam.C | 4 +- .../rhoPimpleFoam/rhoPimpleFoam.C | 4 +- .../overRhoSimpleFoam/rhoSimpleFoam.C | 4 +- .../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 5 +- .../rhoSimpleFoam/rhoSimpleFoam.C | 4 +- .../sonicFoam/sonicDyMFoam/sonicDyMFoam.C | 4 +- .../compressible/sonicFoam/sonicFoam.C | 4 +- .../sonicLiquidFoam/sonicLiquidFoam.C | 4 +- .../discreteMethods/dsmc/dsmcFoam/dsmcFoam.C | 5 +- .../mdEquilibrationFoam/mdEquilibrationFoam.C | 4 +- .../molecularDynamics/mdFoam/mdFoam.C | 4 +- .../electrostaticFoam/electrostaticFoam.C | 4 +- .../financial/financialFoam/financialFoam.C | 4 +- .../liquidFilmFoam/liquidFilmFoam.C | 4 +- .../sphereSurfactantFoam/surfactantFoam.C | 4 +- .../surfactantFoam/surfactantFoam.C | 4 +- .../buoyantBoussinesqPimpleFoam.C | 4 +- .../buoyantBoussinesqSimpleFoam.C | 4 +- .../buoyantPimpleFoam/buoyantPimpleFoam.C | 4 +- .../buoyantSimpleFoam/buoyantSimpleFoam.C | 4 +- .../chtMultiRegionFoam/chtMultiRegionFoam.C | 4 +- .../chtMultiRegionSimpleFoam.C | 4 +- .../heatTransfer/thermoFoam/thermoFoam.C | 12 +-- .../adjointShapeOptimizationFoam.C | 4 +- .../boundaryFoam/boundaryFoam.C | 4 +- .../solvers/incompressible/icoFoam/icoFoam.C | 4 +- .../nonNewtonianIcoFoam/nonNewtonianIcoFoam.C | 4 +- .../pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C | 4 +- .../overPimpleDyMFoam/pimpleDyMFoam.C | 4 +- .../pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C | 4 +- .../incompressible/pimpleFoam/pimpleFoam.C | 4 +- .../incompressible/pisoFoam/pisoFoam.C | 4 +- .../shallowWaterFoam/shallowWaterFoam.C | 4 +- .../simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C | 4 +- .../simpleFoam/overSimpleFoam/simpleFoam.C | 4 +- .../porousSimpleFoam/porousSimpleFoam.C | 4 +- .../incompressible/simpleFoam/simpleFoam.C | 4 +- .../DPMFoam/DPMDyMFoam/DPMDyMFoam.C | 4 +- .../solvers/lagrangian/DPMFoam/DPMFoam.C | 4 +- .../coalChemistryFoam/coalChemistryFoam.C | 4 +- .../icoUncoupledKinematicParcelDyMFoam.C | 4 +- .../icoUncoupledKinematicParcelFoam.C | 4 +- .../reactingParcelFoam/reactingParcelFoam.C | 4 +- .../simpleReactingParcelFoam.C | 4 +- .../simpleCoalParcelFoam.C | 4 +- .../sprayFoam/sprayDyMFoam/sprayDyMFoam.C | 4 +- .../sprayEngineFoam/sprayEngineFoam.C | 4 +- .../solvers/lagrangian/sprayFoam/sprayFoam.C | 4 +- .../uncoupledKinematicParcelDyMFoam.C | 4 +- .../uncoupledKinematicParcelFoam.C | 4 +- .../MPPICInterFoam/MPPICInterFoam.C | 4 +- .../cavitatingDyMFoam/cavitatingDyMFoam.C | 4 +- .../cavitatingFoam/cavitatingFoam.C | 4 +- .../compressibleInterDyMFoam.C | 4 +- .../compressibleInterFilmFoam.C | 4 +- .../compressibleInterFoam.C | 4 +- .../compressibleMultiphaseInterFoam.C | 4 +- .../multiphase/driftFluxFoam/driftFluxFoam.C | 4 +- .../interCondensatingEvaporatingFoam.C | 4 +- .../interFoam/interDyMFoam/interDyMFoam.C | 4 +- .../solvers/multiphase/interFoam/interFoam.C | 4 +- .../interMixingFoam/interMixingFoam.C | 4 +- .../interFoam/overInterDyMFoam/interDyMFoam.C | 4 +- .../multiphase/interIsoFoam/interIsoFoam.C | 4 +- .../interPhaseChangeDyMFoam.C | 4 +- .../interPhaseChangeFoam.C | 4 +- .../multiphaseEulerFoam/multiphaseEulerFoam.C | 4 +- .../multiphaseInterDyMFoam.C | 4 +- .../multiphaseInterFoam/multiphaseInterFoam.C | 4 +- .../potentialFreeSurfaceDyMFoam.C | 4 +- .../potentialFreeSurfaceFoam.C | 4 +- .../reactingMultiphaseEulerFoam.C | 4 +- .../reactingTwoPhaseEulerFoam.C | 4 +- .../twoLiquidMixingFoam/twoLiquidMixingFoam.C | 4 +- .../twoPhaseEulerFoam/twoPhaseEulerFoam.C | 4 +- .../solidDisplacementFoam.C | 4 +- .../solidEquilibriumDisplacementFoam.C | 4 +- applications/test/POSIX/Test-POSIX.C | 2 + .../test/fieldMapping/Test-fieldMapping.C | 5 +- applications/test/hexRef8/Test-hexRef8.C | 5 +- .../test/parallelOverset/laplacianDyMFoam.C | 18 ++--- .../passiveParticle/Test-passiveParticle.C | 10 +-- .../advanced/collapseEdges/collapseEdges.C | 5 +- .../cellSizeAndAlignmentGrid.C | 5 +- .../foamyMesh/foamyHexMesh/foamyHexMesh.C | 7 +- .../moveDynamicMesh/moveDynamicMesh.C | 4 +- .../moveEngineMesh/moveEngineMesh.C | 4 +- .../mesh/manipulation/moveMesh/moveMesh.C | 4 +- .../applyBoundaryLayer/applyBoundaryLayer.C | 5 +- .../dsmcInitialise/dsmcInitialise.C | 4 +- .../preProcessing/mdInitialise/mdInitialise.C | 4 +- .../surfaceFeatureExtract.C | 4 +- .../surface/surfaceInflate/surfaceInflate.C | 6 +- etc/codeTemplates/app/app.C | 5 +- etc/controlDict | 5 ++ src/OSspecific/POSIX/clockValue/clockValue.C | 50 +++++++++++- src/OSspecific/POSIX/clockValue/clockValue.H | 6 +- src/OSspecific/POSIX/cpuTime/cpuTime.H | 1 + src/OpenFOAM/db/Time/Time.C | 16 +++- src/OpenFOAM/db/Time/Time.H | 18 ++++- src/OpenFOAM/db/Time/TimeIO.C | 79 ++++++++++++++++++- .../functionObjects/timeControl/timeControl.C | 2 +- src/OpenFOAM/global/clock/clock.C | 16 ++-- src/OpenFOAM/global/clock/clock.H | 6 +- .../validation/WatersKing/WatersKing.C | 5 +- 125 files changed, 311 insertions(+), 388 deletions(-) diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C index a38a001258..87720db898 100644 --- a/applications/solvers/DNS/dnsFoam/dnsFoam.C +++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C @@ -126,9 +126,7 @@ int main(int argc, char *argv[]) ); } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C index c22c11608e..06148020d1 100644 --- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C +++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C @@ -93,9 +93,7 @@ int main(int argc, char *argv[]) #include "write.H" - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/laplacianDyMFoam.C b/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/laplacianDyMFoam.C index 7bcd6b6cb6..bc626b3747 100644 --- a/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/laplacianDyMFoam.C +++ b/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/laplacianDyMFoam.C @@ -96,9 +96,7 @@ int main(int argc, char *argv[]) #include "write.H" - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/overPotentialFoam/potentialFoam.C index d63f664a5c..3259c951da 100644 --- a/applications/solvers/basic/potentialFoam/overPotentialFoam/potentialFoam.C +++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/potentialFoam.C @@ -247,9 +247,7 @@ int main(int argc, char *argv[]) runTime.functionObjects().end(); - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); Info<< "End\n" << endl; diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C index b0e2b93538..3c0408717e 100644 --- a/applications/solvers/basic/potentialFoam/potentialFoam.C +++ b/applications/solvers/basic/potentialFoam/potentialFoam.C @@ -235,9 +235,7 @@ int main(int argc, char *argv[]) runTime.functionObjects().end(); - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); Info<< "End\n" << endl; diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C index 9d873681fe..5f4cac3e6e 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoam.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C @@ -150,9 +150,7 @@ int main(int argc, char *argv[]) runTime.write(); - Info<< "\nExecutionTime = " - << runTime.elapsedCpuTime() - << " s\n" << endl; + runTime.printExecutionTime(Info); } Info<< "\n end\n"; diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C index 6f41ca13c7..60618232e0 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C @@ -198,9 +198,7 @@ int main(int argc, char *argv[]) runTime.write(); - Info<< "\nExecutionTime = " - << runTime.elapsedCpuTime() - << " s\n" << endl; + runTime.printExecutionTime(Info); } Info<< "\n end\n"; diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C b/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C index 07b52d60d9..22ee548456 100644 --- a/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C +++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C @@ -170,9 +170,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/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index 4c23928970..b4a19af179 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/applications/solvers/combustion/XiFoam/XiFoam.C @@ -128,9 +128,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 79037aae50..2a52eca117 100644 --- a/applications/solvers/combustion/chemFoam/chemFoam.C +++ b/applications/solvers/combustion/chemFoam/chemFoam.C @@ -82,9 +82,7 @@ int main(int argc, char *argv[]) #include "output.H" - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info << "Number of steps = " << runTime.timeIndex() << endl; diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C index 9d42388cba..7c442bafcb 100644 --- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C +++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C @@ -106,9 +106,7 @@ int main(int argc, char *argv[]) #include "logSummary.H" - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C index 19ad61e610..a1f29f3e1f 100644 --- a/applications/solvers/combustion/engineFoam/engineFoam.C +++ b/applications/solvers/combustion/engineFoam/engineFoam.C @@ -140,9 +140,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/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index cc7f5d879e..6b068cc302 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/applications/solvers/combustion/fireFoam/fireFoam.C @@ -118,9 +118,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" << endl; diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index d3e1b19ad3..e2e8291661 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -119,9 +119,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/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C index ae94c219a1..f3b0b6d326 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C @@ -113,9 +113,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/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C index 5be897c6c7..195b80735e 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C @@ -121,9 +121,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/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C index 47047c702f..35469637d1 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C @@ -266,9 +266,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/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C index cd6fb827dd..6ec612d820 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C @@ -254,9 +254,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/compressible/rhoPimpleAdiabaticFoam/rhoPimpleAdiabaticFoam.C b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/rhoPimpleAdiabaticFoam.C index c122090869..c1b574a2c9 100644 --- a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/rhoPimpleAdiabaticFoam.C +++ b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/rhoPimpleAdiabaticFoam.C @@ -115,9 +115,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/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/rhoPimpleDyMFoam.C index 67c12334cd..4260feb58c 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/rhoPimpleDyMFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/rhoPimpleDyMFoam.C @@ -157,9 +157,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/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C index 493b35f692..dcd73ffc68 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C @@ -152,9 +152,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/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index 5d5ed3f5f4..120b81f0f7 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -126,9 +126,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/compressible/rhoSimpleFoam/overRhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/rhoSimpleFoam.C index d2aced6375..d72329b0f9 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/rhoSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/rhoSimpleFoam.C @@ -78,9 +78,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/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C index 548a7dd130..967e754035 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C @@ -76,9 +76,8 @@ int main(int argc, char *argv[]) turbulence->correct(); 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/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C index 9cae9c3e28..89fa908d82 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C @@ -81,9 +81,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/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C index 31b0a6e614..60dd32589c 100644 --- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C @@ -134,9 +134,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/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C index c2da0f2255..90037c2c56 100644 --- a/applications/solvers/compressible/sonicFoam/sonicFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C @@ -90,9 +90,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/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C index e96992a64a..619b704c31 100644 --- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C @@ -121,9 +121,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/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C b/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C index 9ae2e4efd7..725c36f123 100644 --- a/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C +++ b/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C @@ -62,9 +62,8 @@ int main(int argc, char *argv[]) runTime.write(); - Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + Info<< nl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C index 3fcce4e0e2..3302b6d073 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C +++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C @@ -90,9 +90,7 @@ int main(int argc, char *argv[]) nAveragingSteps = 0; } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C index ca8709904b..a9bbd6d32f 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C +++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C @@ -72,9 +72,7 @@ int main(int argc, char *argv[]) nAveragingSteps = 0; } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C index 5c4a248df0..6ecf1c804b 100644 --- a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C +++ b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C @@ -66,9 +66,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/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C index 47b28a4184..5af2290011 100644 --- a/applications/solvers/financial/financialFoam/financialFoam.C +++ b/applications/solvers/financial/financialFoam/financialFoam.C @@ -80,9 +80,7 @@ int main(int argc, char *argv[]) writeCellGraph(delta, runTime.graphFormat()); } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C b/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C index 1f1f8e389d..31d049d2cb 100644 --- a/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C +++ b/applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C @@ -146,9 +146,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/finiteArea/sphereSurfactantFoam/surfactantFoam.C b/applications/solvers/finiteArea/sphereSurfactantFoam/surfactantFoam.C index 893d46284d..daee7e9e59 100644 --- a/applications/solvers/finiteArea/sphereSurfactantFoam/surfactantFoam.C +++ b/applications/solvers/finiteArea/sphereSurfactantFoam/surfactantFoam.C @@ -77,9 +77,7 @@ int main(int argc, char *argv[]) Info<< "Total mass of surfactant: " << sum(Cs.internalField()*aMesh.S()) << endl; - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/finiteArea/surfactantFoam/surfactantFoam.C b/applications/solvers/finiteArea/surfactantFoam/surfactantFoam.C index 630ca8e668..4a0d63a89c 100644 --- a/applications/solvers/finiteArea/surfactantFoam/surfactantFoam.C +++ b/applications/solvers/finiteArea/surfactantFoam/surfactantFoam.C @@ -100,9 +100,7 @@ int main(int argc, char *argv[]) Info<< "Total mass of surfactant: " << sum(Cs.internalField()*aMesh.S()) << endl; - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C index e69f06819f..2a453d933b 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C @@ -109,9 +109,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/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C index 0cca77af0b..604484d6ea 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C @@ -91,9 +91,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/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index 3f032deb98..a3bbf07b19 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C @@ -101,9 +101,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/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C index 42d9c2780c..ba03a2674d 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C @@ -76,9 +76,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/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index 80e7e78fbb..ab34e7873e 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -146,9 +146,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/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C index 20aa2d59cd..12c7ac5514 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C @@ -111,9 +111,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/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C index ea5012e72e..285f536af8 100644 --- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C +++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C @@ -71,11 +71,9 @@ int main(int argc, char *argv[]) #include "EEqn.H" } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - runTime.write(); + + runTime.printExecutionTime(Info); } } else @@ -93,11 +91,9 @@ int main(int argc, char *argv[]) #include "EEqn.H" } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - runTime.write(); + + runTime.printExecutionTime(Info); } } diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C index 7296a8cb37..0b36208ba9 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C @@ -236,9 +236,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/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C index b3cef57dce..7ed87e218e 100644 --- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C +++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C @@ -106,9 +106,7 @@ int main(int argc, char *argv[]) #include "makeGraphs.H" } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C index dc3644fb9f..90057926b1 100644 --- a/applications/solvers/incompressible/icoFoam/icoFoam.C +++ b/applications/solvers/incompressible/icoFoam/icoFoam.C @@ -145,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/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C index f380d435a1..713906aaf3 100644 --- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C +++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C @@ -121,9 +121,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/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C index bd4bcaf2b4..99af095921 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C @@ -96,9 +96,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/incompressible/pimpleFoam/overPimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/pimpleDyMFoam.C index fe477e99bc..b41b2ece31 100644 --- a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/pimpleDyMFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/pimpleDyMFoam.C @@ -132,9 +132,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/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C index 3c0f7b99e2..47a3bd4ce2 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C @@ -114,9 +114,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/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C index 16b91c9074..46e18dcfee 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C @@ -124,9 +124,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/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C index 229d948783..ebe88caafc 100644 --- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C +++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C @@ -113,9 +113,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/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C index 76f6f0e0a4..c069cb0d03 100644 --- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C +++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C @@ -152,9 +152,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/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C index 849c8a20f0..7d6e15007a 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C @@ -77,9 +77,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/incompressible/simpleFoam/overSimpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/simpleFoam.C index 4a7cf1315b..1207488540 100644 --- a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/simpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/simpleFoam.C @@ -111,9 +111,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/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C index d97ff4cda3..2e0f67a53f 100644 --- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C @@ -78,9 +78,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/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C index e841f0bc6f..caaf58c3b8 100644 --- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C @@ -102,9 +102,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/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C index a282ef19a9..6f90b9c119 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C @@ -147,9 +147,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/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C index 174e165f49..aa1e808be3 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C @@ -127,9 +127,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/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index c7ea95929c..269997ed79 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -124,9 +124,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/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C index 00c66823ea..418935b5c7 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C @@ -84,9 +84,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/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C index 6b64ce99f3..b3d0fa2471 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C @@ -77,9 +77,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/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index 497aa835a5..57a285028b 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -126,9 +126,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" << endl; diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C index a5092143a9..f9ba557872 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C @@ -79,9 +79,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/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C index 12ac28ccdf..e15156250e 100644 --- a/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C @@ -83,9 +83,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/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C index 40acccae9e..710ce766eb 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C @@ -144,9 +144,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/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C index 21646fed97..2aff98b498 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C @@ -116,9 +116,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/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C index a4eaaeaad5..96dd72220f 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C @@ -116,9 +116,7 @@ int main(int argc, char *argv[]) } } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/uncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/uncoupledKinematicParcelDyMFoam.C index 18f8e63869..81b323c5d3 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/uncoupledKinematicParcelDyMFoam.C +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/uncoupledKinematicParcelDyMFoam.C @@ -76,9 +76,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/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C index 006c98b7a8..987033f4d5 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C @@ -72,9 +72,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/multiphase/MPPICInterFoam/MPPICInterFoam.C b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C index d6fce4ef55..6e6c8c0bf2 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C +++ b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C @@ -163,9 +163,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/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C index 33ae61499b..4ff3adb3c0 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C @@ -115,9 +115,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/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C index bf4a49abc6..2c59f602d8 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C @@ -92,9 +92,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/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C index 0366272631..7828936239 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C @@ -173,9 +173,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/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C index bc30ed8f60..598a0aec5d 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C @@ -134,9 +134,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/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C index e0e3c4459c..1ed92af190 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C @@ -128,9 +128,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/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C index 18b1345fd5..7b2365b728 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C @@ -102,9 +102,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/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C index d8b3c48e79..10b05e9e81 100644 --- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C +++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C @@ -111,9 +111,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/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C index 566f074b58..3d0635a903 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C @@ -130,9 +130,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/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C index 615671b1a8..956743a4cc 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C @@ -182,9 +182,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/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index 356d795e15..240c70581f 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -131,9 +131,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/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index a2b92de3f9..d2c03d8897 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -118,9 +118,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/multiphase/interFoam/overInterDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/overInterDyMFoam/interDyMFoam.C index c60310034e..4ce1875bee 100644 --- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/interDyMFoam.C @@ -196,9 +196,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/multiphase/interIsoFoam/interIsoFoam.C b/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C index 14242048fc..0405546bc6 100644 --- a/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C +++ b/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C @@ -129,9 +129,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/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C index 8465100138..268fa2cce5 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C @@ -182,9 +182,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/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index 2998d3a78c..7a710fdb8a 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C @@ -122,9 +122,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/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C index 0c0686603f..debca9adec 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C @@ -110,9 +110,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/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C index 3b47907a2b..5a39281a84 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C @@ -156,9 +156,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/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C index 5a2e749f5e..8f4a59cf78 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C @@ -101,9 +101,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/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C index 1435d6b362..18f511c5d8 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C @@ -148,9 +148,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/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C index 61918df33a..5fe31eab7b 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C @@ -94,9 +94,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/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C index 87b8449cb4..43a1f28c93 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C @@ -135,9 +135,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/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C index edcd357e0e..fc068ac812 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C @@ -169,9 +169,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/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C index 0f1a8491b7..e993679c34 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C @@ -98,9 +98,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/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C index 6f46e2b044..0b99456e5c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C @@ -117,9 +117,7 @@ int main(int argc, char *argv[]) #include "write.H" - Info<< "ExecutionTime = " - << runTime.elapsedCpuTime() - << " s\n\n" << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C index ef4d27539a..d02e420ecb 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C @@ -125,9 +125,7 @@ int main(int argc, char *argv[]) #include "calculateStress.H" - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C index b5bfaeda4d..ce297ac89e 100644 --- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C +++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C @@ -85,9 +85,7 @@ int main(int argc, char *argv[]) #include "calculateStress.H" #include "kineticEnergyLimiter.H" - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/test/POSIX/Test-POSIX.C b/applications/test/POSIX/Test-POSIX.C index 3f9f05c7db..e38899ec92 100644 --- a/applications/test/POSIX/Test-POSIX.C +++ b/applications/test/POSIX/Test-POSIX.C @@ -48,6 +48,7 @@ int main(int argc, char *argv[]) << "clock: iso " << clock::dateTime() << nl; } + Info<< "since epoch = " << clockValue::now().str() << nl; { clockValue a; @@ -67,6 +68,7 @@ int main(int argc, char *argv[]) Info<< "elapsed = " << a.elapsed() << nl; Info<< "elapsed = " << a.elapsed().seconds() << nl; + Info<< "elapsed = " << a.elapsed().str() << nl; clockValue b = clockValue::now(); diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C index 0ca3052e4c..d714616623 100644 --- a/applications/test/fieldMapping/Test-fieldMapping.C +++ b/applications/test/fieldMapping/Test-fieldMapping.C @@ -323,10 +323,7 @@ int main(int argc, char *argv[]) } } - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "End\n" << endl; diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C index d34ff23c42..0b606525d1 100644 --- a/applications/test/hexRef8/Test-hexRef8.C +++ b/applications/test/hexRef8/Test-hexRef8.C @@ -405,10 +405,7 @@ int main(int argc, char *argv[]) } } - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } Info<< "pc:" << pc.patchPatchPointConstraintPoints().size() << endl; diff --git a/applications/test/parallelOverset/laplacianDyMFoam.C b/applications/test/parallelOverset/laplacianDyMFoam.C index ea06cd7d3a..88b20fa338 100644 --- a/applications/test/parallelOverset/laplacianDyMFoam.C +++ b/applications/test/parallelOverset/laplacianDyMFoam.C @@ -77,17 +77,13 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; - Info<< "Reading : ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + Info<< "Reading : "; + runTime.printExecutionTime(Info); mesh.update(); - Info<< "Overset calculation : ExecutionTime = " - << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - + Info<< "Overset calculation : "; + runTime.printExecutionTime(Info); if (false) { @@ -110,11 +106,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/test/passiveParticle/Test-passiveParticle.C b/applications/test/passiveParticle/Test-passiveParticle.C index f72f2d3ade..23680dc5dc 100644 --- a/applications/test/passiveParticle/Test-passiveParticle.C +++ b/applications/test/passiveParticle/Test-passiveParticle.C @@ -65,9 +65,7 @@ int main(int argc, char *argv[]) << endl; } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); runTime++; Pout<< "Writing particles to time " << runTime.timeName() << endl; @@ -89,11 +87,7 @@ int main(int argc, char *argv[]) } } - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - + runTime.printExecutionTime(Info); Info<< "End\n" << endl; diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C index f4d889d28a..f1fcb114b2 100644 --- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C +++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C @@ -254,9 +254,8 @@ int main(int argc, char *argv[]) pointPriority.write(); } - Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + Info<< nl; + runTime.printExecutionTime(Info); Info<< "End\n" << endl; diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C index a763b1b613..ea83b2b210 100644 --- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C +++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C @@ -701,9 +701,8 @@ int main(int argc, char *argv[]) sizesIO.write(); alignmentsIO.write(); - Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + Info<< nl; + runTime.printExecutionTime(Info); Info<< "\nEnd\n" << endl; diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C index 3c20f17a84..d8a757c8eb 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C @@ -144,14 +144,11 @@ int main(int argc, char *argv[]) mesh.move(); - Info<< nl - << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + Info<< nl; + runTime.printExecutionTime(Info); } } - Info<< "\nEnd\n" << endl; return 0; diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C index 6b51443bea..09e8f35868 100644 --- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C +++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C @@ -207,9 +207,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/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C index 9757be6655..a9c3181d59 100644 --- a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C +++ b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C @@ -57,9 +57,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/utilities/mesh/manipulation/moveMesh/moveMesh.C b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C index 0f4049ad7c..3c51933dbd 100644 --- a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C +++ b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C @@ -58,9 +58,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/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C index 4f63381fbe..6360dcef27 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C +++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C @@ -374,9 +374,8 @@ int main(int argc, char *argv[]) Info<< "Writing U\n" << endl; U.write(); - Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + Info<< nl; + runTime.printExecutionTime(Info); Info<< "End\n" << endl; diff --git a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C index f2a2574e9d..183fa0f325 100644 --- a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C +++ b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C @@ -81,8 +81,8 @@ int main(int argc, char *argv[]) << nl << exit(FatalError); } - Info<< nl << "ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + Info<< nl; + runTime.printExecutionTime(Info); Info<< "End\n" << endl; diff --git a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C index a3127cdc1f..34aa3aaecc 100644 --- a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C +++ b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C @@ -91,8 +91,8 @@ int main(int argc, char *argv[]) << nl << exit(FatalError); } - Info<< nl << "ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + Info<< nl; + runTime.printExecutionTime(Info); Info<< "\nEnd\n" << endl; diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C index 6a4f0d546d..b06ea808e0 100644 --- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C +++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C @@ -761,9 +761,7 @@ int main(int argc, char *argv[]) Info<< endl; } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); Info<< "End\n" << endl; diff --git a/applications/utilities/surface/surfaceInflate/surfaceInflate.C b/applications/utilities/surface/surfaceInflate/surfaceInflate.C index 039bae91e8..f945a65fad 100644 --- a/applications/utilities/surface/surfaceInflate/surfaceInflate.C +++ b/applications/utilities/surface/surfaceInflate/surfaceInflate.C @@ -845,9 +845,7 @@ int main(int argc, char *argv[]) // Write runTime.write(); - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + runTime.printExecutionTime(Info); } @@ -868,7 +866,7 @@ int main(int argc, char *argv[]) } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/etc/codeTemplates/app/app.C b/etc/codeTemplates/app/app.C index 602a5e52b8..167dcc886c 100644 --- a/etc/codeTemplates/app/app.C +++ b/etc/codeTemplates/app/app.C @@ -39,9 +39,8 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; + Info<< nl; + runTime.printExecutionTime(Info); Info<< "End\n" << endl; diff --git a/etc/controlDict b/etc/controlDict index eae042cad4..98a281c5d3 100644 --- a/etc/controlDict +++ b/etc/controlDict @@ -54,6 +54,11 @@ InfoSwitches // Enable job info writeJobInfo 0; + // Style for "ExecutionTime = " output + // - 0 = seconds (with trailing 's') + // - 1 = day-hh:mm::ss + printExecutionFormat 0; + // Allow profiling allowProfiling 1; diff --git a/src/OSspecific/POSIX/clockValue/clockValue.C b/src/OSspecific/POSIX/clockValue/clockValue.C index 7394feaf55..7e1447d978 100644 --- a/src/OSspecific/POSIX/clockValue/clockValue.C +++ b/src/OSspecific/POSIX/clockValue/clockValue.C @@ -26,14 +26,17 @@ License #include "clockValue.H" #include "IOstreams.H" #include +#include +#include // * * * * * * * * * * * * * * * * Local Data * * * * * * * * * * * * * * * // namespace { - constexpr int factorMicro = (1000000); - constexpr int factorMicro2 = (500000); + constexpr int factorMicro = (1000000); //!< From usec to sec + constexpr int factorMicro2 = (500000); //!< Rounding usec to sec + constexpr int factorHundred = (10000); //!< From usec to 0.01 sec } // End anonymous namespace @@ -92,6 +95,47 @@ long Foam::clockValue::seconds() const } +std::string Foam::clockValue::str() const +{ + std::ostringstream os; + + const unsigned long ss = value_.tv_sec; + + // days + const auto dd = (ss / 86400); + + if (dd) os << dd << '-'; + + // hours + const int hh = ((ss / 3600) % 24); + + if (dd || hh) + { + os << std::setw(2) << std::setfill('0') + << hh << ':'; + } + + + // minutes + os << std::setw(2) << std::setfill('0') + << ((ss / 60) % 60) << ':'; + + // seconds + os << std::setw(2) << std::setfill('0') + << (ss % 60); + + // 1/100th seconds. As none or 2 decimal places + const int hundredths = (value_.tv_sec % factorHundred); + + if (hundredths) + { + os << '.' << std::setw(2) << std::setfill('0') << hundredths; + } + + return os.str(); +} + + // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // Foam::clockValue::operator double () const @@ -100,8 +144,6 @@ Foam::clockValue::operator double () const } -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - Foam::clockValue& Foam::clockValue::operator-=(const clockValue& rhs) { const value_type& b = rhs.value_; diff --git a/src/OSspecific/POSIX/clockValue/clockValue.H b/src/OSspecific/POSIX/clockValue/clockValue.H index 425c1090eb..0109af083b 100644 --- a/src/OSspecific/POSIX/clockValue/clockValue.H +++ b/src/OSspecific/POSIX/clockValue/clockValue.H @@ -36,6 +36,7 @@ SourceFiles #ifndef clockValue_H #define clockValue_H +#include #include #ifdef darwin #include @@ -47,7 +48,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class clockValue Declaration + Class clockValue Declaration \*---------------------------------------------------------------------------*/ class clockValue @@ -93,6 +94,9 @@ public: //- The value in seconds (rounded) long seconds() const; + //- Format as day-hh:mm:ss string + std::string str() const; + // Operators diff --git a/src/OSspecific/POSIX/cpuTime/cpuTime.H b/src/OSspecific/POSIX/cpuTime/cpuTime.H index b8ccaacf74..a57a653b80 100644 --- a/src/OSspecific/POSIX/cpuTime/cpuTime.H +++ b/src/OSspecific/POSIX/cpuTime/cpuTime.H @@ -38,6 +38,7 @@ SourceFiles #ifndef cpuTime_H #define cpuTime_H +#include #include #include diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C index e5333b6158..f524dbad5c 100644 --- a/src/OpenFOAM/db/Time/Time.C +++ b/src/OpenFOAM/db/Time/Time.C @@ -30,6 +30,7 @@ License #include "profiling.H" #include "demandDrivenData.H" #include "IOdictionary.H" +#include "registerSwitch.H" #include @@ -77,6 +78,19 @@ const int Foam::Time::maxPrecision_(3 - log10(SMALL)); Foam::word Foam::Time::controlDictName("controlDict"); +int Foam::Time::printExecutionFormat_ +( + Foam::debug::infoSwitch("printExecutionFormat", 0) +); + + +registerInfoSwitch +( + "printExecutionFormat", + int, + Foam::Time::printExecutionFormat_ +); + // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // @@ -1161,7 +1175,7 @@ Foam::Time& Foam::Time::operator++() { const label writeIndex = label ( - returnReduce(label(elapsedClockTime()), maxOp