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

This commit is contained in:
Andrew Heather
2016-06-27 23:22:54 +01:00
45 changed files with 659 additions and 277 deletions

View File

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