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

ENH: Propagated caching of HbyA across solvers

Browse Source
This commit is contained in:
andy
2012-03-02 18:15:54 +00:00
parent 658f0a0680
commit 912a20b7a3
28 changed files with 321 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/solvers/compressible/rhoPimpleFoam/pEqn.H
View File

@ -3,7 +3,8 @@ rho = max(rho, rhoMin);
rho = min(rho, rhoMax);
rho.relax();
U = rAU*UEqn().H();
volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn().H();
if (pimple.nCorrPISO() <= 1)
{
@ -17,7 +18,7 @@ if (pimple.transonic())
"phid",
fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
(fvc::interpolate(HbyA) & mesh.Sf())
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
@ -41,12 +42,15 @@ if (pimple.transonic())
}
else
{
phi =
fvc::interpolate(rho)*
(
(fvc::interpolate(U) & mesh.Sf())
surfaceScalarField phiHbyA
(
"phiHbyA",
fvc::interpolate(rho)
*(
(fvc::interpolate(HbyA) & mesh.Sf())
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
)
);
while (pimple.correctNonOrthogonal())
{
@ -54,7 +58,7 @@ else
fvScalarMatrix pEqn
(
fvm::ddt(psi, p)
+ fvc::div(phi)
+ fvc::div(phiHbyA)
- fvm::laplacian(rho*rAU, p)
);
@ -62,7 +66,7 @@ else
if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
phi = phiHbyA + pEqn.flux();
}
}
}
@ -81,7 +85,7 @@ rho.relax();
Info<< "rho max/min : " << max(rho).value()
<< " " << min(rho).value() << endl;
U -= rAU*fvc::grad(p);
U = HbyA - rAU*fvc::grad(p);
U.correctBoundaryConditions();
K = 0.5*magSqr(U);

27
applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
View File

@ -4,7 +4,8 @@ rho = min(rho, rhoMax);
rho.relax();
volScalarField rAU(1.0/UEqn().A());
U = rAU*UEqn().H();
volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn().H();
if (pimple.nCorrPISO() <= 1)
{
@ -18,7 +19,7 @@ if (pimple.transonic())
"phid",
fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
(fvc::interpolate(HbyA) & mesh.Sf())
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
@ -43,13 +44,17 @@ if (pimple.transonic())
}
else
{
phi =
fvc::interpolate(rho)*
(
(fvc::interpolate(U) & mesh.Sf())
surfaceScalarField phiHbyA
(
"phiHbyA",
fvc::interpolate(rho)
*(
(fvc::interpolate(HbyA) & mesh.Sf())
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
mrfZones.relativeFlux(fvc::interpolate(rho), phi);
)
);
mrfZones.relativeFlux(fvc::interpolate(rho), phiHbyA);
while (pimple.correctNonOrthogonal())
{
@ -57,7 +62,7 @@ else
fvScalarMatrix pEqn
(
fvm::ddt(psi, p)
+ fvc::div(phi)
+ fvc::div(phiHbyA)
- fvm::laplacian(rho*rAU, p)
);
@ -65,7 +70,7 @@ else
if (pimple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
phi = phiHbyA + pEqn.flux();
}
}
}
@ -83,7 +88,7 @@ rho.relax();
Info<< "rho max/min : " << max(rho).value()
<< " " << min(rho).value() << endl;
U -= rAU*fvc::grad(p);
U = HbyA - rAU*fvc::grad(p);
U.correctBoundaryConditions();
K = 0.5*magSqr(U);

21
applications/solvers/compressible/rhoSimpleFoam/pEqn.H
View File

@ -4,7 +4,9 @@ rho = min(rho, rhoMax);
rho.relax();
volScalarField rAU(1.0/UEqn().A());
U = rAU*UEqn().H();
volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn().H();
UEqn.clear();
bool closedVolume = false;
@ -14,7 +16,7 @@ if (simple.transonic())
surfaceScalarField phid
(
"phid",
fvc::interpolate(psi)*(fvc::interpolate(U) & mesh.Sf())
fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
);
while (simple.correctNonOrthogonal())
@ -40,14 +42,19 @@ if (simple.transonic())
}
else
{
phi = fvc::interpolate(rho)*(fvc::interpolate(U) & mesh.Sf());
closedVolume = adjustPhi(phi, U, p);
surfaceScalarField phiHbyA
(
"phiHbyA",
fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
);
closedVolume = adjustPhi(phiHbyA, U, p);
while (simple.correctNonOrthogonal())
{
fvScalarMatrix pEqn
(
fvm::laplacian(rho*rAU, p) == fvc::div(phi)
fvm::laplacian(rho*rAU, p) == fvc::div(phiHbyA)
);
pEqn.setReference(pRefCell, pRefValue);
@ -56,7 +63,7 @@ else
if (simple.finalNonOrthogonalIter())
{
phi -= pEqn.flux();
phi = phiHbyA - pEqn.flux();
}
}
}
@ -67,7 +74,7 @@ else
// Explicitly relax pressure for momentum corrector
p.relax();
U -= rAU*fvc::grad(p);
U = HbyA - rAU*fvc::grad(p);
U.correctBoundaryConditions();
// For closed-volume cases adjust the pressure and density levels

29
applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H
View File

@ -1,10 +1,12 @@
volVectorField HbyA("HbyA", U);
if (pressureImplicitPorosity)
{
U = trTU()&UEqn().H();
HbyA = trTU() & UEqn().H();
}
else
{
U = trAU()*UEqn().H();
HbyA = trAU()*UEqn().H();
}
UEqn.clear();
@ -16,7 +18,7 @@ if (simple.transonic())
surfaceScalarField phid
(
"phid",
fvc::interpolate(psi)*(fvc::interpolate(U) & mesh.Sf())
fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
);
mrfZones.relativeFlux(fvc::interpolate(psi), phid);
@ -45,10 +47,15 @@ if (simple.transonic())
}
else
{
phi = fvc::interpolate(rho*U) & mesh.Sf();
mrfZones.relativeFlux(fvc::interpolate(rho), phi);
surfaceScalarField phiHbyA
(
"phiHbyA",
fvc::interpolate(rho*HbyA) & mesh.Sf()
);
closedVolume = adjustPhi(phi, U, p);
mrfZones.relativeFlux(fvc::interpolate(rho), phiHbyA);
closedVolume = adjustPhi(phiHbyA, U, p);
while (simple.correctNonOrthogonal())
{
@ -56,11 +63,11 @@ else
if (pressureImplicitPorosity)
{
tpEqn = (fvm::laplacian(rho*trTU(), p) == fvc::div(phi));
tpEqn = (fvm::laplacian(rho*trTU(), p) == fvc::div(phiHbyA));
}
else
{
tpEqn = (fvm::laplacian(rho*trAU(), p) == fvc::div(phi));
tpEqn = (fvm::laplacian(rho*trAU(), p) == fvc::div(phiHbyA));
}
tpEqn().setReference(pRefCell, pRefValue);
@ -69,7 +76,7 @@ else
if (simple.finalNonOrthogonalIter())
{
phi -= tpEqn().flux();
phi = phiHbyA - tpEqn().flux();
}
}
}
@ -81,11 +88,11 @@ p.relax();
if (pressureImplicitPorosity)
{
U -= trTU()&fvc::grad(p);
U = HbyA - (trTU() & fvc::grad(p));
}
else
{
U -= trAU()*fvc::grad(p);
U = HbyA - trAU()*fvc::grad(p);
}
U.correctBoundaryConditions();

22
applications/solvers/compressible/rhoSimplecFoam/pEqn.H
View File

@ -7,7 +7,10 @@ volScalarField p0(p);
volScalarField AU(UEqn().A());
volScalarField AtU(AU - UEqn().H1());
U = UEqn().H()/AU;
volVectorField HbyA("HbyA", U);
HbyA = UEqn().H()/AU;
UEqn.clear();
bool closedVolume = false;
@ -19,7 +22,7 @@ if (simple.transonic())
surfaceScalarField phid
(
"phid",
fvc::interpolate(psi*U) & mesh.Sf()
fvc::interpolate(psi*HbyA) & mesh.Sf()
);
surfaceScalarField phic
@ -56,13 +59,18 @@ else
{
while (simple.correctNonOrthogonal())
{
phi = fvc::interpolate(rho*U) & mesh.Sf();
surfaceScalarField phiHbyA
(
"phiHbyA",
fvc::interpolate(rho*HbyA) & mesh.Sf()
);
closedVolume = adjustPhi(phi, U, p);
phi += fvc::interpolate(rho/AtU - rho/AU)*fvc::snGrad(p)*mesh.magSf();
fvScalarMatrix pEqn
(
fvc::div(phi)
fvc::div(phiHbyA)
//- fvm::laplacian(rho/AU, p)
- fvm::laplacian(rho/AtU, p)
);
@ -73,7 +81,7 @@ else
if (simple.finalNonOrthogonalIter())
{
phi += pEqn.flux();
phi = phiHbyA + pEqn.flux();
}
}
}
@ -85,8 +93,8 @@ else
// Explicitly relax pressure for momentum corrector
p.relax();
U -= (fvc::grad(p0)*(1.0/AU - 1.0/AtU) + fvc::grad(p)/AtU);
//U -= fvc::grad(p)/AU;
U = HbyA - (fvc::grad(p0)*(1.0/AU - 1.0/AtU) + fvc::grad(p)/AtU);
//U = HbyA - fvc::grad(p)/AU;
U.correctBoundaryConditions();

7
applications/solvers/compressible/sonicFoam/pEqn.H
View File

@ -1,14 +1,15 @@
rho = thermo.rho();
volScalarField rAU(1.0/UEqn.A());
U = rAU*UEqn.H();
volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn.H();
surfaceScalarField phid
(
"phid",
fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
(fvc::interpolate(HbyA) & mesh.Sf())
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
@ -33,5 +34,5 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
#include "rhoEqn.H"
#include "compressibleContinuityErrs.H"
U -= rAU*fvc::grad(p);
U = HbyA - rAU*fvc::grad(p);
U.correctBoundaryConditions();

7
applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
View File

@ -1,14 +1,15 @@
rho = thermo.rho();
volScalarField rAU(1.0/UEqn.A());
U = UEqn.H()/UEqn.A();
volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn.H();
surfaceScalarField phid
(
"phid",
fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
(fvc::interpolate(HbyA) & mesh.Sf())
- fvc::meshPhi(rho, U)
)
);
@ -29,5 +30,5 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
#include "compressibleContinuityErrs.H"
U -= rAU*fvc::grad(p);
U = HbyA - rAU*fvc::grad(p);
U.correctBoundaryConditions();