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

@@ -126,9 +126,7 @@ int main(int argc, char *argv[])
             );
         }
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/basic/laplacianFoam/laplacianFoam.C

@@ -93,9 +93,7 @@ int main(int argc, char *argv[])
 
         #include "write.H"
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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"
+    runTime.printExecutionTime(Info);
-        << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-        << nl << endl;
 
     Info<< "End\n" << endl;
 

applications/solvers/basic/potentialFoam/potentialFoam.C

@@ -235,9 +235,7 @@ int main(int argc, char *argv[])
 
     runTime.functionObjects().end();
 
-    Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+    runTime.printExecutionTime(Info);
-        << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-        << nl << endl;
 
     Info<< "End\n" << endl;
 

applications/solvers/combustion/PDRFoam/PDRFoam.C

@@ -150,9 +150,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "\nExecutionTime = "
+        runTime.printExecutionTime(Info);
-             << runTime.elapsedCpuTime()
-             << " s\n" << endl;
     }
 
     Info<< "\n end\n";

applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C

@@ -198,9 +198,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "\nExecutionTime = "
+        runTime.printExecutionTime(Info);
-             << runTime.elapsedCpuTime()
-             << " s\n" << endl;
     }
 
     Info<< "\n end\n";

applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C

@@ -170,9 +170,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/combustion/XiFoam/XiFoam.C

@@ -128,9 +128,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/combustion/chemFoam/chemFoam.C

@@ -82,9 +82,7 @@ int main(int argc, char *argv[])
 
         #include "output.H"
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info << "Number of steps = " << runTime.timeIndex() << endl;

applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C

@@ -106,9 +106,7 @@ int main(int argc, char *argv[])
 
         #include "logSummary.H"
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/combustion/engineFoam/engineFoam.C

@@ -140,9 +140,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/combustion/fireFoam/fireFoam.C

@@ -118,9 +118,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End" << endl;

applications/solvers/combustion/reactingFoam/reactingFoam.C

@@ -119,9 +119,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C

@@ -113,9 +113,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C

@@ -121,9 +121,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C

@@ -266,9 +266,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C

@@ -254,9 +254,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/rhoPimpleAdiabaticFoam/rhoPimpleAdiabaticFoam.C

@@ -115,9 +115,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/rhoPimpleDyMFoam.C

@@ -157,9 +157,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C

@@ -152,9 +152,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -126,9 +126,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/rhoSimpleFoam.C

@@ -78,9 +78,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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"
+        runTime.printExecutionTime(Info);
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C

@@ -81,9 +81,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C

@@ -134,9 +134,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/sonicFoam/sonicFoam.C

@@ -90,9 +90,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C

@@ -121,9 +121,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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"
+        Info<< nl;
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+        runTime.printExecutionTime(Info);
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C

@@ -90,9 +90,7 @@ int main(int argc, char *argv[])
             nAveragingSteps = 0;
         }
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C

@@ -72,9 +72,7 @@ int main(int argc, char *argv[])
             nAveragingSteps = 0;
         }
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C

@@ -66,9 +66,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/finiteArea/liquidFilmFoam/liquidFilmFoam.C

@@ -146,9 +146,7 @@ int main(int argc, char *argv[])
             runTime.write();
         }
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C

@@ -109,9 +109,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C

@@ -91,9 +91,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C

@@ -101,9 +101,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

@@ -76,9 +76,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C

@@ -146,9 +146,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C

@@ -111,9 +111,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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);
         }
     }
 

applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C

@@ -236,9 +236,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = "
+        runTime.printExecutionTime(Info);
-            << runTime.elapsedCpuTime()
-            << " s\n\n" << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/boundaryFoam/boundaryFoam.C

@@ -106,9 +106,7 @@ int main(int argc, char *argv[])
             #include "makeGraphs.H"
         }
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/icoFoam/icoFoam.C

@@ -145,9 +145,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C

@@ -121,9 +121,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C

@@ -96,9 +96,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/pimpleDyMFoam.C

