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

ENH: Updated pimpleControl - better encapsulation and included PISO/non-ortho loops

Browse Source
This commit is contained in:
andy
2011-10-26 12:02:26 +01:00
parent 72cc4cd7d8
commit 4c63590979
3 changed files with 172 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,8 +42,10 @@ void Foam::pimpleControl::read()
// Read solution controls
const dictionary& pimpleDict = dict();
nOuterCorr_ = pimpleDict.lookupOrDefault<label>("nOuterCorrectors", 1);
nCorr_ = pimpleDict.lookupOrDefault<label>("nCorrectors", 1);
nCorrPIMPLE_ = pimpleDict.lookupOrDefault<label>("nOuterCorrectors", 1);
nCorrPISO_ = pimpleDict.lookupOrDefault<label>("nCorrectors", 1);
nCorrNonOrtho_ =
pimpleDict.lookupOrDefault<label>("nNonOrthogonalCorrectors", 1);
turbOnFinalIterOnly_ =
pimpleDict.lookupOrDefault<Switch>("turbOnFinalIterOnly", true);
}
@ -51,12 +53,14 @@ void Foam::pimpleControl::read()
bool Foam::pimpleControl::criteriaSatisfied()
{
if ((corr_ == 0) || residualControl_.empty() || finalIter())
// no checks on first iteration - nothing has been calculated yet
if ((corrPIMPLE_ == 1) || residualControl_.empty() || finalIter())
{
return false;
}
bool firstIter = corr_ == 1;
bool storeIni = this->storeInitialResiduals();
bool achieved = true;
bool checked = false; // safety that some checks were indeed performed
@ -73,7 +77,7 @@ bool Foam::pimpleControl::criteriaSatisfied()
checked = true;
if (firstIter)
if (storeIni)
{
residualControl_[fieldI].initialResidual =
sp.first().initialResidual();
@ -83,7 +87,7 @@ bool Foam::pimpleControl::criteriaSatisfied()
bool relCheck = false;
scalar relative = 0.0;
if (!firstIter)
if (!storeIni)
{
const scalar iniRes =
residualControl_[fieldI].initialResidual
@ -97,9 +101,10 @@ bool Foam::pimpleControl::criteriaSatisfied()
if (debug)
{
Info<< algorithmName_ << "loop statistics:" << endl;
Info<< algorithmName_ << " loop:" << endl;
Info<< " " << variableName << " iter " << corr_
Info<< " " << variableName
<< " PIMPLE iter " << corrPIMPLE_
<< ": ini res = "
<< residualControl_[fieldI].initialResidual
<< ", abs tol = " << residual
@ -120,25 +125,28 @@ bool Foam::pimpleControl::criteriaSatisfied()
Foam::pimpleControl::pimpleControl(fvMesh& mesh)
:
solutionControl(mesh, "PIMPLE"),
nOuterCorr_(0),
nCorr_(0),
corr_(0),
nCorrPIMPLE_(0),
nCorrPISO_(0),
nCorrNonOrtho_(0),
corrPIMPLE_(0),
corrPISO_(0),
corrNonOrtho_(0),
turbOnFinalIterOnly_(true)
{
read();
if (nOuterCorr_ > 1)
if (nCorrPIMPLE_ > 1)
{
Info<< nl;
if (residualControl_.empty())
{
Info<< algorithmName_ << ": no residual control data found. "
<< "Calculations will employ " << nOuterCorr_
<< "Calculations will employ " << nCorrPIMPLE_
<< " corrector loops" << nl << endl;
}
else
{
Info<< algorithmName_ << ": max iterations = " << nOuterCorr_
Info<< algorithmName_ << ": max iterations = " << nCorrPIMPLE_
<< endl;
forAll(residualControl_, i)
{