Skip to content
Snippets Groups Projects
Commit 28762dc4 authored by Henry's avatar Henry
Browse files

Removed trailing whitespace

parent 70595a9a
Branches
Tags
No related merge requests found
Showing
with 52 additions and 40 deletions
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -85,7 +85,7 @@ int main(int argc, char *argv[]) ...@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
for (int corr=1; corr<=1; corr++) for (int corr=1; corr<=1; corr++)
{ {
volScalarField rAU(1.0/UEqn.A()); volScalarField rAU("Dp", 1.0/UEqn.A());
volVectorField HbyA("HbyA", U); volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn.H(); HbyA = rAU*UEqn.H();
......
rho = thermo.rho(); rho = thermo.rho();
volScalarField rAU(1.0/UEqn.A()); volScalarField rAU(1.0/UEqn.A());
surfaceScalarField rhorAUf(rAU.name() + 'f', fvc::interpolate(rho*rAU)); surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
volVectorField HbyA("HbyA", U); volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn.H(); HbyA = rAU*UEqn.H();
......
{ {
volScalarField rAU("rAU", 1.0/UEqn.A()); volScalarField rAU("rAU", 1.0/UEqn.A());
surfaceScalarField rAUf("(1|A(U))", fvc::interpolate(rAU)); surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
volVectorField HbyA("HbyA", U); volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn.H(); HbyA = rAU*UEqn.H();
......
{ {
volScalarField rAU("rAU", 1.0/UEqn().A()); volScalarField rAU("rAU", 1.0/UEqn().A());
surfaceScalarField rAUf("(1|A(U))", fvc::interpolate(rAU)); surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
volVectorField HbyA("HbyA", U); volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn().H(); HbyA = rAU*UEqn().H();
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
thermo.rho() -= psi*p_rgh; thermo.rho() -= psi*p_rgh;
volScalarField rAU(1.0/UEqn.A()); volScalarField rAU(1.0/UEqn.A());
surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU)); surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
volVectorField HbyA("HbyA", U); volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn.H(); HbyA = rAU*UEqn.H();
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
rho.relax(); rho.relax();
volScalarField rAU(1.0/UEqn().A()); volScalarField rAU(1.0/UEqn().A());
surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU)); surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
volVectorField HbyA("HbyA", U); volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn().H(); HbyA = rAU*UEqn().H();
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
rho.relax(); rho.relax();
volScalarField rAU(1.0/UEqn().A()); volScalarField rAU(1.0/UEqn().A());
surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU)); surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
U = rAU*UEqn().H(); U = rAU*UEqn().H();
UEqn.clear(); UEqn.clear();
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
dimensionedScalar compressibility = fvc::domainIntegrate(psi); dimensionedScalar compressibility = fvc::domainIntegrate(psi);
bool compressible = (compressibility.value() > SMALL); bool compressible = (compressibility.value() > SMALL);
surfaceScalarField buoyancyPhi(rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf()); surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
phi -= buoyancyPhi; phi += phig;
// Solve pressure // Solve pressure
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
// Correct the momentum source with the pressure gradient flux // Correct the momentum source with the pressure gradient flux
// calculated from the relaxed pressure // calculated from the relaxed pressure
U -= rAU*fvc::reconstruct((buoyancyPhi + p_rghEqn.flux())/rhorAUf); U += rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rhorAUf);
U.correctBoundaryConditions(); U.correctBoundaryConditions();
} }
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
rho = thermo.rho(); rho = thermo.rho();
volScalarField rAU(1.0/UEqn().A()); volScalarField rAU(1.0/UEqn().A());
surfaceScalarField rhorAUf("(rho*(1|A(U)))", fvc::interpolate(rho*rAU)); surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
volVectorField HbyA("HbyA", U); volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn().H(); HbyA = rAU*UEqn().H();
......
volScalarField rAU(1.0/UEqn().A()); volScalarField rAU(1.0/UEqn().A());
surfaceScalarField rAUf(rAU.name() + 'f', fvc::interpolate(rAU)); surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
volVectorField HbyA("HbyA", U); volVectorField HbyA("HbyA", U);
HbyA = rAU*(UEqn() == sources(U))().H(); HbyA = rAU*(UEqn() == sources(U))().H();
......
rho = thermo.rho(); rho = thermo.rho();
volScalarField rAU(1.0/UEqn.A()); volScalarField rAU(1.0/UEqn.A());
surfaceScalarField rhorAUf(rAU.name() + 'f', fvc::interpolate(rho*rAU)); surfaceScalarField rhorAUf("Dp", fvc::interpolate(rho*rAU));
volVectorField HbyA("HbyA", U); volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn.H(); HbyA = rAU*UEqn.H();
......
...@@ -8,16 +8,21 @@ ...@@ -8,16 +8,21 @@
surfaceScalarField rAU1f(fvc::interpolate(rAU1)); surfaceScalarField rAU1f(fvc::interpolate(rAU1));
surfaceScalarField rAU2f(fvc::interpolate(rAU2)); surfaceScalarField rAU2f(fvc::interpolate(rAU2));
U1 = rAU1*U1Eqn.H(); volVectorField HbyA1("HbyA1", U1);
U2 = rAU2*U2Eqn.H(); HbyA1 = rAU1*U1Eqn.H();
volVectorField HbyA2("HbyA2", U2);
HbyA2 = rAU2*U2Eqn.H();
surfaceScalarField phiDrag1 surfaceScalarField phiDrag1
( (
fvc::interpolate(alpha2/rho1*dragCoef*rAU1)*phi2 + rAU1f*(g & mesh.Sf()) fvc::interpolate(alpha2/rho1*dragCoef*rAU1)*phi2
+ rAU1f*(g & mesh.Sf())
); );
surfaceScalarField phiDrag2 surfaceScalarField phiDrag2
( (
fvc::interpolate(alpha1/rho2*dragCoef*rAU2)*phi1 + rAU2f*(g & mesh.Sf()) fvc::interpolate(alpha1/rho2*dragCoef*rAU2)*phi1
+ rAU2f*(g & mesh.Sf())
); );
forAll(p.boundaryField(), patchi) forAll(p.boundaryField(), patchi)
...@@ -29,16 +34,25 @@ ...@@ -29,16 +34,25 @@
} }
} }
phi1 = (fvc::interpolate(U1) & mesh.Sf()) + fvc::ddtPhiCorr(rAU1, U1, phi1) surfaceScalarField phiHbyA1
+ phiDrag1; (
phi2 = (fvc::interpolate(U2) & mesh.Sf()) + fvc::ddtPhiCorr(rAU2, U2, phi2) (fvc::interpolate(HbyA1) & mesh.Sf())
+ phiDrag2; + fvc::ddtPhiCorr(rAU1, U1, phi1)
+ phiDrag1
);
surfaceScalarField phiHbyA2
(
(fvc::interpolate(HbyA2) & mesh.Sf())
+ fvc::ddtPhiCorr(rAU2, U2, phi2)
+ phiDrag2
);
phi = alpha1f*phi1 + alpha2f*phi2; surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
surfaceScalarField Dp surfaceScalarField Dp
( (
"(rho*(1|A(U)))", "Dp",
alpha1f*rAU1f/rho1 + alpha2f*rAU2f/rho2 alpha1f*rAU1f/rho1 + alpha2f*rAU2f/rho2
); );
...@@ -46,7 +60,7 @@ ...@@ -46,7 +60,7 @@
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
fvm::laplacian(Dp, p) == fvc::div(phi) fvm::laplacian(Dp, p) == fvc::div(phiHbyA)
); );
pEqn.setReference(pRefCell, pRefValue); pEqn.setReference(pRefCell, pRefValue);
...@@ -57,19 +71,17 @@ ...@@ -57,19 +71,17 @@
{ {
surfaceScalarField SfGradp(pEqn.flux()/Dp); surfaceScalarField SfGradp(pEqn.flux()/Dp);
phi1 -= rAU1f*SfGradp/rho1; phi1 = phiHbyA1 - rAU1f*SfGradp/rho1;
phi2 -= rAU2f*SfGradp/rho2; phi2 = phiHbyA2 - rAU2f*SfGradp/rho2;
phi = alpha1f*phi1 + alpha2f*phi2; phi = alpha1f*phi1 + alpha2f*phi2;
p.relax(); p.relax();
SfGradp = pEqn.flux()/Dp; SfGradp = pEqn.flux()/Dp;
U1 += (fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1)); U1 = HbyA1 + (fvc::reconstruct(phiDrag1 - rAU1f*SfGradp/rho1));
//U1 += rAU1*(fvc::reconstruct(phiDrag1/rAU1f - SfGradp/rho1));
U1.correctBoundaryConditions(); U1.correctBoundaryConditions();
U2 += (fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2)); U2 = HbyA2 + (fvc::reconstruct(phiDrag2 - rAU2f*SfGradp/rho2));
//U2 += rAU2*(fvc::reconstruct(phiDrag2/rAU2f - SfGradp/rho2));
U2.correctBoundaryConditions(); U2.correctBoundaryConditions();
U = alpha1*U1 + alpha2*U2; U = alpha1*U1 + alpha2*U2;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
surfaceScalarField rhof("rhof", fvc::interpolate(rho)); surfaceScalarField rhof("rhof", fvc::interpolate(rho));
volScalarField rAU(1.0/UEqn.A()); volScalarField rAU(1.0/UEqn.A());
surfaceScalarField rAUf("rAUf", rhof*fvc::interpolate(rAU)); surfaceScalarField rAUf("Dp", rhof*fvc::interpolate(rAU));
volVectorField HbyA("HbyA", U); volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn.H(); HbyA = rAU*UEqn.H();
......
...@@ -37,7 +37,7 @@ laplacianSchemes ...@@ -37,7 +37,7 @@ laplacianSchemes
{ {
default none; default none;
laplacian(nu,U) Gauss linear corrected; laplacian(nu,U) Gauss linear corrected;
laplacian((1|A(U)),p) Gauss linear corrected; laplacian(Dp,p) Gauss linear corrected;
} }
interpolationSchemes interpolationSchemes
......
...@@ -33,6 +33,7 @@ mixture ...@@ -33,6 +33,7 @@ mixture
{ {
As 1.458e-06; As 1.458e-06;
Ts 110.4; Ts 110.4;
Pr 1;
} }
} }
......
...@@ -15,8 +15,6 @@ FoamFile ...@@ -15,8 +15,6 @@ FoamFile
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Pr 0.72;
thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>; thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
mixture mixture
...@@ -38,6 +36,7 @@ mixture ...@@ -38,6 +36,7 @@ mixture
{ {
As 1.458e-06; As 1.458e-06;
Ts 110; Ts 110;
Pr 0.72;
} }
} }
......
...@@ -41,7 +41,7 @@ laplacianSchemes ...@@ -41,7 +41,7 @@ laplacianSchemes
{ {
default none; default none;
laplacian(nuEff,U) Gauss linear uncorrected; laplacian(nuEff,U) Gauss linear uncorrected;
laplacian((1|A(U)),p_rgh) Gauss linear uncorrected; laplacian(Dp,p_rgh) Gauss linear uncorrected;
laplacian(kappaEff,T) Gauss linear uncorrected; laplacian(kappaEff,T) Gauss linear uncorrected;
laplacian(DkEff,k) Gauss linear uncorrected; laplacian(DkEff,k) Gauss linear uncorrected;
laplacian(DepsilonEff,epsilon) Gauss linear uncorrected; laplacian(DepsilonEff,epsilon) Gauss linear uncorrected;
......
...@@ -39,7 +39,7 @@ laplacianSchemes ...@@ -39,7 +39,7 @@ laplacianSchemes
{ {
default none; default none;
laplacian(nuEff,U) Gauss linear corrected; laplacian(nuEff,U) Gauss linear corrected;
laplacian((1|A(U)),p_rgh) Gauss linear corrected; laplacian(Dp,p_rgh) Gauss linear corrected;
laplacian(kappaEff,T) Gauss linear corrected; laplacian(kappaEff,T) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected;
......
...@@ -41,7 +41,7 @@ laplacianSchemes ...@@ -41,7 +41,7 @@ laplacianSchemes
{ {
default none; default none;
laplacian(nuEff,U) Gauss linear limited 0.333; laplacian(nuEff,U) Gauss linear limited 0.333;
laplacian((1|A(U)),p_rgh) Gauss linear limited 0.333; laplacian(Dp,p_rgh) Gauss linear limited 0.333;
laplacian(kappaEff,T) Gauss linear limited 0.333; laplacian(kappaEff,T) Gauss linear limited 0.333;
laplacian(DkEff,k) Gauss linear limited 0.333; laplacian(DkEff,k) Gauss linear limited 0.333;
laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333;
......
...@@ -42,7 +42,7 @@ laplacianSchemes ...@@ -42,7 +42,7 @@ laplacianSchemes
{ {
default none; default none;
laplacian(muEff,U) Gauss linear corrected; laplacian(muEff,U) Gauss linear corrected;
laplacian((rho*(1|A(U))),p_rgh) Gauss linear corrected; laplacian(Dp,p_rgh) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected; laplacian(alphaEff,h) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected;
......
...@@ -40,7 +40,7 @@ laplacianSchemes ...@@ -40,7 +40,7 @@ laplacianSchemes
{ {
default none; default none;
laplacian(muEff,U) Gauss linear orthogonal; laplacian(muEff,U) Gauss linear orthogonal;
laplacian((rho*(1|A(U))),p_rgh) Gauss linear orthogonal; laplacian(Dp,p_rgh) Gauss linear orthogonal;
laplacian(alphaEff,h) Gauss linear orthogonal; laplacian(alphaEff,h) Gauss linear orthogonal;
laplacian(DkEff,k) Gauss linear orthogonal; laplacian(DkEff,k) Gauss linear orthogonal;
laplacian(DepsilonEff,epsilon) Gauss linear orthogonal; laplacian(DepsilonEff,epsilon) Gauss linear orthogonal;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment