From ef615ed17fa7ecf03a3c8c746a4670d950ffcd67 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 21 Aug 2018 12:58:19 +0100
Subject: [PATCH] ENH: runTimeControl valueAverage condition - added start-up
 iterations option

---
 .../averageCondition/averageCondition.C          | 16 ++++++++++++----
 .../averageCondition/averageCondition.H          |  5 +++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
index 59405f6dcc..f9c3e0a3d7 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
@@ -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_);
 }
 
 
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.H b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.H
index c295602515..355460c4a3 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.H
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.H
@@ -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