diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index c4b7be29fc..d2ef427e48 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/applications/solvers/combustion/fireFoam/fireFoam.C @@ -34,7 +34,7 @@ Description #include "turbulenceModel.H" #include "combustionModel.H" #include "radiationModel.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,6 +51,8 @@ int main(int argc, char *argv[]) #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -61,6 +63,7 @@ int main(int argc, char *argv[]) #include "readTimeControls.H" #include "compressibleCourantNo.H" #include "setDeltaT.H" + pimple.read(); runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; @@ -68,12 +71,7 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { #include "UEqn.H" diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H index 74b3cdc958..64ebb1a970 100644 --- a/applications/solvers/combustion/fireFoam/pEqn.H +++ b/applications/solvers/combustion/fireFoam/pEqn.H @@ -32,11 +32,9 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) ( p_rgh.select ( - ( - pimpleCorr.finalIter() - && corr == nCorr-1 - && nonOrth == nNonOrthCorr - ) + pimple.finalIter() + && corr == nCorr-1 + && nonOrth == nNonOrthCorr ) ) ); diff --git a/applications/solvers/combustion/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/rhoReactingFoam/pEqn.H index 21f5ec080b..7c227676eb 100644 --- a/applications/solvers/combustion/rhoReactingFoam/pEqn.H +++ b/applications/solvers/combustion/rhoReactingFoam/pEqn.H @@ -44,11 +44,9 @@ ( p.select ( - ( - pimpleCorr.finalIter() - && corr == nCorr-1 - && nonOrth == nNonOrthCorr - ) + pimple.finalIter() + && corr == nCorr-1 + && nonOrth == nNonOrthCorr ) ) ); @@ -88,11 +86,9 @@ ( p.select ( - ( - pimpleCorr.finalIter() - && corr == nCorr-1 - && nonOrth == nNonOrthCorr - ) + pimple.finalIter() + && corr == nCorr-1 + && nonOrth == nNonOrthCorr ) ) ); diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C index 5181a50b29..36329f1215 100644 --- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C +++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C @@ -36,7 +36,7 @@ Description #include "rhoChemistryModel.H" #include "chemistrySolver.H" #include "multivariateScheme.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,6 +53,8 @@ int main(int argc, char *argv[]) #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -60,9 +62,10 @@ int main(int argc, char *argv[]) while (runTime.run()) { #include "readTimeControls.H" - #include "readPISOControls.H" + #include "readPIMPLEControls.H" #include "compressibleCourantNo.H" #include "setDeltaT.H" + pimple.read(); runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; @@ -71,12 +74,7 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { #include "UEqn.H" #include "YEqn.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H index 4029b8fc8d..b665c8fc62 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H @@ -37,7 +37,7 @@ if (transonic) ( p.select ( - pimpleCorr.finalIter() + pimple.finalIter() && corr == nCorr-1 && nonOrth == nNonOrthCorr ) @@ -75,7 +75,7 @@ else ( p.select ( - pimpleCorr.finalIter() + pimple.finalIter() && corr == nCorr-1 && nonOrth == nNonOrthCorr ) diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index f399ae40cb..6db691f5ed 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -37,7 +37,7 @@ Description #include "basicPsiThermo.H" #include "turbulenceModel.H" #include "bound.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,6 +49,8 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "initContinuityErrs.H" + pimpleControl pimple(mesh); + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) @@ -57,6 +59,7 @@ int main(int argc, char *argv[]) #include "readPIMPLEControls.H" #include "compressibleCourantNo.H" #include "setDeltaT.H" + pimple.read(); runTime++; @@ -65,12 +68,7 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { if (nOuterCorr != 1) { diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C index 9bceaa1167..1ee1ed665e 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C @@ -40,7 +40,7 @@ Description #include "MRFZones.H" #include "porousZones.H" #include "fvcSmooth.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" #include "bound.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -56,6 +56,10 @@ int main(int argc, char *argv[]) #include "createZones.H" #include "initContinuityErrs.H" + pimpleControl pimple(mesh); + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) @@ -64,6 +68,7 @@ int main(int argc, char *argv[]) #include "readPIMPLEControls.H" #include "compressibleCourantNo.H" #include "setDeltaT.H" + pimple.read(); runTime++; @@ -74,12 +79,7 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { if (nOuterCorr != 1) { diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setInitialrDeltaT.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setInitialrDeltaT.H index 6a397be9c2..54652dd8ed 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setInitialrDeltaT.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setInitialrDeltaT.H @@ -1,6 +1,6 @@ scalar maxDeltaT ( - pimple.lookupOrDefault("maxDeltaT", GREAT) + pimpleDict.lookupOrDefault("maxDeltaT", GREAT) ); volScalarField rDeltaT diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H index e854f03d35..7cad4d2679 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H @@ -1,22 +1,22 @@ { scalar maxCo ( - pimple.lookupOrDefault("maxCo", 0.8) + pimpleDict.lookupOrDefault("maxCo", 0.8) ); scalar rDeltaTSmoothingCoeff ( - pimple.lookupOrDefault("rDeltaTSmoothingCoeff", 0.02) + pimpleDict.lookupOrDefault("rDeltaTSmoothingCoeff", 0.02) ); scalar rDeltaTDampingCoeff ( - pimple.lookupOrDefault("rDeltaTDampingCoeff", 1.0) + pimpleDict.lookupOrDefault("rDeltaTDampingCoeff", 1.0) ); scalar maxDeltaT ( - pimple.lookupOrDefault("maxDeltaT", GREAT) + pimpleDict.lookupOrDefault("maxDeltaT", GREAT) ); volScalarField rDeltaT0("rDeltaT0", rDeltaT); diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H index 4a0626e3d1..32058ffa9e 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H @@ -39,11 +39,9 @@ if (transonic) ( p.select ( - ( - pimpleCorr.finalIter() - && corr == nCorr-1 - && nonOrth == nNonOrthCorr - ) + pimple.finalIter() + && corr == nCorr-1 + && nonOrth == nNonOrthCorr ) ) ); @@ -80,11 +78,9 @@ else ( p.select ( - ( - pimpleCorr.finalIter() - && corr == nCorr-1 - && nonOrth == nNonOrthCorr - ) + pimple.finalIter() + && corr == nCorr-1 + && nonOrth == nNonOrthCorr ) ) ); diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C index 94e3f67e59..0bce64d7a3 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C @@ -39,7 +39,7 @@ Description #include "bound.H" #include "MRFZones.H" #include "porousZones.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,6 +52,8 @@ int main(int argc, char *argv[]) #include "createZones.H" #include "initContinuityErrs.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -62,6 +64,7 @@ int main(int argc, char *argv[]) #include "readPIMPLEControls.H" #include "compressibleCourantNo.H" #include "setDeltaT.H" + pimple.read(); runTime++; @@ -70,12 +73,7 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { if (nOuterCorr != 1) { diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C index c8542832dc..f5cd55daca 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C @@ -48,7 +48,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" #include "RASModel.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -64,6 +64,8 @@ int main(int argc, char *argv[]) #include "CourantNo.H" #include "setInitialDeltaT.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -76,14 +78,10 @@ int main(int argc, char *argv[]) #include "readPIMPLEControls.H" #include "CourantNo.H" #include "setDeltaT.H" + pimple.read(); // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { if (nOuterCorr != 1) { diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H index 363ac11fb1..31c4f484e0 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H @@ -25,11 +25,9 @@ ( p_rgh.select ( - ( - pimpleCorr.finalIter() - && corr == nCorr-1 - && nonOrth == nNonOrthCorr - ) + pimple.finalIter() + && corr == nCorr-1 + && nonOrth == nNonOrthCorr ) ) ); diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index 161ebc509d..f2deb2e2d5 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C @@ -37,7 +37,7 @@ Description #include "basicRhoThermo.H" #include "turbulenceModel.H" #include "fixedGradientFvPatchFields.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,6 +53,8 @@ int main(int argc, char *argv[]) #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -63,6 +65,7 @@ int main(int argc, char *argv[]) #include "readPIMPLEControls.H" #include "compressibleCourantNo.H" #include "setDeltaT.H" + pimple.read(); runTime++; @@ -71,12 +74,7 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { if (nOuterCorr != 1) { diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H index 343ff2b800..963b4df548 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H @@ -39,11 +39,9 @@ ( p_rgh.select ( - ( - pimpleCorr.finalIter() - && corr == nCorr-1 - && nonOrth == nNonOrthCorr - ) + pimple.finalIter() + && corr == nCorr-1 + && nonOrth == nNonOrthCorr ) ) ); diff --git a/applications/solvers/incompressible/pimpleFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pEqn.H index 8326f35a6b..0a4e6b1aaa 100644 --- a/applications/solvers/incompressible/pimpleFoam/pEqn.H +++ b/applications/solvers/incompressible/pimpleFoam/pEqn.H @@ -27,7 +27,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) ( p.select ( - pimpleCorr.finalIter() + pimple.finalIter() && corr == nCorr-1 && nonOrth == nNonOrthCorr ) diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H index 88a0056e77..81a46f227b 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H +++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H @@ -29,11 +29,9 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) ( p.select ( - ( - pimpleCorr.finalIter() - && corr == nCorr-1 - && nonOrth == nNonOrthCorr - ) + pimple.finalIter() + && corr == nCorr-1 + && nonOrth == nNonOrthCorr ) ) ); diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C index 73f34858d4..14c7c6fdc7 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C @@ -36,7 +36,7 @@ Description #include "singlePhaseTransportModel.H" #include "turbulenceModel.H" #include "dynamicFvMesh.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,11 +46,12 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createDynamicFvMesh.H" - #include "readPIMPLEControls.H" #include "initContinuityErrs.H" #include "createFields.H" #include "readTimeControls.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -59,6 +60,7 @@ int main(int argc, char *argv[]) { #include "readControls.H" #include "CourantNo.H" + pimple.read(); // Make the fluxes absolute fvc::makeAbsolute(phi, U); @@ -85,12 +87,7 @@ int main(int argc, char *argv[]) } // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { if (nOuterCorr != 1) { diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H index 8789bd0ab4..8835bb6b48 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H +++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H @@ -2,8 +2,8 @@ #include "readPIMPLEControls.H" const bool correctPhi = - pimple.lookupOrDefault("correctPhi", false); + pimpleDict.lookupOrDefault("correctPhi", false); const bool checkMeshCourantNo = - pimple.lookupOrDefault("checkMeshCourantNo", false); + pimpleDict.lookupOrDefault("checkMeshCourantNo", false); diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C index d1b98ee10e..6e2683d69c 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" #include "turbulenceModel.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -47,6 +47,10 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "initContinuityErrs.H" + pimpleControl pimple(mesh); + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) @@ -55,18 +59,14 @@ int main(int argc, char *argv[]) #include "readPIMPLEControls.H" #include "CourantNo.H" #include "setDeltaT.H" + pimple.read(); runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { if (nOuterCorr != 1) { diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C b/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C index 534c64bd9b..7b8d04206d 100644 --- a/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C +++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C @@ -46,7 +46,7 @@ Description #include "timeActivatedExplicitSource.H" #include "SLGThermo.H" #include "fvcSmooth.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -66,6 +66,8 @@ int main(int argc, char *argv[]) #include "createPorousZones.H" #include "initContinuityErrs.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -76,6 +78,7 @@ int main(int argc, char *argv[]) #include "readChemistryProperties.H" #include "readAdditionalSolutionControls.H" #include "readTimeControls.H" + pimple.read(); runTime++; @@ -89,12 +92,7 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { if (nOuterCorr != 1) { diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H index 8ee50f42e8..4accc5dad9 100644 --- a/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H @@ -46,7 +46,7 @@ ( p.select ( - pimpleCorr.finalIter() + pimple.finalIter() && corr == nCorr-1 && nonOrth == nNonOrthCorr ) diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index b1f8b99a31..ab9c56dccd 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -45,7 +45,7 @@ Description #include "timeActivatedExplicitSource.H" #include "radiationModel.H" #include "SLGThermo.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -65,6 +65,8 @@ int main(int argc, char *argv[]) #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -75,6 +77,7 @@ int main(int argc, char *argv[]) #include "readPISOControls.H" #include "compressibleCourantNo.H" #include "setDeltaT.H" + pimple.read(); runTime++; @@ -91,12 +94,7 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { #include "UEqn.H" #include "YEqn.H" diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H index 0e5cb3e1fe..2e9099624c 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H @@ -32,7 +32,7 @@ if (transonic) ( p.select ( - pimpleCorr.finalIter() + pimple.finalIter() && corr == nCorr-1 && nonOrth == nNonOrthCorr ) @@ -71,7 +71,7 @@ else ( p.select ( - pimpleCorr.finalIter() + pimple.finalIter() && corr == nCorr-1 && nonOrth == nNonOrthCorr ) diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H index ff7c716968..8178c40af5 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H @@ -34,7 +34,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) ( p_rgh.select ( - pimpleCorr.finalIter() + pimple.finalIter() && corr == nCorr-1 && nonOrth == nNonOrthCorr ) diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C index 9ec100f3fd..5ab5dfb8d8 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C @@ -39,7 +39,7 @@ Description #include "chemistrySolver.H" #include "radiationModel.H" #include "SLGThermo.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -60,6 +60,8 @@ int main(int argc, char *argv[]) #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -71,6 +73,7 @@ int main(int argc, char *argv[]) #include "compressibleCourantNo.H" #include "setMultiRegionDeltaT.H" #include "setDeltaT.H" + pimple.read(); runTime++; @@ -86,12 +89,7 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" // --- PIMPLE loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { #include "UEqn.H" #include "YEqn.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H index 15999a1798..0e7e36f0ef 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H @@ -32,7 +32,7 @@ if (transonic) ( p.select ( - pimpleCorr.finalIter() + pimple.finalIter() && corr == nCorr-1 && nonOrth == nNonOrthCorr ) @@ -71,7 +71,7 @@ else ( p.select ( - pimpleCorr.finalIter() + pimple.finalIter() && corr == nCorr-1 && nonOrth == nNonOrthCorr ) diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index f938d0f22b..fd5599736a 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -38,7 +38,7 @@ Description #include "chemistrySolver.H" #include "radiationModel.H" #include "SLGThermo.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -58,6 +58,8 @@ int main(int argc, char *argv[]) #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -65,9 +67,10 @@ int main(int argc, char *argv[]) while (runTime.run()) { #include "readTimeControls.H" - #include "readPISOControls.H" + #include "readPIMPLEControls.H" #include "compressibleCourantNo.H" #include "setDeltaT.H" + pimple.read(); runTime++; @@ -79,12 +82,7 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { #include "UEqn.H" #include "YEqn.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index 2e241d13e2..eb03daea93 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C @@ -46,7 +46,7 @@ Description #include "interfaceProperties.H" #include "phaseChangeTwoPhaseMixture.H" #include "turbulenceModel.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -64,16 +64,19 @@ int main(int argc, char *argv[]) #include "CourantNo.H" #include "setInitialDeltaT.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { - #include "readPISOControls.H" + #include "readPIMPLEControls.H" #include "readTimeControls.H" #include "CourantNo.H" #include "setDeltaT.H" + pimple.read(); runTime++; @@ -84,12 +87,7 @@ int main(int argc, char *argv[]) turbulence->correct(); // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { #include "UEqn.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H index 59bc275540..c15d76312c 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H @@ -39,7 +39,7 @@ ( p_rgh.select ( - pimpleCorr.finalIter() + pimple.finalIter() && corr == nCorr-1 && nonOrth == nNonOrthCorr ) diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H index 4d7a6b986c..42e85e1db9 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/pEqn.H @@ -29,7 +29,7 @@ ( p_rgh.select ( - pimpleCorr.finalIter() + pimple.finalIter() && corr == nCorr-1 && nonOrth == nNonOrthCorr ) diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C index a21b862441..fb06b7fed3 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C @@ -34,7 +34,7 @@ Description #include "fvCFD.H" #include "twoPhaseMixture.H" #include "turbulenceModel.H" -#include "pimpleLoop.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,6 +51,8 @@ int main(int argc, char *argv[]) #include "CourantNo.H" #include "setInitialDeltaT.H" + pimpleControl pimple(mesh); + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; @@ -61,18 +63,14 @@ int main(int argc, char *argv[]) #include "readTimeControls.H" #include "CourantNo.H" #include "setDeltaT.H" + pimple.read(); runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; // --- Pressure-velocity PIMPLE corrector loop - for - ( - pimpleLoop pimpleCorr(mesh, nOuterCorr); - pimpleCorr.loop(); - pimpleCorr++ - ) + for (pimple.start(); pimple.loop(); pimple++) { twoPhaseProperties.correct();