conditions for simulation finished refactoring

airshaper · Jul 21, 2022 · 865935b · 865935b
1 parent 9fdcbeb
commit 865935b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/convergenceDetection.C b/convergenceDetection.C
@@ -220,35 +220,45 @@ void Foam::functionObjects::convergenceDetection::writeDataFile(
     os << endl;
 }
 
+bool Foam::functionObjects::convergenceDetection::reachedMaxIterations()
+{
+    return currentIteration_ >= (maxStepConvergence_ + maxStepAveraging_);
+}
+
+bool Foam::functionObjects::convergenceDetection::minIterationsForAveraging()
+{
+    return currentIteration_ >= static_cast<int>(1.1 * averagingStartedAt_) &&
+           currentIteration_ >= static_cast<int>(averagingMinIter_ + averagingStartedAt_);
+}
+
+bool Foam::functionObjects::convergenceDetection::checkAveragingCriteria()
+{
+    return checkCriteriaForAveraging() < conditionAveraging_ &&
+           checkCriteriaForAveraging() > 0.0 &&
+           currentIteration_ > static_cast<int>(1.25 * averagingStartedAt_) &&
+           !simulationFinished_
+}
+
 void Foam::functionObjects::convergenceDetection::checkIfFinished()
 {
     double caclculatedPolynomGradAveraging = calculatePolynomGradAveraging();
 
     polyVectorAveraging_.push_back(caclculatedPolynomGradAveraging);
 
-    // Info << "checkCriteriaForAveraging(): " << checkCriteriaForAveraging() << " conditionAveraging_: " << conditionAveraging_ << endl;
-
-    if (checkCriteriaForAveraging() < conditionAveraging_ &&
-        checkCriteriaForAveraging() > 0.0 &&
-        currentIteration_ > static_cast<int>(1.25 * averagingStartedAt_) &&
-        !simulationFinished_)
+    if (checkAveragingCriteria() ||
+        reachedMaxIterations())
     {
-        if (currentIteration_ > static_cast<int>(1.1 * averagingStartedAt_) &&
-            currentIteration_ > static_cast<int>(averagingMinIter_ + averagingStartedAt_))
+        if (minIterationsForAveraging())
         {
             Info << "###########" << endl;
             Info << "Simulation should stop!!!!" << endl;
-            Info << "###########" << endl;
             Info << "Polynom Grad: " << checkCriteriaForAveraging() << endl;
             Info << "Condition for averaging: " << conditionAveraging_ << endl;
-            Info << "Condition is: " << (checkCriteriaForAveraging() < conditionAveraging_) << endl;
+            Info << "###########" << endl;
+
             time().stopAt(Time::saWriteNow);
             simulationFinished_ = true;
         }
-        // Info << "###########" << endl;
-        // Info << "Simulation should stop!!!!" << endl;
-        // Info << "###########" << endl;
-        // OFstream os(time().globalPath() + "/FINISHED");
     }
 }
 

diff --git a/convergenceDetection.H b/convergenceDetection.H
@@ -245,6 +245,9 @@ namespace Foam
             virtual void checkConvergence();
             virtual void checkIfForcesExploded();
             virtual void createDataFile();
+            virtual bool reachedMaxIterations();
+            virtual bool minIterationsForAveraging();
+            virtual bool checkAveragingCriteria();
             virtual void writeDataFileHeader(const word &header, const word &tabbedName, OFstream &os) const;
             virtual void writeDataFile(OFstream &os, double &value) const;
             virtual std::vector<double> polyfit(const std::vector<double> x,