From db5d8588024ff9dc2c0f58682bec9d0cb001aea5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Mon, 19 Aug 2019 12:49:02 +0100
Subject: [PATCH] PBiCGStab: Further improvements to the dual convergence logic

---
 .../matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C
index dcd779cb27..82906cd57c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C
@@ -206,8 +206,9 @@ Foam::solverPerformance Foam::PBiCGStab::solve
 
             if
             (
-                ++solverPerf.nIterations() >= maxIter_
-             && solverPerf.checkConvergence(tolerance_, relTol_))
+                ++solverPerf.nIterations() >= minIter_
+             && solverPerf.checkConvergence(tolerance_, relTol_)
+            )
             {
                 for (label cell=0; cell<nCells; cell++)
                 {
@@ -241,8 +242,11 @@ Foam::solverPerformance Foam::PBiCGStab::solve
                /normFactor;
         } while
         (
-            solverPerf.nIterations() < minIter_
-         || !solverPerf.checkConvergence(tolerance_, relTol_)
+            (
+                solverPerf.nIterations() < maxIter_
+            && !solverPerf.checkConvergence(tolerance_, relTol_)
+            )
+         || solverPerf.nIterations() < minIter_
         );
     }