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

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