zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

16
src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
View File

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