zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: Updated PIMPLE solvers to new pimpleControl framework

Browse Source
This commit is contained in:
andy
2011-10-26 12:04:25 +01:00
parent 4c63590979
commit d05c5a41a1
87 changed files with 312 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C
View File

@ -87,7 +87,7 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for (pimple.start(); pimple.loop(); pimple++)
while (pimple.loop())
{
turbulence->correct();
@ -95,8 +95,8 @@ int main(int argc, char *argv[])
#include "YEqn.H"
#include "hsEqn.H"
// --- PISO loop
for (int corr=0; corr<pimple.nCorr(); corr++)
// --- Pressure corrector loop
while (pimple.correct())
{
#include "pEqn.H"
}

9
applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
View File

@ -32,7 +32,7 @@
+ massSource.SuTot()
);
for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@ -40,12 +40,9 @@
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve
(
mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
);
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (nonOrth == pimple.nNonOrthCorr())
if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}

6
applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
View File

@ -88,14 +88,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for (pimple.start(); pimple.loop(); pimple++)
while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
// --- PISO loop
for (int corr=0; corr<pimple.nCorr(); corr++)
// --- Pressure corrector loop
while (pimple.correct())
{
#include "pEqn.H"
}

18
applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
View File

@ -15,7 +15,7 @@ if (pimple.transonic())
)
);
for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@ -26,12 +26,9 @@ if (pimple.transonic())
coalParcels.Srho()
);
pEqn.solve
(
mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
);
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (nonOrth == pimple.nNonOrthCorr())
if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@ -46,7 +43,7 @@ else
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@ -57,12 +54,9 @@ else
coalParcels.Srho()
);
pEqn.solve
(
mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
);
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (nonOrth == pimple.nNonOrthCorr())
if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}

9
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
View File

@ -32,7 +32,7 @@
+ massSource.SuTot()
);
for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@ -40,12 +40,9 @@
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve
(
mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
);
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (nonOrth == pimple.nNonOrthCorr())
if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}

6
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
View File

@ -90,14 +90,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for (pimple.start(); pimple.loop(); pimple++)
while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
// --- PISO loop
for (int corr=0; corr<pimple.nCorr(); corr++)
// --- Pressure corrector loop
while (pimple.correct())
{
#include "pEqn.H"
}

9
applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
View File

@ -15,7 +15,7 @@ surfaceScalarField phiU
phi = phiU - rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf();
for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
while (pimple.correctNonOrthogonal())
{
fvScalarMatrix p_rghEqn
(
@ -28,12 +28,9 @@ for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
+ surfaceFilm.Srho()
);
p_rghEqn.solve
(
mesh.solver(p_rgh.select(pimple.finalInnerIter(corr, nonOrth)))
);
p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
if (nonOrth == pimple.nNonOrthCorr())
if (pimple.finalNonOrthogonalIter())
{
phi += p_rghEqn.flux();
}

6
applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
View File

@ -83,14 +83,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- PIMPLE loop
for (pimple.start(); pimple.loop(); pimple++)
while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
// --- PISO loop
for (int corr=1; corr<=pimple.nCorr(); corr++)
// --- Pressure corrector loop
while (pimple.correct())
{
#include "pEqn.H"
}

18
applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
View File

@ -15,7 +15,7 @@ if (pimple.transonic())
)
);
for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@ -26,12 +26,9 @@ if (pimple.transonic())
parcels.Srho()
);
pEqn.solve
(
mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
);
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (nonOrth == pimple.nNonOrthCorr())
if (pimple.finalNonOrthogonalIter())
{
phi == pEqn.flux();
}
@ -46,7 +43,7 @@ else
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
for (int nonOrth=0; nonOrth<=pimple.nNonOrthCorr(); nonOrth++)
while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
@ -57,12 +54,9 @@ else
parcels.Srho()
);
pEqn.solve
(
mesh.solver(p.select(pimple.finalInnerIter(corr, nonOrth)))
);
pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
if (nonOrth == pimple.nNonOrthCorr())
if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
}

6
applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
View File

@ -76,14 +76,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for (pimple.start(); pimple.loop(); pimple++)
while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
// --- PISO loop
for (int corr=0; corr<pimple.nCorr(); corr++)
// --- Pressure corrector loop
while (pimple.correct())
{
#include "pEqn.H"
}

6
applications/solvers/lagrangian/sprayFoam/sprayFoam.C
View File

@ -76,14 +76,14 @@ int main(int argc, char *argv[])
#include "rhoEqn.H"
// --- Pressure-velocity PIMPLE corrector loop
for (pimple.start(); pimple.loop(); pimple++)
while (pimple.loop())
{
#include "UEqn.H"
#include "YEqn.H"
#include "hsEqn.H"
// --- PISO loop
for (int corr=0; corr<pimple.nCorr(); corr++)
// --- Pressure corrector loop
while (pimple.correct())
{
#include "pEqn.H"
}