From 5215aab7197bae882d0f9fa61b602532c3c26ff8 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Thu, 20 Jun 2019 12:10:12 +0100
Subject: [PATCH] ENH: averageCondition - result now 'false' if no fields were
processed
---
.../runTimeCondition/averageCondition/averageCondition.C | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
index 1f2d4d62646..bd6925c7987 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2015-2016 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2015-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015 OpenFOAM Foundation
@@ -118,7 +118,7 @@ bool Foam::functionObjects::runTimeControls::averageCondition::apply()
return true;
}
- bool satisfied = iter_ > nIterStartUp_ ? true : false;
+ bool satisfied = iter_ > nIterStartUp_;
++iter_;
@@ -155,6 +155,11 @@ bool Foam::functionObjects::runTimeControls::averageCondition::apply()
{
Info<< " " << fieldNames_[fieldi] << nl;
}
+
+ if (unprocessedFields.size() == fieldNames_.size())
+ {
+ satisfied = false;
+ }
}
Log << endl;
--
GitLab