Renamed rUA -> rAU

This commit is contained in:
Henry
2010-10-11 20:10:34 +01:00
parent 216f0a0cd1
commit eb51614780
43 changed files with 263 additions and 241 deletions

View File

@ -9,7 +9,7 @@ tmp<fvVectorMatrix> UEqn
UEqn().relax();
volScalarField rUA = 1.0/UEqn().A();
volScalarField rAU = 1.0/UEqn().A();
if (momentumPredictor)
{
@ -17,6 +17,6 @@ if (momentumPredictor)
}
else
{
U = rUA*(UEqn().H() - fvc::grad(p));
U = rAU*(UEqn().H() - fvc::grad(p));
U.correctBoundaryConditions();
}

View File

@ -1,6 +1,6 @@
rho = thermo.rho();
U = rUA*UEqn().H();
U = rAU*UEqn().H();
if (nCorr <= 1)
{
@ -15,7 +15,7 @@ if (transonic)
fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
@ -25,7 +25,7 @@ if (transonic)
(
fvm::ddt(psi, p)
+ fvm::div(phid, p)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve
@ -55,7 +55,7 @@ else
fvc::interpolate(rho)*
(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
@ -65,7 +65,7 @@ else
(
fvm::ddt(psi, p)
+ fvc::div(phi)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve
@ -101,7 +101,7 @@ rho = thermo.rho();
Info<< "rho max/min : " << max(rho).value()
<< " " << min(rho).value() << endl;
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();
DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);

View File

@ -12,7 +12,7 @@ UEqn().relax();
mrfZones.addCoriolis(rho, UEqn());
pZones.addResistance(UEqn());
volScalarField rUA = 1.0/UEqn().A();
volScalarField rAU = 1.0/UEqn().A();
if (momentumPredictor)
{
@ -20,6 +20,6 @@ if (momentumPredictor)
}
else
{
U = rUA*(UEqn().H() - fvc::grad(p));
U = rAU*(UEqn().H() - fvc::grad(p));
U.correctBoundaryConditions();
}

View File

@ -1,7 +1,7 @@
rho = thermo.rho();
volScalarField rUA = 1.0/UEqn().A();
U = rUA*UEqn().H();
volScalarField rAU = 1.0/UEqn().A();
U = rAU*UEqn().H();
if (nCorr <= 1)
{
@ -16,7 +16,7 @@ if (transonic)
fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
mrfZones.relativeFlux(fvc::interpolate(psi), phid);
@ -27,7 +27,7 @@ if (transonic)
(
fvm::ddt(psi, p)
+ fvm::div(phid, p)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve
@ -57,7 +57,7 @@ else
fvc::interpolate(rho)*
(
(fvc::interpolate(U) & mesh.Sf())
//+ fvc::ddtPhiCorr(rUA, rho, U, phi)
//+ fvc::ddtPhiCorr(rAU, rho, U, phi)
);
mrfZones.relativeFlux(fvc::interpolate(rho), phi);
@ -68,7 +68,7 @@ else
(
fvm::ddt(psi, p)
+ fvc::div(phi)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve
@ -109,7 +109,7 @@ else
<< " " << min(rho).value() << endl;
}
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();
DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);

View File

@ -3,8 +3,8 @@ rho = max(rho, rhoMin);
rho = min(rho, rhoMax);
rho.relax();
volScalarField rUA = 1.0/UEqn().A();
U = rUA*UEqn().H();
volScalarField rAU = 1.0/UEqn().A();
U = rAU*UEqn().H();
UEqn.clear();
bool closedVolume = false;
@ -22,7 +22,7 @@ if (transonic)
fvScalarMatrix pEqn
(
fvm::div(phid, p)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
// Relax the pressure equation to ensure diagonal-dominance
@ -47,7 +47,7 @@ else
{
fvScalarMatrix pEqn
(
fvm::laplacian(rho*rUA, p) == fvc::div(phi)
fvm::laplacian(rho*rAU, p) == fvc::div(phi)
);
pEqn.setReference(pRefCell, pRefValue);
@ -67,7 +67,7 @@ else
// Explicitly relax pressure for momentum corrector
p.relax();
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();
// For closed-volume cases adjust the pressure and density levels

View File

@ -1,7 +1,7 @@
rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
volScalarField rAU = 1.0/UEqn.A();
U = rAU*UEqn.H();
surfaceScalarField phid
(
@ -9,7 +9,7 @@ surfaceScalarField phid
fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
@ -19,7 +19,7 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
(
fvm::ddt(psi, p)
+ fvm::div(phid, p)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve();
@ -33,5 +33,5 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
#include "rhoEqn.H"
#include "compressibleContinuityErrs.H"
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();

View File

@ -71,8 +71,8 @@ int main(int argc, char *argv[])
for (int corr=0; corr<nCorr; corr++)
{
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
volScalarField rAU = 1.0/UEqn.A();
U = rAU*UEqn.H();
surfaceScalarField phid
(
@ -80,7 +80,7 @@ int main(int argc, char *argv[])
psi
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
@ -91,7 +91,7 @@ int main(int argc, char *argv[])
fvm::ddt(psi, p)
+ fvc::div(phi)
+ fvm::div(phid, p)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve();
@ -100,7 +100,7 @@ int main(int argc, char *argv[])
#include "compressibleContinuityErrs.H"
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();
}