From 0f45c29feb9b3e2e6dc75a3ef4a0e45e8f437292 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 9 Oct 2017 12:23:28 +0100 Subject: [PATCH] ENH: PBiCG, PBiCGStab, PCG: Changed maxIter test to pre-increment counter Resolves bug-report https://bugs.openfoam.org/view.php?id=2716 --- src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C | 2 +- src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C | 2 +- src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C index b4e630571f..f0e4a3feb2 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C @@ -201,7 +201,7 @@ Foam::solverPerformance Foam::PBiCG::solve } while ( ( - solverPerf.nIterations()++ < maxIter_ + ++solverPerf.nIterations() < maxIter_ && !solverPerf.checkConvergence(tolerance_, relTol_) ) || solverPerf.nIterations() < minIter_ diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C index 8fbbb57f24..a189de6ecb 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCGStab/PBiCGStab.C @@ -241,7 +241,7 @@ Foam::solverPerformance Foam::PBiCGStab::solve } while ( ( - solverPerf.nIterations()++ < maxIter_ + ++solverPerf.nIterations() < maxIter_ && !solverPerf.checkConvergence(tolerance_, relTol_) ) || solverPerf.nIterations() < minIter_ diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C index d113d90754..283fd7c3df 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -182,7 +182,7 @@ Foam::solverPerformance Foam::PCG::solve } while ( ( - solverPerf.nIterations()++ < maxIter_ + ++solverPerf.nIterations() < maxIter_ && !solverPerf.checkConvergence(tolerance_, relTol_) ) || solverPerf.nIterations() < minIter_