zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: Corrected pimpleControl behaviour for final iteration

Browse Source
This commit is contained in:
andy
2012-03-13 09:33:02 +00:00
parent f849409c20
commit 94bacb8c18
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -126,7 +126,8 @@ Foam::pimpleControl::pimpleControl(fvMesh& mesh)
nCorrPIMPLE_(0), nCorrPIMPLE_(0),
nCorrPISO_(0), nCorrPISO_(0),
corrPISO_(0), corrPISO_(0),
turbOnFinalIterOnly_(true) turbOnFinalIterOnly_(true),
converged_(false)
{ {
read(); read();
@ -194,12 +195,27 @@ bool Foam::pimpleControl::loop()
} }
bool completed = false; bool completed = false;
if (criteriaSatisfied()) if (converged_ || criteriaSatisfied())
{ {
Info<< algorithmName_ << ": converged in " << corr_ - 1 << " iterations" if (converged_)
<< endl; {
completed = true; Info<< algorithmName_ << ": converged in " << corr_ - 1
<< " iterations" << endl;
mesh_.data::remove("finalIteration");
corr_ = 0; corr_ = 0;
converged_ = false;
completed = true;
}
else
{
Info<< algorithmName_ << ": iteration " << corr_ << endl;
storePrevIterFields();
mesh_.data::add("finalIteration", true);
converged_ = true;
}
} }
else else
{ {

5
src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -66,6 +66,9 @@ protected:
//- Flag to indicate whether to only solve turbulence on final iter //- Flag to indicate whether to only solve turbulence on final iter
bool turbOnFinalIterOnly_; bool turbOnFinalIterOnly_;
//- Converged flag
bool converged_;
// Protected Member Functions // Protected Member Functions

6
src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControlI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -73,14 +73,14 @@ inline bool Foam::pimpleControl::storeInitialResiduals() const
inline bool Foam::pimpleControl::finalIter() const inline bool Foam::pimpleControl::finalIter() const
{ {
return corr_ == nCorrPIMPLE_; return converged_ || (corr_ == nCorrPIMPLE_);
} }
inline bool Foam::pimpleControl::finalInnerIter() const inline bool Foam::pimpleControl::finalInnerIter() const
{ {
return return
corr_ == nCorrPIMPLE_ finalIter()
&& corrPISO_ == nCorrPISO_ && corrPISO_ == nCorrPISO_
&& corrNonOrtho_ == nNonOrthCorr_ + 1; && corrNonOrtho_ == nNonOrthCorr_ + 1;
} }