diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index 40a48cfbdba140f5d935c5e97f97bed3706edf47..bf70e83c5d1266a44c507c01b5c43d0dcb597aa7 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -114,12 +114,12 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=1; corr<=pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "bEqn.H"
#include "ftEqn.H"
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 557c8aa1fb79d3f7c50e5a20dd9307dc9800ab06..0c5082df0426d82e82642cc698e263b6591848c2 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -167,13 +167,13 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=1; corr<=pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "bEqn.H"
#include "ftEqn.H"
diff --git a/applications/solvers/combustion/PDRFoam/pEqn.H b/applications/solvers/combustion/PDRFoam/pEqn.H
index 3c6a6341f9dd55765189db50542f413ce38f6bee..e2a2a471e28e1935c990af0c7f1f1f2959dc5d41 100644
--- a/applications/solvers/combustion/PDRFoam/pEqn.H
+++ b/applications/solvers/combustion/PDRFoam/pEqn.H
@@ -15,7 +15,7 @@ if (pimple.transonic())
)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -24,12 +24,9 @@ if (pimple.transonic())
- fvm::laplacian(rho*invA, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@@ -44,7 +41,7 @@ else
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -53,12 +50,9 @@ else
- fvm::laplacian(rho*invA, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index 71b03064fad779d858c9f7ee7c9513ba630a1506..069e5b8caa09f77f494ad1737c443329f6c70bf1 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
@@ -105,8 +105,8 @@ int main(int argc, char *argv[])
hu == h;
}
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H
index bef433d388f709f892ba72b5248951353f7702fd..784e9ca6b71b90d114e13d880d7bf18b067c66f6 100644
--- a/applications/solvers/combustion/XiFoam/pEqn.H
+++ b/applications/solvers/combustion/XiFoam/pEqn.H
@@ -15,7 +15,7 @@ if (pimple.transonic())
)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -24,12 +24,9 @@ if (pimple.transonic())
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@@ -44,7 +41,7 @@ else
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -53,12 +50,9 @@ else
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index 7a0f3acd09d7531904670942c412656885e985ac..6ef3a599c17b1d1d65d89f06a6c2b98de8fc0785 100644
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@@ -74,12 +74,12 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=1; corr<=pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "hEqn.H"
#include "pEqn.H"
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index 6fd1981be9ca474a01102572e966895f6caad18a..3c60e9c9eace15d17b5a66f678ecf81a4a398b24 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -83,14 +83,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
- // --- PISO loop
- for (int corr=1; corr<=pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/combustion/dieselEngineFoam/pEqn.H b/applications/solvers/combustion/dieselEngineFoam/pEqn.H
index 42228cc7b0e000192884340a7740b83b34f19522..0493a1ff6c60560c2dc1fab40c6f800216f78402 100644
--- a/applications/solvers/combustion/dieselEngineFoam/pEqn.H
+++ b/applications/solvers/combustion/dieselEngineFoam/pEqn.H
@@ -12,7 +12,7 @@ if (pimple.transonic())
*((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U))
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -23,12 +23,9 @@ if (pimple.transonic())
Sevap
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@@ -39,7 +36,7 @@ else
phi = fvc::interpolate(rho)
*((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U));
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -50,12 +47,9 @@ else
Sevap
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 70808e8dbe3758da7e18f95f755ded62b754d45b..5bcb6b327353a3aab13bda4054cb4350742efe47 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -80,14 +80,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/combustion/dieselFoam/pEqn.H b/applications/solvers/combustion/dieselFoam/pEqn.H
index 5c4bd5ddf632231744a976b76ba40a92b32f022c..8ef13cde9d20f04be8e1e897ddb78e28f496dc11 100644
--- a/applications/solvers/combustion/dieselFoam/pEqn.H
+++ b/applications/solvers/combustion/dieselFoam/pEqn.H
@@ -15,7 +15,7 @@ if (pimple.transonic())
)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -26,12 +26,9 @@ if (pimple.transonic())
Sevap
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@@ -46,7 +43,7 @@ else
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -57,14 +54,11 @@ else
Sevap
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
- phi += pEqn.flux();
+ phi == pEqn.flux();
}
}
}
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index 5b2256ba45eb94233def5559545baa167270fad8..84472420c522d0f0fdd05398dd6982d488b57934 100644
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
@@ -111,8 +111,8 @@ int main(int argc, char *argv[])
hu == h;
}
- // --- PISO loop
- for (int corr=1; corr<=pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H
index 1b75a933981097bd18a08945374f155caf667d2a..580be2da56ef087f2c63ed7b30470234e4e40eeb 100644
--- a/applications/solvers/combustion/engineFoam/pEqn.H
+++ b/applications/solvers/combustion/engineFoam/pEqn.H
@@ -12,7 +12,7 @@ if (pimple.transonic())
*((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U))
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -21,12 +21,9 @@ if (pimple.transonic())
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@@ -37,7 +34,7 @@ else
phi = fvc::interpolate(rho)
*((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U));
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -46,12 +43,9 @@ else
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C
index e95a4318c7857d1be1480dc48f6c2c3806600397..1d58470cbfd5436f1338c30785810440b7d06cdd 100644
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.C
@@ -91,13 +91,13 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- PIMPLE loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "YhsEqn.H"
- // --- PISO loop
- for (int corr=1; corr<=pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H
index 5c7a4ae33e30c7b3dd4bf145e5687f500ce8857a..65259391daf83589f2c939ebcf829f1c9a50fda4 100644
--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@@ -15,7 +15,7 @@ surfaceScalarField phiU
phi = phiU - rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf();
-for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -28,12 +28,9 @@ for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ surfaceFilm.Srho()
);
- p_rghEqn.solve
- (
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += p_rghEqn.flux();
}
diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H
index bef433d388f709f892ba72b5248951353f7702fd..784e9ca6b71b90d114e13d880d7bf18b067c66f6 100644
--- a/applications/solvers/combustion/reactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pEqn.H
@@ -15,7 +15,7 @@ if (pimple.transonic())
)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -24,12 +24,9 @@ if (pimple.transonic())
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@@ -44,7 +41,7 @@ else
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -53,12 +50,9 @@ else
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 7f3347f780489c967392a73fa2841fa8bdb9cfe1..5344eea3beb07d9e52fe9a24dcad59a7f576c560 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -66,14 +66,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/combustion/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/rhoReactingFoam/pEqn.H
index 724f45e18941daefd039fe397d1dcffcd8ef05a3..b22fc890794a469f5fef975b198c8592fa3af963 100644
--- a/applications/solvers/combustion/rhoReactingFoam/pEqn.H
+++ b/applications/solvers/combustion/rhoReactingFoam/pEqn.H
@@ -30,7 +30,7 @@
+ correction(fvm::ddt(psi, p) + fvm::div(phid, p))
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -38,12 +38,9 @@
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
@@ -64,7 +61,7 @@
+ fvc::div(phi)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -72,12 +69,9 @@
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
index 73b252e5790723c154d37beb210f81350c0aa122..aa8f1a55015b510945dceb6b35f40c9cacb51f81 100644
--- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
@@ -68,14 +68,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
- // --- PISO loop
- for (int corr=1; corr<=pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index eea0ea9bff880eb5cb957bd33afdd0587edb77a7..1361c6441f1ec240207f83fb1af6bc217583c992 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -5,7 +5,7 @@ rho.relax();
U = rAU*UEqn().H();
-if (pimple.nCorr() <= 1)
+if (pimple.nCorrPIMPLE() <= 1)
{
UEqn.clear();
}
@@ -22,7 +22,7 @@ if (pimple.transonic())
)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -31,12 +31,9 @@ if (pimple.transonic())
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@@ -51,7 +48,7 @@ else
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
// Pressure corrector
fvScalarMatrix pEqn
@@ -61,12 +58,9 @@ else
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 0336ceb74d708531aa00f5a6520bb3bb2197f08e..26d11a14aa6694211f3c9dfba3e97825bd7a79e1 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -69,13 +69,13 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "hEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C
index 66ffb082756651cc1eec5a0cac6cb89242e3b1ab..de32f1f5c633c48aae0434b92799818183829cf5 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C
@@ -77,15 +77,15 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
turbulence->correct();
#include "UEqn.H"
#include "hEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
index 5e54f970cd5db9d6c630524b1381359b9afaf8db..cd10ed78e2fb08b3658da8ec4d9a50143d00e761 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
@@ -6,7 +6,7 @@ rho.relax();
volScalarField rAU(1.0/UEqn().A());
U = rAU*UEqn().H();
-if (pimple.nCorr() <= 1)
+if (pimple.nCorrPIMPLE() <= 1)
{
UEqn.clear();
}
@@ -24,7 +24,7 @@ if (pimple.transonic())
);
mrfZones.relativeFlux(fvc::interpolate(psi), phid);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -33,12 +33,9 @@ if (pimple.transonic())
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@@ -54,7 +51,7 @@ else
);
mrfZones.relativeFlux(fvc::interpolate(rho), phi);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
// Pressure corrector
fvScalarMatrix pEqn
@@ -64,12 +61,9 @@ else
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
index 8de8a412c350931914bad79d0434dcb051d63a43..068de89952e1f5b940ffac33f4af63c3c82b20ec 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
@@ -72,13 +72,13 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "hEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
index c00c1fe8d8316900cafc17c8b8d596911defb882..461578e864ed5172d8a4f178a1b8672eefa78e84 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
@@ -79,13 +79,13 @@ int main(int argc, char *argv[])
#include "setDeltaT.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "TEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
index 8ac13dc93ee3e0673967f35c8e1ac9baeacc0fbd..14e87ea844ea30ac23f42843daa6ee3739fb48a8 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H
@@ -10,7 +10,7 @@
surfaceScalarField buoyancyPhi(rAUf*ghf*fvc::snGrad(rhok)*mesh.magSf());
phi -= buoyancyPhi;
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -19,12 +19,9 @@
p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
- p_rghEqn.solve
- (
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
// Calculate the conservative fluxes
phi -= p_rghEqn.flux();
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
index 42397711680cf6be2a8de3576bf937706d8a9fb5..3e6b46a4bc6c9f15a790409204012a18e6a36860 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
@@ -72,13 +72,13 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "hEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index b47d65b842ac3e85d2c9155920e4b577b8775ef4..5c60d78b35acfc20d7ef5e7372494db4d10d9d90 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@@ -25,7 +25,7 @@
+ fvc::div(phi)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -33,12 +33,9 @@
- fvm::laplacian(rhorAUf, p_rgh)
);
- p_rghEqn.solve
- (
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
// Calculate the conservative fluxes
phi += p_rghEqn.flux();
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
index 30725cd070240642494361b7fd14f6fe4fc75d52..ba222b5034a75b71caadea7d1184d5085e27836e 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
@@ -65,12 +65,12 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UrelEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
index e4f9190cc53f260b51cf3475e5e35f7ffef7a13a..a8ade8c1cab8684c3a5e02f178cb5dcddbb1c79b 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H
@@ -1,7 +1,7 @@
volScalarField rAUrel(1.0/UrelEqn().A());
Urel = rAUrel*UrelEqn().H();
-if (pimple.nCorr() <= 1)
+if (pimple.nCorrPIMPLE() <= 1)
{
UrelEqn.clear();
}
@@ -12,7 +12,7 @@ phi = (fvc::interpolate(Urel) & mesh.Sf())
adjustPhi(phi, Urel, p);
// Non-orthogonal pressure corrector loop
-for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+while (pimple.correctNonOrthogonal())
{
// Pressure corrector
fvScalarMatrix pEqn
@@ -22,12 +22,9 @@ for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
pEqn.setReference(pRefCell, pRefValue);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= pEqn.flux();
}
diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H
index da9b7581bfcf914064c97469b3ac704b3bc191cc..2d6b37db6737acb05329b4d93c1dfc8f77829d8e 100644
--- a/applications/solvers/incompressible/pimpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H
@@ -1,6 +1,6 @@
U = rAU*UEqn().H();
-if (pimple.nCorr() <= 1)
+if (pimple.nCorrPIMPLE() <= 1)
{
UEqn.clear();
}
@@ -11,7 +11,7 @@ phi = (fvc::interpolate(U) & mesh.Sf())
adjustPhi(phi, U, p);
// Non-orthogonal pressure corrector loop
-for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+while (pimple.correctNonOrthogonal())
{
// Pressure corrector
fvScalarMatrix pEqn
@@ -21,12 +21,9 @@ for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
pEqn.setReference(pRefCell, pRefValue);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= pEqn.flux();
}
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/correctPhi.H
index e112db4621faf2bee4e4df3f9f7ba491747615dd..aed4884c4cb8437fcfea2fcccbb5e46630083fd5 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/correctPhi.H
@@ -50,7 +50,7 @@
pcorrTypes
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pcorrEqn
(
@@ -60,7 +60,7 @@
pcorrEqn.setReference(pRefCell, pRefValue);
pcorrEqn.solve();
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= pcorrEqn.flux();
}
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
index 3e8a587768f17e523c035889b5fbdfc929b60bc7..5986a92adf0b74ea25127b435915b18af0cc3fe2 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
@@ -1,6 +1,6 @@
U = rAU*UEqn().H();
-if (pimple.nCorr() <= 1)
+if (pimple.nCorrPIMPLE() <= 1)
{
UEqn.clear();
}
@@ -19,7 +19,7 @@ if (p.needReference())
fvc::makeAbsolute(phi, U);
}
-for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -28,12 +28,9 @@ for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
pEqn.setReference(pRefCell, pRefValue);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= pEqn.flux();
}
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
index 55ee07dbc725857de871a4f647dbd0ffecae9dfc..b2b0c48c13db92e9573b007ecb23409cbfde0605 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
@@ -86,12 +86,12 @@ int main(int argc, char *argv[])
}
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index e8b58bbea5ecd9ed5956538f88ab69ba0eec1de8..da5e2974c9bbe06c343af015aafee1488cfde034 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -64,12 +64,12 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 9fbe918a9f2e4abd064feea5640b5d8dba4cfbf4..b49155264727f3fc35e85a17cb63589a6cf2c804 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
#include "CourantNo.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
surfaceScalarField phiv("phiv", phi/fvc::interpolate(h));
@@ -89,8 +89,8 @@ int main(int argc, char *argv[])
}
}
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
volScalarField rAU(1.0/hUEqn.A());
surfaceScalarField ghrAUf(magg*fvc::interpolate(h*rAU));
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
+ fvc::ddtPhiCorr(rAU, h, hU, phi)
- phih0;
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix hEqn
(
@@ -119,15 +119,9 @@ int main(int argc, char *argv[])
- fvm::laplacian(ghrAUf, h)
);
- hEqn.solve
- (
- mesh.solver
- (
- h.select(pimple.finalInnerIter(corr, nonOrth))
- )
- );
+ hEqn.solve(mesh.solver(h.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += hEqn.flux();
}
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C b/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C
index dc642e7c7237d2bc93ea8cf7913d99b39e187463..23c9e0322930dbc65a00e3c3b65e3450e5d46476 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
turbulence->correct();
@@ -95,8 +95,8 @@ int main(int argc, char *argv[])
#include "YEqn.H"
#include "hsEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
index fcbfad3efb21d7d4e0c69296867ccc767fa45959..d3aaed21efe1fe9999b4c93fdc8640165f9be751 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
@@ -32,7 +32,7 @@
+ massSource.SuTot()
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -40,12 +40,9 @@
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 7b5c3e73c717ea38215689df66f27d3223e16289..897f43e3c3efb0cf4260c8d5f7e711b5ea20dcbe 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -88,14 +88,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
index de0c04577a06eaf583126e9e43dbe96d337751a4..73e56f07c5d9f2c606eebc75d39d33bf570ed5ed 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@@ -15,7 +15,7 @@ if (pimple.transonic())
)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -26,12 +26,9 @@ if (pimple.transonic())
coalParcels.Srho()
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@@ -46,7 +43,7 @@ else
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -57,12 +54,9 @@ else
coalParcels.Srho()
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
index 63d746fe79fdf811e7e393b502803c50d140b377..b6e69acead325bf7adc337fab4099059a4134be2 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
@@ -32,7 +32,7 @@
+ massSource.SuTot()
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -40,12 +40,9 @@
- fvm::laplacian(rho*rAU, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
index 283773f4f6fa692bd83ab7d12588fc0c6e295c90..19d7e96d13f4dab7bda58ae383696e7869504e1b 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@@ -90,14 +90,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
index 5c7a4ae33e30c7b3dd4bf145e5687f500ce8857a..65259391daf83589f2c939ebcf829f1c9a50fda4 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
@@ -15,7 +15,7 @@ surfaceScalarField phiU
phi = phiU - rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf();
-for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -28,12 +28,9 @@ for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ surfaceFilm.Srho()
);
- p_rghEqn.solve
- (
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += p_rghEqn.flux();
}
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
index 8dd3e3c9e6aeb2dd5d89b77f3788898a00d722a4..06ef5ddac3b96bf372dd5a43cd93fa079d1b0cc8 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
@@ -83,14 +83,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- PIMPLE loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
- // --- PISO loop
- for (int corr=1; corr<=pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
index 3bf304ceccf4168d6214eb32d879f01c977542f0..8031af20d576e8ecbf8362316668f59adb649e86 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
@@ -15,7 +15,7 @@ if (pimple.transonic())
)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -26,12 +26,9 @@ if (pimple.transonic())
parcels.Srho()
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@@ -46,7 +43,7 @@ else
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -57,12 +54,9 @@ else
parcels.Srho()
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index 94e551ca7215f1b88c94a8b7d57cef0206e49f5d..a46cb30f80c8a529c10705bfc071d780af8895da 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -76,14 +76,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
index 96ad7dee5232fac8bb43f706369465a46b57096c..50e24a70dfd91f2ebd0f1b4e86fc64db778a372e 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
@@ -76,14 +76,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index 0d095d36483844edf6e0ac2300ac285076652d76..4bbaf792af26405c7d45cb112d64a77baa96015c 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -68,14 +68,14 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "alphaEqn.H"
#include "liftDragCoeffs.H"
#include "UEqns.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
diff --git a/applications/solvers/multiphase/bubbleFoam/pEqn.H b/applications/solvers/multiphase/bubbleFoam/pEqn.H
index 453575b19b76fb5d73673484e62b631ac1ecfc17..268c2b4f0d7740e43ab11444596768db2ae66702 100644
--- a/applications/solvers/multiphase/bubbleFoam/pEqn.H
+++ b/applications/solvers/multiphase/bubbleFoam/pEqn.H
@@ -42,7 +42,7 @@
alphaf*rUaAf/rhoa + betaf*rUbAf/rhob
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -51,12 +51,9 @@
pEqn.setReference(pRefCell, pRefValue);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
surfaceScalarField SfGradp(pEqn.flux()/Dp);
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index 159eb0f0bd45d4719b3f78b7890195b35731b8db..256a58d95339b7bb657d697fcef46223a1d38acc 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -68,13 +68,15 @@ int main(int argc, char *argv[])
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
- for (pimple.start(); pimple.loop(); pimple++)
+ // --- Pressure-velocity PIMPLE corrector loop
+ while (pimple.loop())
{
#include "rhoEqn.H"
#include "gammaPsi.H"
#include "UEqn.H"
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index c604539cde376de10bb7d52c5a4efbd1658813fc..fb8893be2ccae6c6a205c61533f19bf76f8e94e1 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -1,5 +1,5 @@
{
- if (pimple.nOuterCorr() == 1)
+ if (pimple.nCorrPIMPLE() == 1)
{
p =
(
@@ -26,7 +26,7 @@
#include "resetPhivPatches.H"
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -37,12 +37,9 @@
- fvm::laplacian(rAUf, p)
);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phiv += (phiGradp + pEqn.flux())/rhof;
}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
index 9161c8056314b4ca86f5507d3a1665faf08c5543..6270f7e9e5dd202bb591a0fdb53c6f40d61231c9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
@@ -30,7 +30,8 @@
#include "alphaEqns.H"
}
- if (pimple.corr() == 0)
+ // correct interface on first PIMPLE corrector
+ if (pimple.corrPIMPLE() == 1)
{
interface.correct();
}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/alphaEqnsSubCycle.H
index 532d2bcc05ea395e13f75406a23e391cf5d9f4b5..862dc60409f8e3b4daceeb169490ab2002187af3 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/alphaEqnsSubCycle.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/alphaEqnsSubCycle.H
@@ -32,7 +32,8 @@
#include "alphaEqns.H"
}
- if (pimple.corr() == 0)
+ // correct interface on first PIMPLE corrector
+ if (pimple.corrPIMPLE() == 1)
{
interface.correct();
}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 4b3b5127d4c707dad7980fc7e86bd27f4534c141..1ac1596c4dbd1702fb0a4cf976226b331c2d11d7 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -116,8 +116,8 @@ int main(int argc, char *argv[])
turbulence->correct();
- // --- Outer-corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ // --- Pressure-velocity PIMPLE corrector loop
+ while (pimple.loop())
{
#include "alphaEqnsSubCycle.H"
@@ -125,8 +125,8 @@ int main(int argc, char *argv[])
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/correctPhi.H
index c3b3726d12226076b01b95627ab82cce24ca2638..1d7b9ca624a4e0acb1d653890c23adda345b5627 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/correctPhi.H
@@ -42,7 +42,7 @@
adjustPhi(phi, U, pcorr);
- for(int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pcorrEqn
(
@@ -51,7 +51,7 @@
pcorrEqn.solve();
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= pcorrEqn.flux();
}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
index cdc541f0cd9b572221ec54a5a3c6154a119ea695..26666c41203f40d6ce9081648103f69d228f2060 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
@@ -39,7 +39,7 @@
- ghf*fvc::snGrad(rho)
)*rAUf*mesh.magSf();
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqnIncomp
(
@@ -55,10 +55,10 @@
)
*p_rghEqnComp()
+ p_rghEqnIncomp,
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
+ mesh.solver(p_rgh.select(pimple.finalInnerIter()))
);
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
dgdt =
(pos(alpha2)*(psi2/rho2) - pos(alpha1)*(psi1/rho1))
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H
index 38bacbf4eaeaebd5e4efa0c7e2554a2b3bc85477..1a718434a81f998e90476ddc61d48fc6e24ae6c6 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H
@@ -4,7 +4,7 @@
label nAlphaSubCycles(readLabel(pimple.dict().lookup("nAlphaSubCycles")));
- if (nAlphaSubCycles > 1 && pimple.nOuterCorr() != 1)
+ if (nAlphaSubCycles > 1 && pimple.nCorrPIMPLE() != 1)
{
FatalErrorIn(args.executable())
<< "Sub-cycling alpha is only allowed for PISO, "
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 02d6764ae2d0ba8f9e80779309586c534d515028..4ad1b3d01da6be39bcd818c33e989c9ec2986e23 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -74,8 +74,8 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
- // --- Outer-corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ // --- Pressure-velocity PIMPLE corrector loop
+ while (pimple.loop())
{
#include "alphaEqnsSubCycle.H"
@@ -83,8 +83,8 @@ int main(int argc, char *argv[])
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index 28c42abe7928a3ea14d8272dbb474e72ac3c13f8..035e8e237da1b02591154623c3b5ec90c1ea14d2 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -39,7 +39,7 @@
- ghf*fvc::snGrad(rho)
)*rAUf*mesh.magSf();
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqnIncomp
(
@@ -55,10 +55,10 @@
)
*p_rghEqnComp()
+ p_rghEqnIncomp,
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
+ mesh.solver(p_rgh.select(pimple.finalInnerIter()))
);
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
dgdt =
(pos(alpha2)*(psi2/rho2) - pos(alpha1)*(psi1/rho1))
diff --git a/applications/solvers/multiphase/compressibleInterFoam/readControls.H b/applications/solvers/multiphase/compressibleInterFoam/readControls.H
index 954fcb27f2da0f67bc0131113f86a99d807a7d09..87a055d641f44e76ee10348cc43fb17c5d558390 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/readControls.H
@@ -1,19 +1,13 @@
- #include "readTimeControls.H"
+ #include "readTimeControls.H"
- label nAlphaCorr
- (
- readLabel(pimple.dict().lookup("nAlphaCorr"))
- );
+ label nAlphaCorr(readLabel(pimple.dict().lookup("nAlphaCorr")));
- label nAlphaSubCycles
- (
- readLabel(pimple.dict().lookup("nAlphaSubCycles"))
- );
+ label nAlphaSubCycles(readLabel(pimple.dict().lookup("nAlphaSubCycles")));
- if (nAlphaSubCycles > 1 && pimple.nOuterCorr() != 1)
+ if (nAlphaSubCycles > 1 && pimple.nCorrPIMPLE() != 1)
{
FatalErrorIn(args.executable())
- << "Sub-cycling alpha is only allowed for PISO, "
+ << "Sub-cycling alpha is only allowed for PISO operation, "
"i.e. when the number of outer-correctors = 1"
<< exit(FatalError);
}
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
index c764472cb77c8f4dff4c3d1712417fac87b4cbfc..d29da482bae16c4a88716b12191e84c82e087d65 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "alphaEqn.H"
#include "kEpsilon.H"
@@ -85,8 +85,8 @@ int main(int argc, char *argv[])
#include "TEqns.H"
#include "UEqns.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
index ea3e825448c1f644eda5055c20fd57c510988e24..d6af50988faa90a997668c0563df9dbf3caba1e1 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
@@ -69,7 +69,7 @@
+ alpha2f*rAlphaAU2f/fvc::interpolate(rho2))
);
- for(int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqnIncomp
(
@@ -82,12 +82,11 @@
(
(alpha1/rho1)*pEqnComp1()
+ (alpha2/rho2)*pEqnComp2()
- ) +
- pEqnIncomp,
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ )
+ + pEqnIncomp,
+ mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
surfaceScalarField mSfGradp = pEqnIncomp.flux()/Dp;
phi1 += rAlphaAU1f*mSfGradp/fvc::interpolate(rho1);
diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
index 938ccbcc02a1e24aba7e85e07828551ee57ad02b..06811c219195d9a5f4f8ea22eb3e25da9a35348b 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
+++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
@@ -81,12 +81,12 @@ int main(int argc, char *argv[])
turbulence->correct();
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C b/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C
index b4f87264b928e96c16e14055cc914b48a1f0baa5..042a17e1f3cf7c127dc7221006ca9d4caefccd7d 100644
--- a/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C
+++ b/applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C
@@ -84,12 +84,12 @@ int main(int argc, char *argv[])
#include "zonePhaseVolumes.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H b/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
index d281e177c8e02dfe6a112f39a2acf44d13921678..6fc51c7ceee25475e2558ce7549960caf20ff54c 100644
--- a/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/MRFInterFoam/pEqn.H
@@ -19,7 +19,7 @@
- ghf*fvc::snGrad(rho)
)*rAUf*mesh.magSf();
- for(int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -28,12 +28,9 @@
p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
- p_rghEqn.solve
- (
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= p_rghEqn.flux();
}
diff --git a/applications/solvers/multiphase/interFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/correctPhi.H
index cb3503e7b8d385f4cf6110cc4c2d57beb3c246f2..a2a61cef21dffc6dd15e0d2538817498c6ecdc54 100644
--- a/applications/solvers/multiphase/interFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/correctPhi.H
@@ -34,7 +34,7 @@
adjustPhi(phi, U, pcorr);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pcorrEqn
(
@@ -44,7 +44,7 @@
pcorrEqn.setReference(pRefCell, pRefValue);
pcorrEqn.solve();
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= pcorrEqn.flux();
}
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index 1face6ddd57a9ad664f9a7811403fc8cc49d9a68..a0c4827633d50210fdd13e6d7ee5e6d56a4a7d34 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -116,12 +116,12 @@ int main(int argc, char *argv[])
#include "alphaEqnSubCycle.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
index 4b90d9949929bc3a5b7d761acc8294604c9d4b51..d94e075424aa1539099cf7e62c29612c0ee373fc 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
@@ -21,7 +21,7 @@
- ghf*fvc::snGrad(rho)
)*rAUf*mesh.magSf();
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -30,12 +30,9 @@
p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
- p_rghEqn.solve
- (
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= p_rghEqn.flux();
}
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index d3895c142c1f100179304fb55742652ce5f5912b..559916f2ce3e313f9c946b4d0e832d7a673fe5a5 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -84,12 +84,12 @@ int main(int argc, char *argv[])
#include "alphaEqnSubCycle.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/interFoam/pEqn.H b/applications/solvers/multiphase/interFoam/pEqn.H
index d75a76766ab21c56a0c8a1e3fbc173a72054297f..a88b5627e2d8944bf97343eb8eca3f9b86a9f66b 100644
--- a/applications/solvers/multiphase/interFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/pEqn.H
@@ -18,7 +18,7 @@
- ghf*fvc::snGrad(rho)
)*rAUf*mesh.magSf();
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -27,12 +27,9 @@
p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
- p_rghEqn.solve
- (
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= p_rghEqn.flux();
}
diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C
index 251a36c997b05b751810a26eae18ce42dcf3501a..891736c77fcc0f4872f92f76558b17b56f7bfe72 100644
--- a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C
+++ b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C
@@ -85,12 +85,12 @@ int main(int argc, char *argv[])
#include "alphaEqnSubCycle.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
index 73cbee3ae430ce641c9aac8e52ede4d3c328eb71..d4b1194ba11a52e523e1a1700723aeeb93ac4308 100644
--- a/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
@@ -78,12 +78,12 @@ int main(int argc, char *argv[])
#define twoPhaseProperties threePhaseProperties
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
index b68160e62d44abdf268134e961e8648f547cc6d3..6e02524e26232e3495d4cab10796cc6091231650 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqnSubCycle.H
@@ -7,7 +7,7 @@ surfaceScalarField rhoPhi
mesh
),
mesh,
- dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0)
+ dimensionedScalar("0", dimMass/dimTime, 0)
);
{
@@ -40,7 +40,7 @@ surfaceScalarField rhoPhi
#include "alphaEqn.H"
}
- if (pimple.nOuterCorr() == 1)
+ if (pimple.nCorrPIMPLE() == 1)
{
interface.correct();
}
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index 70fd424e6269f50bed4bc5b7855c00422b07506e..5ed807bbad45965dc8b018005214b76d07bb171d 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -85,12 +85,12 @@ int main(int argc, char *argv[])
turbulence->correct();
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
index 6cfa59cc7c8e7c7b418cd5b0f9453dd7f423bb8c..c9b65eb9d5a575e3b05f4487685f2d477b41559e 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
@@ -13,8 +13,9 @@
adjustPhi(phiU, U, p_rgh);
- phi = phiU +
- (
+ phi =
+ phiU
+ + (
fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
- ghf*fvc::snGrad(rho)
)*rAUf*mesh.magSf();
@@ -23,7 +24,7 @@
const volScalarField& vDotcP = vDotP[0]();
const volScalarField& vDotvP = vDotP[1]();
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -33,12 +34,9 @@
p_rghEqn.setReference(pRefCell, pRefValue);
- p_rghEqn.solve
- (
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi += p_rghEqn.flux();
}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/correctPhi.H b/applications/solvers/multiphase/multiphaseEulerFoam/correctPhi.H
index 92c8676225e7b9f7789b726c4c64e686b34c6cff..78f93384b0a103389aafcb0ca22e44a571c17788 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/correctPhi.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/correctPhi.H
@@ -34,7 +34,7 @@
adjustPhi(phi, U, pcorr);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pcorrEqn
(
@@ -44,7 +44,7 @@
pcorrEqn.setReference(pRefCell, pRefValue);
pcorrEqn.solve();
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= pcorrEqn.flux();
}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
index b4cc5798350d6ce2544204a3911d70bc2fcebdbc..91a71ce60b6906a21f1c964b25d31cc9f1a81f47 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
sgsModel->correct();
fluid.solve();
@@ -85,8 +85,8 @@ int main(int argc, char *argv[])
//#include "TEqns.H"
#include "UEqns.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 6cbfbf2d16a040fe7b8caf5483f824d9137768f1..3bd26add308b724631a9d11776a862cfecabe893 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -134,7 +134,7 @@
Dp = mag(Dp);
adjustPhi(phi, U, p);
- for(int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqnIncomp
(
@@ -152,7 +152,7 @@
mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
);
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
surfaceScalarField mSfGradp = pEqnIncomp.flux()/Dp;
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/MRFMultiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/MRFMultiphaseInterFoam.C
index 6769a4747494b3c9ce8865b2e11a6662b88ef68a..0179b98e68ca5a45d58f5b5a1701b994f3b4c2f1 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/MRFMultiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/MRFMultiphaseInterFoam.C
@@ -76,12 +76,12 @@ int main(int argc, char *argv[])
#include "zonePhaseVolumes.H"
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
index 9975ebac832570c72c065923426208ac8106f330..efb181f3f2d31740bdd8ea6c41c2d734bd06c2b2 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/MRFMultiphaseInterFoam/pEqn.H
@@ -14,13 +14,14 @@
adjustPhi(phiU, U, p_rgh);
- phi = phiU +
- (
- mixture.surfaceTensionForce()
- - ghf*fvc::snGrad(rho)
- )*rAUf*mesh.magSf();
-
- for(int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ phi =
+ phiU
+ + (
+ mixture.surfaceTensionForce()
+ - ghf*fvc::snGrad(rho)
+ )*rAUf*mesh.magSf();
+
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -29,12 +30,9 @@
p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
- p_rghEqn.solve
- (
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= p_rghEqn.flux();
}
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index 3575c25cda4acfaca4d4e53e7f662dd4d3bdb3d4..9f3fec616b3fcea27a13b06b7b45e2d695705aa4 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -73,12 +73,12 @@ int main(int argc, char *argv[])
rho = mixture.rho();
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
index 78bfc89bb471efbbc2709bb67ab3f3dd8a8b55e9..e7e5bc14cfc81ec2e1f4484f8ef39a6f1142fde3 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
@@ -19,7 +19,7 @@
- ghf*fvc::snGrad(rho)
)*rAUf*mesh.magSf();
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -28,12 +28,9 @@
p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
- p_rghEqn.solve
- (
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= p_rghEqn.flux();
}
diff --git a/applications/solvers/multiphase/settlingFoam/pEqn.H b/applications/solvers/multiphase/settlingFoam/pEqn.H
index 7b62411d2d17344bf88d1014cbc5e2a05b98803c..d89fd3ef4ed05a3ea20b812f4d76ebf70ee24dec 100644
--- a/applications/solvers/multiphase/settlingFoam/pEqn.H
+++ b/applications/solvers/multiphase/settlingFoam/pEqn.H
@@ -17,7 +17,7 @@ phi =
surfaceScalarField phiU("phiU", phi);
phi -= ghf*fvc::snGrad(rho)*rAUf*mesh.magSf();
-for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -25,9 +25,10 @@ for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
);
p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
- p_rghEqn.solve();
- if (nonOrth == pimple.nNonOrthCorr())
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
+
+ if (pimple.finalNonOrthogonalIter())
{
phi -= p_rghEqn.flux();
}
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index 76f141bbea63421a41fe7098fe05609ff454b1f9..3d9fe516d80904e00e293e3e29d432586b7d954e 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -65,7 +65,8 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
- for (pimple.start(); pimple.loop(); pimple++)
+ // --- Pressure-velocity PIMPLE corrector loop
+ while (pimple.loop())
{
#include "calcVdj.H"
@@ -75,8 +76,8 @@ int main(int argc, char *argv[])
#include "correctViscosity.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
index 01b6442e9dff45ec0938ccd2fd9d714aafa11d7d..ac7fc35f68b9c55fecb6b1c2f8f0653abf7f9b68 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H
@@ -14,7 +14,7 @@
phi = phiU - ghf*fvc::snGrad(rho)*rAUf*mesh.magSf();
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@@ -23,12 +23,9 @@
p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
- p_rghEqn.solve
- (
- mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
phi -= p_rghEqn.flux();
}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index 465020a70087f3620885c452b24305443c5648c2..8a2b20e153be50b07fd86ae745f5b4e7776503f4 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
twoPhaseProperties.correct();
@@ -75,8 +75,8 @@ int main(int argc, char *argv[])
#include "UEqn.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
index 53d11f9e0692520c75b9bc68d0e11ebe4215626a..1788dd2808fca503a1f6c62137aece6b780e3c78 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H
@@ -58,7 +58,7 @@
alphaf*rUaAf/rhoa + betaf*rUbAf/rhob
);
- for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@@ -67,12 +67,9 @@
pEqn.setReference(pRefCell, pRefValue);
- pEqn.solve
- (
- mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
- );
+ pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
- if (nonOrth == pimple.nNonOrthCorr())
+ if (pimple.finalNonOrthogonalIter())
{
surfaceScalarField SfGradp(pEqn.flux()/Dp);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index 43f353cd1c4d01cfc66bbbda172cffb867123f8f..19810a15f19c7db8839497c21dd12b054655af28 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -76,14 +76,14 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
// --- Pressure-velocity PIMPLE corrector loop
- for (pimple.start(); pimple.loop(); pimple++)
+ while (pimple.loop())
{
#include "alphaEqn.H"
#include "liftDragCoeffs.H"
#include "UEqns.H"
- // --- PISO loop
- for (int corr=0; corr<pimple.nCorr(); corr++)
+ // --- Pressure corrector loop
+ while (pimple.correct())
{
#include "pEqn.H"