From c205857f0bbe06845d1f2636e61600d682000f42 Mon Sep 17 00:00:00 2001 From: Henry Date: Sun, 28 Apr 2013 21:53:30 +0100 Subject: [PATCH] interPhaseChangeFoam: Improve consistency with current interFoam --- .../solvers/multiphase/interFoam/interFoam.C | 1 - .../interPhaseChangeFoam/interPhaseChangeFoam.C | 17 ++++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index 51f082b616..dccf3f8b28 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -63,7 +63,6 @@ int main(int argc, char *argv[]) #include "CourantNo.H" #include "setInitialDeltaT.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index 83eb7106e9..bc6af055f0 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C @@ -81,14 +81,10 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; + twoPhaseProperties->correct(); + #include "alphaEqnSubCycle.H" - - if (pimple.nCorrPIMPLE() == 1) - { - interface.correct(); - } - - turbulence->correct(); + interface.correct(); // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) @@ -100,9 +96,12 @@ int main(int argc, char *argv[]) { #include "pEqn.H" } - } - twoPhaseProperties->correct(); + if (pimple.turbCorr()) + { + turbulence->correct(); + } + } runTime.write();