Commit eb516147 authored by Henry's avatar Henry
Browse files

Renamed rUA -> rAU

parent 216f0a0c
......@@ -85,15 +85,15 @@ int main(int argc, char *argv[])
for (int corr=1; corr<=1; corr++)
{
volScalarField rUA = 1.0/UEqn.A();
volScalarField rAU = 1.0/UEqn.A();
U = rUA*UEqn.H();
U = rAU*UEqn.H();
phi = (fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, U, phi);
+ fvc::ddtPhiCorr(rAU, U, phi);
fvScalarMatrix pEqn
(
fvm::laplacian(rUA, p) == fvc::div(phi)
fvm::laplacian(rAU, p) == fvc::div(phi)
);
pEqn.solve();
......@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
#include "continuityErrs.H"
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();
}
......
rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
volScalarField rAU = 1.0/UEqn.A();
U = invA & UEqn.H();
if (transonic)
......@@ -11,7 +11,7 @@ if (transonic)
fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
......@@ -38,7 +38,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++)
......
rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
volScalarField rAU = 1.0/UEqn.A();
U = rAU*UEqn.H();
if (transonic)
{
......@@ -11,7 +11,7 @@ if (transonic)
fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
......@@ -21,7 +21,7 @@ if (transonic)
(
fvm::ddt(psi, p)
+ fvm::div(phid, p)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve();
......@@ -38,7 +38,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++)
......@@ -47,7 +47,7 @@ else
(
fvm::ddt(psi, p)
+ fvc::div(phi)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve();
......@@ -62,7 +62,7 @@ else
#include "rhoEqn.H"
#include "compressibleContinuityErrs.H"
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();
DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
volScalarField rAU = 1.0/UEqn.A();
U = rAU*UEqn.H();
if (transonic)
{
......@@ -11,7 +11,7 @@ if (transonic)
fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
......@@ -21,7 +21,7 @@ if (transonic)
(
fvm::ddt(psi, p)
+ fvm::div(phid, p)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
==
Sevap
);
......@@ -40,7 +40,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++)
......@@ -49,7 +49,7 @@ else
(
fvm::ddt(psi, p)
+ fvc::div(phi)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
==
Sevap
);
......@@ -66,7 +66,7 @@ else
#include "rhoEqn.H"
#include "compressibleContinuityErrs.H"
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();
DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
volScalarField rAU = 1.0/UEqn.A();
U = rAU*UEqn.H();
if (transonic)
{
......@@ -18,7 +18,7 @@ if (transonic)
(
fvm::ddt(psi, p)
+ fvm::div(phid, p, "div(phid,p)")
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve();
......@@ -40,7 +40,7 @@ else
(
fvm::ddt(psi, p)
+ fvc::div(phi)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve();
......@@ -55,7 +55,7 @@ else
#include "rhoEqn.H"
#include "compressibleContinuityErrs.H"
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();
DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
surfaceScalarField rhorUAf("(rho*(1|A(U)))", fvc::interpolate(rho*rUA));
U = rUA*UEqn.H();
volScalarField rAU = 1.0/UEqn.A();
surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU));
U = rAU*UEqn.H();
surfaceScalarField phiU
(
fvc::interpolate(rho)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
phi = phiU - rhorUAf*ghf*fvc::snGrad(rho)*mesh.magSf();
phi = phiU - rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf();
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
{
surfaceScalarField rhorUAf = fvc::interpolate(rho*rUA);
surfaceScalarField rhorAUf = fvc::interpolate(rho*rAU);
fvScalarMatrix p_rghEqn
(
fvm::ddt(psi, p_rgh) + fvc::ddt(psi, rho)*gh
+ fvc::div(phi)
- fvm::laplacian(rhorUAf, p_rgh)
- fvm::laplacian(rhorAUf, p_rgh)
);
p_rghEqn.solve
......@@ -52,7 +52,7 @@ p = p_rgh + rho*gh;
#include "rhoEqn.H"
#include "compressibleContinuityErrs.H"
U += rUA*fvc::reconstruct((phi - phiU)/rhorUAf);
U += rAU*fvc::reconstruct((phi - phiU)/rhorAUf);
U.correctBoundaryConditions();
DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
volScalarField rAU = 1.0/UEqn.A();
U = rAU*UEqn.H();
if (transonic)
{
......@@ -11,7 +11,7 @@ if (transonic)
fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
+ fvc::ddtPhiCorr(rAU, rho, U, phi)
)
);
......@@ -21,7 +21,7 @@ if (transonic)
(
fvm::ddt(psi, p)
+ fvm::div(phid, p)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve();
......@@ -38,7 +38,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++)
......@@ -47,7 +47,7 @@ else
(
fvm::ddt(psi, p)
+ fvc::div(phi)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve();
......@@ -62,7 +62,7 @@ else
#include "rhoEqn.H"
#include "compressibleContinuityErrs.H"
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();
DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
......@@ -5,14 +5,14 @@
// pressure solution - done in 2 parts. Part 1:
thermo.rho() -= psi*p;
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
volScalarField rAU = 1.0/UEqn.A();
U = rAU*UEqn.H();
if (transonic)
{
surfaceScalarField phiv =
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi);
+ fvc::ddtPhiCorr(rAU, rho, U, phi);
phi = fvc::interpolate(rho)*phiv;
......@@ -28,7 +28,7 @@
(
fvc::ddt(rho) + fvc::div(phi)
+ correction(fvm::ddt(psi, p) + fvm::div(phid, p))
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve
......@@ -58,7 +58,7 @@
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++)
......@@ -67,7 +67,7 @@
(
fvc::ddt(rho) + psi*correction(fvm::ddt(p))
+ fvc::div(phi)
- fvm::laplacian(rho*rUA, p)
- fvm::laplacian(rho*rAU, p)
);
pEqn.solve
......@@ -98,7 +98,7 @@
#include "rhoEqn.H"
#include "compressibleContinuityErrs.H"
U -= rUA*fvc::grad(p);
U -= rAU*fvc::grad(p);
U.correctBoundaryConditions();
DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
......
......@@ -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();
}
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);
......@@ -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();
}
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);
......
......@@ -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
......
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();
......@@ -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();
}
......
......@@ -92,18 +92,18 @@ int main(int argc, char *argv[])
for (int corr=0; corr<nCorr; corr++)
{
volScalarField rUA = 1.0/UEqn.A();