Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
sergio
2012-05-08 11:03:57 +01:00
10 changed files with 56 additions and 18 deletions

View File

@ -0,0 +1,18 @@
{
// Kinetic + pressure energy
volScalarField Ekp("Ekp", 0.5*magSqr(U) + p/rho);
fvScalarMatrix eEqn
(
fvm::div(phi, e)
- fvm::Sp(fvc::div(phi), e)
- fvm::laplacian(turbulence->alphaEff(), e)
==
fvc::div(phi)*Ekp - fvc::div(phi, Ekp)
);
eEqn.relax();
eEqn.solve();
thermo.correct();
}

View File

@ -0,0 +1,19 @@
{
volScalarField Ekp("Ekp", 0.5*magSqr(U) + p/rho);
fvScalarMatrix eEqn
(
fvm::div(phi, e)
- fvm::Sp(fvc::div(phi), e)
- fvm::laplacian(turbulence->alphaEff(), e)
==
fvc::div(phi)*Ekp - fvc::div(phi, Ekp)
);
//pZones.addEnergySource(thermo, rho, eEqn);
eEqn.relax();
eEqn.solve();
thermo.correct();
}

View File

@ -29,16 +29,16 @@ divSchemes
{ {
div(phi,U) Gauss upwind; div(phi,U) Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear; div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,h) Gauss upwind; div(phi,e) Gauss upwind;
div(phi,epsilon) Gauss upwind; div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind; div(phi,k) Gauss upwind;
div(phi,K) Gauss upwind; div(phi,Ekp) Gauss upwind;
} }
laplacianSchemes laplacianSchemes
{ {
laplacian(muEff,U) Gauss linear corrected; laplacian(muEff,U) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected; laplacian(alphaEff,e) Gauss linear corrected;
laplacian((rho*rAU),p) Gauss linear corrected; laplacian((rho*rAU),p) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected;

View File

@ -38,7 +38,7 @@ solvers
relTol 0.1; relTol 0.1;
} }
h e
{ {
solver PBiCG; solver PBiCG;
preconditioner DILU; preconditioner DILU;
@ -82,7 +82,7 @@ relaxationFactors
{ {
U 0.7; U 0.7;
"(k|epsilon)" 0.7; "(k|epsilon)" 0.7;
h 0.5; e 0.5;
} }
} }

View File

@ -15,7 +15,7 @@ FoamFile
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>; thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>>>>>;
mixture mixture
{ {
@ -26,7 +26,7 @@ mixture
} }
thermodynamics thermodynamics
{ {
Cp 1007; Cv 719.3;
Hf 0; Hf 0;
} }
transport transport

View File

@ -29,16 +29,16 @@ divSchemes
{ {
div(phi,U) Gauss upwind; div(phi,U) Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear; div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,h) Gauss upwind; div(phi,e) Gauss upwind;
div(phi,epsilon) Gauss upwind; div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind; div(phi,k) Gauss upwind;
div(phi,K) Gauss upwind; div(phi,Ekp) Gauss upwind;
} }
laplacianSchemes laplacianSchemes
{ {
laplacian(muEff,U) Gauss linear corrected; laplacian(muEff,U) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected; laplacian(alphaEff,e) Gauss linear corrected;
laplacian((rho*rAU),p) Gauss linear corrected; laplacian((rho*rAU),p) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected;

View File

@ -29,7 +29,7 @@ solvers
mergeLevels 1; mergeLevels 1;
} }
h e
{ {
solver PBiCG; solver PBiCG;
preconditioner DILU; preconditioner DILU;
@ -76,7 +76,7 @@ relaxationFactors
{ {
U 0.7; U 0.7;
"(k|epsilon)" 0.9; "(k|epsilon)" 0.9;
h 0.9; e 0.9;
} }
} }

View File

@ -15,7 +15,7 @@ FoamFile
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>; thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>>>>>;
mixture mixture
{ {
@ -26,7 +26,7 @@ mixture
} }
thermodynamics thermodynamics
{ {
Cp 1007; Cv 719.3;
Hf 0; Hf 0;
} }
transport transport

View File

@ -31,12 +31,13 @@ divSchemes
div(phi,U) Gauss upwind; div(phi,U) Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear; div((muEff*dev2(T(grad(U))))) Gauss linear;
div(phi,h) Gauss upwind; div(phi,e) Gauss upwind;
div(phi,epsilon) Gauss upwind; div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind; div(phi,k) Gauss upwind;
div(phid,p) Gauss upwind; div(phid,p) Gauss upwind;
div(phi,K) Gauss upwind; div(phi,Ekp) Gauss upwind;
div((phi|interpolate(rho)),p) Gauss upwind;
} }
laplacianSchemes laplacianSchemes

View File

@ -32,7 +32,7 @@ solvers
mergeLevels 1; mergeLevels 1;
} }
"(U|h|k|epsilon)" "(U|e|k|epsilon)"
{ {
solver GAMG; solver GAMG;
tolerance 1e-08; tolerance 1e-08;
@ -67,7 +67,7 @@ relaxationFactors
{ {
p 1; p 1;
U 0.9; U 0.9;
h 0.9; e 0.9;
k 0.9; k 0.9;
epsilon 0.9; epsilon 0.9;
} }