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 valueAverage condition - added start-up iterations option

Browse Source
This commit is contained in:
Andrew Heather
2018-08-21 12:58:19 +01:00
parent a3327b3761
commit ef615ed17f
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
View File

@ -75,7 +75,9 @@ Foam::functionObjects::runTimeControls::averageCondition::averageCondition
: windowType::NONE
),
totalTime_(fieldNames_.size(), scalar(0)),
resetOnRestart_(dict.lookupOrDefault<bool>("resetOnRestart", false))
resetOnRestart_(dict.lookupOrDefault<bool>("resetOnRestart", false)),
nIterStartUp_(dict.lookupOrDefault<label>("nIterStartUp", 10)),
iter_(-1)
{
dictionary& conditionDict = this->conditionDict();
@ -100,6 +102,8 @@ Foam::functionObjects::runTimeControls::averageCondition::averageCondition
}
}
}
conditionDict.readIfPresent("iter", iter_);
}
@ -107,13 +111,15 @@ Foam::functionObjects::runTimeControls::averageCondition::averageCondition
bool Foam::functionObjects::runTimeControls::averageCondition::apply()
{
bool satisfied = true;
if (!active_)
{
return satisfied;
return true;
}
bool satisfied = iter_ > nIterStartUp_ ? true : false;
++iter_;
const scalar dt = obr_.time().deltaTValue();
Log << " " << type() << ": " << name_ << " averages:" << nl;
@ -175,6 +181,8 @@ void Foam::functionObjects::runTimeControls::averageCondition::write()
conditionDict.add(fieldName, valueDict);
}
}
conditionDict.set("iter", iter_);
}

5
src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.H
View File

@ -97,6 +97,11 @@ protected:
//- Reset the averaging process on restart flag
Switch resetOnRestart_;
//- Number of start-up iterations before allowing satisfied checks
label nIterStartUp_;
//- Current iteration count
label iter_;
// Protected Member Functions