zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: run-time control clean-up

Browse Source
This commit is contained in:
Andrew Heather
2018-08-17 16:52:11 +01:00
parent 21d2d7e6c3
commit 8b387961d9
15 changed files with 35 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/functionObjects/utilities/runTimeControl/runTimeControl.C
View File

@ -60,18 +60,13 @@ Foam::functionObjects::runTimeControls::runTimeControl::runTimeControl
nWriteStep_(0),
writeStepI_(0),
satisfiedAction_(satisfiedAction::end),
triggerIndex_(labelMin)
triggerIndex_(labelMin),
active_(getObjectProperty(name, "active", true))
{
read(dict);
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::runTimeControls::runTimeControl::~runTimeControl()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::functionObjects::runTimeControls::runTimeControl::read
@ -117,17 +112,17 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::read
else
{
// Check that at least one condition is active
bool active = false;
bool check = false;
for (const auto& condition : conditions_)
{
if (condition.active())
{
active = true;
check = true;
break;
}
}
if (!active)
if (!check)
{
Info<< type() << " " << name() << " output:" << nl
<< " All conditions are inactive" << nl
@ -156,6 +151,11 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::read
bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
{
if (!active_)
{
return true;
}
Info<< type() << " " << name() << " output:" << nl;
// IDs of satisfied conditions
@ -242,12 +242,17 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
Info<< " Stopping calculation" << nl
<< " Writing fields - final step" << nl;
time.writeAndEnd();
break;
}
break;
}
case satisfiedAction::setTrigger:
{
Info<< " Setting trigger " << triggerIndex_ << nl;
setTrigger(triggerIndex_);
// Deactivate the model
active_ = false;
setProperty("active", active_);
break;
}
}