From 53dcbea597f4097e13461f34e19bc7c2d7ee7bb0 Mon Sep 17 00:00:00 2001 From: Vanja Skuric Date: Sun, 8 May 2016 10:48:57 +0200 Subject: [PATCH] Backported XiFoam, engineFoam, coldEngineFoam and tutorials (vanilla OF 3.0.1) --- applications/solvers/combustion/XiFoam/UEqn.H | 2 +- applications/solvers/combustion/XiFoam/XiFoam.C | 9 ++++++--- applications/solvers/combustion/XiFoam/createFields.H | 2 ++ applications/solvers/combustion/XiFoam/pEqn.H | 10 +++++----- .../solvers/combustion/coldEngineFoam/coldEngineFoam.C | 7 +++++-- .../solvers/combustion/coldEngineFoam/createFields.H | 2 ++ applications/solvers/combustion/engineFoam/UEqn.H | 2 +- .../solvers/combustion/engineFoam/engineFoam.C | 7 +++++-- applications/solvers/combustion/engineFoam/pEqn.H | 10 +++++----- .../combustion/XiFoam/les/pitzDaily/system/fvSchemes | 8 +------- .../combustion/XiFoam/les/pitzDaily/system/fvSolution | 2 +- .../combustion/XiFoam/les/pitzDaily3D/system/fvSchemes | 8 +------- .../XiFoam/les/pitzDaily3D/system/fvSolution | 2 +- .../XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes | 8 +------- .../XiFoam/ras/moriyoshiHomogeneous/system/fvSolution | 2 +- .../engineFoam/kivaTest/constant/polyMesh/boundary | 4 ++-- .../combustion/engineFoam/kivaTest/system/fvSchemes | 9 ++------- 17 files changed, 42 insertions(+), 52 deletions(-) diff --git a/applications/solvers/combustion/XiFoam/UEqn.H b/applications/solvers/combustion/XiFoam/UEqn.H index 9697c6e1e..1e626d75b 100644 --- a/applications/solvers/combustion/XiFoam/UEqn.H +++ b/applications/solvers/combustion/XiFoam/UEqn.H @@ -9,7 +9,7 @@ UEqn.relax(); - if (momentumPredictor) + if (pimple.momentumPredictor()) { solve(UEqn == -fvc::grad(p)); } diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index c652e2624..f4b93a51f 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/applications/solvers/combustion/XiFoam/XiFoam.C @@ -55,6 +55,7 @@ Description #include "laminarFlameSpeed.H" #include "ignition.H" #include "Switch.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -64,6 +65,9 @@ int main(int argc, char *argv[]) # include "createTime.H" # include "createMesh.H" + + pimpleControl pimple(mesh); + # include "readCombustionProperties.H" # include "readGravitationalAcceleration.H" # include "createFields.H" @@ -79,7 +83,6 @@ int main(int argc, char *argv[]) while (runTime.run()) { # include "readTimeControls.H" -# include "readPISOControls.H" # include "compressibleCourantNo.H" # include "setDeltaT.H" @@ -87,7 +90,7 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; // --- Pressure-velocity PIMPLE corrector loop - for (int oCorr=0; oCorrdivDevRhoReff(U) ); - if (momentumPredictor) + if (piso.momentumPredictor()) { solve(UEqn == -fvc::grad(p)); } diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C index 56b487bf8..0b55614b1 100644 --- a/applications/solvers/combustion/engineFoam/engineFoam.C +++ b/applications/solvers/combustion/engineFoam/engineFoam.C @@ -57,6 +57,7 @@ Description #include "ignition.H" #include "Switch.H" #include "OFstream.H" +#include "pisoControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -66,6 +67,9 @@ int main(int argc, char *argv[]) # include "createEngineTime.H" # include "createEngineMesh.H" + + pisoControl piso(mesh); + # include "readCombustionProperties.H" # include "createFields.H" # include "initContinuityErrs.H" @@ -81,7 +85,6 @@ int main(int argc, char *argv[]) while (runTime.run()) { -# include "readPISOControls.H" # include "readEngineTimeControls.H" # include "compressibleCourantNo.H" # include "setDeltaT.H" @@ -97,7 +100,7 @@ int main(int argc, char *argv[]) # include "UEqn.H" // --- PISO loop - for (int corr=1; corr<=nCorr; corr++) + while (piso.correct()) { # include "ftEqn.H" # include "bEqn.H" diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H index 39b496731..ed86b9c97 100644 --- a/applications/solvers/combustion/engineFoam/pEqn.H +++ b/applications/solvers/combustion/engineFoam/pEqn.H @@ -3,7 +3,7 @@ rho = thermo.rho(); volScalarField rUA = 1.0/UEqn.A(); U = rUA*UEqn.H(); -if (transonic) +if (piso.transonic()) { surfaceScalarField phid ( @@ -12,7 +12,7 @@ if (transonic) *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)) ); - for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + while (piso.correctNonOrthogonal()) { fvScalarMatrix pEqn ( @@ -23,7 +23,7 @@ if (transonic) pEqn.solve(); - if (nonOrth == nNonOrthCorr) + if (piso.finalNonOrthogonalIter()) { phi == pEqn.flux(); } @@ -34,7 +34,7 @@ else phi = fvc::interpolate(rho) *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)); - for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + while (piso.correctNonOrthogonal()) { fvScalarMatrix pEqn ( @@ -45,7 +45,7 @@ else pEqn.solve(); - if (nonOrth == nNonOrthCorr) + if (piso.finalNonOrthogonalIter()) { phi += pEqn.flux(); } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes index 617e2c137..85149d415 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes @@ -44,7 +44,7 @@ divSchemes div(U) Gauss linear; div((Su*grad(b))) Gauss linear; div((U+((Su*Xi)*grad(b)))) Gauss linear; - div((muEff*dev2(grad(U).T()))) Gauss linear; + div((muEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -70,10 +70,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p ; -} - // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution index 14c6270cb..bb58ac024 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution @@ -122,7 +122,7 @@ solvers } } -PISO +PIMPLE { nOuterCorrectors 2; nCorrectors 1; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes index 9e60a7502..923b1c8b5 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes @@ -44,7 +44,7 @@ divSchemes div(U) Gauss linear; div((Su*grad(b))) Gauss linear; div((U+((Su*Xi)*grad(b)))) Gauss linear; - div((muEff*dev2(grad(U).T()))) Gauss linear; + div((muEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -70,10 +70,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p ; -} - // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution index aa029ac96..f6268e03c 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution @@ -122,7 +122,7 @@ solvers } } -PISO +PIMPLE { nOuterCorrectors 2; nCorrectors 1; diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes index fa004306d..96e263d29 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes @@ -50,7 +50,7 @@ divSchemes div(U) Gauss linear; div((Su*grad(b))) Gauss linear; div((U+((Su*Xi)*grad(b)))) Gauss linear; - div((muEff*dev2(grad(U).T()))) Gauss linear; + div((muEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -77,10 +77,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p ; -} - // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution index 7c6380a8e..ad27ea05d 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution @@ -122,7 +122,7 @@ solvers } } -PISO +PIMPLE { nCorrectors 2; nNonOrthogonalCorrectors 0; diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary index fd71ea09e..a50d04c25 100644 --- a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary +++ b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary @@ -1,9 +1,9 @@ /*--------------------------------*- 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 | | +| \\/ M anipulation | For copyright notice see file Copyright | \*---------------------------------------------------------------------------*/ FoamFile { diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes index 6e689868b..15ad9d5f3 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes +++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes @@ -43,7 +43,7 @@ divSchemes div(U) Gauss linear; div((Su*grad(b))) Gauss linear; div((U+((Su*Xi)*grad(b)))) Gauss linear; - div((muEff*dev2(grad(U).T()))) Gauss linear; + div((muEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -59,6 +59,7 @@ laplacianSchemes laplacian(alphaEff,h) Gauss linear limited 0.5; laplacian(alphaEff,hu) Gauss linear limited 0.5; laplacian(alphaEff,ft) Gauss linear limited 0.5; + laplacian(alphaEff,b) Gauss linear limited 0.5; } interpolationSchemes @@ -71,10 +72,4 @@ snGradSchemes default limited 0.5; } -fluxRequired -{ - default no; - p ; -} - // ************************************************************************* //