From 1c1a98363c68750af01229f11c468a4fc45a44c0 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 8 Sep 2011 12:04:15 +0100 Subject: [PATCH] ENH: Simplified solvers - removed storePrevIter code --- .../solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C | 6 ------ .../rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C | 6 ------ .../rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C | 6 ------ .../rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C | 3 --- .../solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C | 3 --- .../solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C | 8 -------- .../buoyantBaffleSimpleFoam/buoyantBaffleSimpleFoam.C | 3 --- .../buoyantBoussinesqPimpleFoam.C | 5 ----- .../buoyantBoussinesqSimpleFoam.C | 2 -- .../heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C | 5 ----- .../heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C | 3 --- .../buoyantSimpleRadiationFoam.C | 3 --- .../adjointShapeOptimizationFoam.C | 4 ---- .../pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C | 5 ----- .../pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C | 5 ----- .../solvers/incompressible/pimpleFoam/pimpleFoam.C | 5 ----- .../simpleFoam/MRFSimpleFoam/MRFSimpleFoam.C | 2 -- .../simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C | 2 -- .../simpleFoam/porousSimpleFoam/porousSimpleFoam.C | 2 -- .../solvers/incompressible/simpleFoam/simpleFoam.C | 2 -- .../simpleFoam/windSimpleFoam/windSimpleFoam.C | 2 -- .../LTSReactingParcelFoam/LTSReactingParcelFoam.C | 5 ----- applications/solvers/multiphase/bubbleFoam/bubbleFoam.C | 5 ----- .../compressibleTwoPhaseEulerFoam.C | 5 ----- .../multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C | 5 ----- .../multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C | 5 ----- 26 files changed, 107 deletions(-) diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index 046da72269..94f3f54de4 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -68,12 +68,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p.storePrevIter(); - rho.storePrevIter(); - } - #include "UEqn.H" #include "hEqn.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C index c4cdf7df01..66ffb08275 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C @@ -79,12 +79,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p.storePrevIter(); - rho.storePrevIter(); - } - turbulence->correct(); #include "UEqn.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C index da5d3d886a..5bfbc84d56 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C @@ -73,12 +73,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p.storePrevIter(); - rho.storePrevIter(); - } - #include "UEqn.H" #include "hEqn.H" diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C index 1bfc7d795f..5273f50eaa 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C @@ -59,9 +59,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p.storePrevIter(); - rho.storePrevIter(); - // Pressure-velocity SIMPLE corrector { #include "UEqn.H" diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C index 377734b7b4..454da31441 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C @@ -55,9 +55,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p.storePrevIter(); - rho.storePrevIter(); - // Pressure-velocity SIMPLE corrector { #include "UEqn.H" diff --git a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C index 111530979f..278e689bc2 100644 --- a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C +++ b/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C @@ -57,14 +57,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p.storePrevIter(); - rho.storePrevIter(); - - if (!simple.transonic()) - { - rho.storePrevIter(); - } - // Velocity-pressure-enthalpy SIMPLEC corrector { #include "UEqn.H" diff --git a/applications/solvers/heatTransfer/buoyantBaffleSimpleFoam/buoyantBaffleSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBaffleSimpleFoam/buoyantBaffleSimpleFoam.C index 67c1531e9c..1a5b66f0c7 100644 --- a/applications/solvers/heatTransfer/buoyantBaffleSimpleFoam/buoyantBaffleSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBaffleSimpleFoam/buoyantBaffleSimpleFoam.C @@ -58,9 +58,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p_rgh.storePrevIter(); - rho.storePrevIter(); - // Pressure-velocity SIMPLE corrector { #include "UEqn.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C index 8d91f0f48b..c00c1fe8d8 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C @@ -81,11 +81,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p_rgh.storePrevIter(); - } - #include "UEqn.H" #include "TEqn.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C index aa8f0aa88e..a3d5c956fc 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C @@ -71,8 +71,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p_rgh.storePrevIter(); - // Pressure-velocity SIMPLE corrector { #include "UEqn.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index 8b6dead722..4239771168 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C @@ -74,11 +74,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p_rgh.storePrevIter(); - } - #include "UEqn.H" #include "hEqn.H" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C index fdb29b8026..cebe1207d8 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C @@ -56,9 +56,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p_rgh.storePrevIter(); - rho.storePrevIter(); - // Pressure-velocity SIMPLE corrector { #include "UEqn.H" diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C index 47194e893f..fc6a37ea0f 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C +++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C @@ -59,9 +59,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p_rgh.storePrevIter(); - rho.storePrevIter(); - // Pressure-velocity SIMPLE corrector { #include "UEqn.H" diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C index 9f0171a02f..1ba675c4bf 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C @@ -85,8 +85,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p.storePrevIter(); - laminarTransport.lookup("lambda") >> lambda; //alpha += @@ -148,8 +146,6 @@ int main(int argc, char *argv[]) U.correctBoundaryConditions(); } - pa.storePrevIter(); - // Adjoint Pressure-velocity SIMPLE corrector { // Adjoint Momentum predictor diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C index ff12ed3f33..30725cd070 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C @@ -67,11 +67,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p.storePrevIter(); - } - #include "UrelEqn.H" // --- PISO loop diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C index 5e686a781a..55ee07dbc7 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C @@ -88,11 +88,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p.storePrevIter(); - } - #include "UEqn.H" // --- PISO loop diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C index 69cb3aaf70..e8b58bbea5 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C @@ -66,11 +66,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p.storePrevIter(); - } - #include "UEqn.H" // --- PISO loop diff --git a/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/MRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/MRFSimpleFoam.C index 912b0a85de..c0cc824b49 100644 --- a/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/MRFSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/MRFSimpleFoam/MRFSimpleFoam.C @@ -60,8 +60,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p.storePrevIter(); - // --- Pressure-velocity SIMPLE corrector { #include "UEqn.H" diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C index 8ecf1cdf1d..7f1fef3946 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C @@ -56,8 +56,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p.storePrevIter(); - // --- Pressure-velocity SIMPLE corrector { #include "UrelEqn.H" diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C index bdeb2891c8..d4aaaf596a 100644 --- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C @@ -58,8 +58,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p.storePrevIter(); - // Pressure-velocity SIMPLE corrector { #include "UEqn.H" diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C index c578a27bf6..ebfd10bba2 100644 --- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C @@ -54,8 +54,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p.storePrevIter(); - // --- Pressure-velocity SIMPLE corrector { #include "UEqn.H" diff --git a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C index b06649b603..d3a8bcda19 100644 --- a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C @@ -58,8 +58,6 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - p.storePrevIter(); - // Pressure-velocity SIMPLE corrector { #include "UEqn.H" diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C b/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C index fc08c9e5ef..dc642e7c72 100644 --- a/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C +++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C @@ -89,11 +89,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p.storePrevIter(); - } - turbulence->correct(); #include "UEqn.H" diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C index f6c3e9c3d7..0d095d3648 100644 --- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C +++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C @@ -70,11 +70,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p.storePrevIter(); - } - #include "alphaEqn.H" #include "liftDragCoeffs.H" #include "UEqns.H" diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C index cec5cbf313..c764472cb7 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C @@ -79,11 +79,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p.storePrevIter(); - } - #include "alphaEqn.H" #include "kEpsilon.H" #include "interfacialCoeffs.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C index 814b4dcb6d..b4cc579835 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C @@ -77,11 +77,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p.storePrevIter(); - } - sgsModel->correct(); fluid.solve(); rho = fluid.rho(); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C index 5fb4b7f7f1..43f353cd1c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C @@ -78,11 +78,6 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop for (pimple.start(); pimple.loop(); pimple++) { - if (pimple.nOuterCorr() != 1) - { - p.storePrevIter(); - } - #include "alphaEqn.H" #include "liftDragCoeffs.H" #include "UEqns.H"