merge

applications/solvers/Lagrangian/kinematicParcelFoam/Make/options

@@ -1,21 +1,21 @@
 EXE_INC = \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
-    -lfiniteVolume \
-    -lmeshTools \
     -lthermophysicalFunctions \
     -lbasicThermophysicalModels \
-    /* -lcombustionThermophysicalModels */ \
     -lspecie \
     -lradiation \
-    -lcompressibleRASModels
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
+    -lfiniteVolume \
+    -lmeshTools

applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H

@@ -32,12 +32,12 @@
         mesh
     );
 
-#   include "compressibleCreatePhi.H"
+    #include "compressibleCreatePhi.H"
 
     Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASModel> turbulence
+    autoPtr<compressible::turbulenceModel> turbulence
     (
-        compressible::RASModel::New
+        compressible::turbulenceModel::New
         (
             rho,
             U,

applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C

@@ -26,14 +26,14 @@ Application
     kinematicParcelFoam
 
 Description
-    Transient solver for a single kinematicCloud. Uses precalculated velocity
+    Transient solver for a single kinematicCloud. Uses pre-calculated velocity
     field to evolve a cloud.
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "turbulenceModel.H"
 #include "basicKinematicCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     #include "createFields.H"
     #include "compressibleCourantNo.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 

applications/solvers/combustion/PDRFoam/Make/options

@@ -9,7 +9,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicFvMesh/lnInclude \

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C

@@ -50,7 +50,7 @@ PDRkEpsilon::PDRkEpsilon
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel),

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H

@@ -77,20 +77,19 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         PDRkEpsilon
         (
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermophysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
     // Destructor
-
+    virtual ~PDRkEpsilon()
-        ~PDRkEpsilon()
+    {}
-        {}
 
 
     // Member Functions

applications/solvers/combustion/PDRFoam/kEpsilon.H

@@ -1,54 +0,0 @@
-if(turbulence)
-{
-    volScalarField divU = fvc::div(Uf & mesh.Sf());
-
-    tmp<volTensorField> tgradU = fvc::grad(Uf);
-    volScalarField G = 2*mut*(tgradU() && dev(symm(tgradU())));
-    tgradU.clear();
-
-    // Add the blockage generation term so that it is included consistently
-    // in both the k and epsilon equations
-    volScalarField GR = rho*mag(U)*(U & CT & U);
-
-#   include "wallFunctions.H"
-
-    // Dissipation equation
-    fvScalarMatrix epsEqn
-    (
-        betav*fvm::ddt(rho, epsilon)
-      + fvm::div(phi, epsilon)
-      - fvm::laplacian(fvc::interpolate(alphaEps*muEff), epsilon)
-      ==
-        C1*(betav*G + GR)*epsilon/k
-      - fvm::SuSp((2.0/3.0*C1)*betav*rho*divU, epsilon)
-      - fvm::Sp(C2*betav*rho*epsilon/k, epsilon)
-    );
-
-#   include "wallDissipation.H"
-
-    epsEqn.solve();
-    bound(epsilon, dimensionedScalar("0", epsilon.dimensions(), 1.0e-15));
-
-
-    // Turbulent kinetic energy equation
-    solve
-    (
-        betav*fvm::ddt(rho, k)
-      + fvm::div(phi, k)
-      - fvm::laplacian(fvc::interpolate(alphak*muEff), k)
-      ==
-        betav*G + GR
-      - fvm::SuSp(2.0/3.0*betav*rho*divU, k)
-      - fvm::Sp(betav*rho*epsilon/k, k)
-    );
-
-    bound(k, dimensionedScalar("0", k.dimensions(), 0.0));
-
-    //- Re-calculate turbulence viscosity
-    mut = Cmu*rho*sqr(k)/epsilon;
-
-#   include "wallViscosity.H"
-
-}
-
-muEff = mut + thermo->mu();

applications/solvers/combustion/XiFoam/Make/options

@@ -1,19 +1,20 @@
 EXE_INC = \
     -I$(LIB_SRC)/engine/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-    -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lengine \
-    -lfiniteVolume \
-    -lmeshTools \
     -lcompressibleRASModels \
+    -lcompressibleLESModels \
     -lbasicThermophysicalModels \
     -lcombustionThermophysicalModels \
     -lspecie \
-    -llaminarFlameSpeedModels
+    -llaminarFlameSpeedModels \
+    -lfiniteVolume \
+    -lmeshTools

applications/solvers/combustion/XiFoam/XiFoam.C

@@ -52,7 +52,7 @@ Description
 
 #include "fvCFD.H"
 #include "hhuCombustionThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "turbulenceModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
 #include "Switch.H"

applications/solvers/combustion/XiFoam/createFields.H

@@ -48,9 +48,9 @@
 
 
     Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASModel> turbulence
+    autoPtr<compressible::turbulenceModel> turbulence
     (
-        compressible::RASModel::New
+        compressible::turbulenceModel::New
         (
             rho,
             U,
@@ -60,7 +60,7 @@
     );
 
     Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt = 
+    volScalarField DpDt =
         fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
 
 

applications/solvers/combustion/Xoodles/Make/files

@@ -1,3 +0,0 @@
-Xoodles.C
-
-EXE = $(FOAM_APPBIN)/Xoodles

applications/solvers/combustion/Xoodles/Make/options

@@ -1,23 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/engine/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
-    -I../XiFoam
-
-
-EXE_LIBS = \
-    -lengine \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lbasicThermophysicalModels \
-    -lcombustionThermophysicalModels \
-    -lspecie \
-    -lcompressibleLESModels \
-    -llaminarFlameSpeedModels

applications/solvers/combustion/Xoodles/Xoodles.C

@@ -1,122 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    Xoodles
-
-Description
-    Compressible premixed/partially-premixed combustion solver with large-eddy
-    simulation (LES) turbulence modelling.
-
-    Combusting LES code using the b-Xi two-equation model.
-    Xi may be obtained by either the solution of the Xi transport
-    equation or from an algebraic exression.  Both approaches are
-    based on Gulder's flame speed correlation which has been shown
-    to be appropriate for LES by comparison with the results from the
-    spectral model.
-
-    Strain effects are encorporated directly into the Xi equation
-    but not in the algebraic approximation.  Further work need to be
-    done on this issue, particularly regarding the enhanced removal rate
-    caused by flame compression.  Analysis using results of the spectral
-    model will be required.
-
-    For cases involving very lean Propane flames or other flames which are
-    very strain-sensitive, a transport equation for the laminar flame
-    speed is present.  This equation is derived using heuristic arguments
-    involving the strain time scale and the strain-rate at extinction.
-    the transport velocity is the same as that for the Xi equation.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "hhuCombustionThermo.H"
-#include "compressible/LESModel/LESModel.H"
-#include "laminarFlameSpeed.H"
-#include "ignition.H"
-#include "IFstream.H"
-#include "OFstream.H"
-
-#define divDevRhoReff divDevRhoBeff
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    #include "setRootCase.H"
-
-    #include "createTime.H"
-    #include "createMeshNoClear.H"
-    #include "readEnvironmentalProperties.H"
-    #include "createFields.H"
-    #include "readPISOControls.H"
-    #include "readCombustionProperties.H"
-    #include "initContinuityErrs.H"
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    for (runTime++; !runTime.end(); runTime++)
-    {
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        #include "compressibleCourantNo.H"
-
-        #include "rhoEqn.H"
-
-        turbulence->correct();
-
-        #include "UEqn.H"
-
-        // --- PISO loop
-        for (int corr=1; corr<=nCorr; corr++)
-        {
-            #include "ftEqn.H"
-            #include "bEqn.H"
-            #include "huEqn.H"
-            #include "hEqn.H"
-
-            if (!ign.ignited())
-            {
-                hu == h;
-            }
-
-            #include "pEqn.H"
-        }
-
-        runTime.write();
-
-        rho = thermo->rho();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return(0);
-}
-
-
-// ************************************************************************* //

applications/solvers/combustion/Xoodles/createFields.H

@@ -1,124 +0,0 @@
-    Info<< "Reading thermophysical properties\n" << endl;
-
-    autoPtr<hhuCombustionThermo> thermo
-    (
-        hhuCombustionThermo::New(mesh)
-    );
-    combustionMixture& composition = thermo->composition();
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        thermo->rho()
-    );
-
-    volScalarField& p = thermo->p();
-    const volScalarField& psi = thermo->psi();
-    volScalarField& h = thermo->h();
-    volScalarField& hu = thermo->hu();
-
-    volScalarField& b = composition.Y("b");
-    Info<< "min(b) = " << min(b).value() << endl;
-
-    const volScalarField& T = thermo->T();
-
-
-    Info<< "\nReading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-#   include "compressibleCreatePhi.H"
-
-
-    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::LESModel> turbulence
-    (
-        compressible::LESModel::New(rho, U, phi, thermo())
-    );
-
-
-    Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt = 
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
-
-    Info<< "Creating field Xi\n" << endl;
-    volScalarField Xi
-    (
-        IOobject
-        (
-            "Xi",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-
-    Info<< "Creating the unstrained laminar flame speed\n" << endl;
-    autoPtr<laminarFlameSpeed> unstrainedLaminarFlameSpeed
-    (
-        laminarFlameSpeed::New(thermo)
-    );
-
-
-    Info<< "Reading strained laminar flame speed field Su\n" << endl;
-    volScalarField Su
-    (
-        IOobject
-        (
-            "Su",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    dimensionedScalar SuMin = 0.01*Su.average();
-    dimensionedScalar SuMax = 4*Su.average();
-
-    Info<< "Calculating turbulent flame speed field St\n" << endl;
-    volScalarField St
-    (
-        IOobject
-        (
-            "St",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        Xi*Su
-    );
-
-
-    multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
-
-    if (composition.contains("ft"))
-    {
-        fields.add(composition.Y("ft"));
-    }
-
-    fields.add(b);
-    fields.add(h);
-    fields.add(hu);

applications/solvers/combustion/coldEngineFoam/Make/options

@@ -2,15 +2,16 @@ EXE_INC = \
     -I../engineFoam \
     -I../XiFoam \
     -I$(LIB_SRC)/engine/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lengine \
-    -lfiniteVolume \
     -lcompressibleRASModels \
+    -lcompressibleLESModels \
     -lbasicThermophysicalModels \
-    -lspecie
+    -lspecie \
+    -lfiniteVolume

applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C

@@ -34,7 +34,7 @@ Description
 #include "engineTime.H"
 #include "engineMesh.H"
 #include "basicThermo.H"
-#include "RASModel.H"
+#include "turbulenceModel.H"
 #include "OFstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/combustion/coldEngineFoam/createFields.H

@@ -42,9 +42,9 @@
 
 
     Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASModel> turbulence
+    autoPtr<compressible::turbulenceModel> turbulence
     (
-        compressible::RASModel::New
+        compressible::turbulenceModel::New
         (
             rho,
             U,

applications/solvers/combustion/dieselEngineFoam/Make/options

@@ -1,7 +1,6 @@
 EXE_INC = \
     -I../engineFoam \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
@@ -14,11 +13,13 @@ EXE_INC = \
     -I$(LIB_SRC)/../applications/solvers/combustion/XiFoam \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
-    -I$(LIB_SRC)/engine/lnInclude
+    -I$(LIB_SRC)/engine/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
 
 EXE_LIBS = \
     -lengine \
     -lcompressibleRASModels \
+    -lcompressibleLESModels \
     -lcombustionThermophysicalModels \
     -lfiniteVolume \
     -llagrangian \

applications/solvers/combustion/dieselEngineFoam/createFields.H

@@ -58,9 +58,9 @@ volScalarField kappa
 );
 
 Info << "Creating turbulence model.\n" << nl;
-autoPtr<compressible::RASModel> turbulence
+autoPtr<compressible::turbulenceModel> turbulence
 (
-    compressible::RASModel::New
+    compressible::turbulenceModel::New
     (
         rho,
         U,
@@ -70,7 +70,7 @@ autoPtr<compressible::RASModel> turbulence
 );
 
 Info<< "Creating field DpDt\n" << endl;
-volScalarField DpDt = 
+volScalarField DpDt =
     fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
 
 Info << "Constructing chemical mechanism" << endl;

applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C

@@ -34,7 +34,7 @@ Description
 #include "engineTime.H"
 #include "engineMesh.H"
 #include "hCombustionThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "turbulenceModel.H"
 #include "spray.H"
 #include "chemistryModel.H"
 #include "chemistrySolver.H"

applications/solvers/combustion/dieselFoam/Make/options

@@ -1,7 +1,7 @@
 EXE_INC = \
     -I../dieselEngineFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
@@ -17,8 +17,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lcompressibleRASModels \
+    -lcompressibleLESModels \
     -lcombustionThermophysicalModels \
-    -lfiniteVolume \
     -llagrangian \
     -ldieselSpray \
     -lliquids \
@@ -29,4 +29,5 @@ EXE_LIBS = \
     -llaminarFlameSpeedModels \
     -lchemistryModel \
     -lODE \
-    -lpdf
+    -lpdf \
+    -lfiniteVolume

applications/solvers/combustion/dieselFoam/dieselFoam.C

@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "hCombustionThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "turbulenceModel.H"
 #include "spray.H"
 #include "chemistryModel.H"
 #include "chemistrySolver.H"

applications/solvers/combustion/engineFoam/Make/options

@@ -1,18 +1,19 @@
 EXE_INC = \
+    -I../XiFoam \
     -I$(LIB_SRC)/engine/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
-    -I../XiFoam
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lengine \
-    -lfiniteVolume \
     -lcompressibleRASModels \
+    -lcompressibleLESModels \
     -lbasicThermophysicalModels \
     -lcombustionThermophysicalModels \
     -lspecie \
-    -llaminarFlameSpeedModels
+    -llaminarFlameSpeedModels \
+    -lfiniteVolume

applications/solvers/combustion/engineFoam/engineFoam.C

@@ -53,7 +53,7 @@ Description
 #include "engineTime.H"
 #include "engineMesh.H"
 #include "hhuCombustionThermo.H"
-#include "RASModel.H"
+#include "turbulenceModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
 #include "Switch.H"

applications/solvers/combustion/reactingFoam/Make/options

@@ -1,18 +1,19 @@
 EXE_INC = \
     -I../XiFoam \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-    -I$(LIB_SRC)/ODE/lnInclude
+    -I$(LIB_SRC)/ODE/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lcompressibleRASModels \
+    -lcompressibleLESModels \
     -lcombustionThermophysicalModels \
-    -lfiniteVolume \
     -lspecie \
     -lbasicThermophysicalModels \
     -lchemistryModel \
-    -lODE
+    -lODE \
+    -lfiniteVolume

applications/solvers/combustion/reactingFoam/createFields.H

@@ -58,9 +58,9 @@ volScalarField kappa
 );
 
 Info << "Creating turbulence model.\n" << nl;
-autoPtr<compressible::RASModel> turbulence
+autoPtr<compressible::turbulenceModel> turbulence
 (
-    compressible::RASModel::New
+    compressible::turbulenceModel::New
     (
         rho,
         U,
@@ -70,7 +70,7 @@ autoPtr<compressible::RASModel> turbulence
 );
 
 Info<< "Creating field DpDt\n" << endl;
-volScalarField DpDt = 
+volScalarField DpDt =
     fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
 
 Info << "Constructing chemical mechanism" << endl;

applications/solvers/combustion/reactingFoam/reactingFoam.C

@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "hCombustionThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "turbulenceModel.H"
 #include "chemistryModel.H"
 #include "chemistrySolver.H"
 #include "multivariateScheme.H"

applications/solvers/compressible/coodles/Make/files

@@ -1,3 +0,0 @@
-coodles.C
-
-EXE = $(FOAM_APPBIN)/coodles

applications/solvers/compressible/coodles/createFields.H

@@ -1,50 +0,0 @@
-    Info<< "Reading thermophysical properties\n" << endl;
-
-    autoPtr<basicThermo> thermo
-    (
-        basicThermo::New(mesh)
-    );
-
-    volScalarField& p = thermo->p();
-    volScalarField& h = thermo->h();
-    const volScalarField& psi = thermo->psi();
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        thermo->rho()
-    );
-
-    Info<< "\nReading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-#   include "compressibleCreatePhi.H"
-
-
-    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::LESModel> turbulence
-    (
-        compressible::LESModel::New(rho, U, phi, thermo())
-    );
-
-    Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt = 
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);

applications/solvers/compressible/rhoPimpleFoam/Make/options

@@ -1,12 +1,13 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/cfdTools \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/finiteVolume/cfdTools \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
     -lbasicThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
+    -lfiniteVolume \
+    -lmeshTools

applications/solvers/compressible/rhoPimpleFoam/createFields.H

@@ -44,9 +44,9 @@
     );
 
     Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASModel> turbulence
+    autoPtr<compressible::turbulenceModel> turbulence
     (
-        compressible::RASModel::New
+        compressible::turbulenceModel::New
         (
             rho,
             U,
@@ -59,5 +59,5 @@
 
 
     Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt = 
+    volScalarField DpDt =
         fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -26,8 +26,8 @@ Application
     rhoPimpleFoam
 
 Description
-    Transient solver for turbulent flow of compressible fluids for
+    Transient solver for laminar or turbulent flow of compressible fluids
-    ventilation and heat-transfer.
+    for HVAC and similar applications.
 
     Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and
     pseudo-transient simulations.
@@ -36,8 +36,8 @@ Description
 
 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "turbulenceModel.H"
-#include "fixedGradientFvPatchFields.H"
+#include "bound.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/solvers/compressible/rhoPisoFoam/Make/files

@@ -0,0 +1,3 @@
+rhoPisoFoam.C
+
+EXE = $(FOAM_APPBIN)/rhoPisoFoam

applications/solvers/compressible/rhoPisoFoam/Make/options

@@ -1,13 +1,13 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lbasicThermophysicalModels \
     -lspecie \
+    -lcompressibleRASModels \
     -lcompressibleLESModels

applications/solvers/compressible/rhoPisoFoam/createFields.H

@@ -40,18 +40,18 @@
 
 
     Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASModel> turbulence
+    autoPtr<compressible::turbulenceModel> turbulence
     (
-        compressible::RASModel::New
+        compressible::turbulenceModel::New
         (
             rho,
             U,
             phi,
             thermo()
         )
-    );    
+    );
-    
+
 
     Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt = 
+    volScalarField DpDt =
         fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);

applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C

@@ -23,18 +23,16 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    coodles
+    rhoPisoFoam
 
 Description
-    Compressible LES solver.
+    Transient PISO solver for compressible, laminar or turbulent flow.
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/LESModel/LESModel.H"
+#include "turbulenceModel.H"
-
-#define divDevRhoReff divDevRhoBeff
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,16 +43,27 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "readPISOControls.H"
     #include "initContinuityErrs.H"
+    #include "readTimeControls.H"
+    #include "compressibleCourantNo.H"
+    #include "setInitialDeltaT.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
-    for (runTime++; !runTime.end(); runTime++)
+    while (runTime.run())
     {
-        Info<< "Time = " << runTime.timeName() << nl << endl;
+        #include "readTimeControls.H"
-
         #include "readPISOControls.H"
         #include "compressibleCourantNo.H"
+        #include "setDeltaT.H"
+
+        runTime++;
+
+        Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "rhoEqn.H"
         #include "UEqn.H"

applications/solvers/compressible/rhoPorousSimpleFoam/Make/options

@@ -1,13 +1,14 @@
 EXE_INC = \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS
 
 EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
     -lbasicThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels
+    -lcompressibleRASModels \
+    -lfiniteVolume \
+    -lmeshTools

applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C

@@ -33,7 +33,7 @@ Description
 
 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "RASModel.H"
 #include "porousZones.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/compressible/rhoSimpleFoam/Make/options

@@ -1,12 +1,13 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/cfdTools \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \
+    -I$(LIB_SRC)/finiteVolume/cfdTools \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
     -lbasicThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels
+    -lcompressibleRASModels \
+    -lfiniteVolume \
+    -lmeshTools

applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C

@@ -26,27 +26,26 @@ Application
     rhoSimpleFoam
 
 Description
-    Steady-state solver for turbulent flow of compressible fluids
+    Steady-state SIMPLE solver for laminar or turbulent flow of
+    compressible fluids.
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "RASModel.H"
-#include "fixedGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "createFields.H"
+    #include "initContinuityErrs.H"
 
-#   include "setRootCase.H"
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "createFields.H"
-#   include "initContinuityErrs.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
@@ -54,17 +53,17 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readSIMPLEControls.H"
+        #include "readSIMPLEControls.H"
-#       include "initConvergenceCheck.H"
+        #include "initConvergenceCheck.H"
 
         p.storePrevIter();
         rho.storePrevIter();
 
         // Pressure-velocity SIMPLE corrector
         {
-#           include "UEqn.H"
+            #include "UEqn.H"
-#           include "hEqn.H"
+            #include "hEqn.H"
-#           include "pEqn.H"
+            #include "pEqn.H"
         }
 
         turbulence->correct();
@@ -75,7 +74,7 @@ int main(int argc, char *argv[])
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
             << nl << endl;
 
-#       include "convergenceCheck.H"
+        #include "convergenceCheck.H"
     }
 
     Info<< "End\n" << endl;

applications/solvers/compressible/rhoTurbFoam/Make/files

@@ -1,3 +0,0 @@
-rhoTurbFoam.C
-
-EXE = $(FOAM_APPBIN)/rhoTurbFoam

applications/solvers/compressible/rhoTurbFoam/Make/options

@@ -1,12 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS
-    
-EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lbasicThermophysicalModels \
-    -lspecie \
-    -lcompressibleRASModels

applications/solvers/compressible/rhoTurbFoam/UEqn.H

@@ -1,11 +0,0 @@
-    fvVectorMatrix UEqn
-    (
-        fvm::ddt(rho, U)
-      + fvm::div(phi, U)
-      + turbulence->divDevRhoReff(U)
-    );
-
-    if (momentumPredictor)
-    {
-        solve(UEqn == -fvc::grad(p));
-    }

applications/solvers/compressible/rhoTurbFoam/hEqn.H

@@ -1,12 +0,0 @@
-{
-    solve
-    (
-        fvm::ddt(rho, h)
-      + fvm::div(phi, h)
-      - fvm::laplacian(turbulence->alphaEff(), h)
-     ==
-        DpDt
-    );
-
-    thermo->correct();
-}

applications/solvers/compressible/rhoTurbFoam/pEqn.H

@@ -1,68 +0,0 @@
-rho = thermo->rho();
-
-volScalarField rUA = 1.0/UEqn.A();
-U = rUA*UEqn.H();
-
-if (transonic)
-{
-    surfaceScalarField phid
-    (
-        "phid",
-        fvc::interpolate(thermo->psi())
-       *(
-            (fvc::interpolate(U) & mesh.Sf())
-          + fvc::ddtPhiCorr(rUA, rho, U, phi)
-        )
-    );
-
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-    {
-        fvScalarMatrix pEqn
-        (
-            fvm::ddt(psi, p)
-          + fvm::div(phid, p)
-          - fvm::laplacian(rho*rUA, p)
-        );
-
-        pEqn.solve();
-
-        if (nonOrth == nNonOrthCorr)
-        {
-            phi == pEqn.flux();
-        }
-    }
-}
-else
-{
-    phi = 
-        fvc::interpolate(rho)*
-        (
-            (fvc::interpolate(U) & mesh.Sf())
-          + fvc::ddtPhiCorr(rUA, rho, U, phi)
-        );
-
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-    {
-        fvScalarMatrix pEqn
-        (
-            fvm::ddt(psi, p)
-          + fvc::div(phi)
-          - fvm::laplacian(rho*rUA, p)
-        );
-
-        pEqn.solve();
-
-        if (nonOrth == nNonOrthCorr)
-        {
-            phi += pEqn.flux();
-        }
-    }
-}
-
-#include "rhoEqn.H"
-#include "compressibleContinuityErrs.H"
-
-U -= rUA*fvc::grad(p);
-U.correctBoundaryConditions();
-
-DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);

applications/solvers/compressible/rhoTurbFoam/rhoTurbFoam.C

@@ -1,96 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    rhoTurbFoam
-
-Description
-    Transient solver for compressible, turbulent flow.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "createFields.H"
-#   include "readPISOControls.H"
-#   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
-#   include "compressibleCourantNo.H"
-#   include "setInitialDeltaT.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.run())
-    {
-#       include "readTimeControls.H"
-#       include "readPISOControls.H"
-#       include "compressibleCourantNo.H"
-#       include "setDeltaT.H"
-
-        runTime++;
-
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-#       include "rhoEqn.H"
-#       include "UEqn.H"
-
-        // --- PISO loop
-        for (int corr=1; corr<=nCorr; corr++)
-        {
-#           include "hEqn.H"
-#           include "pEqn.H"
-        }
-
-        turbulence->correct();
-
-        rho = thermo->rho();
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return(0);
-}
-
-
-// ************************************************************************* //

applications/solvers/compressible/sonicDyMFoam/Make/files

@@ -0,0 +1,3 @@
+sonicDyMFoam.C
+
+EXE = $(FOAM_APPBIN)/sonicDyMFoam

applications/solvers/compressible/sonicDyMFoam/Make/options

@@ -1,12 +1,16 @@
 EXE_INC = \
     -I../sonicFoam \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lcompressibleRASModels \
     -lbasicThermophysicalModels \
-    -lspecie
+    -lspecie \
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
+    -lfiniteVolume \
+    -ldynamicMesh \
+    -lmeshTools

applications/solvers/compressible/sonicDyMFoam/createFields.H

@@ -38,9 +38,9 @@
 
 
     Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASModel> turbulence
+    autoPtr<compressible::turbulenceModel> turbulence
     (
-        compressible::RASModel::New
+        compressible::turbulenceModel::New
         (
             rho,
             U,
@@ -50,5 +50,5 @@
     );
 
     Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt = 
+    volScalarField DpDt =
         fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);

applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C

@@ -23,31 +23,30 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    sonicFoamAutoMotion
+    sonicDyMFoam
 
 Description
-    Transient solver for trans-sonic/supersonic, laminar flow of a 
+    Transient solver for trans-sonic/supersonic, laminar or turbulent flow
-    compressible gas with mesh motion..
+    of a compressible gas with mesh motion..
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "basicThermo.H"
+#include "turbulenceModel.H"
 #include "motionSolver.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "createFields.H"
+    #include "initContinuityErrs.H"
 
-#   include "setRootCase.H"
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "readThermodynamicProperties.H"
-#   include "readTransportProperties.H"
-#   include "createFields.H"
-#   include "initContinuityErrs.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
@@ -57,34 +56,24 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPISOControls.H"
+        #include "readPISOControls.H"
-#       include "compressibleCourantNo.H"
+        #include "compressibleCourantNo.H"
 
         mesh.movePoints(motionPtr->newPoints());
 
-#       include "rhoEqn.H"
+        #include "rhoEqn.H"
 
         fvVectorMatrix UEqn
         (
             fvm::ddt(rho, U)
           + fvm::div(phi, U)
-          - fvm::laplacian(mu, U)
+          + turbulence->divDevRhoReff(U)
         );
 
         solve(UEqn == -fvc::grad(p));
 
-        solve
+        #include "hEqn.H"
-        (
-            fvm::ddt(rho, e)
-          + fvm::div(phi, e)
-          - fvm::laplacian(mu, e)
-          ==
-          - p*fvc::div(phi/fvc::interpolate(rho) + fvc::meshPhi(rho, U))
-          + mu*magSqr(symm(fvc::grad(U)))
-        );
 
-        T = e/Cv;
-        psi = 1.0/(R*T);
 
         // --- PISO loop
 
@@ -115,12 +104,24 @@ int main(int argc, char *argv[])
                 phi = pEqn.flux();
             }
 
-#           include "compressibleContinuityErrs.H"
+            #include "compressibleContinuityErrs.H"
 
             U -= fvc::grad(p)/UEqn.A();
             U.correctBoundaryConditions();
         }
 
+        DpDt = fvc::DDt
+        (
+            surfaceScalarField
+            (
+                "phiU",
+                phi/fvc::interpolate(rho) + fvc::meshPhi(rho, U)
+            ),
+            p
+        );
+
+        turbulence->correct();
+
         rho = psi*p;
 
         runTime.write();

applications/solvers/compressible/sonicFoam/Make/options

@@ -1,4 +1,12 @@
 EXE_INC = \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
-EXE_LIBS = -lfiniteVolume
+EXE_LIBS = \
+    -lbasicThermophysicalModels \
+    -lspecie \
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
+    -lfiniteVolume \
+    -lmeshTools

applications/solvers/compressible/sonicFoam/createFields.H

@@ -1,49 +1,25 @@
-    Info<< "Reading field p\n" << endl;
+    Info<< "Reading thermophysical properties\n" << endl;
-    volScalarField p
+
+    autoPtr<basicThermo> thermo
+    (
+        basicThermo::New(mesh)
+    );
+
+    volScalarField& p = thermo->p();
+    volScalarField& h = thermo->h();
+    const volScalarField& psi = thermo->psi();
+
+    volScalarField rho
     (
         IOobject
         (
-            "p",
+            "rho",
             runTime.timeName(),
-            mesh,
+            mesh
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
         ),
-        mesh
+        thermo->rho()
     );
 
-
-    Info<< "Reading field T\n" << endl;
-    volScalarField T
-    (
-        IOobject
-        (
-            "T",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-
-    Info<< "Calculating field e from T\n" << endl;
-    volScalarField e
-    (
-        IOobject
-        (
-            "e",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        Cv*T,
-        T.boundaryField().types()
-    );
-
-
     Info<< "Reading field U\n" << endl;
     volVectorField U
     (
@@ -58,29 +34,21 @@
         mesh
     );
 
-    volScalarField psi
-    (
-        IOobject
-        (
-            "psi",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        1.0/(R*T)
-    );
-    psi.oldTime();
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh
-        ),
-        psi*p
-    );
-
 #   include "compressibleCreatePhi.H"
+
+
+    Info<< "Creating turbulence model\n" << endl;
+    autoPtr<compressible::turbulenceModel> turbulence
+    (
+        compressible::turbulenceModel::New
+        (
+            rho,
+            U,
+            phi,
+            thermo()
+        )
+    );
+
+    Info<< "Creating field DpDt\n" << endl;
+    volScalarField DpDt =
+        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);

applications/solvers/compressible/sonicFoam/sonicFoam.C

@@ -26,27 +26,26 @@ Application
     sonicFoam
 
 Description
-    Transient solver for trans-sonic/supersonic, laminar flow of a 
+    Transient solver for trans-sonic/supersonic, laminar or turbulent flow
-    compressible gas. 
+    of a compressible gas.
 
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
+#include "basicThermo.H"
+#include "turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "createFields.H"
+    #include "initContinuityErrs.H"
 
-#   include "setRootCase.H"
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "readThermodynamicProperties.H"
-#   include "readTransportProperties.H"
-#   include "createFields.H"
-#   include "initContinuityErrs.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
@@ -54,35 +53,25 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-#       include "readPISOControls.H"
+        #include "readPISOControls.H"
-#       include "compressibleCourantNo.H"
+        #include "compressibleCourantNo.H"
 
-#       include "rhoEqn.H"
+        #include "rhoEqn.H"
 
         fvVectorMatrix UEqn
         (
             fvm::ddt(rho, U)
           + fvm::div(phi, U)
-          - fvm::laplacian(mu, U)
+          + turbulence->divDevRhoReff(U)
         );
 
         solve(UEqn == -fvc::grad(p));
 
-        solve
+        #include "hEqn.H"
-        (
-            fvm::ddt(rho, e)
-          + fvm::div(phi, e)
-          - fvm::laplacian(mu, e)
-         ==
-          - p*fvc::div(phi/fvc::interpolate(rho))
-          + mu*magSqr(symm(fvc::grad(U)))
-        );
-
-        T = e/Cv;
-        psi = 1.0/(R*T);
 
 
         // --- PISO loop
+
         for (int corr=0; corr<nCorr; corr++)
         {
             volScalarField rUA = 1.0/UEqn.A();
@@ -91,11 +80,11 @@ int main(int argc, char *argv[])
             surfaceScalarField phid
             (
                 "phid",
-                fvc::interpolate(psi)
+                fvc::interpolate(thermo->psi())
                *(
                    (fvc::interpolate(U) & mesh.Sf())
                  + fvc::ddtPhiCorr(rUA, rho, U, phi)
-                )
+               )
             );
 
             for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
@@ -109,15 +98,23 @@ int main(int argc, char *argv[])
 
                 pEqn.solve();
 
-                phi = pEqn.flux();
+                if (nonOrth == nNonOrthCorr)
+                {
+                    phi = pEqn.flux();
+                }
             }
 
-#           include "compressibleContinuityErrs.H"
+             #include "compressibleContinuityErrs.H"
 
             U -= rUA*fvc::grad(p);
             U.correctBoundaryConditions();
         }
 
+        DpDt =
+            fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+
+        turbulence->correct();
+
         rho = psi*p;
 
         runTime.write();

applications/solvers/compressible/sonicFoamAutoMotion/Make/files

@@ -1,3 +0,0 @@
-sonicFoamAutoMotion.C
-
-EXE = $(FOAM_APPBIN)/sonicFoamAutoMotion

applications/solvers/compressible/sonicFoamAutoMotion/Make/options

@@ -1,9 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -ldynamicMesh \
-    -lmeshTools

applications/solvers/compressible/sonicFoamAutoMotion/createFields.H

@@ -1,103 +0,0 @@
-    Info<< "Reading field p\n" << endl;
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-
-    Info<< "Reading field T\n" << endl;
-    volScalarField T
-    (
-        IOobject
-        (
-            "T",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-
-    Info<< "Calculating field e from T\n" << endl;
-    volScalarField e
-    (
-        IOobject
-        (
-            "e",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        Cv*T,
-        T.boundaryField().types()
-    );
-
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-
-    volScalarField psi
-    (
-        IOobject
-        (
-            "psi",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        1.0/(R*T)
-    );
-    psi.oldTime();
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh
-        ),
-        psi*p
-    );
-
-#   include "compressibleCreatePhi.H"
-
-
-    Info<< "Creating field phid\n" << endl;
-    surfaceScalarField phid
-    (
-        IOobject
-        (
-            "phid",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        phi/fvc::interpolate(p),
-        phi.boundaryField().types()
-    );

applications/solvers/compressible/sonicTurbFoam/Make/files

@@ -1,3 +0,0 @@
-sonicTurbFoam.C
-
-EXE = $(FOAM_APPBIN)/sonicTurbFoam

applications/solvers/compressible/sonicTurbFoam/sonicTurbFoam.C

@@ -1,135 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    sonicFoam
-
-Description
-    Transient solver for trans-sonic/supersonic, turbulent flow of a 
-    compressible gas.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "createFields.H"
-#   include "initContinuityErrs.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    for (runTime++; !runTime.end(); runTime++)
-    {
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-#       include "readPISOControls.H"
-#       include "compressibleCourantNo.H"
-
-#       include "rhoEqn.H"
-
-        fvVectorMatrix UEqn
-        (
-            fvm::ddt(rho, U)
-          + fvm::div(phi, U)
-          + turbulence->divDevRhoReff(U)
-        );
-
-        solve(UEqn == -fvc::grad(p));
-
-#       include "hEqn.H"
-
-
-        // --- PISO loop
-
-        for (int corr=0; corr<nCorr; corr++)
-        {
-            volScalarField rUA = 1.0/UEqn.A();
-            U = rUA*UEqn.H();
-
-            surfaceScalarField phid
-            (
-                "phid",
-                fvc::interpolate(thermo->psi())
-               *(
-                   (fvc::interpolate(U) & mesh.Sf())
-                 + fvc::ddtPhiCorr(rUA, rho, U, phi)
-               )
-            );
-
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-            {
-                fvScalarMatrix pEqn
-                (
-                    fvm::ddt(psi, p)
-                  + fvm::div(phid, p)
-                  - fvm::laplacian(rho*rUA, p)
-                );
-
-                pEqn.solve();
-
-                if (nonOrth == nNonOrthCorr)
-                {
-                    phi = pEqn.flux();
-                }
-            }
-
-#           include "compressibleContinuityErrs.H"
-
-            U -= rUA*fvc::grad(p);
-            U.correctBoundaryConditions();
-        }
-
-        DpDt = 
-            fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
-
-        turbulence->correct();
-
-        rho = psi*p;
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return(0);
-}
-
-
-// ************************************************************************* //

applications/solvers/heatTransfer/buoyantFoam/Make/options

@@ -1,12 +1,13 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-    -I../XiFoam
+    -I../XiFoam \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
     -lmeshTools \
     -lbasicThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
+    -lfiniteVolume

applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C

@@ -34,7 +34,7 @@ Description
 
 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "turbulenceModel.H"
 #include "fixedGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/heatTransfer/buoyantFoam/createFields.H

@@ -41,9 +41,9 @@
 
 
     Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASModel> turbulence
+    autoPtr<compressible::turbulenceModel> turbulence
     (
-        compressible::RASModel::New
+        compressible::turbulenceModel::New
         (
             rho,
             U,

applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options

@@ -1,12 +1,13 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/cfdTools \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/cfdTools \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
     -lmeshTools \
     -lbasicThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels
+    -lcompressibleRASModels \
+    -lfiniteVolume

applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "RASModel.H"
 #include "fixedGradientFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options

@@ -1,14 +1,16 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/cfdTools \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/finiteVolume/cfdTools \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
     -lbasicThermophysicalModels \
     -lspecie \
     -lradiation \
-    -lcompressibleRASModels
+    -lcompressibleRASModels \
+    -lfiniteVolume \
+    -lmeshTools

applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C

@@ -33,7 +33,7 @@ Description
 
 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "RASModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "radiationModel.H"
 

applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options

@@ -7,10 +7,11 @@ EXE_INC = \
     -IderivedFvPatchFields/solidWallHeatFluxTemperatureCoupled \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel
 
 EXE_LIBS = \
-    -lfiniteVolume \
     -lbasicThermophysicalModels \
     -lspecie \
-    -lcompressibleRASModels
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
+    -lfiniteVolume

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C

@@ -33,7 +33,7 @@ Description
 
 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "turbulenceModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "regionProperties.H"
 

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H

@@ -4,7 +4,7 @@
     PtrList<volScalarField> Kf(fluidRegions.size());
     PtrList<volVectorField> Uf(fluidRegions.size());
     PtrList<surfaceScalarField> phif(fluidRegions.size());
-    PtrList<compressible::RASModel> turb(fluidRegions.size());
+    PtrList<compressible::turbulenceModel> turb(fluidRegions.size());
     PtrList<volScalarField> DpDtf(fluidRegions.size());
     PtrList<volScalarField> ghf(fluidRegions.size());
     PtrList<volScalarField> pdf(fluidRegions.size());
@@ -127,9 +127,9 @@
         turb.set
         (
             i,
-            autoPtr<compressible::RASModel>
+            autoPtr<compressible::turbulenceModel>
             (
-                compressible::RASModel::New
+                compressible::turbulenceModel::New
                 (
                     rhof[i],
                     Uf[i],

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveEnthalpyEquation.C

@@ -32,7 +32,7 @@ void solveEnthalpyEquation
     const volScalarField& rho,
     const volScalarField& DpDt,
     const surfaceScalarField& phi,
-    const compressible::RASModel& turb,
+    const compressible::turbulenceModel& turb,
     basicThermo& thermo
 )
 {

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveMomentumEquation.C

@@ -35,7 +35,7 @@ tmp<fvVectorMatrix> solveMomentumEquation
     const surfaceScalarField& phi,
     const volScalarField& pd,
     const volScalarField& gh,
-    const compressible::RASModel& turb
+    const compressible::turbulenceModel& turb
 )
 {
     // Solve the Momentum equation

applications/solvers/heatTransfer/lesBuoyantFoam/Make/files

@@ -1,3 +0,0 @@
-lesBuoyantFoam.C
-
-EXE = $(FOAM_APPBIN)/lesBuoyantFoam

applications/solvers/heatTransfer/lesBuoyantFoam/Make/options

@@ -1,13 +0,0 @@
-EXE_INC = \
-    -I../buoyantFoam \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/LES \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lbasicThermophysicalModels \
-    -lspecie \
-    -lcompressibleLESModels

applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H

@@ -1,75 +0,0 @@
-    Info<< "Reading thermophysical properties\n" << endl;
-
-    autoPtr<basicThermo> thermo
-    (
-        basicThermo::New(mesh)
-    );
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        thermo->rho()
-    );
-
-    volScalarField& p = thermo->p();
-    volScalarField& h = thermo->h();
-    const volScalarField& psi = thermo->psi();
-
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    #include "compressibleCreatePhi.H"
-
-
-    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::LESModel> turbulence
-    (
-        compressible::LESModel::New(rho, U, phi, thermo())
-    );
-
-
-    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt = fvc::ddt(p);
-
-    Info<< "Calculating field g.h\n" << endl;
-    volScalarField gh("gh", g & mesh.C());
-
-    dimensionedScalar pRef("pRef", p.dimensions(), thermo->lookup("pRef"));
-
-    Info<< "Creating field pd\n" << endl;
-    volScalarField pd
-    (
-        IOobject
-        (
-            "pd",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    p = pd + rho*gh + pRef;
-    thermo->correct();
-
-    dimensionedScalar initialMass = fvc::domainIntegrate(rho);

applications/solvers/heatTransfer/lesBuoyantFoam/lesBuoyantFoam.C

@@ -1,96 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    lesBuoyantFoam
-
-Description
-    Transient Solver for buoyant, turbulent flow of compressible fluids for
-    ventilation and heat-transfer.  Turbulence is modelled using a run-time
-    selectable compressible LES model.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "basicThermo.H"
-#include "compressible/LESModel/LESModel.H"
-
-#define divDevRhoReff divDevRhoBeff
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "readEnvironmentalProperties.H"
-#   include "initContinuityErrs.H"
-#   include "createFields.H"
-#   include "readTimeControls.H"
-#   include "compressibleCourantNo.H"
-#   include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.run())
-    {
-#       include "readPISOControls.H"
-#       include "readTimeControls.H"
-#       include "compressibleCourantNo.H"
-#       include "setDeltaT.H"
-
-        runTime++;
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-#       include "rhoEqn.H"
-
-        turbulence->correct();
-
-#       include "UEqn.H"
-#       include "hEqn.H"
-
-        // --- PISO loop
-        for (int corr=0; corr<nCorr; corr++)
-        {
-#           include "pEqn.H"
-        }
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //

applications/solvers/incompressible/boundaryFoam/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \

applications/solvers/incompressible/channelFoam/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/incompressible/LES/LESModel \
     -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
     -I$(LIB_SRC)/transportModels \

applications/solvers/incompressible/simpleFoam/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \

applications/test/tmpField/tmpFieldTest.C

@@ -23,8 +23,10 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    
+    tmpFieldTest
+
 Description
+    Tests for possible memory leaks in the tmp<Field> algebra.
 
 \*---------------------------------------------------------------------------*/
 
@@ -44,9 +46,6 @@ int main()
         f1 = f2 + f3 + f2 + f3;
     }
 
-//    Info<< f1 << endl;
-
-
     Info<< "end" << endl;
 }
 

applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options

@@ -1,19 +1,18 @@
 EXE_INC = \
     -I$(LIB_SRC)/postProcessing/postCalc \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/LES \
     -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
-    -lfiniteVolume \
     -lincompressibleTransportModels \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
-    -lcompressibleLESModels
+    -lcompressibleLESModels \
+    -lfiniteVolume

applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C

@@ -39,12 +39,12 @@ Description
 
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
 
-#include "incompressible/RASModel/RASModel.H"
+#include "incompressible/RAS/RASModel/RASModel.H"
-#include "incompressible/LESModel/LESModel.H"
+#include "incompressible/LES/LESModel/LESModel.H"
 
 #include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "compressible/RAS/RASModel/RASModel.H"
-#include "compressible/LESModel/LESModel.H"
+#include "compressible/LES/LESModel/LESModel.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/utilities/postProcessing/turbulence/R/Make/options

@@ -1,10 +1,10 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
-    -I$(LIB_SRC)/transportModels
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
     -lincompressibleRASModels \
     -lincompressibleTransportModels \
     -lfiniteVolume

applications/utilities/postProcessing/turbulence/R/R.C

@@ -32,21 +32,19 @@ Description
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASModel/RASModel.H"
+#include "RASModel.H"
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
+    #include "setRootCase.H"
 
-#   include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "createFields.H"
 
-#   include "createTime.H"
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#   include "createMesh.H"
-#   include "createFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nCalculating the Reynolds Stress R\n" << endl;
 

applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options

@@ -1,9 +1,10 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/transportModels
+    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
     -lincompressibleRASModels \
-    -lincompressibleTransportModels
+    -lincompressibleTransportModels \
+    -lfiniteVolume

applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C

@@ -36,28 +36,26 @@ Source files:
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASModel/RASModel.H"
+#include "RASModel.H"
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
-
+    #include "addTimeOptions.H"
-#   include "addTimeOptions.H"
+    #include "setRootCase.H"
-#   include "setRootCase.H"
+    #include "createTime.H"
-#   include "createTime.H"
 
     // Get times list
     instantList Times = runTime.times();
 
     // set startTime and endTime depending on -time and -latestTime options
-#   include "checkTimeOptions.H"
+    #include "checkTimeOptions.H"
 
     runTime.setTime(Times[startTime], startTime);
-#   include "createMesh.H"
+    #include "createMesh.H"
 
-#   include "createFields.H"
+    #include "createFields.H"
 
     for (label i=startTime; i<endTime; i++)
     {

applications/utilities/postProcessing/velocityField/Pe/Make/options

@@ -1,22 +1,21 @@
 EXE_INC = \
     -I$(LIB_SRC)/postProcessing/postCalc \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
-    -I$(LIB_SRC)/turbulenceModels/LES \
-    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
 
 EXE_LIBS = \
     $(FOAM_LIBBIN)/postCalc.o \
-    -lfiniteVolume \
-    -lmeshTools \
     -lincompressibleTransportModels \
     -lincompressibleRASModels \
     -lincompressibleLESModels \
     -lbasicThermophysicalModels \
     -lspecie \
     -lcompressibleRASModels \
-    -lcompressibleLESModels
+    -lcompressibleLESModels \
+    -lfiniteVolume \
+    -lmeshTools

applications/utilities/postProcessing/velocityField/Pe/Pe.C

@@ -37,11 +37,11 @@ Description
 #include "fvc.H"
 
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASModel/RASModel.H"
+#include "incompressible/RAS/RASModel/RASModel.H"
-#include "incompressible/LESModel/LESModel.H"
+#include "incompressible/LES/LESModel/LESModel.H"
 #include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "compressible/RAS/RASModel/RASModel.H"
-#include "compressible/LESModel/LESModel.H"
+#include "compressible/LES/LESModel/LESModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/utilities/postProcessing/wall/wallHeatFlux/Make/options

@@ -1,9 +1,10 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lcompressibleRASModels \

applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C

@@ -34,7 +34,7 @@ Description
 
 #include "fvCFD.H"
 #include "hCombustionThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "RASModel.H"
 #include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -43,9 +43,9 @@ int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
     #include "setRootCase.H"
-#   include "createTime.H"
+    #include "createTime.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
-#   include "createMesh.H"
+    #include "createMesh.H"
 
     forAll(timeDirs, timeI)
     {
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << endl;
         mesh.readUpdate();
 
-#       include "createFields.H"
+        #include "createFields.H"
 
         surfaceScalarField heatFlux =
             fvc::interpolate(RASModel->alphaEff())*fvc::snGrad(h);

applications/utilities/postProcessing/wall/wallShearStress/Make/options

@@ -1,7 +1,8 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/transportModels
+    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lincompressibleRASModels \

applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C

@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASModel/RASModel.H"
+#include "RASModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,9 +40,9 @@ int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
     #include "setRootCase.H"
-#   include "createTime.H"
+    #include "createTime.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
-#   include "createMesh.H"
+    #include "createMesh.H"
 
     forAll(timeDirs, timeI)
     {
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << endl;
         mesh.readUpdate();
 
-#       include "createFields.H"
+        #include "createFields.H"
 
         volSymmTensorField Reff(RASModel->devReff());
 

applications/utilities/postProcessing/wall/yPlusLES/Make/options

@@ -1,5 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/turbulenceModels/LES \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/LES/LESModel \
     -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/finiteVolume/lnInclude

applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C

@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/LESModel/LESModel.H"
+#include "LESModel.H"
 #include "nearWallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/utilities/postProcessing/wall/yPlusRAS/Make/options

@@ -1,7 +1,8 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/turbulenceModels/RAS \
+    -I$(LIB_SRC)/turbulenceModels \
-    -I$(LIB_SRC)/transportModels
+    -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 EXE_LIBS = \
     -lincompressibleRASModels \