PIMPLE updates

This commit is contained in:
Hrvoje Jasak 2013-10-29 13:27:11 +00:00
parent 7e59f48450
commit 0b4174e6b6
2 changed files with 38 additions and 28 deletions

View file

@ -53,7 +53,7 @@ int main(int argc, char *argv[])
#include "createTime.H" #include "createTime.H"
#include "createMesh.H" #include "createMesh.H"
#include "readGravitationalAcceleration.H" #include "readGravitationalAcceleration.H"
#include "readPISOControls.H" #include "readPIMPLEControls.H"
#include "initContinuityErrs.H" #include "initContinuityErrs.H"
#include "createFields.H" #include "createFields.H"
#include "createMRFZones.H" #include "createMRFZones.H"
@ -68,7 +68,7 @@ int main(int argc, char *argv[])
while (runTime.run()) while (runTime.run())
{ {
#include "readPISOControls.H" #include "readPIMPLEControls.H"
#include "readTimeControls.H" #include "readTimeControls.H"
#include "CourantNo.H" #include "CourantNo.H"
#include "setDeltaT.H" #include "setDeltaT.H"
@ -77,21 +77,26 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl; Info<< "Time = " << runTime.timeName() << nl << endl;
twoPhaseProperties.correct(); // Pressure-velocity corrector
int oCorr = 0;
#include "alphaEqnSubCycle.H" do
#include "UEqn.H"
// --- PISO loop
for (int corr=0; corr<nCorr; corr++)
{ {
#include "pEqn.H" twoPhaseProperties.correct();
}
#include "continuityErrs.H" # include "alphaEqnSubCycle.H"
turbulence->correct(); # include "UEqn.H"
// --- PISO loop
for (int corr=0; corr<nCorr; corr++)
{
# include "pEqn.H"
}
# include "continuityErrs.H"
turbulence->correct();
} while (++oCorr < nOuterCorr);
runTime.write(); runTime.write();

View file

@ -55,7 +55,7 @@ int main(int argc, char *argv[])
# include "createTime.H" # include "createTime.H"
# include "createMesh.H" # include "createMesh.H"
# include "readGravitationalAcceleration.H" # include "readGravitationalAcceleration.H"
# include "readPISOControls.H" # include "readPIMPLEControls.H"
# include "initContinuityErrs.H" # include "initContinuityErrs.H"
# include "createFields.H" # include "createFields.H"
# include "createPorousZones.H" # include "createPorousZones.H"
@ -70,7 +70,7 @@ int main(int argc, char *argv[])
while (runTime.run()) while (runTime.run())
{ {
# include "readPISOControls.H" # include "readPIMPLEControls.H"
# include "readTimeControls.H" # include "readTimeControls.H"
# include "CourantNo.H" # include "CourantNo.H"
# include "setDeltaT.H" # include "setDeltaT.H"
@ -79,21 +79,26 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl; Info<< "Time = " << runTime.timeName() << nl << endl;
twoPhaseProperties.correct(); // Pressure-velocity corrector
int oCorr = 0;
# include "alphaEqnSubCycle.H" do
# include "UEqn.H"
// --- PISO loop
for (int corr = 0; corr < nCorr; corr++)
{ {
# include "pEqn.H" twoPhaseProperties.correct();
}
# include "continuityErrs.H" # include "alphaEqnSubCycle.H"
turbulence->correct(); # include "UEqn.H"
// --- PISO loop
for (int corr = 0; corr < nCorr; corr++)
{
# include "pEqn.H"
}
# include "continuityErrs.H"
turbulence->correct();
} while (++oCorr < nOuterCorr);
runTime.write(); runTime.write();