From f31623d337870d4e28326690dfd1483f6c5d7f05 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 12 Dec 2016 14:35:21 +0000 Subject: [PATCH 01/28] pimpleControl: Added optional 'solveFlow' control sprayFoam: Added support for the optional 'solveFlow' control to allow simulation of the spray evolution with all sub-models in a 'frozen' flow-field. --- .../solvers/lagrangian/sprayFoam/sprayFoam.C | 41 ++++++++++--------- .../pimpleControl/pimpleControl.C | 4 +- .../pimpleControl/pimpleControl.H | 18 +++++--- .../pimpleControl/pimpleControlI.H | 8 +++- 4 files changed, 44 insertions(+), 27 deletions(-) diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C index 4bffd93bbd..d70075000a 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C @@ -75,34 +75,37 @@ int main(int argc, char *argv[]) parcels.evolve(); - #include "rhoEqn.H" - - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) + if (pimple.solveFlow()) { - #include "UEqn.H" - #include "YEqn.H" - #include "EEqn.H" + #include "rhoEqn.H" - // --- Pressure corrector loop - while (pimple.correct()) + // --- Pressure-velocity PIMPLE corrector loop + while (pimple.loop()) { - #include "pEqn.H" + #include "UEqn.H" + #include "YEqn.H" + #include "EEqn.H" + + // --- Pressure corrector loop + while (pimple.correct()) + { + #include "pEqn.H" + } + + if (pimple.turbCorr()) + { + turbulence->correct(); + } } - if (pimple.turbCorr()) + rho = thermo.rho(); + + if (runTime.write()) { - turbulence->correct(); + combustion->dQ()().write(); } } - rho = thermo.rho(); - - if (runTime.write()) - { - combustion->dQ()().write(); - } - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; diff --git a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C index 2622f94867..e500ab7587 100644 --- a/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C +++ b/src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.C @@ -40,8 +40,9 @@ void Foam::pimpleControl::read() { solutionControl::read(false); - // Read solution controls const dictionary& pimpleDict = dict(); + + solveFlow_ = pimpleDict.lookupOrDefault("solveFlow", true); nCorrPIMPLE_ = pimpleDict.lookupOrDefault