@@ -132,9 +132,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C

@@ -114,9 +114,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/pimpleFoam/pimpleFoam.C

@@ -124,9 +124,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/pisoFoam/pisoFoam.C

@@ -113,9 +113,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C

@@ -152,9 +152,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C

@@ -77,9 +77,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/simpleFoam/overSimpleFoam/simpleFoam.C

@@ -111,9 +111,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C

@@ -78,9 +78,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/simpleFoam/simpleFoam.C

@@ -102,9 +102,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C

@@ -147,9 +147,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/lagrangian/DPMFoam/DPMFoam.C

@@ -127,9 +127,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C

@@ -124,9 +124,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C

@@ -84,9 +84,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C

@@ -77,9 +77,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C

@@ -126,9 +126,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End" << endl;

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C

@@ -79,9 +79,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C

@@ -83,9 +83,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/lagrangian/sprayFoam/sprayFoam.C

@@ -116,9 +116,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/uncoupledKinematicParcelDyMFoam.C

@@ -76,9 +76,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C

@@ -72,9 +72,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C

@@ -163,9 +163,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C

@@ -115,9 +115,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C

@@ -92,9 +92,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C

@@ -173,9 +173,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = "
+        runTime.printExecutionTime(Info);
-            << runTime.elapsedCpuTime()
-            << " s\n\n" << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C

@@ -134,9 +134,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = "
+        runTime.printExecutionTime(Info);
-            << runTime.elapsedCpuTime()
-            << " s\n\n" << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C

@@ -128,9 +128,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = "
+        runTime.printExecutionTime(Info);
-            << runTime.elapsedCpuTime()
-            << " s\n\n" << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C

@@ -102,9 +102,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C

@@ -111,9 +111,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C

@@ -130,9 +130,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C

@@ -182,9 +182,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/interFoam/interFoam.C

@@ -131,9 +131,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C

@@ -118,9 +118,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/interFoam/overInterDyMFoam/interDyMFoam.C

@@ -196,9 +196,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/interIsoFoam/interIsoFoam.C

@@ -129,9 +129,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C

@@ -182,9 +182,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C

@@ -122,9 +122,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C

@@ -110,9 +110,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = "
+        runTime.printExecutionTime(Info);
-            << runTime.elapsedCpuTime()
-            << " s\n\n" << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C

@@ -156,9 +156,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C

@@ -101,9 +101,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C

@@ -148,9 +148,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C

@@ -94,9 +94,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C

@@ -135,9 +135,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = "
+        runTime.printExecutionTime(Info);
-            << runTime.elapsedCpuTime()
-            << " s\n\n" << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C

@@ -169,9 +169,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = "
+        runTime.printExecutionTime(Info);
-            << runTime.elapsedCpuTime()
-            << " s\n\n" << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C

@@ -98,9 +98,7 @@ int main(int argc, char *argv[])
 
         runTime.write();
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C

@@ -117,9 +117,7 @@ int main(int argc, char *argv[])
 
         #include "write.H"
 
-        Info<< "ExecutionTime = "
+        runTime.printExecutionTime(Info);
-            << runTime.elapsedCpuTime()
-            << " s\n\n" << endl;
     }
 
     Info<< "End\n" << endl;

applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C

@@ -125,9 +125,7 @@ int main(int argc, char *argv[])
 
         #include "calculateStress.H"
 
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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"
+        runTime.printExecutionTime(Info);
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

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();
 

applications/test/fieldMapping/Test-fieldMapping.C

@@ -323,10 +323,7 @@ int main(int argc, char *argv[])
             }
         }
 
-
+        runTime.printExecutionTime(Info);
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "End\n" << endl;

applications/test/hexRef8/Test-hexRef8.C

@@ -405,10 +405,7 @@ int main(int argc, char *argv[])
             }
         }
 
-
+        runTime.printExecutionTime(Info);
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
     }
 
     Info<< "pc:" << pc.patchPatchPointConstraintPoints().size() << endl;