From 620e1ce085babbc985c60fd01fdbd55ce49f37a0 Mon Sep 17 00:00:00 2001 From: Vanja Skuric Date: Fri, 27 May 2016 00:17:32 +0200 Subject: [PATCH] Backported sonicFoam, sonicDyMFoam, sonicLiquidFoam and tutorials (vanilla OF 3.0.1) --- .../solvers/compressible/sonicDyMFoam/UEqn.H | 37 ++++++++-------------- .../compressible/sonicDyMFoam/createControls.H | 19 +++++------ .../compressible/sonicDyMFoam/createFields.H | 2 ++ .../solvers/compressible/sonicDyMFoam/eEqn.H | 19 +++-------- .../solvers/compressible/sonicDyMFoam/pEqn.H | 22 +++---------- .../compressible/sonicDyMFoam/readControls.H | 15 ++------- .../compressible/sonicDyMFoam/sonicDyMFoam.C | 11 ++++--- applications/solvers/compressible/sonicFoam/UEqn.H | 37 ++++++++-------------- .../solvers/compressible/sonicFoam/createFields.H | 2 ++ applications/solvers/compressible/sonicFoam/eEqn.H | 19 +++-------- applications/solvers/compressible/sonicFoam/pEqn.H | 4 +-- .../solvers/compressible/sonicFoam/sonicFoam.C | 12 ++++--- .../compressible/sonicLiquidFoam/createFields.H | 2 ++ .../compressible/sonicLiquidFoam/sonicLiquidFoam.C | 12 ++++--- .../laminar/forwardStep/constant/polyMesh/boundary | 2 +- .../sonicFoam/laminar/forwardStep/system/fvSchemes | 8 +---- .../laminar/forwardStep/system/fvSolution | 8 +++++ .../sonicFoam/laminar/shockTube/system/fvSchemes | 8 +---- .../sonicFoam/laminar/shockTube/system/fvSolution | 8 +++++ .../ras/nacaAirfoil/constant/polyMesh/boundary | 2 +- .../sonicFoam/ras/nacaAirfoil/system/fvSchemes | 8 +---- .../sonicFoam/ras/nacaAirfoil/system/fvSolution | 8 +++-- .../sonicFoam/ras/prism/constant/polyMesh/boundary | 2 +- .../sonicFoam/ras/prism/system/fvSchemes | 8 +---- .../sonicFoam/ras/prism/system/fvSolution | 8 +++++ .../decompressionTank/system/fvSchemes | 6 ---- 26 files changed, 115 insertions(+), 174 deletions(-) rewrite applications/solvers/compressible/sonicDyMFoam/UEqn.H (64%) rewrite applications/solvers/compressible/sonicFoam/UEqn.H (64%) diff --git a/applications/solvers/compressible/sonicDyMFoam/UEqn.H b/applications/solvers/compressible/sonicDyMFoam/UEqn.H dissimilarity index 64% index 377aa0a13..bdcc54f6e 100644 --- a/applications/solvers/compressible/sonicDyMFoam/UEqn.H +++ b/applications/solvers/compressible/sonicDyMFoam/UEqn.H @@ -1,24 +1,13 @@ - fvVectorMatrix UEqn - ( - fvm::ddt(rho, U) - + fvm::div(phi, U) - + turbulence->divDevRhoReff(U) - ); - - if (oCorr == nOuterCorr - 1) - { - if (mesh.solutionDict().relax("UFinal")) - { - UEqn.relax(mesh.solutionDict().relaxationFactor("UFinal")); - } - else - { - UEqn.relax(1); - } - } - else - { - UEqn.relax(); - } - - solve(UEqn == -fvc::grad(p)); + fvVectorMatrix UEqn + ( + fvm::ddt(rho, U) + + fvm::div(phi, U) + + turbulence->divDevRhoReff(U) + ); + + UEqn.relax + ( + mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) + ); + + solve(UEqn == -fvc::grad(p)); diff --git a/applications/solvers/compressible/sonicDyMFoam/createControls.H b/applications/solvers/compressible/sonicDyMFoam/createControls.H index 45a18790e..a9c1b9b0a 100644 --- a/applications/solvers/compressible/sonicDyMFoam/createControls.H +++ b/applications/solvers/compressible/sonicDyMFoam/createControls.H @@ -1,14 +1,11 @@ # include "createTimeControls.H" -# include "readPIMPLEControls.H" - bool correctPhi = false; - if (pimple.found("correctPhi")) - { - correctPhi = Switch(pimple.lookup("correctPhi")); - } +bool correctPhi +( + pimple.dict().lookupOrDefault("correctPhi", false) +); - bool checkMeshCourantNo = false; - if (pimple.found("checkMeshCourantNo")) - { - checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo")); - } +bool checkMeshCourantNo +( + pimple.dict().lookupOrDefault("checkMeshCourantNo", false) +); diff --git a/applications/solvers/compressible/sonicDyMFoam/createFields.H b/applications/solvers/compressible/sonicDyMFoam/createFields.H index a17764ce4..0bec8c245 100644 --- a/applications/solvers/compressible/sonicDyMFoam/createFields.H +++ b/applications/solvers/compressible/sonicDyMFoam/createFields.H @@ -51,3 +51,5 @@ thermo ) ); + + mesh.schemesDict().setFluxRequired(p.name()); diff --git a/applications/solvers/compressible/sonicDyMFoam/eEqn.H b/applications/solvers/compressible/sonicDyMFoam/eEqn.H index 7b11958a7..63c1a729e 100644 --- a/applications/solvers/compressible/sonicDyMFoam/eEqn.H +++ b/applications/solvers/compressible/sonicDyMFoam/eEqn.H @@ -17,21 +17,10 @@ // viscous heating? ); - if (oCorr == nOuterCorr - 1) - { - if (mesh.solutionDict().relax("eFinal")) - { - eEqn.relax(mesh.solutionDict().relaxationFactor("eFinal")); - } - else - { - eEqn.relax(1); - } - } - else - { - eEqn.relax(); - } + eEqn.relax + ( + mesh.solutionDict().relaxationFactor(e.select(pimple.finalIter())) + ); eEqn.solve(); diff --git a/applications/solvers/compressible/sonicDyMFoam/pEqn.H b/applications/solvers/compressible/sonicDyMFoam/pEqn.H index 1be1b12b2..20cb4ea4c 100644 --- a/applications/solvers/compressible/sonicDyMFoam/pEqn.H +++ b/applications/solvers/compressible/sonicDyMFoam/pEqn.H @@ -3,7 +3,7 @@ # include "limitU.H" - for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++) + while (pimple.correctNonOrthogonal()) { // Calculate phi for boundary conditions phi = rhof* @@ -36,25 +36,13 @@ - fvm::laplacian(rho*rUA, p) ); - if + pEqn.solve ( -// oCorr == nOuterCorr - 1 - corr == nCorr - 1 - && nonOrth == nNonOrthCorr - ) - { - pEqn.solve - ( - mesh.solutionDict().solver(p.name() + "Final") - ); - } - else - { - pEqn.solve(mesh.solutionDict().solver(p.name())); - } + mesh.solutionDict().solver(p.select(pimple.finalInnerIter())) + ); // Calculate the flux - if (nonOrth == nNonOrthCorr) + if (pimple.finalNonOrthogonalIter()) { phi = phid2 + pEqn.flux(); } diff --git a/applications/solvers/compressible/sonicDyMFoam/readControls.H b/applications/solvers/compressible/sonicDyMFoam/readControls.H index 2db7f5142..9f982e260 100644 --- a/applications/solvers/compressible/sonicDyMFoam/readControls.H +++ b/applications/solvers/compressible/sonicDyMFoam/readControls.H @@ -1,14 +1,5 @@ -# include "readTimeControls.H" -# include "readPIMPLEControls.H" +#include "readTimeControls.H" - correctPhi = false; - if (pimple.found("correctPhi")) - { - correctPhi = Switch(pimple.lookup("correctPhi")); - } +correctPhi = pimple.dict().lookupOrDefault("correctPhi", false); - checkMeshCourantNo = false; - if (pimple.found("checkMeshCourantNo")) - { - checkMeshCourantNo = Switch(pimple.lookup("checkMeshCourantNo")); - } +checkMeshCourantNo = pimple.dict().lookupOrDefault("checkMeshCourantNo", false); diff --git a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C index 0920a9542..d8e9c123f 100644 --- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C +++ b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C @@ -47,6 +47,7 @@ Author #include "specie.H" #include "basicPsiThermo.H" #include "turbulenceModel.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -56,6 +57,9 @@ int main(int argc, char *argv[]) # include "createTime.H" # include "createDynamicFvMesh.H" + + pimpleControl pimple(mesh); + # include "createFields.H" # include "initContinuityErrs.H" # include "createControls.H" @@ -106,8 +110,7 @@ int main(int argc, char *argv[]) } // --- PIMPLE loop - label oCorr = 0; - do + while (pimple.loop()) { # include "rhoEqn.H" # include "eEqn.H" @@ -123,13 +126,13 @@ int main(int argc, char *argv[]) // but psi and rho are not surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p); - for (int corr = 0; corr < nCorr; corr++) + while (pimple.correct()) { # include "pEqn.H" } turbulence->correct(); - } while (++oCorr < nOuterCorr); + } runTime.write(); diff --git a/applications/solvers/compressible/sonicFoam/UEqn.H b/applications/solvers/compressible/sonicFoam/UEqn.H dissimilarity index 64% index 377aa0a13..bdcc54f6e 100644 --- a/applications/solvers/compressible/sonicFoam/UEqn.H +++ b/applications/solvers/compressible/sonicFoam/UEqn.H @@ -1,24 +1,13 @@ - fvVectorMatrix UEqn - ( - fvm::ddt(rho, U) - + fvm::div(phi, U) - + turbulence->divDevRhoReff(U) - ); - - if (oCorr == nOuterCorr - 1) - { - if (mesh.solutionDict().relax("UFinal")) - { - UEqn.relax(mesh.solutionDict().relaxationFactor("UFinal")); - } - else - { - UEqn.relax(1); - } - } - else - { - UEqn.relax(); - } - - solve(UEqn == -fvc::grad(p)); + fvVectorMatrix UEqn + ( + fvm::ddt(rho, U) + + fvm::div(phi, U) + + turbulence->divDevRhoReff(U) + ); + + UEqn.relax + ( + mesh.solutionDict().relaxationFactor(U.select(pimple.finalIter())) + ); + + solve(UEqn == -fvc::grad(p)); diff --git a/applications/solvers/compressible/sonicFoam/createFields.H b/applications/solvers/compressible/sonicFoam/createFields.H index 8e03212c2..e88da74d3 100644 --- a/applications/solvers/compressible/sonicFoam/createFields.H +++ b/applications/solvers/compressible/sonicFoam/createFields.H @@ -50,3 +50,5 @@ thermo ) ); + + mesh.schemesDict().setFluxRequired(p.name()); diff --git a/applications/solvers/compressible/sonicFoam/eEqn.H b/applications/solvers/compressible/sonicFoam/eEqn.H index 2b54224ac..774f2a059 100644 --- a/applications/solvers/compressible/sonicFoam/eEqn.H +++ b/applications/solvers/compressible/sonicFoam/eEqn.H @@ -14,21 +14,10 @@ // viscous heating? ); - if (oCorr == nOuterCorr - 1) - { - if (mesh.solutionDict().relax("eFinal")) - { - eEqn.relax(mesh.solutionDict().relaxationFactor("eFinal")); - } - else - { - eEqn.relax(1); - } - } - else - { - eEqn.relax(); - } + eEqn.relax + ( + mesh.solutionDict().relaxationFactor(e.select(pimple.finalIter())) + ); eEqn.solve(); diff --git a/applications/solvers/compressible/sonicFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/pEqn.H index 2a53cc3ec..686acebaa 100644 --- a/applications/solvers/compressible/sonicFoam/pEqn.H +++ b/applications/solvers/compressible/sonicFoam/pEqn.H @@ -1,7 +1,7 @@ { U = UEqn.H()/UEqn.A(); - for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++) + while (pimple.correctNonOrthogonal()) { // Calculate phi for boundary conditions phi = rhof* @@ -36,7 +36,7 @@ pEqn.solve(); // Calculate the flux - if (nonOrth == nNonOrthCorr) + if (pimple.finalNonOrthogonalIter()) { phi = phid2 + pEqn.flux(); } diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C index fb11a64bc..9085439ee 100644 --- a/applications/solvers/compressible/sonicFoam/sonicFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C @@ -42,6 +42,7 @@ Author #include "fvCFD.H" #include "basicPsiThermo.H" #include "turbulenceModel.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,6 +51,9 @@ int main(int argc, char *argv[]) # include "setRootCase.H" # include "createTime.H" # include "createMesh.H" + + pimpleControl pimple(mesh); + # include "createFields.H" # include "initContinuityErrs.H" # include "createTimeControls.H" @@ -61,7 +65,6 @@ int main(int argc, char *argv[]) while (runTime.run()) { # include "readTimeControls.H" -# include "readPIMPLEControls.H" # include "compressibleCourantNo.H" # include "setDeltaT.H" @@ -70,8 +73,7 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; // --- PIMPLE loop - label oCorr = 0; - do + while (pimple.loop()) { # include "rhoEqn.H" # include "eEqn.H" @@ -87,13 +89,13 @@ int main(int argc, char *argv[]) // but psi and rho are not surfaceScalarField rhoReff = rhof - psisf*fvc::interpolate(p); - for (int corr = 0; corr < nCorr; corr++) + while (pimple.correct()) { # include "pEqn.H" } turbulence->correct(); - } while (++oCorr < nOuterCorr); + } runTime.write(); diff --git a/applications/solvers/compressible/sonicLiquidFoam/createFields.H b/applications/solvers/compressible/sonicLiquidFoam/createFields.H index f419234c7..cf3dce8f8 100644 --- a/applications/solvers/compressible/sonicLiquidFoam/createFields.H +++ b/applications/solvers/compressible/sonicLiquidFoam/createFields.H @@ -42,3 +42,5 @@ # include "compressibleCreatePhi.H" + + mesh.schemesDict().setFluxRequired(p.name()); diff --git a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C index 66df9e7df..259dc677a 100644 --- a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C +++ b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C @@ -31,6 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -39,6 +40,9 @@ int main(int argc, char *argv[]) # include "setRootCase.H" # include "createTime.H" # include "createMesh.H" + + pimpleControl pimple(mesh); + # include "readThermodynamicProperties.H" # include "readTransportProperties.H" # include "createFields.H" @@ -52,14 +56,12 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; -# include "readPIMPLEControls.H" # include "compressibleCourantNo.H" # include "rhoEqn.H" // --- PIMPLE loop - label oCorr = 0; - do + while (pimple.loop()) { fvVectorMatrix UEqn ( @@ -71,7 +73,7 @@ int main(int argc, char *argv[]) solve(UEqn == -fvc::grad(p)); // --- PISO loop - for (int corr = 0; corr < nCorr; corr++) + while (pimple.correct()) { volScalarField rAU("rAU", 1.0/UEqn.A()); surfaceScalarField rhorAUf @@ -113,7 +115,7 @@ int main(int argc, char *argv[]) U -= rAU*fvc::grad(p); U.correctBoundaryConditions(); } - } while (++oCorr < nOuterCorr); + } // Correct density diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary index 43bfa8da3..635db6d90 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.2 | +| \\ / O peration | Version: 4.0 | | \\ / A nd | Web: http://www.foam-extend.org | | \\/ M anipulation | For copyright notice see file Copyright | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes index 5824630ad..d07e66a82 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes @@ -31,7 +31,7 @@ divSchemes div(phi,U) Gauss upwind; div(phid,p) Gauss upwind; div(phi,e) Gauss upwind; - div((muEff*dev2(grad(U).T()))) Gauss linear; + div((muEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -49,10 +49,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p; -} - // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution index 36bf9d4df..3e4690cea 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution @@ -52,4 +52,12 @@ PIMPLE nNonOrthogonalCorrectors 0; } +relaxationFactors +{ + U 1; + UFinal 1; + e 1; + eFinal 1; +} + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes index f3e8c3c32..f5f356a7e 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes @@ -32,7 +32,7 @@ divSchemes div(phid,p) Gauss vanLeer; div(phi,e) Gauss vanLeer; div(phiU,p) Gauss vanLeer; - div((muEff*dev2(grad(U).T()))) Gauss linear; + div((muEff*dev2(T(grad(U))))) Gauss linear; div(interpolate(rho),U) Gauss linear; } @@ -52,10 +52,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p ; -} - // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution index 400a06424..f0bcb2a0c 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution @@ -57,4 +57,12 @@ PIMPLE nNonOrthogonalCorrectors 0; } +relaxationFactors +{ + U 1; + UFinal 1; + e 1; + eFinal 1; +} + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary index a2be7031a..8e1412724 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.2 | +| \\ / O peration | Version: 4.0 | | \\ / A nd | Web: http://www.foam-extend.org | | \\/ M anipulation | For copyright notice see file Copyright | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes index ec9ee2895..0688f277c 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes @@ -36,7 +36,7 @@ divSchemes div(phid,p) Gauss limitedLinear 1; div(phiU,p) Gauss limitedLinear 1; div(phi,e) Gauss limitedLinear 1; - div((muEff*dev2(grad(U).T()))) Gauss linear; + div((muEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -54,10 +54,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p; -} - // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution index 251e35535..b98c34c9e 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution @@ -85,9 +85,11 @@ PIMPLE relaxationFactors { - U 0.8; - p 0.8; - e 0.8; + U 0.8; + UFinal 1; + p 0.8; + e 0.8; + eFinal 1; } // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary index f612fade1..b611ba5de 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.2 | +| \\ / O peration | Version: 4.0 | | \\ / A nd | Web: http://www.foam-extend.org | | \\/ M anipulation | For copyright notice see file Copyright | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes index 7a72514a7..015b13fcb 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes +++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes @@ -31,7 +31,7 @@ divSchemes div(phi,U) Gauss upwind; div(phid,p) Gauss upwind; div(phi,e) Gauss upwind; - div((muEff*dev2(grad(U).T()))) Gauss linear; + div((muEff*dev2(T(grad(U))))) Gauss linear; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; @@ -54,10 +54,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p; -} - // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution index a4bfb4086..77927c51c 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution +++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution @@ -76,4 +76,12 @@ PIMPLE nNonOrthogonalCorrectors 0; } +relaxationFactors +{ + U 1; + UFinal 1; + e 1; + eFinal 1; +} + // ************************************************************************* // diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes index 0497c9070..05cd7e80e 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes @@ -50,10 +50,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p ; -} - // ************************************************************************* // -- 2.11.4.GIT