research/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

timeControlFunctionObject: Updated the control logic in the 'end' function

Browse source 
to correspond to the new default behavior of the 'end' function in
functionObject which now calls 'execute' then 'write'.
This commit is contained in:
Henry Weller 2016-05-18 09:05:24 +01:00
parent ca60658aee
commit 83517fac63
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
View file

@ -87,12 +87,9 @@ Foam::functionObjects::timeControl::timeControl
bool Foam::functionObjects::timeControl::execute(const bool postProcess)
{
if (active())
if (active() && (postProcess || executeControl_.execute()))
{
if (postProcess || executeControl_.execute())
{
foPtr_->execute();
}
foPtr_->execute();
}
return true;
@ -101,12 +98,9 @@ bool Foam::functionObjects::timeControl::execute(const bool postProcess)
bool Foam::functionObjects::timeControl::write(const bool postProcess)
{
if (active())
if (active() && (postProcess || writeControl_.execute()))
{
if (postProcess || writeControl_.execute())
{
foPtr_->write();
}
foPtr_->write();
}
return true;
@ -115,11 +109,9 @@ bool Foam::functionObjects::timeControl::write(const bool postProcess)
bool Foam::functionObjects::timeControl::end()
{
foPtr_->end();
if (writeControl_.execute())
if (active() && (executeControl_.execute() || writeControl_.execute()))
{
foPtr_->write();
foPtr_->end();
}
return true;