zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: runTimeControl FO - added action for case that conditions are satisfied

Browse Source
This commit is contained in:
Andrew Heather
2018-08-21 13:08:58 +01:00
parent ef615ed17f
commit 74dc8b3ce1
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,15 @@ namespace runTimeControls
} }
} }
Foam::Enum
<
Foam::functionObjects::runTimeControls::runTimeControl::satisfiedAction
>
Foam::functionObjects::runTimeControls::runTimeControl::satisfiedActionNames
{
{ satisfiedAction::END, "end"},
{ satisfiedAction::SET_TRIGGER, "setTrigger"},
};
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -59,7 +68,7 @@ Foam::functionObjects::runTimeControls::runTimeControl::runTimeControl
groupMap_(), groupMap_(),
nWriteStep_(0), nWriteStep_(0),
writeStepI_(0), writeStepI_(0),
satisfiedAction_(satisfiedAction::end), satisfiedAction_(satisfiedAction::END),
triggerIndex_(labelMin), triggerIndex_(labelMin),
active_(getObjectProperty(name, "active", true)) active_(getObjectProperty(name, "active", true))
{ {
@ -137,10 +146,10 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::read
( (
"satisfiedAction", "satisfiedAction",
dict, dict,
satisfiedAction::end satisfiedAction::END
); );
if (satisfiedAction_ == satisfiedAction::setTrigger) if (satisfiedAction_ == satisfiedAction::SET_TRIGGER)
{ {
triggerIndex_ = readLabel(dict.lookup("trigger")); triggerIndex_ = readLabel(dict.lookup("trigger"));
} }
@ -226,7 +235,7 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
switch (satisfiedAction_) switch (satisfiedAction_)
{ {
case satisfiedAction::end: case satisfiedAction::END:
{ {
// Set to write a data dump or finalise the calculation // Set to write a data dump or finalise the calculation
Time& time = const_cast<Time&>(time_); Time& time = const_cast<Time&>(time_);
@ -240,12 +249,21 @@ bool Foam::functionObjects::runTimeControls::runTimeControl::execute()
else else
{ {
Info<< " Stopping calculation" << nl Info<< " Stopping calculation" << nl
<< " Writing fields - final step" << nl; << " Writing fields";
if (nWriteStep_ != 0)
{
Info<< " - final step" << nl;
}
else
{
Info<< nl;
}
time.writeAndEnd(); time.writeAndEnd();
} }
break; break;
} }
case satisfiedAction::setTrigger: case satisfiedAction::SET_TRIGGER:
{ {
Info<< " Setting trigger " << triggerIndex_ << nl; Info<< " Setting trigger " << triggerIndex_ << nl;
setTrigger(triggerIndex_); setTrigger(triggerIndex_);

4
src/functionObjects/utilities/runTimeControl/runTimeControl.H
View File

@ -73,8 +73,8 @@ public:
enum class satisfiedAction enum class satisfiedAction
{ {
end, END,
setTrigger SET_TRIGGER
}; };
static Enum<satisfiedAction> satisfiedActionNames; static Enum<satisfiedAction> satisfiedActionNames;