From 96068a670d1d254b5ea034003ac62eee46d501d3 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 22 Nov 2011 17:54:13 +0000 Subject: [PATCH] Thermodynamics: Changed h-eqn to conserve total energy --- .../solvers/combustion/PDRFoam/UEqn.H | 1 + .../solvers/combustion/PDRFoam/createFields.H | 14 +- .../solvers/combustion/PDRFoam/hEqn.H | 3 +- .../solvers/combustion/PDRFoam/huEqn.H | 2 +- .../solvers/combustion/PDRFoam/pEqn.H | 3 +- applications/solvers/combustion/XiFoam/UEqn.H | 1 + .../solvers/combustion/XiFoam/createFields.H | 9 +- applications/solvers/combustion/XiFoam/hEqn.H | 3 +- .../solvers/combustion/XiFoam/huEqn.H | 4 +- applications/solvers/combustion/XiFoam/pEqn.H | 3 +- .../combustion/coldEngineFoam/createFields.H | 10 +- .../solvers/combustion/coldEngineFoam/hEqn.H | 2 +- .../solvers/combustion/engineFoam/UEqn.H | 1 + .../solvers/combustion/engineFoam/pEqn.H | 3 +- .../solvers/combustion/fireFoam/UEqn.H | 2 + .../solvers/combustion/fireFoam/YhsEqn.H | 3 +- .../combustion/fireFoam/createFields.H | 12 +- .../solvers/combustion/fireFoam/pEqn.H | 3 +- .../solvers/combustion/reactingFoam/UEqn.H | 1 + .../combustion/reactingFoam/createFields.H | 12 +- .../solvers/combustion/reactingFoam/hsEqn.H | 3 +- .../solvers/combustion/reactingFoam/pEqn.H | 3 +- .../solvers/combustion/rhoReactingFoam/UEqn.H | 1 + .../combustion/rhoReactingFoam/createFields.H | 12 +- .../combustion/rhoReactingFoam/hsEqn.H | 3 +- .../solvers/combustion/rhoReactingFoam/pEqn.H | 3 +- .../solvers/compressible/rhoSimpleFoam/hEqn.H | 3 +- .../heatTransfer/buoyantSimpleFoam/hEqn.H | 3 +- .../buoyantSimpleRadiationFoam/hEqn.H | 3 +- .../chtMultiRegionSimpleFoam/fluid/hEqn.H | 3 +- .../system/fvSchemes | 2 +- .../XiFoam/les/pitzDaily/system/fvSchemes | 2 +- .../XiFoam/les/pitzDaily3D/system/fvSchemes | 2 +- .../ras/moriyoshiHomogeneous/system/fvSchemes | 2 +- .../engineFoam/kivaTest/system/fvSchemes | 2 +- .../oppositeBurningPanels/system/fvSchemes | 2 +- .../les/smallPoolFire2D/system/fvSchemes | 2 +- .../fireFoam/les/smallPoolFire3D/0/G | 3 +- .../constant/polyMesh/boundary | 14 +- .../les/smallPoolFire3D/system/fvSchemes | 2 +- .../ras/counterFlowFlame2D/system/fvSchemes | 2 +- .../squareBend/system/fvSchemes | 20 +-- .../squareBend/system/fvSolution | 143 +----------------- .../buoyantCavity/system/fvSchemes | 1 + .../circuitBoardCooling/system/fvSchemes | 1 + .../hotRoom/system/fvSchemes | 1 + .../hotRadiationRoom/system/fvSchemes | 1 + .../hotRadiationRoomFvDOM/system/fvSchemes | 1 + 48 files changed, 109 insertions(+), 223 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/UEqn.H b/applications/solvers/combustion/PDRFoam/UEqn.H index 70912c7cfa..79d81663c4 100644 --- a/applications/solvers/combustion/PDRFoam/UEqn.H +++ b/applications/solvers/combustion/PDRFoam/UEqn.H @@ -13,4 +13,5 @@ { U = invA & (UEqn.H() - betav*fvc::grad(p)); U.correctBoundaryConditions(); + K = 0.5*magSqr(U); } diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H index 15a0ecafea..2d8451c9ae 100644 --- a/applications/solvers/combustion/PDRFoam/createFields.H +++ b/applications/solvers/combustion/PDRFoam/createFields.H @@ -44,7 +44,7 @@ mesh ); -# include "compressibleCreatePhi.H" + #include "compressibleCreatePhi.H" Info<< "Creating turbulence model\n" << endl; autoPtr turbulence @@ -58,12 +58,12 @@ ) ); - Info<< "Creating field DpDt\n" << endl; - volScalarField DpDt - ( - "DpDt", - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p) - ); + + Info<< "Creating field dpdt\n" << endl; + volScalarField dpdt("dpdt", fvc::ddt(p)); + + Info<< "Creating field kinetic energy K\n" << endl; + volScalarField K("K", 0.5*magSqr(U)); Info<< "Creating the unstrained laminar flame speed\n" << endl; diff --git a/applications/solvers/combustion/PDRFoam/hEqn.H b/applications/solvers/combustion/PDRFoam/hEqn.H index 7f5292d01a..4d8bb54588 100644 --- a/applications/solvers/combustion/PDRFoam/hEqn.H +++ b/applications/solvers/combustion/PDRFoam/hEqn.H @@ -5,7 +5,8 @@ + mvConvection->fvmDiv(phi, h) - fvm::laplacian(Db, h) == - betav*DpDt + betav*dpdt + - betav*(fvc::ddt(rho, K) + fvc::div(phi, K)) ); thermo.correct(); diff --git a/applications/solvers/combustion/PDRFoam/huEqn.H b/applications/solvers/combustion/PDRFoam/huEqn.H index 3467bc6b75..f0fa7be5ea 100644 --- a/applications/solvers/combustion/PDRFoam/huEqn.H +++ b/applications/solvers/combustion/PDRFoam/huEqn.H @@ -13,6 +13,6 @@ if (ign.ignited()) //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hu) == - betav*DpDt*rho/thermo.rhou() + betav*(dpdt - (fvc::ddt(rho, K) + fvc::div(phi, K)))*rho/thermo.rhou() ); } diff --git a/applications/solvers/combustion/PDRFoam/pEqn.H b/applications/solvers/combustion/PDRFoam/pEqn.H index e2a2a471e2..45f982ba4d 100644 --- a/applications/solvers/combustion/PDRFoam/pEqn.H +++ b/applications/solvers/combustion/PDRFoam/pEqn.H @@ -64,5 +64,6 @@ else U -= invA & (betav*fvc::grad(p)); U.correctBoundaryConditions(); +K = 0.5*magSqr(U); -DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); +dpdt = fvc::ddt(p); diff --git a/applications/solvers/combustion/XiFoam/UEqn.H b/applications/solvers/combustion/XiFoam/UEqn.H index 1e626d75b8..b9bc567aae 100644 --- a/applications/solvers/combustion/XiFoam/UEqn.H +++ b/applications/solvers/combustion/XiFoam/UEqn.H @@ -12,4 +12,5 @@ if (pimple.momentumPredictor()) { solve(UEqn == -fvc::grad(p)); + K = 0.5*magSqr(U); } diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index 7a7e796b62..1750c693e5 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -60,12 +60,11 @@ ) ); - Info<< "Creating field DpDt\n" << endl; - volScalarField DpDt - ( - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p) - ); + Info<< "Creating field dpdt\n" << endl; + volScalarField dpdt("dpdt", fvc::ddt(p)); + Info<< "Creating field kinetic energy K\n" << endl; + volScalarField K("K", 0.5*magSqr(U)); Info<< "Creating field Xi\n" << endl; volScalarField Xi diff --git a/applications/solvers/combustion/XiFoam/hEqn.H b/applications/solvers/combustion/XiFoam/hEqn.H index 513ae60441..f562466b20 100644 --- a/applications/solvers/combustion/XiFoam/hEqn.H +++ b/applications/solvers/combustion/XiFoam/hEqn.H @@ -5,7 +5,8 @@ + mvConvection->fvmDiv(phi, h) - fvm::laplacian(turbulence->alphaEff(), h) == - DpDt + dpdt + - (fvc::ddt(rho, K) + fvc::div(phi, K)) ); hEqn.relax(); diff --git a/applications/solvers/combustion/XiFoam/huEqn.H b/applications/solvers/combustion/XiFoam/huEqn.H index 0b4068344b..3059b9445e 100644 --- a/applications/solvers/combustion/XiFoam/huEqn.H +++ b/applications/solvers/combustion/XiFoam/huEqn.H @@ -12,7 +12,7 @@ if (ign.ignited()) //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), hu) //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hu) - == - DpDt*rho/thermo.rhou() + == + (dpdt - (fvc::ddt(rho, K) + fvc::div(phi, K)))*rho/thermo.rhou() ); } diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H index 784e9ca6b7..cb25e7029f 100644 --- a/applications/solvers/combustion/XiFoam/pEqn.H +++ b/applications/solvers/combustion/XiFoam/pEqn.H @@ -64,5 +64,6 @@ else U -= rAU*fvc::grad(p); U.correctBoundaryConditions(); +K = 0.5*magSqr(U); -DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); +dpdt = fvc::ddt(p); diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H index 9705f04525..6286b1a555 100644 --- a/applications/solvers/combustion/coldEngineFoam/createFields.H +++ b/applications/solvers/combustion/coldEngineFoam/createFields.H @@ -54,8 +54,8 @@ ) ); - Info<< "Creating field DpDt\n" << endl; - volScalarField DpDt - ( - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p) - ); + Info<< "Creating field dpdt\n" << endl; + volScalarField dpdt("dpdt", fvc::ddt(p)); + + Info<< "Creating field kinetic energy K\n" << endl; + volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/combustion/coldEngineFoam/hEqn.H b/applications/solvers/combustion/coldEngineFoam/hEqn.H index ae60d3316e..2e1a2703a8 100644 --- a/applications/solvers/combustion/coldEngineFoam/hEqn.H +++ b/applications/solvers/combustion/coldEngineFoam/hEqn.H @@ -5,7 +5,7 @@ + fvm::div(phi, h) - fvm::laplacian(turbulence->alphaEff(), h) == - DpDt + - fvc::div(phi, 0.5*magSqr(U)) ); thermo.correct(); diff --git a/applications/solvers/combustion/engineFoam/UEqn.H b/applications/solvers/combustion/engineFoam/UEqn.H index eff9e1a5d2..f110051946 100644 --- a/applications/solvers/combustion/engineFoam/UEqn.H +++ b/applications/solvers/combustion/engineFoam/UEqn.H @@ -8,4 +8,5 @@ if (pimple.momentumPredictor()) { solve(UEqn == -fvc::grad(p)); + K = 0.5*magSqr(U); } diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H index 580be2da56..d1b7135649 100644 --- a/applications/solvers/combustion/engineFoam/pEqn.H +++ b/applications/solvers/combustion/engineFoam/pEqn.H @@ -57,5 +57,6 @@ else U -= rAU*fvc::grad(p); U.correctBoundaryConditions(); +K = 0.5*magSqr(U); -DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); +dpdt = fvc::ddt(p); diff --git a/applications/solvers/combustion/fireFoam/UEqn.H b/applications/solvers/combustion/fireFoam/UEqn.H index a64e50a2d2..31d01e4327 100644 --- a/applications/solvers/combustion/fireFoam/UEqn.H +++ b/applications/solvers/combustion/fireFoam/UEqn.H @@ -23,4 +23,6 @@ )*mesh.magSf() ) ); + + K = 0.5*magSqr(U); } diff --git a/applications/solvers/combustion/fireFoam/YhsEqn.H b/applications/solvers/combustion/fireFoam/YhsEqn.H index 299eb64ab7..b85396caa1 100644 --- a/applications/solvers/combustion/fireFoam/YhsEqn.H +++ b/applications/solvers/combustion/fireFoam/YhsEqn.H @@ -53,7 +53,8 @@ tmp > mvConvection + mvConvection->fvmDiv(phi, hs) - fvm::laplacian(turbulence->alphaEff(), hs) == - DpDt + dpdt + - (fvc::ddt(rho, K) + fvc::div(phi, K)) + combustion->Sh() + radiation->Shs(thermo) + parcels.Sh(hs) diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index afabd393c7..e0c11335e3 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -83,12 +83,12 @@ dimensionedScalar("dQ", dimEnergy/dimTime, 0.0) ); - Info<< "Creating field DpDt\n" << endl; - volScalarField DpDt - ( - "DpDt", - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p) - ); + + Info<< "Creating field dpdt\n" << endl; + volScalarField dpdt("dpdt", fvc::ddt(p)); + + Info<< "Creating field kinetic energy K\n" << endl; + volScalarField K("K", 0.5*magSqr(U)); Info<< "Calculating field g.h\n" << endl; diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H index 65259391da..872a0513a3 100644 --- a/applications/solvers/combustion/fireFoam/pEqn.H +++ b/applications/solvers/combustion/fireFoam/pEqn.H @@ -43,5 +43,6 @@ p = p_rgh + rho*gh; U += rAU*fvc::reconstruct((phi - phiU)/rhorAUf); U.correctBoundaryConditions(); +K = 0.5*magSqr(U); -DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); +dpdt = fvc::ddt(p); diff --git a/applications/solvers/combustion/reactingFoam/UEqn.H b/applications/solvers/combustion/reactingFoam/UEqn.H index 1e626d75b8..b9bc567aae 100644 --- a/applications/solvers/combustion/reactingFoam/UEqn.H +++ b/applications/solvers/combustion/reactingFoam/UEqn.H @@ -12,4 +12,5 @@ if (pimple.momentumPredictor()) { solve(UEqn == -fvc::grad(p)); + K = 0.5*magSqr(U); } diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index 7cf94f754d..0b6e9ee2e1 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -65,11 +65,13 @@ autoPtr turbulence // Set the turbulence into the combustion model combustion->setTurbulence(turbulence()); -Info<< "Creating field DpDt\n" << endl; -volScalarField DpDt -( - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p) -); + +Info<< "Creating field dpdt\n" << endl; +volScalarField dpdt("dpdt", fvc::ddt(p)); + +Info<< "Creating field kinetic energy K\n" << endl; +volScalarField K("K", 0.5*magSqr(U)); + multivariateSurfaceInterpolationScheme::fieldTable fields; diff --git a/applications/solvers/combustion/reactingFoam/hsEqn.H b/applications/solvers/combustion/reactingFoam/hsEqn.H index de1a85fddf..642b7091bc 100644 --- a/applications/solvers/combustion/reactingFoam/hsEqn.H +++ b/applications/solvers/combustion/reactingFoam/hsEqn.H @@ -6,7 +6,8 @@ - fvm::laplacian(turbulence->alphaEff(), hs) // - fvm::laplacian(turbulence->muEff(), hs) // unit lewis no. == - DpDt + dpdt + - (fvc::ddt(rho, K) + fvc::div(phi, K)) + combustion->Sh() ); diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H index 784e9ca6b7..cb25e7029f 100644 --- a/applications/solvers/combustion/reactingFoam/pEqn.H +++ b/applications/solvers/combustion/reactingFoam/pEqn.H @@ -64,5 +64,6 @@ else U -= rAU*fvc::grad(p); U.correctBoundaryConditions(); +K = 0.5*magSqr(U); -DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); +dpdt = fvc::ddt(p); diff --git a/applications/solvers/combustion/rhoReactingFoam/UEqn.H b/applications/solvers/combustion/rhoReactingFoam/UEqn.H index 1e626d75b8..b9bc567aae 100644 --- a/applications/solvers/combustion/rhoReactingFoam/UEqn.H +++ b/applications/solvers/combustion/rhoReactingFoam/UEqn.H @@ -12,4 +12,5 @@ if (pimple.momentumPredictor()) { solve(UEqn == -fvc::grad(p)); + K = 0.5*magSqr(U); } diff --git a/applications/solvers/combustion/rhoReactingFoam/createFields.H b/applications/solvers/combustion/rhoReactingFoam/createFields.H index 65860a67eb..690cdc4b60 100644 --- a/applications/solvers/combustion/rhoReactingFoam/createFields.H +++ b/applications/solvers/combustion/rhoReactingFoam/createFields.H @@ -67,11 +67,13 @@ autoPtr turbulence // Set the turbulence into the combustion model combustion->setTurbulence(turbulence()); -Info<< "Creating field DpDt\n" << endl; -volScalarField DpDt -( - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p) -); + +Info<< "Creating field dpdt\n" << endl; +volScalarField dpdt("dpdt", fvc::ddt(p)); + +Info<< "Creating field kinetic energy K\n" << endl; +volScalarField K("K", 0.5*magSqr(U)); + multivariateSurfaceInterpolationScheme::fieldTable fields; diff --git a/applications/solvers/combustion/rhoReactingFoam/hsEqn.H b/applications/solvers/combustion/rhoReactingFoam/hsEqn.H index 01f85ac1da..ba95be8452 100644 --- a/applications/solvers/combustion/rhoReactingFoam/hsEqn.H +++ b/applications/solvers/combustion/rhoReactingFoam/hsEqn.H @@ -6,7 +6,8 @@ - fvm::laplacian(turbulence->alphaEff(), hs) // - fvm::laplacian(turbulence->muEff(), hs) // unit lewis no. == - DpDt + dpdt + - (fvc::ddt(rho, K) + fvc::div(phi, K)) + combustion->Sh() ); diff --git a/applications/solvers/combustion/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/rhoReactingFoam/pEqn.H index b22fc89079..4e94de243c 100644 --- a/applications/solvers/combustion/rhoReactingFoam/pEqn.H +++ b/applications/solvers/combustion/rhoReactingFoam/pEqn.H @@ -86,6 +86,7 @@ U -= rAU*fvc::grad(p); U.correctBoundaryConditions(); + K = 0.5*magSqr(U); - DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); + dpdt = fvc::ddt(p); } diff --git a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H index e6c74938ee..8ff402a2b1 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H @@ -5,8 +5,7 @@ - fvm::Sp(fvc::div(phi), h) - fvm::laplacian(turbulence->alphaEff(), h) == - fvc::div(phi/fvc::interpolate(rho), rho/psi, "div(U,p)") - - (rho/psi)*fvc::div(phi/fvc::interpolate(rho)) + - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)") ); hEqn.relax(); diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H index 6e607f89e8..24ed135c08 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H @@ -5,8 +5,7 @@ - fvm::Sp(fvc::div(phi), h) - fvm::laplacian(turbulence->alphaEff(), h) == - fvc::div(phi/fvc::interpolate(rho)*fvc::interpolate(p)) - - p*fvc::div(phi/fvc::interpolate(rho)) + - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)") ); hEqn.relax(); diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H index 57de44e4a0..2c422a5cab 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H +++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H @@ -5,8 +5,7 @@ - fvm::Sp(fvc::div(phi), h) - fvm::laplacian(turbulence->alphaEff(), h) == - fvc::div(phi/fvc::interpolate(rho)*fvc::interpolate(p)) - - p*fvc::div(phi/fvc::interpolate(rho)) + - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)") + radiation->Sh(thermo) ); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/hEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/hEqn.H index 03b2580425..4505f77ed0 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/hEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/hEqn.H @@ -5,8 +5,7 @@ - fvm::Sp(fvc::div(phi), h) - fvm::laplacian(turb.alphaEff(), h) == - fvc::div(phi/fvc::interpolate(rho), p, "div(U,p)") - - p*fvc::div(phi/fvc::interpolate(rho)) + - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)") + rad.Sh(thermo) ); diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes index c68d0f8a2f..7de6b2228e 100644 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes @@ -31,7 +31,7 @@ divSchemes default none; div(phi,U) Gauss limitedLinearV 1; - div(phiU,p) Gauss limitedLinear 1; + div(phi,K) Gauss limitedLinear 1; div(phid,p) Gauss limitedLinear 1; div(phi,k) Gauss limitedLinear 1; div(phi,epsilon) Gauss limitedLinear 1; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes index 1aff419daf..303b193a01 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { default none; div(phi,U) Gauss linear; - div(phiU,p) Gauss linear; + div(phi,K) Gauss linear; div(phi,k) Gauss limitedLinear 0.1; div(phiXi,Xi) Gauss limitedLinear01 0.1; div(phiXi,Su) Gauss limitedLinear01 0.1; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes index 1aff419daf..303b193a01 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { default none; div(phi,U) Gauss linear; - div(phiU,p) Gauss linear; + div(phi,K) Gauss linear; div(phi,k) Gauss limitedLinear 0.1; div(phiXi,Xi) Gauss limitedLinear01 0.1; div(phiXi,Su) Gauss limitedLinear01 0.1; diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes index 059d89339c..39ac527206 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes @@ -30,7 +30,7 @@ divSchemes default none; div(phi,U) Gauss limitedLinearV 1; div(phid,p) Gauss limitedLinear 1; - div(phiU,p) Gauss linear; + div(phi,K) Gauss limitedLinear 1; div(phi,k) Gauss limitedLinear 1; div(phi,epsilon) Gauss limitedLinear 1; div(phi,R) Gauss limitedLinear 1; diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes index ffb8a769e5..62b296f3ed 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes +++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes @@ -29,8 +29,8 @@ divSchemes { default none; div(phi,U) Gauss upwind; + div(phi,K) Gauss upwind; div(phid,p) Gauss upwind; - div(phiU,p) Gauss linear; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes index 8fec68c55f..03db056e8b 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/fvSchemes @@ -40,7 +40,7 @@ divSchemes hs limitedLinear 1; }; div((muEff*dev2(T(grad(U))))) Gauss linear; - div(phiU,p) Gauss linear; + div(phi,K) Gauss limitedLinear 1; div(Ji,Ii_h) Gauss upwind; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes index 6a10661e24..775f4cb396 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes @@ -41,7 +41,7 @@ divSchemes }; div((muEff*dev2(T(grad(U))))) Gauss linear; div(phi,omega) Gauss limitedLinear 1; - div(phiU,p) Gauss linear; + div(phi,K) Gauss limitedLinear 1; div(U) Gauss linear; div(Ji,Ii_h) Gauss upwind; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G index c0b1c57ad9..fe75242d76 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G @@ -24,7 +24,8 @@ boundaryField { type MarshakRadiation; T T; - emissivity 1; + emissivityMode lookup; + emissivity uniform 1.0; value uniform 0; } } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/boundary b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/boundary index 54beb4a79d..5f99cb1862 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/boundary +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/boundary @@ -15,25 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -3 +4 ( base { type patch; - nFaces 3600; + nFaces 3456; startFace 637200; } outlet { type patch; nFaces 3600; - startFace 640800; + startFace 640656; } sides { type patch; nFaces 14400; - startFace 644400; + startFace 644256; + } + inlet + { + type patch; + nFaces 144; + startFace 658656; } ) diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes index c7a3c9b507..0a76845c6f 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes @@ -29,6 +29,7 @@ divSchemes { default none; div(phi,U) Gauss linear; + div(phi,K) Gauss linear; div(phi,k) Gauss limitedLinear 0.1; div(phi,Yi_hs) Gauss multivariateSelection { @@ -40,7 +41,6 @@ divSchemes hs limitedLinear 1; }; div((muEff*dev2(T(grad(U))))) Gauss linear; - div(phiU,p) Gauss linear; div(Ji,Ii_h) Gauss upwind; } diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes index f9d7d6ecf0..6d4a329ff2 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes @@ -33,7 +33,7 @@ divSchemes div(phi,U) Gauss limitedLinearV 1; div(phi,Yi_h) Gauss limitedLinear01 1; div(phi,h) Gauss limitedLinear 1; - div(phiU,p) Gauss limitedLinear 1; + div(phi,K) Gauss limitedLinear 1; div(phid,p) Gauss limitedLinear 1; div(phi,epsilon) Gauss limitedLinear 1; div(phi,k) Gauss limitedLinear 1; diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes index 872b5d50fe..c9c95b180c 100644 --- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes +++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes @@ -29,14 +29,14 @@ divSchemes { default none; - div(phi,U) Gauss upwind; //limitedLinearV 1; //upwind; + div(phi,U) Gauss upwind; div((muEff*dev2(T(grad(U))))) Gauss linear; - div(phi,h) Gauss upwind; //limitedLinear 1; //upwind; + div(phi,h) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,k) Gauss upwind; div(phid,p) Gauss upwind; - div(U,p) Gauss linear; + div(phi,K) Gauss upwind; } laplacianSchemes @@ -46,24 +46,18 @@ laplacianSchemes interpolationSchemes { - default none; - interpolate(rho) linear; - div(U,p) upwind phi; - interpolate((psi*U)) linear; - interpolate(U) linear; - UD upwind phid; - interpolate(p) linear; - interpolate(((rho|(A(U)-H(1)))-(rho|A(U)))) linear; + default linear; + UD upwind phid; } snGradSchemes { - default corrected; + default corrected; } fluxRequired { - default no; + default no; p; pCorr; } diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution index 8b5f9ccd5f..df2018d930 100644 --- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution +++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution @@ -17,14 +17,6 @@ FoamFile solvers { - p0 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0.01; - } - p { solver GAMG; @@ -40,120 +32,7 @@ solvers mergeLevels 1; } - U0 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0.1; - } - - U1 - { - solver smoothSolver; - smoother GaussSeidel; - nSweeps 1; - tolerance 1e-08; - relTol 0.1; - } - - U - { - solver GAMG; - tolerance 1e-08; - relTol 0.1; - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; - } - - h0 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0.1; - } - - h1 - { - solver smoothSolver; - smoother GaussSeidel; - nSweeps 1; - tolerance 1e-08; - relTol 0.1; - } - - h - { - solver GAMG; - tolerance 1e-08; - relTol 0.1; - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; - } - - k0 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0.1; - } - - k1 - { - solver smoothSolver; - smoother GaussSeidel; - nSweeps 1; - tolerance 1e-08; - relTol 0.1; - } - - k - { - solver GAMG; - tolerance 1e-08; - relTol 0.1; - smoother GaussSeidel; - nPreSweeps 0; - nPostSweeps 2; - nFinestSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 20; - agglomerator faceAreaPair; - mergeLevels 1; - } - - epsilon0 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-08; - relTol 0.1; - } - - epsilon1 - { - solver smoothSolver; - smoother GaussSeidel; - nSweeps 1; - tolerance 1e-08; - relTol 0.1; - } - - epsilon + "(U|h|k|epsilon)" { solver GAMG; tolerance 1e-08; @@ -182,31 +61,15 @@ relaxationFactors fields { p 1; - rho 1; //0.1; + rho 1; } equations { U 0.9; - h 0.95; + h 0.8; k 0.9; epsilon 0.9; } } -relaxationFactors0 -{ - fields - { - p 0.3; - rho 0.1; - } - equations - { - U 0.7; - h 0.7; - k 0.7; - epsilon 0.7; - } -} - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes index d19197862d..02edc9816b 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSchemes @@ -28,6 +28,7 @@ divSchemes { default none; div(phi,U) Gauss limitedLinear 0.2; + div(phi,K) Gauss limitedLinear 0.2; div(phi,h) Gauss limitedLinear 0.2; div(phi,k) Gauss limitedLinear 0.2; div(phi,epsilon) Gauss limitedLinear 0.2; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes index d19197862d..02edc9816b 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSchemes @@ -28,6 +28,7 @@ divSchemes { default none; div(phi,U) Gauss limitedLinear 0.2; + div(phi,K) Gauss limitedLinear 0.2; div(phi,h) Gauss limitedLinear 0.2; div(phi,k) Gauss limitedLinear 0.2; div(phi,epsilon) Gauss limitedLinear 0.2; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes index 593744fbe7..f0019f6690 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes @@ -30,6 +30,7 @@ divSchemes default none; div(phi,U) Gauss upwind; div(phi,h) Gauss upwind; + div(phi,K) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes index f35af85372..572a6207d2 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes @@ -29,6 +29,7 @@ divSchemes { default none; div(phi,U) Gauss upwind; + div(phi,K) Gauss upwind; div(phi,h) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes index ad314dec68..3cbd118408 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes @@ -29,6 +29,7 @@ divSchemes { default none; div(phi,U) Gauss upwind; + div(phi,K) Gauss upwind; div(phi,h) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind;