Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C

@@ -81,6 +81,8 @@ Note
 #include "cellSet.H"
 #include "fvMeshSubset.H"
 
+#include "memInfo.H"
+
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -156,6 +158,11 @@ int main(int argc, char *argv[])
     const bool binary = !args.optionFound("ascii");
     const bool nodeValues = args.optionFound("nodeValues");
 
+    cpuTime timer;
+    memInfo mem;
+    Info<< "Initial memory "
+        << mem.update().size() << " kB" << endl;
+
     #include "createTime.H"
 
     instantList Times = timeSelector::select0(runTime, args);
@@ -746,6 +753,10 @@ int main(int argc, char *argv[])
                 }
             }
         }
+
+        Info<< "Wrote in "
+            << timer.cpuTimeIncrement() << " s, "
+            << mem.update().size() << " kB" << endl;
     }
 
     #include "ensightCaseTail.H"
@@ -755,7 +766,9 @@ int main(int argc, char *argv[])
         delete ensightCaseFilePtr;
     }
 
-    Info<< "End\n" << endl;
+    Info<< "\nEnd: "
+        << timer.elapsedCpuTime() << " s, "
+        << mem.update().peak() << " kB (peak)\n" << endl;
 
     return 0;
 }

applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C

@@ -74,6 +74,8 @@ Note
 #include "ensightParts.H"
 #include "ensightOutputFunctions.H"
 
+#include "memInfo.H"
+
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -135,6 +137,12 @@ int main(int argc, char *argv[])
     const char* geometryName = "geometry";
 
     #include "setRootCase.H"
+
+    cpuTime timer;
+    memInfo mem;
+    Info<< "Initial memory "
+        << mem.update().size() << " kB" << endl;
+
     #include "createTime.H"
 
     // get times list
@@ -471,11 +479,17 @@ int main(int argc, char *argv[])
             // remember the time index
             cloudTimesUsed[cloudName].append(timeIndex);
         }
+
+        Info<< "Wrote in "
+            << timer.cpuTimeIncrement() << " s, "
+            << mem.update().size() << " kB" << endl;
     }
 
     #include "ensightOutputCase.H"
 
-    Info<< "\nEnd\n"<< endl;
+    Info<< "\nEnd: "
+        << timer.elapsedCpuTime() << " s, "
+        << mem.update().peak() << " kB (peak)\n" << endl;
 
     return 0;
 }

applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C

@@ -163,6 +163,7 @@ Note
 #include "surfaceMeshWriter.H"
 #include "writeSurfFields.H"
 
+#include "memInfo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -322,6 +323,12 @@ int main(int argc, char *argv[])
     );
 
     #include "setRootCase.H"
+
+    cpuTime timer;
+    memInfo mem;
+    Info<< "Initial memory "
+        << mem.update().size() << " kB" << endl;
+
     #include "createTime.H"
 
     const bool doWriteInternal = !args.optionFound("noInternal");
@@ -432,10 +439,13 @@ int main(int argc, char *argv[])
 
     mkDir(fvPath);
 
-
     // Mesh wrapper; does subsetting and decomposition
     vtkMesh vMesh(mesh, cellSetName);
 
+    Info<< "VTK mesh topology: "
+        << timer.cpuTimeIncrement() << " s, "
+        << mem.update().size() << " kB" << endl;
+
 
     // Scan for all possible lagrangian clouds
     HashSet<fileName> allCloudDirs;
@@ -1245,6 +1255,10 @@ int main(int argc, char *argv[])
                 writer.writeParcelHeader(0);
             }
         }
+
+        Info<< "Wrote in "
+            << timer.cpuTimeIncrement() << " s, "
+            << mem.update().size() << " kB" << endl;
     }
 
 
@@ -1305,7 +1319,9 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info<< "End\n" << endl;
+    Info<< "\nEnd: "
+        << timer.elapsedCpuTime() << " s, "
+        << mem.update().peak() << " kB (peak)\n" << endl;
 
     return 0;
 }