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

This commit is contained in:
mattijs
2017-07-13 14:47:54 +01:00
3 changed files with 9 additions and 1 deletions

View File

@ -32,6 +32,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "argList.H" #include "argList.H"
#include "profiling.H"
#include "timeSelector.H" #include "timeSelector.H"
#include "ReadFields.H" #include "ReadFields.H"
#include "volFields.H" #include "volFields.H"
@ -132,6 +133,7 @@ void executeFunctionObjects
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
Foam::timeSelector::addOptions(); Foam::timeSelector::addOptions();
#include "addProfilingOption.H"
#include "addRegionOption.H" #include "addRegionOption.H"
#include "addFunctionObjectOptions.H" #include "addFunctionObjectOptions.H"
@ -202,6 +204,9 @@ int main(int argc, char *argv[])
functionsPtr(), functionsPtr(),
timei == timeDirs.size()-1 timei == timeDirs.size()-1
); );
// Report to output (avoid overwriting values from simulation)
profiling::print(Info);
} }
catch (IOerror& err) catch (IOerror& err)
{ {

View File

@ -4931,7 +4931,7 @@ _of_postProcess()
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
local prev="${COMP_WORDS[COMP_CWORD-1]}" local prev="${COMP_WORDS[COMP_CWORD-1]}"
local opts="-constant -latestTime -list -newTimes -noFunctionObjects -noZero -parallel -srcDoc -doc -help " local opts="-constant -latestTime -list -newTimes -noFunctionObjects -noZero -parallel -profiling -srcDoc -doc -help "
local optsWithArgs="-case -decomposeParDict -dict -field -fields -func -funcs -region -roots -time " local optsWithArgs="-case -decomposeParDict -dict -field -fields -func -funcs -region -roots -time "
case ${prev} in case ${prev} in

View File

@ -143,6 +143,9 @@ if (argList::postProcess(argc, argv))
{ {
functionsPtr->end(); functionsPtr->end();
} }
// Report to output (avoid overwriting values from simulation)
profiling::print(Info);
} }
catch (IOerror& err) catch (IOerror& err)
{ {