diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options index b6c6398fd..6b89ae638 100644 --- a/applications/solvers/combustion/PDRFoam/Make/options +++ b/applications/solvers/combustion/PDRFoam/Make/options @@ -8,8 +8,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ @@ -20,8 +20,8 @@ EXE_INC = \ EXE_LIBS = \ -lengine \ -lmeshTools \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C index ad6e2d029..1d56ab28f 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoam.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,7 +69,7 @@ Description #include "fvCFD.H" #include "psiuReactionThermo.H" -#include "RASModel.H" +#include "turbulentFluidThermoModel.H" #include "laminarFlameSpeed.H" #include "XiModel.H" #include "PDRDragModel.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C index 88d6305e1..190432570 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "psiuReactionThermo.H" -#include "RASModel.H" +#include "turbulentFluidThermoModel.H" #include "laminarFlameSpeed.H" #include "XiModel.H" #include "PDRDragModel.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C index 426e65981..de5b26c13 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,6 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "basicXiSubXiEq.H" +#include "zeroGradientFvPatchFields.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C index 05aeb059f..f5a76fa5c 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,6 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "basicXiSubG.H" +#include "zeroGradientFvPatchFields.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H index feb9ae8d4..4cf942280 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,7 +38,7 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "RASModel.H" +#include "turbulentFluidThermoModel.H" #include "multivariateSurfaceInterpolationScheme.H" #include "runTimeSelectionTables.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C index d8e3a9ed9..be2cc6dab 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,6 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "basic.H" +#include "zeroGradientFvPatchFields.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index 12cfba078..73dbee566 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,8 +27,6 @@ License #include "PDRDragModel.H" #include "addToRunTimeSelectionTable.H" -#include "backwardsCompatibilityWallFunctions.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -47,15 +45,27 @@ addToRunTimeSelectionTable(RASModel, PDRkEpsilon, dictionary); PDRkEpsilon::PDRkEpsilon ( + const geometricOneField& alpha, const volScalarField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const fluidThermo& thermophysicalModel, const word& turbulenceModelName, const word& modelName ) : - kEpsilon(rho, U, phi, thermophysicalModel, turbulenceModelName, modelName), + Foam::RASModels::kEpsilon > + ( + geometricOneField(), + rho, + U, + phi, + phi, + thermophysicalModel, + turbulenceModelName, + modelName + ), C4_ ( @@ -96,12 +106,12 @@ void PDRkEpsilon::correct() if (!turbulence_) { // Re-calculate viscosity - mut_ = rho_*Cmu_*sqr(k_)/epsilon_; - mut_.correctBoundaryConditions(); + nut_ = Cmu_*sqr(k_)/epsilon_; + nut_.correctBoundaryConditions(); // Re-calculate thermal diffusivity - alphat_ = mut_/Prt_; - alphat_.correctBoundaryConditions(); + //***HGWalphat_ = mut_/Prt_; + //alphat_.correctBoundaryConditions(); return; } @@ -116,7 +126,7 @@ void PDRkEpsilon::correct() } tmp tgradU = fvc::grad(U_); - volScalarField G(GName(), mut_*(tgradU() && dev(twoSymm(tgradU())))); + volScalarField G(GName(), rho_*nut_*(tgradU() && dev(twoSymm(tgradU())))); tgradU.clear(); // Update espsilon and G at the wall @@ -143,7 +153,7 @@ void PDRkEpsilon::correct() ( betav*fvm::ddt(rho_, epsilon_) + fvm::div(phi_, epsilon_) - - fvm::laplacian(DepsilonEff(), epsilon_) + - fvm::laplacian(rho_*DepsilonEff(), epsilon_) == C1_*betav*G*epsilon_/k_ + 1.5*pow(Cmu_, 3.0/4.0)*GR*sqrt(k_)/LI @@ -165,7 +175,7 @@ void PDRkEpsilon::correct() ( betav*fvm::ddt(rho_, k_) + fvm::div(phi_, k_) - - fvm::laplacian(DkEff(), k_) + - fvm::laplacian(rho_*DkEff(), k_) == betav*G + GR - fvm::SuSp((2.0/3.0)*betav*rho_*divU, k_) @@ -177,12 +187,12 @@ void PDRkEpsilon::correct() bound(k_, kMin_); // Re-calculate viscosity - mut_ = rho_*Cmu_*sqr(k_)/epsilon_; - mut_.correctBoundaryConditions(); + nut_ = Cmu_*sqr(k_)/epsilon_; + nut_.correctBoundaryConditions(); // Re-calculate thermal diffusivity - alphat_ = mut_/Prt_; - alphat_.correctBoundaryConditions(); + //***HGWalphat_ = mut_/Prt_; + //alphat_.correctBoundaryConditions(); } diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index d210aab70..689a47844 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,8 +60,8 @@ SourceFiles #ifndef compressiblePDRkEpsilon_H #define compressiblePDRkEpsilon_H - #include "kEpsilon.H" +#include "turbulentFluidThermoModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -78,7 +78,13 @@ namespace RASModels class PDRkEpsilon : - public kEpsilon + public Foam::RASModels::kEpsilon + < + eddyDiffusivity + < + compressible::turbulenceModel + > + > { // Private data @@ -97,8 +103,10 @@ public: //- Construct from components PDRkEpsilon ( + const geometricOneField& alpha, const volScalarField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const fluidThermo& thermophysicalModel, const word& turbulenceModelName = turbulenceModel::typeName, diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C index 8fe73daa9..ba0e121e7 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,6 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "XiEqModel.H" +#include "zeroGradientFvPatchFields.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H index 929c4df11..2574c4c14 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "RASModel.H" +#include "turbulentFluidThermoModel.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H index 3bc4b53a9..ac61eb7f8 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,7 +40,7 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "RASModel.H" +#include "turbulentFluidThermoModel.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H index ad091f410..ae69d5bab 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,8 +92,9 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "RASModel.H" +#include "turbulentFluidThermoModel.H" #include "multivariateSurfaceInterpolationScheme.H" +#include "fvcDiv.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C index caf471a15..91ad18fdf 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,6 +24,11 @@ License \*---------------------------------------------------------------------------*/ #include "transport.H" +#include "surfaceInterpolate.H" +#include "fvmDdt.H" +#include "fvcLaplacian.H" +#include "fvmDiv.H" +#include "fvmSup.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index 468cc1919..4860d14f4 100644 --- a/applications/solvers/combustion/XiFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/Make/options @@ -7,7 +7,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude EXE_LIBS = \ @@ -16,9 +17,8 @@ EXE_LIBS = \ -lsampling \ -lmeshTools \ -lengine \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index 84fac0482..898e79f41 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/applications/solvers/combustion/XiFoam/XiFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,7 @@ Description #include "fvCFD.H" #include "psiuReactionThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "laminarFlameSpeed.H" #include "ignition.H" #include "Switch.H" diff --git a/applications/solvers/combustion/chemFoam/Make/options b/applications/solvers/combustion/chemFoam/Make/options index 9facf7ac9..79647a861 100644 --- a/applications/solvers/combustion/chemFoam/Make/options +++ b/applications/solvers/combustion/chemFoam/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -12,8 +13,8 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lreactionThermophysicalModels \ -lfluidThermophysicalModels \ -lchemistryModel \ diff --git a/applications/solvers/combustion/chemFoam/chemFoam.C b/applications/solvers/combustion/chemFoam/chemFoam.C index 4183045a1..699a929bb 100644 --- a/applications/solvers/combustion/chemFoam/chemFoam.C +++ b/applications/solvers/combustion/chemFoam/chemFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "psiReactionThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "psiChemistryModel.H" #include "chemistrySolver.H" #include "OFstream.H" diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index d688fb1e2..c49f5de1b 100644 --- a/applications/solvers/combustion/coldEngineFoam/Make/options +++ b/applications/solvers/combustion/coldEngineFoam/Make/options @@ -6,7 +6,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -14,9 +15,8 @@ EXE_INC = \ EXE_LIBS = \ -lengine \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C index 43eb616e1..988cf128b 100644 --- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C +++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ Description #include "engineTime.H" #include "engineMesh.H" #include "psiThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "OFstream.H" #include "fvIOoptionList.H" #include "pimpleControl.H" diff --git a/applications/solvers/combustion/engineFoam/Make/options b/applications/solvers/combustion/engineFoam/Make/options index fcbc3a420..0ede4569e 100644 --- a/applications/solvers/combustion/engineFoam/Make/options +++ b/applications/solvers/combustion/engineFoam/Make/options @@ -8,7 +8,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude EXE_LIBS = \ @@ -17,9 +18,8 @@ EXE_LIBS = \ -lsampling \ -lmeshTools \ -lengine \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C index a35e22dc5..97c5cc56f 100644 --- a/applications/solvers/combustion/engineFoam/engineFoam.C +++ b/applications/solvers/combustion/engineFoam/engineFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,7 +52,7 @@ Description #include "engineTime.H" #include "engineMesh.H" #include "psiuReactionThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "laminarFlameSpeed.H" #include "ignition.H" #include "Switch.H" diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index cd5ad097a..cccf0a7da 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -3,7 +3,8 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ -I${LIB_SRC}/sampling/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solid/lnInclude \ @@ -34,8 +35,8 @@ EXE_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lspecie \ -lfluidThermophysicalModels \ -lsolidProperties \ diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index b8c48549a..b70a9d6cc 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/applications/solvers/combustion/fireFoam/fireFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "basicReactingCloud.H" #include "surfaceFilmModel.H" #include "pyrolysisModelCollection.H" diff --git a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/LTSReactingFoam.C b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/LTSReactingFoam.C index 0b3421086..9088b382a 100644 --- a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/LTSReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/LTSReactingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "psiCombustionModel.H" #include "multivariateScheme.H" #include "pimpleControl.H" diff --git a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options index abac9d96a..102806126 100644 --- a/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/LTSReactingFoam/Make/options @@ -4,7 +4,8 @@ EXE_INC = -ggdb3 \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -17,9 +18,8 @@ EXE_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lreactionThermophysicalModels \ -lspecie \ -lfluidThermophysicalModels \ diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options index 15cf68cb5..5a7c91bce 100644 --- a/applications/solvers/combustion/reactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/Make/options @@ -3,7 +3,8 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -16,9 +17,8 @@ EXE_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lreactionThermophysicalModels \ -lspecie \ -lfluidThermophysicalModels \ diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index 831df5c9a..755cf14ab 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "psiCombustionModel.H" #include "multivariateScheme.H" #include "pimpleControl.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options index bf015097e..a9ea986c0 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options @@ -4,7 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -18,9 +19,8 @@ EXE_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lreactionThermophysicalModels \ -lspecie \ -lfluidThermophysicalModels \ diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C index fd4b6f58e..0adee03a9 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "rhoCombustionModel.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "multivariateScheme.H" #include "pimpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options index bf015097e..a9ea986c0 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options @@ -4,7 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -18,9 +19,8 @@ EXE_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lreactionThermophysicalModels \ -lspecie \ -lfluidThermophysicalModels \ diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C index 192fb7405..bdbf5f594 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "rhoCombustionModel.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "multivariateScheme.H" #include "pimpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options index 4ddaa7fb9..1b16a7b36 100644 --- a/applications/solvers/compressible/rhoCentralFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/Make/options @@ -3,7 +3,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -12,7 +13,6 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lrhoCentralFoam \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lmeshTools diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options index 33707728f..f79e10048 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options @@ -4,7 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -13,8 +14,7 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lrhoCentralFoam \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -ldynamicMesh \ -lmeshTools diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C index a42825342..d8f83da12 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "psiThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "zeroGradientFvPatchFields.H" #include "fixedRhoFvPatchScalarField.H" #include "motionSolver.H" diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C index 3ae35694e..164f0d1a2 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "psiThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "zeroGradientFvPatchFields.H" #include "fixedRhoFvPatchScalarField.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options index c25d77014..8f38ef182 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -10,9 +11,8 @@ EXE_INC = \ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfiniteVolume \ -lmeshTools \ -lsampling \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options index 502938c53..669cd4a3d 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/Make/options @@ -1,7 +1,8 @@ EXE_INC = \ -I.. \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -11,9 +12,8 @@ EXE_INC = \ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfiniteVolume \ -lmeshTools \ -lsampling \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C index 8f2943f84..8ff8c28da 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ Description #include "fvCFD.H" #include "psiThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "fvIOoptionList.H" #include "fvcSmooth.H" #include "pimpleControl.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options index 2093b620b..f94f65e6a 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/Make/options @@ -1,7 +1,8 @@ EXE_INC = \ -I.. \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -14,9 +15,8 @@ EXE_INC = \ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfiniteVolume \ -lmeshTools \ -lsampling \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C index fcfc2aa79..f3676b66d 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "psiThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "bound.H" #include "pimpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index 6c6c4e99a..ae43c9504 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "psiThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "bound.H" #include "pimpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options index 502938c53..669cd4a3d 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options @@ -1,7 +1,8 @@ EXE_INC = \ -I.. \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -11,9 +12,8 @@ EXE_INC = \ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfiniteVolume \ -lmeshTools \ -lsampling \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C index 308a90e51..fd3e102dc 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "psiThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "bound.H" #include "pimpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options index 4606400cb..dc8643260 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ @@ -11,8 +11,8 @@ EXE_INC = \ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfiniteVolume \ -lsampling \ -lmeshTools \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options index 39d6f696e..bf3eda587 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options @@ -1,8 +1,8 @@ EXE_INC = \ -I.. \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ @@ -12,8 +12,8 @@ EXE_INC = \ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfiniteVolume \ -lsampling \ -lmeshTools \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C index fd30404ae..d8598bae4 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "rhoThermo.H" -#include "RASModel.H" +#include "turbulentFluidThermoModel.H" #include "fvIOoptionList.H" #include "IOporosityModelList.H" #include "simpleControl.H" diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C index c0a6282a3..1d70a557c 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "psiThermo.H" -#include "RASModel.H" +#include "turbulentFluidThermoModel.H" #include "simpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options index cc82ba958..bf3eda587 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options @@ -1,8 +1,8 @@ EXE_INC = \ -I.. \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ @@ -12,7 +12,8 @@ EXE_INC = \ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleRASModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfiniteVolume \ -lsampling \ -lmeshTools \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C index a7c9b2070..bad31d378 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "psiThermo.H" -#include "RASModel.H" +#include "turbulentFluidThermoModel.H" #include "mixedFvPatchFields.H" #include "bound.H" #include "simpleControl.H" diff --git a/applications/solvers/compressible/sonicFoam/Make/options b/applications/solvers/compressible/sonicFoam/Make/options index b1663bb82..92ca5cd17 100644 --- a/applications/solvers/compressible/sonicFoam/Make/options +++ b/applications/solvers/compressible/sonicFoam/Make/options @@ -1,7 +1,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ @@ -10,9 +11,8 @@ EXE_INC = \ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lmeshTools \ -lsampling \ -lfvOptions \ diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options index 761311a8b..1561dffa7 100644 --- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options +++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options @@ -3,7 +3,8 @@ EXE_INC = \ -I../../rhoPimpleFoam/rhoPimpleDyMFoam \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ @@ -15,9 +16,8 @@ EXE_INC = \ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfiniteVolume \ -lmeshTools \ -lsampling \ diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C index 5a8e0b92e..a78ef861d 100644 --- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "psiThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C index 875e7afa7..1042889db 100644 --- a/applications/solvers/compressible/sonicFoam/sonicFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "psiThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options index 1e23e4594..9a60cac43 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options @@ -1,21 +1,21 @@ EXE_INC = \ -I../buoyantBoussinesqSimpleFoam \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels \ + -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ + -lincompressibleTransportModels \ + -lradiationModels \ -lfiniteVolume \ -lfvOptions \ -lsampling \ - -lmeshTools \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleTransportModels \ - -lradiationModels + -lmeshTools diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C index 5827ddf2c..1e9fca7f8 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C @@ -47,7 +47,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "RASModel.H" +#include "turbulentTransportModel.H" #include "radiationModel.H" #include "fvIOoptionList.H" #include "pimpleControl.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options index 6a6311e47..48d83838a 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options @@ -1,18 +1,18 @@ EXE_INC = \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels \ + -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/fvOptions/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel + -I$(LIB_SRC)/fvOptions/lnInclude EXE_LIBS = \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ + -lincompressibleTransportModels \ -lfiniteVolume \ -lsampling \ -lmeshTools \ - -lfvOptions \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleTransportModels + -lfvOptions diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C index bcf4729a4..e9a964c81 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C @@ -47,7 +47,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "RASModel.H" +#include "turbulentTransportModel.H" #include "fvIOoptionList.H" #include "simpleControl.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options index e57cfc441..fc4620b28 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options @@ -5,7 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude EXE_LIBS = \ -lfiniteVolume \ @@ -15,7 +16,5 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lradiationModels \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels - + -lturbulenceModels \ + -lcompressibleTurbulenceModels diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index 9d62893f1..379216854 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "rhoThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "radiationModel.H" #include "fvIOoptionList.H" #include "pimpleControl.H" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options index 11decf6bb..383ee341f 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options @@ -5,9 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/RAS \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude EXE_LIBS = \ -lfiniteVolume \ @@ -17,6 +16,6 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lmeshTools diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C index 2e52da8f5..6c05e0cac 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "rhoThermo.H" -#include "RASModel.H" +#include "turbulentFluidThermoModel.H" #include "radiationModel.H" #include "simpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index 359d2d452..75695454d 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options @@ -11,7 +11,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude @@ -21,9 +22,8 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lsolidThermo \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lmeshTools \ -lfiniteVolume \ -lradiationModels \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index 6aae0cf5b..7ee8492cb 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ Description #include "fvCFD.H" #include "rhoThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "fixedGradientFvPatchFields.H" #include "regionProperties.H" #include "compressibleCourantNo.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options index 93b544d0e..e3c4d178f 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options @@ -9,9 +9,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude @@ -21,9 +20,8 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lsolidThermo \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lradiationModels \ -lfvOptions \ -lregionModels \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C index 75720dd51..6c07dcbdf 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ Description #include "fvCFD.H" #include "rhoThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "fixedGradientFvPatchFields.H" #include "regionProperties.H" #include "solidThermo.H" diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options index d4d56df1b..fc4620b28 100644 --- a/applications/solvers/heatTransfer/thermoFoam/Make/options +++ b/applications/solvers/heatTransfer/thermoFoam/Make/options @@ -5,11 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude EXE_LIBS = \ -lfiniteVolume \ @@ -19,6 +16,5 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lradiationModels \ -lspecie \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels + -lturbulenceModels \ + -lcompressibleTurbulenceModels diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C index f765ca86e..a23ce288e 100644 --- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C +++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,8 +31,8 @@ Description #include "fvCFD.H" #include "rhoThermo.H" -#include "turbulenceModel.H" -#include "RASModel.H" +#include "turbulentFluidThermoModel.H" +#include "turbulentFluidThermoModel.H" #include "LESModel.H" #include "radiationModel.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options index 1223bdd06..50a9de019 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options @@ -1,11 +1,13 @@ EXE_INC = \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ - -lincompressibleRASModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfiniteVolume diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C index 62a083e36..460e72c5e 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C @@ -47,7 +47,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "RASModel.H" +#include "turbulentTransportModel.H" #include "simpleControl.H" template diff --git a/applications/solvers/incompressible/boundaryFoam/Make/options b/applications/solvers/incompressible/boundaryFoam/Make/options index d993beac0..895199f10 100644 --- a/applications/solvers/incompressible/boundaryFoam/Make/options +++ b/applications/solvers/incompressible/boundaryFoam/Make/options @@ -1,14 +1,14 @@ EXE_INC = \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C index 03ccffcce..39d214a6e 100644 --- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C +++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C @@ -37,7 +37,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "RASModel.H" +#include "turbulentTransportModel.H" #include "wallFvPatch.H" #include "makeGraph.H" diff --git a/applications/solvers/incompressible/pimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/Make/options index a597aafbc..bc0201f37 100644 --- a/applications/solvers/incompressible/pimpleFoam/Make/options +++ b/applications/solvers/incompressible/pimpleFoam/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -9,10 +10,9 @@ EXE_INC = \ EXE_LIBS = \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ -lfiniteVolume \ -lmeshTools \ -lfvOptions \ diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options index 7cdb6a555..20feab872 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -8,10 +9,9 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ -lfiniteVolume \ -lmeshTools \ -lfvOptions \ diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C index f6beed973..f9c35f073 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C @@ -34,7 +34,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "SRFModel.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options index 263fd7375..90e43d56a 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options +++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I.. \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -11,10 +12,9 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ EXE_LIBS = \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ -lfiniteVolume \ -lfvOptions \ -lsampling \ diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C index 3feb2a97f..7c23e6583 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C index 8361c5462..85861ae39 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C @@ -36,7 +36,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" #include "IOporosityModelList.H" diff --git a/applications/solvers/incompressible/pisoFoam/Make/options b/applications/solvers/incompressible/pisoFoam/Make/options index 259f95f7b..23368faba 100644 --- a/applications/solvers/incompressible/pisoFoam/Make/options +++ b/applications/solvers/incompressible/pisoFoam/Make/options @@ -1,13 +1,13 @@ EXE_INC = \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C index 14237946a..b812418fd 100644 --- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C +++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/incompressible/simpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/Make/options index f9913bf0d..bc0201f37 100644 --- a/applications/solvers/incompressible/simpleFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -10,8 +10,8 @@ EXE_INC = \ EXE_LIBS = \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options index cae6c88fe..a888499d8 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options @@ -1,17 +1,18 @@ EXE_INC = \ -I.. \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lincompressibleRASModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C index 354757b66..00178524a 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "RASModel.H" +#include "turbulentTransportModel.H" #include "SRFModel.H" #include "simpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options index 6cee67f66..a888499d8 100644 --- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I.. \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -11,8 +11,8 @@ EXE_INC = \ EXE_LIBS = \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C index d10ba2d1e..a6c48d7c1 100644 --- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "RASModel.H" +#include "turbulentTransportModel.H" #include "simpleControl.H" #include "IOMRFZoneList.H" #include "IOporosityModelList.H" diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C index 9541bcbd1..807c1e5a0 100644 --- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C @@ -31,7 +31,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "RASModel.H" +#include "turbulentTransportModel.H" #include "simpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C index 1aeca7795..3ade3bbfd 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ License #include "makeTurbulenceModel.H" #include "laminar.H" -#include "RASModel.H" +#include "turbulentTransportModel.H" #include "LESModel.H" makeBaseTurbulenceModel diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options index 4a0c3a565..843220db5 100644 --- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options @@ -22,7 +22,7 @@ EXE_LIBS = \ -lmeshTools \ -llagrangian \ -llagrangianIntermediate \ - -llagrangianTurbulentSubModels \ + -llagrangianTurbulence \ -lthermophysicalFunctions \ -lspecie \ -lradiationModels \ diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options index 83684e57c..5734ebb65 100644 --- a/applications/solvers/lagrangian/DPMFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/Make/options @@ -21,7 +21,7 @@ EXE_LIBS = \ -lmeshTools \ -llagrangian \ -llagrangianIntermediate \ - -llagrangianTurbulentSubModels \ + -llagrangianTurbulence \ -lthermophysicalFunctions \ -lspecie \ -lradiationModels \ diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index 8abe45c5c..5689c1bab 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -1,7 +1,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ @@ -30,9 +31,8 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ @@ -54,4 +54,3 @@ EXE_LIBS = \ -lcombustionModels \ -lfvOptions \ -lsampling - diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index 475e48a1c..fc28c3de4 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "basicThermoCloud.H" #include "coalCloud.H" #include "psiCombustionModel.H" diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options index 05b6391ed..bec7663b6 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options @@ -5,7 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -21,8 +22,8 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options index e35babe8f..000a4abb2 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options @@ -6,7 +6,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -25,8 +26,8 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C index 8f7619cdd..b355148a9 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "basicKinematicCollidingCloud.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C index 2bf123845..befcb57d0 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "basicKinematicCollidingCloud.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options index b6f5cf105..96880c05c 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -3,7 +3,8 @@ EXE_INC = \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I${LIB_SRC}/sampling/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -30,8 +31,8 @@ EXE_LIBS = \ -lfvOptions \ -lsampling \ -lmeshTools \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lspecie \ -lfluidThermophysicalModels \ -lsolidProperties \ diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C index 27f272100..08bc14d85 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "basicReactingCloud.H" #include "surfaceFilmModel.H" #include "psiCombustionModel.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C index 7481ae79c..e81f37593 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "basicReactingMultiphaseCloud.H" #include "rhoCombustionModel.H" #include "radiationModel.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options index 1eb9a3dba..f0d8062ec 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options @@ -2,7 +2,8 @@ EXE_INC = \ -I.. \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ @@ -29,9 +30,8 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index 997aeae66..cc79d690f 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -1,7 +1,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ @@ -29,9 +30,8 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index 1425a3e5f..30e44df94 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "basicReactingMultiphaseCloud.H" #include "rhoCombustionModel.H" #include "radiationModel.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options index 997aeae66..cc79d690f 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options @@ -1,7 +1,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ @@ -29,9 +30,8 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C index 6620d2af5..22667ba18 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "basicReactingMultiphaseCloud.H" #include "rhoCombustionModel.H" #include "radiationModel.H" diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options index 5c63b0d2f..404a0d373 100644 --- a/applications/solvers/lagrangian/sprayFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/Make/options @@ -3,7 +3,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ -I${LIB_SRC}/sampling/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/spray/lnInclude \ @@ -30,9 +31,8 @@ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lsampling \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options index a8a0bfc56..487508d30 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options @@ -4,7 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ -I${LIB_SRC}/sampling/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/spray/lnInclude \ @@ -32,9 +33,8 @@ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lsampling \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C index b91a3ad79..11caf270a 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "engineTime.H" #include "engineMesh.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "basicSprayCloud.H" #include "psiCombustionModel.H" #include "radiationModel.H" diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C index 1c93d3ab1..9da22ec75 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "basicSprayCloud.H" #include "psiCombustionModel.H" #include "radiationModel.H" diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options index 3e975674d..026161c0d 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options @@ -5,7 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ @@ -19,9 +20,8 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfiniteVolume \ -lmeshTools \ -lregionModels \ diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C index 352678f85..6545c4d72 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ Description #include "fvCFD.H" #include "psiThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "basicKinematicCloud.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/cavitatingFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/Make/options index 5efeeb355..1bcdc8e83 100644 --- a/applications/solvers/multiphase/cavitatingFoam/Make/options +++ b/applications/solvers/multiphase/cavitatingFoam/Make/options @@ -4,13 +4,12 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude EXE_LIBS = \ - -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ - -lfiniteVolume \ - -lbarotropicCompressibilityModel + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ + -lbarotropicCompressibilityModel \ + -lfiniteVolume diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options index 34590e930..5ec5c9a72 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options @@ -5,19 +5,18 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude EXE_LIBS = \ - -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ - -lfiniteVolume \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lbarotropicCompressibilityModel \ + -lfiniteVolume \ -ldynamicMesh \ - -lmeshTools \ - -ldynamicFvMesh + -ldynamicFvMesh \ + -lmeshTools diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C index 284ca97bd..9910f1a4b 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ Description #include "dynamicFvMesh.H" #include "barotropicCompressibilityModel.H" #include "incompressibleTwoPhaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C index 2b04d58fb..78b929615 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "barotropicCompressibilityModel.H" #include "incompressibleTwoPhaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options index 54e9f74e4..a36fe0541 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options @@ -4,7 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ @@ -14,7 +15,6 @@ EXE_LIBS = \ -ltwoPhaseMixture \ -ltwoPhaseProperties \ -linterfaceProperties \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfiniteVolume diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options index 123645b4c..91f2d03a2 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options @@ -5,7 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ @@ -18,9 +19,8 @@ EXE_LIBS = \ -ltwoPhaseMixture \ -ltwoPhaseProperties \ -linterfaceProperties \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -ldynamicMesh \ -lmeshTools \ -ldynamicFvMesh \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C index 064441633..cf35e60be 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ Description #include "interfaceProperties.H" #include "twoPhaseMixture.H" #include "twoPhaseMixtureThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "pimpleControl.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C index 030b997f4..0559985b5 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,7 +42,7 @@ Description #include "interfaceProperties.H" #include "twoPhaseMixture.H" #include "twoPhaseMixtureThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "pimpleControl.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options index af7020f40..900ababa1 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options @@ -5,7 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ @@ -13,7 +14,6 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -linterfaceProperties \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lfiniteVolume diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C index 5648f2d3b..24ba56e3e 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ Description #include "fvCFD.H" #include "multiphaseMixtureThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "pimpleControl.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C index 1e870c42a..575d8d793 100644 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C +++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,7 +41,7 @@ Description #include "CMULES.H" #include "subCycle.H" #include "immiscibleIncompressibleTwoPhaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "fvcSmooth.H" #include "pimpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options b/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options index 14861f2b8..f0762e15d 100644 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options @@ -4,7 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -13,9 +14,8 @@ EXE_INC = \ EXE_LIBS = \ -limmiscibleIncompressibleTwoPhaseMixture \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume \ -lmeshTools \ -lfvOptions \ diff --git a/applications/solvers/multiphase/interFoam/Make/options b/applications/solvers/multiphase/interFoam/Make/options index 207a796b1..df659a93d 100644 --- a/applications/solvers/multiphase/interFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/Make/options @@ -3,7 +3,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ @@ -12,9 +13,8 @@ EXE_INC = \ EXE_LIBS = \ -limmiscibleIncompressibleTwoPhaseMixture \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume \ -lfvOptions \ -lmeshTools \ diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options index b9638e612..2e8c289ff 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options @@ -4,7 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ @@ -15,9 +16,8 @@ EXE_INC = \ EXE_LIBS = \ -limmiscibleIncompressibleTwoPhaseMixture \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume \ -ldynamicMesh \ -ldynamicFvMesh \ diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C index 58d74a625..ba40cc3e1 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ Description #include "CMULES.H" #include "subCycle.H" #include "immiscibleIncompressibleTwoPhaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index 6b6168bf0..deb001c4f 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,7 +41,7 @@ Description #include "CMULES.H" #include "subCycle.H" #include "immiscibleIncompressibleTwoPhaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options index 43456c904..7198616b3 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options @@ -6,7 +6,8 @@ EXE_INC = \ -IthreePhaseInterfaceProperties \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -17,9 +18,8 @@ EXE_LIBS = \ -ltwoPhaseMixture \ -ltwoPhaseProperties \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume \ -lmeshTools \ -lfvOptions \ diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index 09cb7f1c7..a39adb3c1 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ Description #include "CMULES.H" #include "subCycle.H" #include "immiscibleIncompressibleThreePhaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/Make/options b/applications/solvers/multiphase/interFoam/porousInterFoam/Make/options index fffa41da9..7a3dd1e71 100644 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/porousInterFoam/Make/options @@ -5,7 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ @@ -14,9 +15,8 @@ EXE_INC = \ EXE_LIBS = \ -limmiscibleIncompressibleTwoPhaseMixture \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume \ -lmeshTools \ -lfvOptions \ diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C index c17847bd3..ee2b6e4d5 100644 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C +++ b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,7 +42,7 @@ Description #include "CMULES.H" #include "subCycle.H" #include "immiscibleIncompressibleTwoPhaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "IOporosityModelList.H" #include "pimpleControl.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options index 4721c8896..254f3ad8b 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options @@ -3,7 +3,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -IphaseChangeTwoPhaseMixtures/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -16,9 +17,8 @@ EXE_LIBS = \ -linterfaceProperties \ -ltwoPhaseProperties \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume \ -lmeshTools \ -lfvOptions \ diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options index 3bf8a5dfb..0512ee194 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options @@ -4,7 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I../phaseChangeTwoPhaseMixtures/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ @@ -19,9 +20,8 @@ EXE_LIBS = \ -linterfaceProperties \ -ltwoPhaseProperties \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume \ -ldynamicMesh \ -ldynamicFvMesh \ diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C index e336e4a0c..4afaca6ca 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ Description #include "subCycle.H" #include "interfaceProperties.H" #include "phaseChangeTwoPhaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index 32f94bf30..7cd7ad43b 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ Description #include "subCycle.H" #include "interfaceProperties.H" #include "phaseChangeTwoPhaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options index ab8d97099..86b52d338 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options @@ -7,8 +7,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/LES/LESModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude @@ -17,6 +17,6 @@ EXE_LIBS = \ -linterfaceProperties \ -lincompressibleTransportModels \ -lcompressibleMultiphaseEulerianInterfacialModels \ - -lincompressibleLESModels \ - -lincompressibleRASModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H index 7584d84f2..1dd551f8f 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H @@ -10,7 +10,7 @@ forAllIter(PtrDictionary, fluid.phases(), iter) const volScalarField& alpha = phase; volVectorField& U = phase.U(); - volScalarField nuEff(sgsModel->nut() + iter().nu()); + volScalarField nuEff(turbulence->nut() + iter().nu()); UEqns.set ( diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H index 79fa72d75..8de6d4902 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H @@ -89,8 +89,8 @@ scalar pRefValue = 0.0; setRefCell(p, mesh.solutionDict().subDict("PIMPLE"), pRefCell, pRefValue); - - autoPtr sgsModel + // Construct incompressible turbulence model + autoPtr turbulence ( - incompressible::LESModel::New(U, phi, fluid) + incompressible::turbulenceModel::New(U, phi, fluid) ); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C index d0285dc35..237a62a7c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ Description #include "dragModel.H" #include "heatTransferModel.H" #include "singlePhaseTransportModel.H" -#include "LESModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "IOMRFZoneList.H" #include "fixedFluxPressureFvPatchScalarField.H" @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) { - sgsModel->correct(); + turbulence->correct(); fluid.solve(); rho = fluid.rho(); #include "zonePhaseVolumes.H" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options index 27f633d62..2eb366fd9 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options @@ -4,7 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -14,9 +15,8 @@ EXE_LIBS = \ -lmultiphaseInterFoam \ -linterfaceProperties \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume \ -lfvOptions \ -lmeshTools \ diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options index 836534822..e05b53a96 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options @@ -6,7 +6,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ @@ -18,9 +19,8 @@ EXE_LIBS = \ -lmultiphaseInterFoam \ -linterfaceProperties \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume \ -ldynamicMesh \ -ldynamicFvMesh \ diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C index acfa7eb3e..7e31d9e42 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "multiphaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C index fdd93eae5..78bed884e 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ Description #include "fvCFD.H" #include "multiphaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options index a597aafbc..72a106ba1 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -10,9 +11,8 @@ EXE_INC = \ EXE_LIBS = \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume \ -lmeshTools \ -lfvOptions \ diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options index 6772c7f35..df44bd78a 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options @@ -1,7 +1,8 @@ EXE_INC = \ -I.. \ -I../../interFoam/interDyMFoam \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -14,9 +15,8 @@ EXE_INC = \ EXE_LIBS = \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume \ -ldynamicMesh \ -ldynamicFvMesh \ diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C index d44f3d2f0..cf0c1af3e 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C @@ -40,7 +40,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C index 9cfe6f99e..4f4239890 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C @@ -36,7 +36,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvIOoptionList.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options index 53ea250a1..32f8d8e62 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options @@ -4,13 +4,12 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ -ltwoPhaseMixture \ - -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lfiniteVolume diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C index 7593aeab1..4d1cdd3d9 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ Description #include "MULES.H" #include "subCycle.H" #include "incompressibleTwoPhaseMixture.H" -#include "turbulenceModel.H" +#include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fixedFluxPressureFvPatchScalarField.H" diff --git a/applications/test/PisoFoam/Make/files b/applications/test/PisoFoam/Make/files deleted file mode 100644 index 340f8016c..000000000 --- a/applications/test/PisoFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -PisoFoam.C - -EXE = $(FOAM_USER_APPBIN)/PisoFoam diff --git a/applications/test/PisoFoam/Make/options b/applications/test/PisoFoam/Make/options deleted file mode 100644 index d14a833f1..000000000 --- a/applications/test/PisoFoam/Make/options +++ /dev/null @@ -1,14 +0,0 @@ -EXE_INC = \ - -I$(FOAM_SOLVERS)/incompressible/pisoFoam \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/finiteVolume/lnInclude - -EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -lmeshTools diff --git a/applications/test/PisoFoam/PisoFoam.C b/applications/test/PisoFoam/PisoFoam.C deleted file mode 100644 index e6fa77087..000000000 --- a/applications/test/PisoFoam/PisoFoam.C +++ /dev/null @@ -1,149 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation - \\/ 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 3 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, see . - -Application - pisoFoam - -Description - Transient solver for incompressible flow. - - Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "singlePhaseTransportModel.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" - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.loop()) - { - Info<< "Time = " << runTime.timeName() << nl << endl; - - #include "readPISOControls.H" - #include "CourantNo.H" - - // Pressure-velocity PISO corrector - { - // Momentum predictor - - fvVectorMatrix UEqn - ( - fvm::ddt(U) - + fvm::div(phi, U) - + turbulence->divDevReff(U) - ); - - UEqn.relax(); - - if (momentumPredictor) - { - solve(UEqn == -fvc::grad(p)); - } - - // --- PISO loop - - for (int corr=0; corrcorrect(); - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/test/PisoFoam/turbulenceModel.H b/applications/test/PisoFoam/turbulenceModel.H deleted file mode 100644 index 77a4ab413..000000000 --- a/applications/test/PisoFoam/turbulenceModel.H +++ /dev/null @@ -1,9 +0,0 @@ -#include "IncompressibleTurbulenceModel.H" - -namespace Foam -{ - namespace incompressible - { - typedef IncompressibleTurbulenceModel turbulenceModel; - } -} diff --git a/applications/test/RhoPimpleFoam/EEqn.H b/applications/test/RhoPimpleFoam/EEqn.H deleted file mode 100644 index 9972bdfff..000000000 --- a/applications/test/RhoPimpleFoam/EEqn.H +++ /dev/null @@ -1,33 +0,0 @@ -{ - volScalarField& he = thermo.he(); - - fvScalarMatrix EEqn - ( - fvm::ddt(rho, he) + fvm::div(phi, he) - + fvc::ddt(rho, K) + fvc::div(phi, K) - + ( - he.name() == "e" - ? fvc::div - ( - fvc::absolute(phi/fvc::interpolate(rho), U), - p, - "div(phiv,p)" - ) - : -dpdt - ) - //- fvm::laplacian(turbulence->alphaEff(), he) - - fvm::laplacian(turbulence->muEff(), he) - == - fvOptions(rho, he) - ); - - EEqn.relax(); - - fvOptions.constrain(EEqn); - - EEqn.solve(); - - fvOptions.correct(he); - - thermo.correct(); -} diff --git a/applications/test/RhoPimpleFoam/Make/files b/applications/test/RhoPimpleFoam/Make/files deleted file mode 100644 index 087a67d21..000000000 --- a/applications/test/RhoPimpleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -rhoPimpleFoam.C - -EXE = $(FOAM_USER_APPBIN)/RhoPimpleFoam diff --git a/applications/test/RhoPimpleFoam/Make/options b/applications/test/RhoPimpleFoam/Make/options deleted file mode 100644 index f8879e9ab..000000000 --- a/applications/test/RhoPimpleFoam/Make/options +++ /dev/null @@ -1,21 +0,0 @@ -EXE_INC = \ - -I$(FOAM_SOLVERS)/compressible/rhoPimpleFoam \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/finiteVolume/cfdTools \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/fvOptions/lnInclude - -EXE_LIBS = \ - -lfluidThermophysicalModels \ - -lspecie \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -lmeshTools \ - -lsampling \ - -lfvOptions diff --git a/applications/test/RhoPimpleFoam/rhoPimpleFoam.C b/applications/test/RhoPimpleFoam/rhoPimpleFoam.C deleted file mode 100644 index a73e90e27..000000000 --- a/applications/test/RhoPimpleFoam/rhoPimpleFoam.C +++ /dev/null @@ -1,107 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation - \\/ 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 3 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, see . - -Application - rhoPimpleFoam - -Description - Transient solver for laminar or turbulent flow of compressible fluids - for HVAC and similar applications. - - Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and - pseudo-transient simulations. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "psiThermo.H" -#include "turbulenceModel.H" -#include "bound.H" -#include "pimpleControl.H" -#include "fvIOoptionList.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "setRootCase.H" - #include "createTime.H" - #include "createMesh.H" - - pimpleControl pimple(mesh); - - #include "createFields.H" - #include "createFvOptions.H" - #include "initContinuityErrs.H" - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.run()) - { - #include "readTimeControls.H" - #include "compressibleCourantNo.H" - #include "setDeltaT.H" - - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - if (pimple.nCorrPIMPLE() <= 1) - { - #include "rhoEqn.H" - } - - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) - { - #include "UEqn.H" - #include "EEqn.H" - - // --- Pressure corrector loop - while (pimple.correct()) - { - #include "pEqn.H" - } - - if (pimple.turbCorr()) - { - turbulence->correct(); - } - } - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/test/RhoPimpleFoam/turbulenceModel.H b/applications/test/RhoPimpleFoam/turbulenceModel.H deleted file mode 100644 index 23547aa0c..000000000 --- a/applications/test/RhoPimpleFoam/turbulenceModel.H +++ /dev/null @@ -1,9 +0,0 @@ -#include "CompressibleTurbulenceModel.H" - -namespace Foam -{ - namespace compressible - { - typedef CompressibleTurbulenceModel turbulenceModel; - } -} diff --git a/applications/utilities/mesh/advanced/PDRMesh/Make/options b/applications/utilities/mesh/advanced/PDRMesh/Make/options index 4ce2e001e..9544389ab 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/Make/options +++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options @@ -4,7 +4,9 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ + -lfluidThermophysicalModels \ -lmeshTools \ -ldynamicMesh \ - -lfiniteVolume \ - -lcompressibleRASModels + -lfiniteVolume diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index 43f0c24cb..23e78b6bf 100644 --- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options +++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options @@ -6,9 +6,7 @@ EXE_LIBS = \ -lblockMesh \ -lchemistryModel \ -lcoalCombustion \ - -lcompressibleLESModels \ - -lcompressibleRASModels \ - -lcompressibleTurbulenceModel \ + -lcompressibleTurbulenceModels \ -lconversion \ -ldecompositionMethods \ -ldistributed \ @@ -25,27 +23,21 @@ EXE_LIBS = \ -lforces \ -lfvMotionSolvers \ -lgenericPatchFields \ - -lincompressibleLESModels \ - -lincompressibleRASModels \ -lincompressibleTransportModels \ - -lincompressibleTurbulenceModel \ + -lincompressibleTurbulenceModels \ -linterfaceProperties \ -lIOFunctionObjects \ -ljobControl \ -llagrangian \ -llagrangianIntermediate \ -llaminarFlameSpeedModels \ - -lLESdeltas \ - -lLESfilters \ -lliquidMixtureProperties \ -lliquidProperties \ -lmeshTools \ -lmolecularMeasurements \ -lmolecule \ -/* -lmultiphaseInterFoam */ \ -lODE \ -lOpenFOAM \ -/* -lphaseModel */ \ -lpotential \ -lradiationModels \ -lrandomProcesses \ @@ -63,5 +55,6 @@ EXE_LIBS = \ -lthermophysicalFunctions \ -ltopoChangerFvMesh \ -ltriSurface \ + -lturbulenceModels \ -ltwoPhaseProperties \ -lutilityFunctionObjects diff --git a/applications/utilities/miscellaneous/foamHelp/Make/options b/applications/utilities/miscellaneous/foamHelp/Make/options index 41ca9e9b5..8191b8b00 100644 --- a/applications/utilities/miscellaneous/foamHelp/Make/options +++ b/applications/utilities/miscellaneous/foamHelp/Make/options @@ -5,11 +5,8 @@ EXE_INC = \ EXE_LIBS = \ -lhelpTypes \ -lfiniteVolume \ - -lincompressibleTurbulenceModel \ - -lcompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lcompressibleRASModels \ - -lincompressibleLESModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ + -lcompressibleTurbulenceModels \ -lradiationModels \ -lfluidThermophysicalModels diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options index 01b25c79a..b3d092f10 100644 --- a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options +++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options @@ -3,11 +3,8 @@ EXE_INC = \ LIB_LIBS = \ -lfiniteVolume \ - -lincompressibleTurbulenceModel \ - -lcompressibleTurbulenceModel \ - -lincompressibleRASModels \ - -lcompressibleRASModels \ - -lincompressibleLESModels \ - -lcompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ + -lcompressibleTurbulenceModels \ -lradiationModels \ -lfluidThermophysicalModels diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options index 012600720..220589ea7 100644 --- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options +++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options @@ -1,7 +1,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ @@ -9,13 +10,12 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ + -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ -lfiniteVolume \ -lfvOptions \ -lmeshTools \ diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C index 246a36fcc..99d7de9b9 100644 --- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C +++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,13 +46,8 @@ Description #include "fvIOoptionList.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" - -#include "incompressible/RAS/RASModel/RASModel.H" -#include "incompressible/LES/LESModel/LESModel.H" - -#include "fluidThermo.H" -#include "compressible/RAS/RASModel/RASModel.H" -#include "compressible/LES/LESModel/LESModel.H" +#include "turbulentTransportModel.H" +#include "turbulentFluidThermoModel.H" using namespace Foam; diff --git a/applications/utilities/postProcessing/stressField/stressComponents/Make/options b/applications/utilities/postProcessing/stressField/stressComponents/Make/options index d1016e9d4..c5c3ac8e9 100644 --- a/applications/utilities/postProcessing/stressField/stressComponents/Make/options +++ b/applications/utilities/postProcessing/stressField/stressComponents/Make/options @@ -1,10 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/RAS \ - -I$(LIB_SRC)/transportModels + -I$(LIB_SRC)/transportModels \ + -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ + -lincompressibleTransportModels \ -lfiniteVolume \ - -lgenericPatchFields \ - -lincompressibleRASModels \ - -lincompressibleTransportModels + -lgenericPatchFields diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options index 27b70cae0..fefdc6b78 100644 --- a/applications/utilities/postProcessing/turbulence/R/Make/options +++ b/applications/utilities/postProcessing/turbulence/R/Make/options @@ -1,18 +1,19 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ + -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ - -lincompressibleRASModels \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleRASModels \ -lfiniteVolume \ -lgenericPatchFields \ -lmeshTools \ diff --git a/applications/utilities/postProcessing/turbulence/R/R.C b/applications/utilities/postProcessing/turbulence/R/R.C index 708cda721..f487a13e5 100644 --- a/applications/utilities/postProcessing/turbulence/R/R.C +++ b/applications/utilities/postProcessing/turbulence/R/R.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,11 +30,9 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" +#include "turbulentTransportModel.H" +#include "turbulentFluidThermoModel.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" -#include "incompressible/turbulenceModel/turbulenceModel.H" - -#include "fluidThermo.H" -#include "compressible/turbulenceModel/turbulenceModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options index 886256586..980dabb8d 100644 --- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options +++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options @@ -1,11 +1,13 @@ EXE_INC = \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ + -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ - -lincompressibleRASModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ - -lfiniteVolume \ - -lgenericPatchFields + -lgenericPatchFields \ + -lfiniteVolume diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C index 1982b4f24..ce074ccc5 100644 --- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C +++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,8 +35,8 @@ Source files: \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" -#include "RASModel.H" +#include "singlePhaseTransportModel.H" +#include "turbulentTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -133,4 +133,3 @@ int main(int argc, char *argv[]) // ************************************************************************* // - diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options index 1d984aa9b..09f921715 100644 --- a/applications/utilities/postProcessing/velocityField/Pe/Make/options +++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options @@ -1,21 +1,21 @@ EXE_INC = \ -I$(LIB_SRC)/postProcessing/postCalc \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -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 EXE_LIBS = \ $(FOAM_LIBBIN)/postCalc.o \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ + -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ -lfiniteVolume \ -lgenericPatchFields \ -lmeshTools diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C index 544a11692..e4d0833ba 100644 --- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C +++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,12 +36,9 @@ Description #include "calc.H" #include "fvc.H" +#include "turbulentTransportModel.H" +#include "turbulentFluidThermoModel.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" -#include "incompressible/RAS/RASModel/RASModel.H" -#include "incompressible/LES/LESModel/LESModel.H" -#include "fluidThermo.H" -#include "compressible/RAS/RASModel/RASModel.H" -#include "compressible/LES/LESModel/LESModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options index cd09f8d5b..c1b5ad47e 100644 --- a/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options +++ b/applications/utilities/postProcessing/wall/wallHeatFlux/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -8,10 +8,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ - -lLESdeltas \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ -lreactionThermophysicalModels \ -lfiniteVolume \ -lgenericPatchFields \ diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C index c45c48b35..8c80f0cf2 100644 --- a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C +++ b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "solidThermo.H" #include "wallFvPatch.H" diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options index 240bf953b..3235acdec 100644 --- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options +++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options @@ -1,14 +1,18 @@ EXE_INC = \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ + -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ - -lincompressibleRASModels \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleRASModels \ -lfiniteVolume \ -lgenericPatchFields diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C index 360f03b39..3cf944ea4 100644 --- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C +++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,12 +34,9 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" - +#include "turbulentTransportModel.H" +#include "turbulentFluidThermoModel.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" -#include "incompressible/RAS/RASModel/RASModel.H" - -#include "fluidThermo.H" -#include "compressible/RAS/RASModel/RASModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/wall/yPlusLES/Make/options b/applications/utilities/postProcessing/wall/yPlusLES/Make/options index d7446846b..a3e31c220 100644 --- a/applications/utilities/postProcessing/wall/yPlusLES/Make/options +++ b/applications/utilities/postProcessing/wall/yPlusLES/Make/options @@ -1,13 +1,14 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -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 + -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lgenericPatchFields diff --git a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C index e8d5f431a..731c6ea6b 100644 --- a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C +++ b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C @@ -31,8 +31,10 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" -#include "LESModel.H" +#include "singlePhaseTransportModel.H" +#include "turbulentTransportModel.H" +#include "nutWallFunctionFvPatchScalarField.H" + #include "nearWallDist.H" #include "wallFvPatch.H" @@ -50,7 +52,7 @@ int main(int argc, char *argv[]) { runTime.setTime(timeDirs[timeI], timeI); Info<< "Time = " << runTime.timeName() << endl; - fvMesh::readUpdateState state = mesh.readUpdate(); + mesh.readUpdate(); volScalarField yPlus ( diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options index 27b70cae0..cacf4eb31 100644 --- a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options +++ b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options @@ -1,18 +1,20 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions \ + -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ + -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ - -lincompressibleRASModels \ -lfluidThermophysicalModels \ -lspecie \ - -lcompressibleRASModels \ -lfiniteVolume \ -lgenericPatchFields \ -lmeshTools \ diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C index c66f88373..dde81571e 100644 --- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C +++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C @@ -34,14 +34,10 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" - -#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" -#include "incompressible/RAS/RASModel/RASModel.H" -#include "nutWallFunction/nutWallFunctionFvPatchScalarField.H" - -#include "fluidThermo.H" -#include "compressible/RAS/RASModel/RASModel.H" -#include "mutWallFunction/mutWallFunctionFvPatchScalarField.H" +#include "singlePhaseTransportModel.H" +#include "turbulentTransportModel.H" +#include "turbulentFluidThermoModel.H" +#include "nutWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,8 +49,7 @@ void calcIncompressibleYPlus volScalarField& yPlus ) { - typedef incompressible::nutWallFunctionFvPatchScalarField - wallFunctionPatchField; + typedef nutWallFunctionFvPatchScalarField wallFunctionPatchField; #include "createPhi.H" @@ -105,8 +100,7 @@ void calcCompressibleYPlus volScalarField& yPlus ) { - typedef compressible::mutWallFunctionFvPatchScalarField - wallFunctionPatchField; + typedef nutWallFunctionFvPatchScalarField wallFunctionPatchField; IOobject rhoHeader ( @@ -145,31 +139,31 @@ void calcCompressibleYPlus ) ); - const volScalarField::GeometricBoundaryField mutPatches = - RASModel->mut()().boundaryField(); + const volScalarField::GeometricBoundaryField nutPatches = + RASModel->nut()().boundaryField(); - bool foundMutPatch = false; - forAll(mutPatches, patchi) + bool foundNutPatch = false; + forAll(nutPatches, patchi) { - if (isA(mutPatches[patchi])) + if (isA(nutPatches[patchi])) { - foundMutPatch = true; + foundNutPatch = true; - const wallFunctionPatchField& mutPw = + const wallFunctionPatchField& nutPw = dynamic_cast - (mutPatches[patchi]); + (nutPatches[patchi]); - yPlus.boundaryField()[patchi] = mutPw.yPlus(); + yPlus.boundaryField()[patchi] = nutPw.yPlus(); const scalarField& Yp = yPlus.boundaryField()[patchi]; Info<< "Patch " << patchi - << " named " << mutPw.patch().name() + << " named " << nutPw.patch().name() << " y+ : min: " << gMin(Yp) << " max: " << gMax(Yp) << " average: " << gAverage(Yp) << nl << endl; } } - if (!foundMutPatch) + if (!foundNutPatch) { Info<< " no " << wallFunctionPatchField::typeName << " patches" << endl; @@ -200,7 +194,7 @@ int main(int argc, char *argv[]) { runTime.setTime(timeDirs[timeI], timeI); Info<< "Time = " << runTime.timeName() << endl; - fvMesh::readUpdateState state = mesh.readUpdate(); + mesh.readUpdate(); volScalarField yPlus ( diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options index e4ea36c3c..9778b15c0 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options +++ b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options @@ -1,15 +1,15 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lfiniteVolume \ - -lincompressibleRASModels \ - -lincompressibleLESModels \ + -lturbulenceModels \ + -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lgenericPatchFields \ + -lfiniteVolume \ -lmeshTools diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C index 18fa6a61e..4f2a30fb5 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C +++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "RASModel.H" +#include "turbulentTransportModel.H" #include "wallDist.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/files b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/files deleted file mode 100644 index 41d3c8b6a..000000000 --- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -applyWallFunctionBoundaryConditions.C - -EXE = $(FOAM_APPBIN)/applyWallFunctionBoundaryConditions diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options deleted file mode 100644 index 60692ce67..000000000 --- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/Make/options +++ /dev/null @@ -1,13 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude - -EXE_LIBS = \ - -lincompressibleRASModels \ - -lfluidThermophysicalModels \ - -lspecie \ - -lcompressibleRASModels \ - -lfiniteVolume \ - -lgenericPatchFields diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C deleted file mode 100644 index 95222a4a7..000000000 --- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C +++ /dev/null @@ -1,363 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation - \\/ 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 3 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, see . - -Application - applyWallFunctionBounaryConditions - -Description - Updates OpenFOAM RAS cases to use the new (v1.6) wall function framework. - - Attempts to determine whether case is compressible or incompressible, or - can be supplied with -compressible command line argument. - -\*---------------------------------------------------------------------------*/ - -#include "argList.H" -#include "fvMesh.H" -#include "Time.H" -#include "volFields.H" -#include "surfaceFields.H" - -#include "wallPolyPatch.H" - -#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H" -#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H" -#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H" -#include "incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H" - -#include "compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H" -#include "compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H" -#include "compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H" -#include "compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H" - -using namespace Foam; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -bool caseIsCompressible(const fvMesh& mesh) -{ - // Attempt flux field - IOobject phiHeader - ( - "phi", - mesh.time().timeName(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ); - - if (phiHeader.headerOk()) - { - surfaceScalarField phi(phiHeader, mesh); - if (phi.dimensions() == dimDensity*dimVelocity*dimArea) - { - return true; - } - } - - // Attempt density field - IOobject rhoHeader - ( - "rho", - mesh.time().timeName(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ); - - if (rhoHeader.headerOk()) - { - volScalarField rho(rhoHeader, mesh); - if (rho.dimensions() == dimDensity) - { - return true; - } - } - - // Attempt pressure field - IOobject pHeader - ( - "p", - mesh.time().timeName(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ); - - if (pHeader.headerOk()) - { - volScalarField p(pHeader, mesh); - if (p.dimensions() == dimMass/sqr(dimTime)/dimLength) - { - return true; - } - } - - // If none of the above are true, assume that the case is incompressible - return false; -} - - -void createVolScalarField -( - const fvMesh& mesh, - const word& fieldName, - const dimensionSet& dims -) -{ - IOobject fieldHeader - ( - fieldName, - mesh.time().timeName(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ); - - if (!fieldHeader.headerOk()) - { - Info<< "Creating field " << fieldName << nl << endl; - - volScalarField field - ( - IOobject - ( - fieldName, - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh, - dimensionedScalar("zero", dims, 0.0) - ); - - field.write(); - } -} - - -void replaceBoundaryType -( - const fvMesh& mesh, - const word& fieldName, - const word& boundaryType, - const string& boundaryValue -) -{ - IOobject header - ( - fieldName, - mesh.time().timeName(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ); - - if (!header.headerOk()) - { - return; - } - - Info<< "Updating boundary types for field " << header.name() << endl; - - const word oldTypeName = IOdictionary::typeName; - const_cast(IOdictionary::typeName) = word::null; - - IOdictionary dict(header); - - const_cast(IOdictionary::typeName) = oldTypeName; - const_cast(dict.type()) = dict.headerClassName(); - - // Make a backup of the old file - if (mvBak(dict.objectPath(), "old")) - { - Info<< " Backup original file to " - << (dict.objectPath() + ".old") << endl; - } - - // Loop through boundary patches and update - const polyBoundaryMesh& bMesh = mesh.boundaryMesh(); - dictionary& boundaryDict = dict.subDict("boundaryField"); - forAll(bMesh, patchI) - { - if (isA(bMesh[patchI])) - { - word patchName = bMesh[patchI].name(); - dictionary& oldPatch = boundaryDict.subDict(patchName); - - dictionary newPatch(dictionary::null); - newPatch.add("type", boundaryType); - newPatch.add("value", ("uniform " + boundaryValue).c_str()); - - oldPatch = newPatch; - } - } - - Info<< " writing updated " << dict.name() << nl << endl; - dict.regIOobject::write(); -} - - -void updateCompressibleCase(const fvMesh& mesh) -{ - Info<< "Case treated as compressible" << nl << endl; - createVolScalarField - ( - mesh, - "mut", - dimArea/dimTime*dimDensity - ); - replaceBoundaryType - ( - mesh, - "mut", - compressible::mutkWallFunctionFvPatchScalarField::typeName, - "0" - ); - replaceBoundaryType - ( - mesh, - "epsilon", - compressible::epsilonWallFunctionFvPatchScalarField::typeName, - "0" - ); - replaceBoundaryType - ( - mesh, - "omega", - compressible::omegaWallFunctionFvPatchScalarField::typeName, - "0" - ); - replaceBoundaryType - ( - mesh, - "k", - compressible::kqRWallFunctionFvPatchField::typeName, - "0" - ); - replaceBoundaryType - ( - mesh, - "q", - compressible::kqRWallFunctionFvPatchField::typeName, - "0" - ); - replaceBoundaryType - ( - mesh, - "R", - compressible::kqRWallFunctionFvPatchField:: - typeName, - "(0 0 0 0 0 0)" - ); -} - - -void updateIncompressibleCase(const fvMesh& mesh) -{ - Info<< "Case treated as incompressible" << nl << endl; - createVolScalarField(mesh, "nut", dimArea/dimTime); - - replaceBoundaryType - ( - mesh, - "nut", - incompressible::nutkWallFunctionFvPatchScalarField::typeName, - "0" - ); - replaceBoundaryType - ( - mesh, - "epsilon", - incompressible::epsilonWallFunctionFvPatchScalarField:: - typeName, - "0" - ); - replaceBoundaryType - ( - mesh, - "omega", - incompressible::omegaWallFunctionFvPatchScalarField:: - typeName, - "0" - ); - replaceBoundaryType - ( - mesh, - "k", - incompressible::kqRWallFunctionFvPatchField::typeName, - "0" - ); - replaceBoundaryType - ( - mesh, - "q", - incompressible::kqRWallFunctionFvPatchField::typeName, - "0" - ); - replaceBoundaryType - ( - mesh, - "R", - incompressible::kqRWallFunctionFvPatchField::typeName, - "(0 0 0 0 0 0)" - ); -} - - -int main(int argc, char *argv[]) -{ - #include "addTimeOptions.H" - argList::addBoolOption - ( - "compressible", - "force use of compressible wall functions. Default is auto-detect." - ); - - #include "setRootCase.H" - #include "createTime.H" - #include "createMesh.H" - - const bool compressible = args.optionFound("compressible"); - - Info<< "Updating turbulence fields to operate using new run time " - << "selectable" << nl << "wall functions" - << nl << endl; - - if (compressible || caseIsCompressible(mesh)) - { - updateCompressibleCase(mesh); - } - else - { - updateIncompressibleCase(mesh); - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options index a5b0bb577..c719bbebe 100644 --- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options +++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options @@ -3,4 +3,5 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ - -lcompressibleTurbulenceModel + -lturbulenceModels \ + -lcompressibleTurbulenceModels diff --git a/applications/utilities/preProcessing/faceAgglomerate/Make/options b/applications/utilities/preProcessing/faceAgglomerate/Make/options index c2b07c702..3facebbe1 100644 --- a/applications/utilities/preProcessing/faceAgglomerate/Make/options +++ b/applications/utilities/preProcessing/faceAgglomerate/Make/options @@ -4,7 +4,6 @@ EXE_INC = \ -I$(LIB_SRC)/fvAgglomerationMethods/pairPatchAgglomeration/lnInclude EXE_LIBS = \ - -lOpenFOAM \ -lfiniteVolume \ -lpairPatchAgglomeration \ -ltriSurface \ diff --git a/applications/utilities/preProcessing/viewFactorsGen/Make/options b/applications/utilities/preProcessing/viewFactorsGen/Make/options index b0dbd4000..89eb06d82 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/Make/options +++ b/applications/utilities/preProcessing/viewFactorsGen/Make/options @@ -8,7 +8,6 @@ EXE_INC = \ EXE_LIBS = \ -lmeshTools \ -lfiniteVolume \ - -lOpenFOAM \ -lmeshTools \ -ltriSurface \ -ldistributed \ diff --git a/src/Allwmake b/src/Allwmake index 925b3f211..c0ea041c3 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -61,7 +61,6 @@ wmake $targetType randomProcesses transportModels/Allwmake $targetType $* thermophysicalModels/Allwmake $targetType $* -turbulenceModels/Allwmake $targetType $* TurbulenceModels/Allwmake $targetType $* wmake $targetType combustionModels regionModels/Allwmake $targetType $* diff --git a/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.H b/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.H index 40cee9b5f..93c7e16ac 100644 --- a/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.H +++ b/src/OpenFOAM/global/constants/physicoChemical/physicoChemicalConstants.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C index 97ecb28ec..92b7aa226 100644 --- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,6 +31,7 @@ template Foam::CompressibleTurbulenceModel:: CompressibleTurbulenceModel ( + const word& type, const geometricOneField& alpha, const volScalarField& rho, const volVectorField& U, diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H index 38ba5f90f..0a9cdfe58 100644 --- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H +++ b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,6 +72,7 @@ public: //- Construct CompressibleTurbulenceModel ( + const word& type, const geometricOneField& alpha, const volScalarField& rho, const volVectorField& U, diff --git a/src/TurbulenceModels/compressible/Make/files b/src/TurbulenceModels/compressible/Make/files index c4107f105..2f6e9f1dd 100644 --- a/src/TurbulenceModels/compressible/Make/files +++ b/src/TurbulenceModels/compressible/Make/files @@ -1,4 +1,19 @@ compressibleTurbulenceModel.C -compressibleTurbulenceModels.C +turbulentFluidThermoModels/turbulentFluidThermoModels.C + +BCs = turbulentFluidThermoModels/derivedFvPatchFields +$(BCs)/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C +$(BCs)/temperatureCoupledBase/temperatureCoupledBase.C +$(BCs)/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C +$(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C +$(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C +$(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C +$(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C +$(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C +$(BCs)/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C +$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C + +turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C +turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels diff --git a/src/TurbulenceModels/compressible/Make/options b/src/TurbulenceModels/compressible/Make/options index 55388cb59..1d4b638c6 100644 --- a/src/TurbulenceModels/compressible/Make/options +++ b/src/TurbulenceModels/compressible/Make/options @@ -4,11 +4,15 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lfluidThermophysicalModels \ + -lsolidThermo \ + -lsolidSpecie \ -lturbulenceModels \ -lspecie diff --git a/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.C b/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.C new file mode 100644 index 000000000..b7430341b --- /dev/null +++ b/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.C @@ -0,0 +1,99 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\/ 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 3 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, see . + +\*---------------------------------------------------------------------------*/ + +#include "SpecificCompressibleTurbulenceModel.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::SpecificCompressibleTurbulenceModel +< + BasicCompressibleTurbulenceModel +>::SpecificCompressibleTurbulenceModel +( + const word& type, + const geometricOneField& alpha, + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, + const surfaceScalarField& phi, + const transportModel& transport, + const word& propertiesName +) +: + BasicCompressibleTurbulenceModel + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ) +{} + + +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +template +Foam::autoPtr +< + Foam::SpecificCompressibleTurbulenceModel + < + BasicCompressibleTurbulenceModel + > +> +Foam::SpecificCompressibleTurbulenceModel +< + BasicCompressibleTurbulenceModel +>::New +( + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& phi, + const transportModel& transport, + const word& propertiesName +) +{ + return autoPtr + ( + static_cast( + BasicCompressibleTurbulenceModel::New + ( + geometricOneField(), + rho, + U, + phi, + phi, + transport, + propertiesName + ).ptr()) + ); +} + + +// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/LES/DESModel/DESModel.H b/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.H similarity index 56% rename from src/turbulenceModels/compressible/LES/DESModel/DESModel.H rename to src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.H index bf0532e03..d8cacd876 100644 --- a/src/turbulenceModels/compressible/LES/DESModel/DESModel.H +++ b/src/TurbulenceModels/compressible/SpecificCompressibleTurbulenceModel/SpecificCompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,93 +22,89 @@ License along with OpenFOAM. If not, see . Class - Foam::compressible::DESModel - -Group - grpCmpDESTurbulence + Foam::SpecificCompressibleTurbulenceModel Description - Extension of LES models to provide an interface for Detached Eddy - Simulation turbulence models - -SeeAlso - Foam::LESModel + Templated abstract base class for specific (RAS/LES) compressible + turbulence models SourceFiles - DESModel.C + SpecificCompressibleTurbulenceModel.C \*---------------------------------------------------------------------------*/ -#ifndef compressibleDESModel_H -#define compressibleDESModel_H - -// note: use full(er) path so that derived utilities can bring in -// incompressible and compressible variants +#ifndef SpecificCompressibleTurbulenceModel_H +#define SpecificCompressibleTurbulenceModel_H -#include "compressible/LES/LESModel/LESModel.H" +#include "CompressibleTurbulenceModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -namespace compressible -{ /*---------------------------------------------------------------------------*\ - Class DESModel Declaration + Class SpecificCompressibleTurbulenceModel Declaration \*---------------------------------------------------------------------------*/ -class DESModel +template +class SpecificCompressibleTurbulenceModel : - public LESModel + public BasicCompressibleTurbulenceModel { -private: - - // Private Member Functions - - //- Disallow default bitwise copy construct - DESModel(const DESModel&); - - //- Disallow default bitwise assignment - DESModel& operator=(const DESModel&); - - public: + typedef typename BasicCompressibleTurbulenceModel::transportModel + transportModel; + // Constructors //- Construct from components - DESModel + SpecificCompressibleTurbulenceModel ( const word& type, + const geometricOneField& alpha, const volScalarField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const fluidThermo& thermoPhysicalModel, - const word& turbulenceModelName + const transportModel& transport, + const word& propertiesName ); //- Destructor - virtual ~DESModel() + virtual ~SpecificCompressibleTurbulenceModel() {} - // Public Member Functions + // Selectors - //- Return the LES field indicator - virtual tmp LESRegion() const = 0; + //- Return a reference to the selected RAS model + static autoPtr New + ( + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& phi, + const transportModel& transport, + const word& propertiesName = turbulenceModel::propertiesName + ); }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace compressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#ifdef NoRepository +# include "SpecificCompressibleTurbulenceModel.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + #endif // ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H index 533d8992b..0019bd281 100644 --- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H +++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,6 +98,12 @@ public: // Member functions + //- Return the density field + const volScalarField& rho() const + { + return rho_; + } + //- Return the volumetric flux field virtual tmp phi() const; diff --git a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C b/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C new file mode 100644 index 000000000..a6dbee759 --- /dev/null +++ b/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C @@ -0,0 +1,146 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\/ 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 3 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, see . + +\*---------------------------------------------------------------------------*/ + +#include "eddyDiffusivity.H" + +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +template +void Foam::eddyDiffusivity::correctAlphat() +{ + alphat_ = this->rho_*this->nut()/Prt_; + alphat_.correctBoundaryConditions(); +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::eddyDiffusivity::eddyDiffusivity +( + const word& type, + const geometricOneField& alpha, + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, + const surfaceScalarField& phi, + const transportModel& transport, + const word& propertiesName +) +: + BasicTurbulenceModel + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), + + // Prt_ + // ( + // dimensioned::lookupOrAddToDict + // ( + // "Prt", + // this->coeffDict_, + // 1.0 + // ) + // ), + + Prt_("Prt", dimless, 1.0), + + alphat_ + ( + IOobject + ( + "alphat", + this->runTime_.timeName(), + this->mesh_, + IOobject::MUST_READ, + IOobject::AUTO_WRITE + ), + this->mesh_ + ) +{} + + +// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // + +template +Foam::autoPtr > +Foam::eddyDiffusivity::New +( + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& phi, + const transportModel& transport, + const word& propertiesName +) +{ + return autoPtr + ( + static_cast( + BasicTurbulenceModel::New + ( + rho, + U, + phi, + transport, + propertiesName + ).ptr()) + ); +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template +bool Foam::eddyDiffusivity::read() +{ + if (BasicTurbulenceModel::read()) + { + Prt_.readIfPresent(this->coeffDict()); + + return true; + } + else + { + return false; + } +} + + +template +void Foam::eddyDiffusivity::correct() +{ + BasicTurbulenceModel::correct(); + correctAlphat(); +} + + +// ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H b/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H new file mode 100644 index 000000000..18d5c9828 --- /dev/null +++ b/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H @@ -0,0 +1,180 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\/ 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 3 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, see . + +Class + Foam::eddyDiffusivity + +Description + Templated abstract base class for single-phase compressible + turbulence models. + +SourceFiles + eddyDiffusivity.C + +\*---------------------------------------------------------------------------*/ + +#ifndef eddyDiffusivity_H +#define eddyDiffusivity_H + +#include "CompressibleTurbulenceModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class eddyDiffusivity Declaration +\*---------------------------------------------------------------------------*/ + +template +class eddyDiffusivity +: + public BasicTurbulenceModel +{ + +protected: + + // Protected data + + // Model coefficients + + dimensionedScalar Prt_; + + // Fields + + volScalarField alphat_; + + + // Protected Member Functions + + virtual void correctAlphat(); + + +public: + + typedef typename BasicTurbulenceModel::alphaField alphaField; + typedef typename BasicTurbulenceModel::rhoField rhoField; + typedef typename BasicTurbulenceModel::transportModel transportModel; + + + // Constructors + + //- Construct + eddyDiffusivity + ( + const word& type, + const geometricOneField& alpha, + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, + const surfaceScalarField& phi, + const transportModel& trasport, + const word& propertiesName + ); + + + // Selectors + + //- Return a reference to the selected turbulence model + static autoPtr New + ( + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& phi, + const transportModel& trasportModel, + const word& propertiesName = turbulenceModel::propertiesName + ); + + + //- Destructor + virtual ~eddyDiffusivity() + {} + + + // Member Functions + + //- Re-read model coefficients if they have changed + virtual bool read(); + + //- Return the turbulent thermal diffusivity for enthalpy [kg/m/s] + virtual tmp alphat() const + { + return alphat_; + } + + //- Return the turbulent thermal diffusivity for enthalpy for a patch + // [kg/m/s] + virtual tmp alphat(const label patchi) const + { + return alphat()().boundaryField()[patchi]; + } + + //- Return the effective turbulent thermal diffusivity for temperature + // [J/m/s/K] + virtual tmp kappaEff() const + { + return this->transport_.kappaEff(alphat()); + } + + //- Return the effective turbulent thermal diffusivity for temperature + // [J/m/s/K] + virtual tmp kappaEff(const label patchi) const + { + return this->transport_.kappaEff(alphat(patchi), patchi); + } + + //- Return the effective turbulent thermal diffusivity for enthalpy + // [kg/m/s] + virtual tmp alphaEff() const + { + return this->transport_.alphaEff(alphat()); + } + + //- Return the effective turbulent thermal diffusivity for enthalpy + // for a patch [kg/m/s] + virtual tmp alphaEff(const label patchi) const + { + return this->transport_.alphaEff(alphat(patchi), patchi); + } + + //- Correct the turbulent thermal diffusivity for enthalpy + virtual void correct(); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository +# include "eddyDiffusivity.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C b/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C new file mode 100644 index 000000000..5b25fe8d8 --- /dev/null +++ b/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C @@ -0,0 +1,124 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\/ 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 3 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, see . + +\*---------------------------------------------------------------------------*/ + +#include "thermalDiffusivity.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::thermalDiffusivity::thermalDiffusivity +( + const word& type, + const geometricOneField& alpha, + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, + const surfaceScalarField& phi, + const transportModel& transport, + const word& propertiesName +) +: + CompressibleTurbulenceModel + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ) +{} + + +// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // + +template +Foam::autoPtr > +Foam::thermalDiffusivity::New +( + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& phi, + const transportModel& transport, + const word& propertiesName +) +{ + return autoPtr + ( + static_cast( + CompressibleTurbulenceModel::New + ( + rho, + U, + phi, + transport, + propertiesName + ).ptr()) + ); +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template +Foam::tmp +Foam::thermalDiffusivity::alphat() const +{ + return tmp + ( + new volScalarField + ( + IOobject + ( + IOobject::groupName("alphat", this->U_.group()), + this->runTime_.timeName(), + this->mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + this->mesh_, + dimensionedScalar("alphat", dimDensity*dimViscosity, 0.0) + ) + ); +} + + +template +Foam::tmp +Foam::thermalDiffusivity::alphat +( + const label patchi +) const +{ + return tmp + ( + new scalarField(this->mesh_.boundary()[patchi].size(), 0.0) + ); +} + + +// ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H b/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H new file mode 100644 index 000000000..b62cfa2e9 --- /dev/null +++ b/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H @@ -0,0 +1,176 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\/ 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 3 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, see . + +Class + Foam::thermalDiffusivity + +Description + Templated abstract base class for single-phase compressible + turbulence models. + +SourceFiles + thermalDiffusivity.C + +\*---------------------------------------------------------------------------*/ + +#ifndef thermalDiffusivity_H +#define thermalDiffusivity_H + +#include "CompressibleTurbulenceModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class thermalDiffusivity Declaration +\*---------------------------------------------------------------------------*/ + +template +class thermalDiffusivity +: + public CompressibleTurbulenceModel +{ + +public: + + typedef geometricOneField alphaField; + typedef volScalarField rhoField; + typedef TransportModel transportModel; + + + // Constructors + + //- Construct + thermalDiffusivity + ( + const word& type, + const geometricOneField& alpha, + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, + const surfaceScalarField& phi, + const transportModel& trasport, + const word& propertiesName + ); + + + // Selectors + + //- Return a reference to the selected turbulence model + static autoPtr New + ( + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& phi, + const transportModel& trasportModel, + const word& propertiesName = turbulenceModel::propertiesName + ); + + + //- Destructor + virtual ~thermalDiffusivity() + {} + + + // Member Functions + + //- Return the thermal diffusivity for temperature [J/m/s/K] + virtual tmp kappa() const + { + return this->transport_.kappa(); + } + + //- Return the laminar thermal diffusivity for temperature on patch + // [J/m/s/K] + virtual tmp kappa(const label patchi) const + { + return this->transport_.kappa(patchi); + } + + //- Return the laminar thermal diffusivity for enthalpy [kg/m/s] + virtual tmp alpha() const + { + return this->transport_.alpha(); + } + + //- Return the laminar thermal diffusivity for enthalpy on patch + // [kg/m/s] + virtual tmp alpha(const label patchi) const + { + return this->transport_.alpha(patchi); + } + + //- Return the turbulent thermal diffusivity for enthalpy [kg/m/s] + virtual tmp alphat() const; + + //- Return the turbulent thermal diffusivity for enthalpy for a patch + // [kg/m/s] + virtual tmp alphat(const label patchi) const; + + //- Return the effective turbulent thermal diffusivity for temperature + // [J/m/s/K] + virtual tmp kappaEff() const + { + return kappa(); + } + + //- Return the effective turbulent thermal diffusivity for temperature + // [J/m/s/K] + virtual tmp kappaEff(const label patchi) const + { + return kappa(patchi); + } + + //- Return the effective turbulent thermal diffusivity for enthalpy + // [kg/m/s] + virtual tmp alphaEff() const + { + return alpha(); + } + + //- Return the effective turbulent thermal diffusivity for enthalpy + // for a patch [kg/m/s] + virtual tmp alphaEff(const label patchi) const + { + return alpha(patchi); + } +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository +# include "thermalDiffusivity.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModelDoc.H b/src/TurbulenceModels/compressible/turbulenceModelDoc.H similarity index 94% rename from src/turbulenceModels/compressible/turbulenceModel/turbulenceModelDoc.H rename to src/TurbulenceModels/compressible/turbulenceModelDoc.H index 17bc21095..5722cee54 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModelDoc.H +++ b/src/TurbulenceModels/compressible/turbulenceModelDoc.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,5 +27,5 @@ License @{ This group contains compressible turbulence models. @} - + \*---------------------------------------------------------------------------*/ diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C similarity index 87% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C index 654054456..02e87c7a7 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "convectiveHeatTransferFvPatchScalarField.H" -#include "compressible/turbulenceModel/turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "fvPatchFieldMapper.H" #include "addToRunTimeSelectionTable.H" @@ -110,16 +110,26 @@ void convectiveHeatTransferFvPatchScalarField::updateCoeffs() const label patchi = patch().index(); - const turbulenceModel& turbModel = - db().lookupObject("turbulenceModel"); + const turbulenceModel& turbModel = db().lookupObject + ( + IOobject::groupName + ( + turbulenceModel::propertiesName, + dimensionedInternalField().group() + ) + ); + const scalarField alphaEffw(turbModel.alphaEff(patchi)); - const scalarField& muw = turbModel.mu().boundaryField()[patchi]; + + const tmp tmuw = turbModel.mu(patchi); + const scalarField& muw = tmuw(); + const scalarField& rhow = turbModel.rho().boundaryField()[patchi]; const vectorField& Uc = turbModel.U(); const vectorField& Uw = turbModel.U().boundaryField()[patchi]; - const scalarField& Tw = turbModel.thermo().T().boundaryField()[patchi]; - const scalarField& pw = turbModel.thermo().p().boundaryField()[patchi]; - const scalarField Cpw(turbModel.thermo().Cp(pw, Tw, patchi)); + const scalarField& Tw = turbModel.transport().T().boundaryField()[patchi]; + const scalarField& pw = turbModel.transport().p().boundaryField()[patchi]; + const scalarField Cpw(turbModel.transport().Cp(pw, Tw, patchi)); const scalarField kappaw(Cpw*alphaEffw); const scalarField Pr(muw*Cpw/kappaw); diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H similarity index 98% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H index cbbd7869b..f1af5d918 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C similarity index 95% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C index c4d54b83b..36b6ce879 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,11 +24,11 @@ License \*---------------------------------------------------------------------------*/ #include "externalCoupledTemperatureMixedFvPatchScalarField.H" +#include "turbulentFluidThermoModel.H" #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "OFstream.H" -#include "turbulenceModel.H" // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // @@ -127,7 +127,16 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData scalarField qDot(this->patch().size(), 0.0); typedef compressible::turbulenceModel cmpTurbModelType; - static word turbName("turbulenceModel"); + + static word turbName + ( + IOobject::groupName + ( + turbulenceModel::propertiesName, + dimensionedInternalField().group() + ) + ); + static word thermoName("thermophysicalProperties"); if (db().foundObject(turbName)) @@ -135,7 +144,7 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData const cmpTurbModelType& turbModel = db().lookupObject(turbName); - const basicThermo& thermo = turbModel.thermo(); + const basicThermo& thermo = turbModel.transport(); const fvPatchScalarField& hep = thermo.he().boundaryField()[patchI]; diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H similarity index 99% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H index 3d17d955a..47fb91531 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C similarity index 99% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C index e6470981e..27306f29c 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H similarity index 99% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H index ad4bc5fd8..0799e9dd7 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C similarity index 95% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C index b128e562e..ff6c5e9f2 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,7 +27,7 @@ License #include "volFields.H" #include "fluidThermo.H" #include "solidThermo.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" // * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * // @@ -111,10 +111,15 @@ Foam::tmp Foam::temperatureCoupledBase::kappa { typedef compressible::turbulenceModel turbulenceModel; - if (mesh.foundObject("turbulenceModel")) + word turbName(turbulenceModel::propertiesName); + + if + ( + mesh.foundObject(turbName) + ) { const turbulenceModel& turbModel = - mesh.lookupObject("turbulenceModel"); + mesh.lookupObject(turbName); return turbModel.kappaEff(patchI); } diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H similarity index 98% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H index f90c8d90f..7385c39df 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C similarity index 98% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C index 490bec5c7..caef41809 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,7 @@ License #include "volFields.H" #include "surfaceFields.H" #include "mappedPatchBase.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "mapDistribute.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -356,7 +356,7 @@ void thermalBaffle1DFvPatchScalarField::updateCoeffs() const compressible::turbulenceModel& turbModel = db().template lookupObject ( - "turbulenceModel" + turbulenceModel::propertiesName ); // local properties @@ -383,7 +383,7 @@ void thermalBaffle1DFvPatchScalarField::updateCoeffs() // nrb properties scalarField nbrTp = - turbModel.thermo().T().boundaryField()[nbrPatchi]; + turbModel.transport().T().boundaryField()[nbrPatchi]; mapDist.distribute(nbrTp); // solid properties diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H similarity index 99% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H index bed019f4b..4df0d4382 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C similarity index 97% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C index ca3f23299..8eab80132 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H similarity index 96% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H index db7dcf0c9..8a3187abc 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C similarity index 91% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C index e3d00dea6..646fbed66 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,8 +29,7 @@ License #include "volFields.H" #include "surfaceFields.H" #include "IOobjectList.H" -#include "turbulenceModel.H" - +#include "turbulentFluidThermoModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField:: @@ -154,16 +153,22 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs() const label patchI = patch().index(); - const compressible::turbulenceModel& turbulence = - db().lookupObject - ( - "turbulenceModel" + const LESModel >& turbModel = + db().lookupObject + < + LESModel > + > ( + IOobject::groupName + ( + turbulenceModel::propertiesName, + dimensionedInternalField().group() + ) ); const fvsPatchField& phip = patch().lookupPatchField(phiName_); - const scalarField alphap(turbulence.alphaEff(patchI)); + const scalarField alphap(turbModel.alphaEff(patchI)); refValue() = massFluxFraction_; refGrad() = 0.0; diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H similarity index 98% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H index 79a1da68e..a6313f71a 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C similarity index 99% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C index 9f0f1a336..4ebd0c180 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H similarity index 98% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H index 740183e35..fc816b3d6 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C similarity index 99% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C index dff61c398..d304e598e 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H similarity index 99% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H index ac17f3c33..862abc185 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C similarity index 99% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C index 19f8a971a..e610afc80 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H similarity index 99% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H index bbfe48c63..8c332402e 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C similarity index 92% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C index 16b69874f..98a5a05f5 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "alphatJayatillekeWallFunctionFvPatchScalarField.H" -#include "compressible/turbulenceModel/turbulenceModel.H" +#include "turbulentFluidThermoModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -199,16 +199,27 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() const label patchi = patch().index(); - const turbulenceModel& turbModel = - db().lookupObject("turbulenceModel"); + // Retrieve turbulence properties from model + + const turbulenceModel& turbModel = db().lookupObject + ( + IOobject::groupName + ( + turbulenceModel::propertiesName, + dimensionedInternalField().group() + ) + ); const scalar Cmu25 = pow025(Cmu_); const scalarField& y = turbModel.y()[patchi]; - const scalarField& muw = turbModel.mu().boundaryField()[patchi]; + const tmp tmuw = turbModel.mu(patchi); + const scalarField& muw = tmuw(); + + const tmp talphaw = turbModel.alpha(patchi); + const scalarField& alphaw = talphaw(); - const scalarField& alphaw = turbModel.alpha().boundaryField()[patchi]; scalarField& alphatw = *this; const tmp tk = turbModel.k(); @@ -220,12 +231,12 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() const scalarField& rhow = turbModel.rho().boundaryField()[patchi]; const fvPatchScalarField& hew = - turbModel.thermo().he().boundaryField()[patchi]; + turbModel.transport().he().boundaryField()[patchi]; // Heat flux [W/m2] - lagging alphatw const scalarField qDot ( - turbModel.thermo().alphaEff(alphatw, patchi)*hew.snGrad() + turbModel.transport().alphaEff(alphatw, patchi)*hew.snGrad() ); // Populate boundary values diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H similarity index 98% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H index 5a43d7773..2626bafc3 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C similarity index 82% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C index dcf694ad1..90d223600 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,8 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF), - mutName_("mut"), + rhoName_("rho"), + nutName_("nut"), Prt_(0.85) {} @@ -58,7 +59,8 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), - mutName_(ptf.mutName_), + rhoName_(ptf.rhoName_), + nutName_(ptf.nutName_), Prt_(ptf.Prt_) {} @@ -71,7 +73,8 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF, dict), - mutName_(dict.lookupOrDefault("mut", "mut")), + rhoName_(dict.lookupOrDefault("rho", "rho")), + nutName_(dict.lookupOrDefault("nut", "nut")), Prt_(dict.lookupOrDefault("Prt", 0.85)) {} @@ -82,7 +85,8 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(awfpsf), - mutName_(awfpsf.mutName_), + rhoName_(awfpsf.rhoName_), + nutName_(awfpsf.nutName_), Prt_(awfpsf.Prt_) {} @@ -94,7 +98,8 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(awfpsf, iF), - mutName_(awfpsf.mutName_), + rhoName_(awfpsf.rhoName_), + nutName_(awfpsf.nutName_), Prt_(awfpsf.Prt_) {} @@ -108,10 +113,13 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs() return; } - const scalarField& mutw = - patch().lookupPatchField(mutName_); + const scalarField& rhow = + patch().lookupPatchField(rhoName_); - operator==(mutw/Prt_); + const scalarField& nutw = + patch().lookupPatchField(nutName_); + + operator==(rhow*nutw/Prt_); fixedValueFvPatchScalarField::updateCoeffs(); } @@ -120,7 +128,8 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs() void alphatWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); - writeEntryIfDifferent(os, "mut", "mut", mutName_); + writeEntryIfDifferent(os, "rho", "rho", rhoName_); + writeEntryIfDifferent(os, "nut", "nut", nutName_); os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl; writeEntry("value", os); } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H similarity index 94% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H index 0500caec6..f44ee6b8c 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,7 @@ Description \table Property | Description | Required | Default value - mut | turbulence viscosity field name | no | mut + nut | turbulence viscosity field name | no | nut Prt | turbulent Prandtl number | no | 0.85 \endtable @@ -59,7 +59,7 @@ Description myPatch { type alphatWallFunction; - mut mut; + nut nut; Prt 0.85; value uniform 0; // optional value entry } @@ -95,8 +95,11 @@ class alphatWallFunctionFvPatchScalarField { // Private data - //- Name of turbulent viscosity field (default = mut) - word mutName_; + //- Name of density field (default = rho) + word rhoName_; + + //- Name of turbulent viscosity field (default = nut) + word nutName_; //- Turbulent Prandtl number (default = 0.85) scalar Prt_; diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C similarity index 94% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C index 2efdccde5..bc5f23ced 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,7 @@ License #include "wallHeatTransferFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" -#include "turbulenceModel.H" +#include "turbulentFluidThermoModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -151,7 +151,11 @@ void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs() const compressible::turbulenceModel& turbModel = db().lookupObject ( - "turbulenceModel" + IOobject::groupName + ( + turbulenceModel::propertiesName, + dimensionedInternalField().group() + ) ); const label patchi = patch().index(); diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H similarity index 98% rename from src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H index a33ce4e47..1524f6c0b 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H new file mode 100644 index 000000000..ae0b0cb59 --- /dev/null +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H @@ -0,0 +1,128 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\/ 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 3 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, see . + +\*---------------------------------------------------------------------------*/ + +#define makeBaseTurbulenceModel(Alpha, Rho, baseModel, BaseModel, Transport) \ + \ + namespace Foam \ + { \ + typedef TurbulenceModel \ + < \ + Alpha, \ + Rho, \ + baseModel, \ + Transport \ + > Transport##baseModel; \ + \ + defineTemplateRunTimeSelectionTable \ + ( \ + Transport##baseModel, \ + dictionary \ + ); \ + \ + typedef BaseModel Transport##BaseModel; \ + \ + \ + typedef laminar Laminar##Transport##BaseModel; \ + \ + defineNamedTemplateTypeNameAndDebug(Laminar##Transport##BaseModel, 0); \ + \ + addToRunTimeSelectionTable \ + ( \ + Transport##baseModel, \ + Laminar##Transport##BaseModel, \ + dictionary \ + ); \ + \ + \ + typedef RASModel > \ + RAS##Transport##BaseModel; \ + \ + defineNamedTemplateTypeNameAndDebug(RAS##Transport##BaseModel, 0); \ + \ + defineTemplateRunTimeSelectionTable \ + (RAS##Transport##BaseModel, dictionary); \ + \ + addToRunTimeSelectionTable \ + ( \ + Transport##baseModel, \ + RAS##Transport##BaseModel, \ + dictionary \ + ); \ + \ + \ + typedef LESModel > \ + LES##Transport##BaseModel; \ + \ + defineNamedTemplateTypeNameAndDebug(LES##Transport##BaseModel, 0); \ + \ + defineTemplateRunTimeSelectionTable \ + (LES##Transport##BaseModel, dictionary); \ + \ + addToRunTimeSelectionTable \ + ( \ + Transport##baseModel, \ + LES##Transport##BaseModel, \ + dictionary \ + ); \ + } + + +#define makeTemplatedTurbulenceModel(BaseModel, SType, Type) \ + namespace Foam \ + { \ + namespace SType##Models \ + { \ + typedef Type > Type##SType##BaseModel; \ + \ + defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \ + \ + addToRunTimeSelectionTable \ + ( \ + SType##BaseModel, \ + Type##SType##BaseModel, \ + dictionary \ + ); \ + } \ + } + + +#define makeTurbulenceModel(BaseModel, SType, Type) \ + namespace Foam \ + { \ + namespace SType##Models \ + { \ + defineTypeNameAndDebug(Type, 0); \ + \ + addToRunTimeSelectionTable \ + ( \ + SType##BaseModel, \ + Type, \ + dictionary \ + ); \ + } \ + } + + +// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H similarity index 57% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H index a62cd0806..7725dee97 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,29 +21,54 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . +Typedef + Foam::compressible::turbulenceModel + +Typedef + Foam::compressible::RASModel + +Typedef + Foam::compressible::LESModel + +Description + Typedefs for turbulence, RAS and LES models for compressible flow + based on the standard laminar transport package. + +SourceFiles + turbulentFluidThermoModels.C + \*---------------------------------------------------------------------------*/ -#ifndef kqRWallFunctionFvPatchFields_H -#define kqRWallFunctionFvPatchFields_H +#ifndef turbulentFluidThermoModel_H +#define turbulentFluidThermoModel_H -#include "kqRWallFunctionFvPatchField.H" -#include "fieldTypes.H" +#include "SpecificCompressibleTurbulenceModel.H" +#include "thermalDiffusivity.H" +#include "eddyDiffusivity.H" +#include "RASModel.H" +#include "LESModel.H" +#include "fluidThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -namespace compressible -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + namespace compressible + { + typedef thermalDiffusivity turbulenceModel; -makePatchTypeFieldTypedefs(kqRWallFunction); + typedef SpecificCompressibleTurbulenceModel + < + RASModel > + > RASModel; -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + typedef SpecificCompressibleTurbulenceModel + < + LESModel > + > LESModel; + } +} -} // End namespace compressible -} // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C similarity index 78% rename from src/TurbulenceModels/compressible/compressibleTurbulenceModels.C rename to src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C index 054dee888..ad86b169a 100644 --- a/src/TurbulenceModels/compressible/compressibleTurbulenceModels.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,11 +23,13 @@ License \*---------------------------------------------------------------------------*/ -#include "CompressibleTurbulenceModel.H" #include "fluidThermo.H" #include "addToRunTimeSelectionTable.H" #include "makeTurbulenceModel.H" +#include "thermalDiffusivity.H" +#include "eddyDiffusivity.H" + #include "laminar.H" #include "RASModel.H" #include "LESModel.H" @@ -37,17 +39,20 @@ makeBaseTurbulenceModel geometricOneField, volScalarField, compressibleTurbulenceModel, - CompressibleTurbulenceModel, + thermalDiffusivity, fluidThermo ); #define makeRASModel(Type) \ makeTemplatedTurbulenceModel \ - (fluidThermoCompressibleTurbulenceModel, RAS, Type) + (fluidThermothermalDiffusivity, RAS, Type) #define makeLESModel(Type) \ makeTemplatedTurbulenceModel \ - (fluidThermoCompressibleTurbulenceModel, LES, Type) + (fluidThermothermalDiffusivity, LES, Type) + +#include "SpalartAllmaras.H" +makeRASModel(SpalartAllmaras); #include "kEpsilon.H" makeRASModel(kEpsilon); @@ -55,6 +60,9 @@ makeRASModel(kEpsilon); #include "buoyantKEpsilon.H" makeRASModel(buoyantKEpsilon); +#include "LaunderSharmaKE.H" +makeRASModel(LaunderSharmaKE); + #include "kOmegaSST.H" makeRASModel(kOmegaSST); @@ -64,5 +72,14 @@ makeLESModel(Smagorinsky); #include "kEqn.H" makeLESModel(kEqn); +#include "SpalartAllmarasDES.H" +makeLESModel(SpalartAllmarasDES); + +#include "SpalartAllmarasDDES.H" +makeLESModel(SpalartAllmarasDDES); + +#include "SpalartAllmarasIDDES.H" +makeLESModel(SpalartAllmarasIDDES); + // ************************************************************************* // diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C index ce93b0d59..447af12ff 100644 --- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,12 +31,13 @@ template Foam::IncompressibleTurbulenceModel:: IncompressibleTurbulenceModel ( + const word& type, const geometricOneField& alpha, const geometricOneField& rho, const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const TransportModel& transportModel, + const TransportModel& transport, const word& propertiesName ) : @@ -53,7 +54,7 @@ IncompressibleTurbulenceModel U, alphaRhoPhi, phi, - transportModel, + transport, propertiesName ) {} @@ -67,7 +68,7 @@ Foam::IncompressibleTurbulenceModel::New ( const volVectorField& U, const surfaceScalarField& phi, - const TransportModel& transportModel, + const TransportModel& transport, const word& propertiesName ) { @@ -87,7 +88,7 @@ Foam::IncompressibleTurbulenceModel::New U, phi, phi, - transportModel, + transport, propertiesName ).ptr()) ); @@ -148,4 +149,23 @@ divDevRhoReff } +template +Foam::tmp +Foam::IncompressibleTurbulenceModel:: +divDevRhoReff +( + const volScalarField& rho, + volVectorField& U +) const +{ + notImplemented + ( + "IncompressibleTurbulenceModel::" + "divDevRhoReff(const volScalarField& rho, volVectorField& U)" + ); + + return divDevReff(U); +} + + // ************************************************************************* // diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H index c0d4af42a..eb9d8bfb0 100644 --- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H +++ b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,6 +38,7 @@ SourceFiles #include "TurbulenceModel.H" #include "incompressibleTurbulenceModel.H" +#include "fvMatrix.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -72,12 +73,13 @@ public: //- Construct IncompressibleTurbulenceModel ( + const word& type, const geometricOneField& alpha, const geometricOneField& rho, const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const TransportModel& trasportModel, + const TransportModel& transport, const word& propertiesName ); @@ -112,6 +114,13 @@ public: //- Return the source term for the momentum equation virtual tmp divDevRhoReff(volVectorField& U) const; + + //- Return the source term for the momentum equation + virtual tmp divDevRhoReff + ( + const volScalarField& rho, + volVectorField& U + ) const; }; diff --git a/src/TurbulenceModels/incompressible/Make/files b/src/TurbulenceModels/incompressible/Make/files index 4b3ca65c1..4d4d5729b 100644 --- a/src/TurbulenceModels/incompressible/Make/files +++ b/src/TurbulenceModels/incompressible/Make/files @@ -1,4 +1,21 @@ incompressibleTurbulenceModel.C -incompressibleTurbulenceModels.C + +turbulentTransportModels/turbulentTransportModels.C +turbulentTransportModels/RAS/kOmega/kOmega.C +turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C +turbulentTransportModels/RAS/v2f/v2f.C +turbulentTransportModels/RAS/qZeta/qZeta.C +turbulentTransportModels/RAS/kkLOmega/kkLOmega.C +turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C +turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C +turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.C +turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C +turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C + +BCs = turbulentTransportModels/RAS/derivedFvPatchFields +$(BCs)/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C +$(BCs)/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C + +turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModels diff --git a/src/TurbulenceModels/incompressible/Make/options b/src/TurbulenceModels/incompressible/Make/options index 617607373..acb769c06 100644 --- a/src/TurbulenceModels/incompressible/Make/options +++ b/src/TurbulenceModels/incompressible/Make/options @@ -2,7 +2,7 @@ EXE_INC = \ -I../turbulenceModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude + -I$(LIB_SRC)/transportModels LIB_LIBS = \ -lincompressibleTransportModels \ diff --git a/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.C b/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.C new file mode 100644 index 000000000..f6ba580c0 --- /dev/null +++ b/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.C @@ -0,0 +1,98 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\/ 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 3 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, see . + +\*---------------------------------------------------------------------------*/ + +#include "SpecificIncompressibleTurbulenceModel.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::SpecificIncompressibleTurbulenceModel +< + BasicIncompressibleTurbulenceModel +>::SpecificIncompressibleTurbulenceModel +( + const word& type, + const geometricOneField& alpha, + const geometricOneField& rho, + const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, + const surfaceScalarField& phi, + const transportModel& transport, + const word& propertiesName +) +: + BasicIncompressibleTurbulenceModel + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ) +{} + + +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +template +Foam::autoPtr +< + Foam::SpecificIncompressibleTurbulenceModel + < + BasicIncompressibleTurbulenceModel + > +> +Foam::SpecificIncompressibleTurbulenceModel +< + BasicIncompressibleTurbulenceModel +>::New +( + const volVectorField& U, + const surfaceScalarField& phi, + const transportModel& transport, + const word& propertiesName +) +{ + return autoPtr + ( + static_cast( + BasicIncompressibleTurbulenceModel::New + ( + geometricOneField(), + geometricOneField(), + U, + phi, + phi, + transport, + propertiesName + ).ptr()) + ); +} + + +// ************************************************************************* // diff --git a/src/turbulenceModels/incompressible/LES/DESModel/DESModel.H b/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.H similarity index 56% rename from src/turbulenceModels/incompressible/LES/DESModel/DESModel.H rename to src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.H index 6aec3ee06..e7cc38118 100644 --- a/src/turbulenceModels/incompressible/LES/DESModel/DESModel.H +++ b/src/TurbulenceModels/incompressible/SpecificIncompressibleTurbulenceModel/SpecificIncompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,92 +22,88 @@ License along with OpenFOAM. If not, see . Class - Foam::incompressible::DESModel - -Group - grpIcoDESTurbulence + Foam::SpecificIncompressibleTurbulenceModel Description - Extension of LES models to provide an interface for Detached Eddy - Simulation turbulence models - -SeeAlso - Foam::LESModel + Templated abstract base class for specific (RAS/LES) incompressible + turbulence models SourceFiles - DESModel.C + SpecificIncompressibleTurbulenceModel.C \*---------------------------------------------------------------------------*/ -#ifndef incompressibleDESModel_H -#define incompressibleDESModel_H - -// note: use full(er) path so that derived utilities can bring in -// incompressible and compressible variants +#ifndef SpecificIncompressibleTurbulenceModel_H +#define SpecificIncompressibleTurbulenceModel_H -#include "incompressible/LES/LESModel/LESModel.H" +#include "IncompressibleTurbulenceModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -namespace incompressible -{ /*---------------------------------------------------------------------------*\ - Class DESModel Declaration + Class SpecificIncompressibleTurbulenceModel Declaration \*---------------------------------------------------------------------------*/ -class DESModel +template +class SpecificIncompressibleTurbulenceModel : - public LESModel + public BasicIncompressibleTurbulenceModel { -private: - - // Private Member Functions - - //- Disallow default bitwise copy construct - DESModel(const DESModel&); - - //- Disallow default bitwise assignment - DESModel& operator=(const DESModel&); - - public: + typedef typename BasicIncompressibleTurbulenceModel::transportModel + transportModel; + // Constructors //- Construct from components - DESModel + SpecificIncompressibleTurbulenceModel ( const word& type, + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName + const word& propertiesName ); //- Destructor - virtual ~DESModel() + virtual ~SpecificIncompressibleTurbulenceModel() {} - // Public Member Functions + // Selectors - //- Return the LES field indicator - virtual tmp LESRegion() const = 0; + //- Return a reference to the selected RAS model + static autoPtr New + ( + const volVectorField& U, + const surfaceScalarField& phi, + const transportModel& transport, + const word& propertiesName = turbulenceModel::propertiesName + ); }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#ifdef NoRepository +# include "SpecificIncompressibleTurbulenceModel.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + #endif // ************************************************************************* // diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModelDoc.H b/src/TurbulenceModels/incompressible/turbulenceModelDoc.H similarity index 94% rename from src/turbulenceModels/incompressible/turbulenceModel/turbulenceModelDoc.H rename to src/TurbulenceModels/incompressible/turbulenceModelDoc.H index f9751dc54..2e5547351 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModelDoc.H +++ b/src/TurbulenceModels/incompressible/turbulenceModelDoc.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,5 +27,5 @@ License @{ This group contains incompressible turbulence models. @} - + \*---------------------------------------------------------------------------*/ diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C similarity index 72% rename from src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C index c23bc4b0b..aa7e9457d 100644 --- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C @@ -24,10 +24,10 @@ License \*---------------------------------------------------------------------------*/ #include "LamBremhorstKE.H" +#include "wallDist.H" +#include "bound.H" #include "addToRunTimeSelectionTable.H" -#include "backwardsCompatibilityWallFunctions.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -42,18 +42,40 @@ namespace RASModels defineTypeNameAndDebug(LamBremhorstKE, 0); addToRunTimeSelectionTable(RASModel, LamBremhorstKE, dictionary); +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +void LamBremhorstKE::correctNut() +{ + nut_ = Cmu_*fMu_*sqr(k_)/epsilon_; + nut_.correctBoundaryConditions(); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // LamBremhorstKE::LamBremhorstKE ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName, - const word& modelName + const word& propertiesName, + const word& type ) : - RASModel(modelName, U, phi, transport, turbulenceModelName), + eddyViscosity + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), Cmu_ ( @@ -96,7 +118,7 @@ LamBremhorstKE::LamBremhorstKE ( IOobject ( - "k", + IOobject::groupName("k", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -109,7 +131,7 @@ LamBremhorstKE::LamBremhorstKE ( IOobject ( - "epsilon", + IOobject::groupName("epsilon", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -126,103 +148,24 @@ LamBremhorstKE::LamBremhorstKE ( sqr(scalar(1) - exp(-0.0165*(sqrt(k_)*y_/nu()))) *(scalar(1) + 20.5/(Rt_ + SMALL)) - ), - - nut_ - ( - IOobject - ( - "nut", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - autoCreateLowReNut("nut", mesh_) ) { bound(k_, kMin_); // already bounded: bound(epsilon_, epsilonMin_); - nut_ = Cmu_*fMu_*sqr(k_)/epsilon_; - nut_.correctBoundaryConditions(); - - printCoeffs(); + if (type == typeName) + { + correctNut(); + printCoeffs(type); + } } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp LamBremhorstKE::R() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)), - k_.boundaryField().types() - ) - ); -} - - -tmp LamBremhorstKE::devReff() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "devRhoReff", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - -nuEff()*dev(twoSymm(fvc::grad(U_))) - ) - ); -} - - -tmp LamBremhorstKE::divDevReff(volVectorField& U) const -{ - return - ( - - fvm::laplacian(nuEff(), U) - - fvc::div(nuEff()*dev(T(fvc::grad(U)))) - ); -} - - -tmp LamBremhorstKE::divDevRhoReff -( - const volScalarField& rho, - volVectorField& U -) const -{ - volScalarField muEff("muEff", rho*nuEff()); - - return - ( - - fvm::laplacian(muEff, U) - - fvc::div(muEff*dev(T(fvc::grad(U)))) - ); -} - - bool LamBremhorstKE::read() { - if (RASModel::read()) + if (eddyViscosity::read()) { Cmu_.readIfPresent(coeffDict()); C1_.readIfPresent(coeffDict()); @@ -240,7 +183,7 @@ bool LamBremhorstKE::read() void LamBremhorstKE::correct() { - RASModel::correct(); + eddyViscosity::correct(); if (!turbulence_) { @@ -293,9 +236,7 @@ void LamBremhorstKE::correct() solve(kEqn); bound(k_, kMin_); - - // Re-calculate viscosity - nut_ == Cmu_*fMu_*sqr(k_)/epsilon_; + correctNut(); } diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H similarity index 81% rename from src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H index 30e590cad..4041e0452 100644 --- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H @@ -39,8 +39,8 @@ SourceFiles #ifndef LamBremhorstKE_H #define LamBremhorstKE_H -#include "RASModel.H" -#include "wallDist.H" +#include "turbulentTransportModel.H" +#include "eddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -57,7 +57,7 @@ namespace RASModels class LamBremhorstKE : - public RASModel + public eddyViscosity { protected: @@ -80,7 +80,11 @@ protected: volScalarField Rt_; volScalarField fMu_; - volScalarField nut_; + + + // Protected Member Functions + + virtual void correctNut(); public: @@ -94,11 +98,14 @@ public: //- Construct from components LamBremhorstKE ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName, - const word& modelName = typeName + const word& propertiesName = turbulenceModel::propertiesName, + const word& type = typeName ); @@ -109,11 +116,8 @@ public: // Member Functions - //- Return the turbulence viscosity - virtual tmp nut() const - { - return nut_; - } + //- Read RASProperties dictionary + virtual bool read(); //- Return the effective diffusivity for k tmp DkEff() const @@ -145,27 +149,8 @@ public: return epsilon_; } - //- Return the Reynolds stress tensor - virtual tmp R() const; - - //- Return the effective stress tensor including the laminar stress - virtual tmp devReff() const; - - //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; - - //- Return the source term for the momentum equation - virtual tmp divDevRhoReff - ( - const volScalarField& rho, - volVectorField& U - ) const; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); - - //- Read RASProperties dictionary - virtual bool read(); }; diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C similarity index 67% rename from src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C index 4065ab267..30f7de7b5 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C @@ -24,10 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "LienCubicKE.H" +#include "bound.H" #include "addToRunTimeSelectionTable.H" -#include "backwardsCompatibilityWallFunctions.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -42,18 +41,82 @@ namespace RASModels defineTypeNameAndDebug(LienCubicKE, 0); addToRunTimeSelectionTable(RASModel, LienCubicKE, dictionary); +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +void LienCubicKE::correctNut() +{ + nut_ = + Cmu_*sqr(k_)/epsilon_ + // C5 term, implicit + + max + ( + C5viscosity_, + dimensionedScalar("0", C5viscosity_.dimensions(), 0.0) + ); + + nut_.correctBoundaryConditions(); +} + + +void LienCubicKE::correctNonlinearStress(const volTensorField& gradU) +{ + nonlinearStress_ = symm + ( + // quadratic terms + pow3(k_)/sqr(epsilon_) + *( + Ctau1_/fEta_ + *( + (gradU & gradU) + + (gradU & gradU)().T() + ) + + Ctau2_/fEta_*(gradU & gradU.T()) + + Ctau3_/fEta_*(gradU.T() & gradU) + ) + // cubic term C4 + - 20.0*pow4(k_)/pow3(epsilon_) + *pow3(Cmu_) + *( + ((gradU & gradU) & gradU.T()) + + ((gradU & gradU.T()) & gradU.T()) + - ((gradU.T() & gradU) & gradU) + - ((gradU.T() & gradU.T()) & gradU) + ) + // cubic term C5, explicit part + + min + ( + C5viscosity_, + dimensionedScalar("0", C5viscosity_.dimensions(), 0.0) + )*gradU + ); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // LienCubicKE::LienCubicKE ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName, - const word& modelName + const word& propertiesName, + const word& type ) : - RASModel(modelName, U, phi, transport, turbulenceModelName), + nonlinearEddyViscosity + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), C1_ ( @@ -150,25 +213,25 @@ LienCubicKE::LienCubicKE ( IOobject ( - "k", + IOobject::groupName("k", U.group()), runTime_.timeName(), mesh_, - IOobject::NO_READ, + IOobject::MUST_READ, IOobject::AUTO_WRITE ), - autoCreateK("k", mesh_) + mesh_ ), epsilon_ ( IOobject ( - "epsilon", + IOobject::groupName("epsilon", U.group()), runTime_.timeName(), mesh_, - IOobject::NO_READ, + IOobject::MUST_READ, IOobject::AUTO_WRITE ), - autoCreateEpsilon("epsilon", mesh_) + mesh_ ), eta_ @@ -182,142 +245,34 @@ LienCubicKE::LienCubicKE *sqrt(2.0*magSqr(0.5*(fvc::grad(U) - T(fvc::grad(U))))) ), Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))), - fEta_(A2_ + pow(eta_, 3.0)), + fEta_(A2_ + pow3(eta_)), C5viscosity_ ( - - 2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_) + -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_) *( magSqr(fvc::grad(U) + T(fvc::grad(U))) - magSqr(fvc::grad(U) - T(fvc::grad(U))) ) - ), - - nut_ - ( - IOobject - ( - "nut", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - autoCreateNut("nut", mesh_) - ), - - nonlinearStress_ - ( - "nonlinearStress", - // quadratic terms - symm - ( - pow(k_, 3.0)/sqr(epsilon_) - *( - Ctau1_/fEta_ - *( - (fvc::grad(U) & fvc::grad(U)) - + (fvc::grad(U) & fvc::grad(U))().T() - ) - + Ctau2_/fEta_*(fvc::grad(U) & T(fvc::grad(U))) - + Ctau3_/fEta_*(T(fvc::grad(U)) & fvc::grad(U)) - ) - // cubic term C4 - - 20.0*pow(k_, 4.0)/pow(epsilon_, 3.0) - *pow(Cmu_, 3.0) - *( - ((fvc::grad(U) & fvc::grad(U)) & T(fvc::grad(U))) - + ((fvc::grad(U) & T(fvc::grad(U))) & T(fvc::grad(U))) - - ((T(fvc::grad(U)) & fvc::grad(U)) & fvc::grad(U)) - - ((T(fvc::grad(U)) & T(fvc::grad(U))) & fvc::grad(U)) - ) - ) ) { bound(k_, kMin_); // already bounded: bound(epsilon_, epsilonMin_); - nut_ = Cmu_*sqr(k_)/epsilon_ + C5viscosity_; - nut_.correctBoundaryConditions(); - - printCoeffs(); + if (type == typeName) + { + correctNut(); + correctNonlinearStress(fvc::grad(U)); + printCoeffs(type); + } } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp LienCubicKE::R() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)) + nonlinearStress_, - k_.boundaryField().types() - ) - ); -} - - -tmp LienCubicKE::devReff() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "devRhoReff", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - -nuEff()*dev(twoSymm(fvc::grad(U_))) + nonlinearStress_ - ) - ); -} - - -tmp LienCubicKE::divDevReff(volVectorField& U) const -{ - return - ( - fvc::div(nonlinearStress_) - - fvm::laplacian(nuEff(), U) - - fvc::div(nuEff()*dev(T(fvc::grad(U)))) - ); -} - - -tmp LienCubicKE::divDevRhoReff -( - const volScalarField& rho, - volVectorField& U -) const -{ - volScalarField muEff("muEff", rho*nuEff()); - - return - ( - fvc::div(rho*nonlinearStress_) - - fvm::laplacian(muEff, U) - - fvc::div(muEff*dev(T(fvc::grad(U)))) - ); -} - - bool LienCubicKE::read() { - if (RASModel::read()) + if (nonlinearEddyViscosity::read()) { C1_.readIfPresent(coeffDict()); C2_.readIfPresent(coeffDict()); @@ -341,7 +296,7 @@ bool LienCubicKE::read() void LienCubicKE::correct() { - RASModel::correct(); + nonlinearEddyViscosity::correct(); if (!turbulence_) { @@ -404,38 +359,14 @@ void LienCubicKE::correct() eta_ = k_/epsilon_*sqrt(2.0*magSqr(0.5*(gradU + gradU.T()))); ksi_ = k_/epsilon_*sqrt(2.0*magSqr(0.5*(gradU - gradU.T()))); Cmu_ = 2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_)); - fEta_ = A2_ + pow(eta_, 3.0); + fEta_ = A2_ + pow3(eta_); C5viscosity_ = - - 2.0*pow(Cmu_, 3.0)*pow(k_, 4.0)/pow(epsilon_, 3.0) + -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_) *(magSqr(gradU + gradU.T()) - magSqr(gradU - gradU.T())); - nut_ = Cmu_*sqr(k_)/epsilon_ + C5viscosity_; - nut_.correctBoundaryConditions(); - - nonlinearStress_ = symm - ( - // quadratic terms - pow(k_, 3.0)/sqr(epsilon_)* - ( - Ctau1_/fEta_* - ( - (gradU & gradU) - + (gradU & gradU)().T() - ) - + Ctau2_/fEta_*(gradU & gradU.T()) - + Ctau3_/fEta_*(gradU.T() & gradU) - ) - // cubic term C4 - - 20.0*pow(k_, 4.0)/pow(epsilon_, 3.0) - *pow(Cmu_, 3.0) - *( - ((gradU & gradU) & gradU.T()) - + ((gradU & gradU.T()) & gradU.T()) - - ((gradU.T() & gradU) & gradU) - - ((gradU.T() & gradU.T()) & gradU) - ) - ); + correctNut(); + correctNonlinearStress(gradU); } diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H similarity index 81% rename from src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H index 9367a766e..411244cc7 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H @@ -38,7 +38,8 @@ SourceFiles #ifndef LienCubicKE_H #define LienCubicKE_H -#include "RASModel.H" +#include "turbulentTransportModel.H" +#include "nonlinearEddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,7 +56,7 @@ namespace RASModels class LienCubicKE : - public RASModel + public nonlinearEddyViscosity { protected: @@ -87,9 +88,11 @@ protected: volScalarField fEta_; volScalarField C5viscosity_; - volScalarField nut_; - volSymmTensorField nonlinearStress_; + // Protected Member Functions + + virtual void correctNut(); + virtual void correctNonlinearStress(const volTensorField& gradU); public: @@ -102,11 +105,14 @@ public: //- Construct from components LienCubicKE ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName, - const word& modelName = typeName + const word& propertiesName = turbulenceModel::propertiesName, + const word& type = typeName ); @@ -117,11 +123,8 @@ public: // Member Functions - //- Return the turbulence viscosity - virtual tmp nut() const - { - return nut_; - } + //- Read RASProperties dictionary + virtual bool read(); //- Return the effective diffusivity for k tmp DkEff() const @@ -153,27 +156,8 @@ public: return epsilon_; } - //- Return the Reynolds stress tensor - virtual tmp R() const; - - //- Return the effective stress tensor including the laminar stress - virtual tmp devReff() const; - - //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; - - //- Return the source term for the momentum equation - virtual tmp divDevRhoReff - ( - const volScalarField& rho, - volVectorField& U - ) const; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); - - //- Read RASProperties dictionary - virtual bool read(); }; diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.C similarity index 69% rename from src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.C index 12a05b4fe..cef1ad5bf 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.C @@ -24,11 +24,11 @@ License \*---------------------------------------------------------------------------*/ #include "LienCubicKELowRe.H" +#include "wallDist.H" #include "wallFvPatch.H" +#include "bound.H" #include "addToRunTimeSelectionTable.H" -#include "backwardsCompatibilityWallFunctions.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -43,18 +43,90 @@ namespace RASModels defineTypeNameAndDebug(LienCubicKELowRe, 0); addToRunTimeSelectionTable(RASModel, LienCubicKELowRe, dictionary); +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +tmp LienCubicKELowRe::fMu() +{ + return + (scalar(1) - exp(-Am_*yStar_)) + /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL); +} + + +void LienCubicKELowRe::correctNut() +{ + nut_ = + Cmu_*fMu()*sqr(k_)/epsilon_ + // C5 term, implicit + + max + ( + C5viscosity_, + dimensionedScalar("0", C5viscosity_.dimensions(), 0.0) + ); + + nut_.correctBoundaryConditions(); +} + + +void LienCubicKELowRe::correctNonlinearStress(const volTensorField& gradU) +{ + nonlinearStress_ = symm + ( + // quadratic terms + pow3(k_)/sqr(epsilon_) + *( + Ctau1_/fEta_ + *( + (gradU & gradU) + + (gradU & gradU)().T() + ) + + Ctau2_/fEta_*(gradU & gradU.T()) + + Ctau3_/fEta_*(gradU.T() & gradU) + ) + // cubic term C4 + - 20.0*pow4(k_)/pow3(epsilon_) + *pow3(Cmu_) + *( + ((gradU & gradU) & gradU.T()) + + ((gradU & gradU.T()) & gradU.T()) + - ((gradU.T() & gradU) & gradU) + - ((gradU.T() & gradU.T()) & gradU) + ) + // cubic term C5, explicit part + + min + ( + C5viscosity_, + dimensionedScalar("0", C5viscosity_.dimensions(), 0.0) + )*gradU + ); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // LienCubicKELowRe::LienCubicKELowRe ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName, - const word& modelName + const word& propertiesName, + const word& type ) : - RASModel(modelName, U, phi, transport, turbulenceModelName), + nonlinearEddyViscosity + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), C1_ ( @@ -196,7 +268,7 @@ LienCubicKELowRe::LienCubicKELowRe ( IOobject ( - "k", + IOobject::groupName("k", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -209,7 +281,7 @@ LienCubicKELowRe::LienCubicKELowRe ( IOobject ( - "epsilon", + IOobject::groupName("epsilon", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -235,156 +307,32 @@ LienCubicKELowRe::LienCubicKELowRe C5viscosity_ ( - -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_) + -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_) *( - magSqr(fvc::grad(U) + T(fvc::grad(U))) - - magSqr(fvc::grad(U) - T(fvc::grad(U))) + magSqr(fvc::grad(U) + T(fvc::grad(U))) + - magSqr(fvc::grad(U) - T(fvc::grad(U))) ) ), - yStar_(sqrt(k_)*y_/nu() + SMALL), - - nut_ - ( - IOobject - ( - "nut", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - autoCreateLowReNut("nut", mesh_) - ), - - nonlinearStress_ - ( - "nonlinearStress", - symm - ( - // quadratic terms - pow3(k_)/sqr(epsilon_) - *( - Ctau1_/fEta_ - *( - (fvc::grad(U) & fvc::grad(U)) - + (fvc::grad(U) & fvc::grad(U))().T() - ) - + Ctau2_/fEta_*(fvc::grad(U) & T(fvc::grad(U))) - + Ctau3_/fEta_*(T(fvc::grad(U)) & fvc::grad(U)) - ) - // cubic term C4 - - 20.0*pow4(k_)/pow3(epsilon_) - *pow3(Cmu_) - *( - ((fvc::grad(U) & fvc::grad(U)) & T(fvc::grad(U))) - + ((fvc::grad(U) & T(fvc::grad(U))) & T(fvc::grad(U))) - - ((T(fvc::grad(U)) & fvc::grad(U)) & fvc::grad(U)) - - ((T(fvc::grad(U)) & T(fvc::grad(U))) & fvc::grad(U)) - ) - // cubic term C5, explicit part - + min - ( - C5viscosity_, - dimensionedScalar("0", C5viscosity_.dimensions(), 0.0) - )*fvc::grad(U) - ) - ) + yStar_(sqrt(k_)*y_/nu() + SMALL) { bound(k_, kMin_); // already bounded: bound(epsilon_, epsilonMin_); - nut_ = Cmu_ - * (scalar(1) - exp(-Am_*yStar_)) - / (scalar(1) - exp(-Aepsilon_*yStar_) + SMALL) - * sqr(k_)/epsilon_ - // cubic term C5, implicit part - + max - ( - C5viscosity_, - dimensionedScalar("0", C5viscosity_.dimensions(), 0.0) - ); - - nut_.correctBoundaryConditions(); - - printCoeffs(); + if (type == typeName) + { + correctNut(); + correctNonlinearStress(fvc::grad(U)); + printCoeffs(type); + } } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp LienCubicKELowRe::R() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)) + nonlinearStress_, - k_.boundaryField().types() - ) - ); -} - - -tmp LienCubicKELowRe::devReff() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "devRhoReff", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - -nuEff()*dev(twoSymm(fvc::grad(U_))) + nonlinearStress_ - ) - ); -} - - -tmp LienCubicKELowRe::divDevReff(volVectorField& U) const -{ - return - ( - fvc::div(nonlinearStress_) - - fvm::laplacian(nuEff(), U) - - fvc::div(nuEff()*dev(T(fvc::grad(U)))) - ); -} - - -tmp LienCubicKELowRe::divDevRhoReff -( - const volScalarField& rho, - volVectorField& U -) const -{ - volScalarField muEff("muEff", rho*nuEff()); - - return - ( - fvc::div(rho*nonlinearStress_) - - fvm::laplacian(muEff, U) - - fvc::div(muEff*dev(T(fvc::grad(U)))) - ); -} - - bool LienCubicKELowRe::read() { - if (RASModel::read()) + if (nonlinearEddyViscosity::read()) { C1_.readIfPresent(coeffDict()); C2_.readIfPresent(coeffDict()); @@ -413,7 +361,7 @@ bool LienCubicKELowRe::read() void LienCubicKELowRe::correct() { - RASModel::correct(); + nonlinearEddyViscosity::correct(); if (!turbulence_) { @@ -429,11 +377,6 @@ void LienCubicKELowRe::correct() yStar_ = sqrt(k_)*y_/nu() + SMALL; tmp Rt = sqr(k_)/(nu()*epsilon_); - const volScalarField fMu - ( - (scalar(1) - exp(-Am_*yStar_)) - /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL) - ); const volScalarField f2 ( scalar(1) - 0.3*exp(-sqr(Rt)) @@ -442,7 +385,7 @@ void LienCubicKELowRe::correct() volScalarField G ( GName(), - Cmu_*fMu*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU) + Cmu_*fMu()*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU) ); // Dissipation equation @@ -491,50 +434,14 @@ void LienCubicKELowRe::correct() eta_ = k_/epsilon_*sqrt(2.0*magSqr(0.5*(gradU + gradU.T()))); ksi_ = k_/epsilon_*sqrt(2.0*magSqr(0.5*(gradU - gradU.T()))); Cmu_ = 2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_)); - fEta_ = A2_ + pow(eta_, 3.0); + fEta_ = A2_ + pow3(eta_); C5viscosity_ = - - 2.0*pow(Cmu_, 3.0)*pow(k_, 4.0)/pow(epsilon_, 3.0) + -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_) *(magSqr(gradU + gradU.T()) - magSqr(gradU - gradU.T())); - nut_ = - Cmu_*fMu*sqr(k_)/epsilon_ - // C5 term, implicit - + max - ( - C5viscosity_, - dimensionedScalar("0", C5viscosity_.dimensions(), 0.0) - ); - - nonlinearStress_ = symm - ( - // quadratic terms - pow(k_, 3.0)/sqr(epsilon_) - *( - Ctau1_/fEta_ - *( - (gradU & gradU) - + (gradU & gradU)().T() - ) - + Ctau2_/fEta_*(gradU & gradU.T()) - + Ctau3_/fEta_*(gradU.T() & gradU) - ) - // cubic term C4 - - 20.0*pow(k_, 4.0)/pow(epsilon_, 3.0) - *pow(Cmu_, 3.0) - *( - ((gradU & gradU) & gradU.T()) - + ((gradU & gradU.T()) & gradU.T()) - - ((gradU.T() & gradU) & gradU) - - ((gradU.T() & gradU.T()) & gradU) - ) - // cubic term C5, explicit part - + min - ( - C5viscosity_, - dimensionedScalar("0", C5viscosity_.dimensions(), 0.0) - )*gradU - ); + correctNut(); + correctNonlinearStress(gradU); } diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.H similarity index 84% rename from src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.H index a7dcac84c..40faf6762 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.H @@ -53,8 +53,8 @@ SourceFiles #ifndef LienCubicKELowRe_H #define LienCubicKELowRe_H -#include "RASModel.H" -#include "wallDist.H" +#include "turbulentTransportModel.H" +#include "nonlinearEddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -71,7 +71,7 @@ namespace RASModels class LienCubicKELowRe : - public RASModel + public nonlinearEddyViscosity { protected: @@ -117,9 +117,13 @@ protected: volScalarField yStar_; - volScalarField nut_; - volSymmTensorField nonlinearStress_; + // Protected Member Functions + + tmp fMu(); + + virtual void correctNut(); + virtual void correctNonlinearStress(const volTensorField& gradU); public: @@ -132,11 +136,14 @@ public: //- Construct from components LienCubicKELowRe ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName, - const word& modelName = typeName + const word& propertiesName = turbulenceModel::propertiesName, + const word& type = typeName ); @@ -147,11 +154,8 @@ public: // Member Functions - //- Return the turbulence viscosity - virtual tmp nut() const - { - return nut_; - } + //- Read RASProperties dictionary + virtual bool read(); //- Return the effective diffusivity for k tmp DkEff() const @@ -183,27 +187,8 @@ public: return epsilon_; } - //- Return the Reynolds stress tensor - virtual tmp R() const; - - //- Return the effective stress tensor including the laminar stress - virtual tmp devReff() const; - - //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; - - //- Return the source term for the momentum equation - virtual tmp divDevRhoReff - ( - const volScalarField& rho, - volVectorField& U - ) const; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); - - //- Read RASProperties dictionary - virtual bool read(); }; diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H similarity index 100% rename from src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C similarity index 72% rename from src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C index 5b4c77477..65880a8a8 100644 --- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C @@ -24,11 +24,11 @@ License \*---------------------------------------------------------------------------*/ #include "LienLeschzinerLowRe.H" +#include "wallDist.H" #include "wallFvPatch.H" +#include "bound.H" #include "addToRunTimeSelectionTable.H" -#include "backwardsCompatibilityWallFunctions.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -43,18 +43,48 @@ namespace RASModels defineTypeNameAndDebug(LienLeschzinerLowRe, 0); addToRunTimeSelectionTable(RASModel, LienLeschzinerLowRe, dictionary); +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +tmp LienLeschzinerLowRe::fMu() +{ + return + (scalar(1) - exp(-Am_*yStar_)) + /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL); +} + + +void LienLeschzinerLowRe::correctNut() +{ + nut_ = Cmu_*fMu()*sqr(k_)/epsilon_; + nut_.correctBoundaryConditions(); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // LienLeschzinerLowRe::LienLeschzinerLowRe ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName, - const word& modelName + const word& propertiesName, + const word& type ) : - RASModel(modelName, U, phi, transport, turbulenceModelName), + eddyViscosity + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), C1_ ( @@ -142,7 +172,7 @@ LienLeschzinerLowRe::LienLeschzinerLowRe ( IOobject ( - "k", + IOobject::groupName("k", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -155,7 +185,7 @@ LienLeschzinerLowRe::LienLeschzinerLowRe ( IOobject ( - "epsilon", + IOobject::groupName("epsilon", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -166,107 +196,24 @@ LienLeschzinerLowRe::LienLeschzinerLowRe y_(wallDist::New(mesh_).y()), - yStar_(sqrt(k_)*y_/nu() + SMALL), - - nut_ - ( - IOobject - ( - "nut", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - autoCreateLowReNut("nut", mesh_) - ) + yStar_(sqrt(k_)*y_/nu() + SMALL) { bound(k_, kMin_); bound(epsilon_, epsilonMin_); - nut_ = Cmu_*(scalar(1) - exp(-Am_*yStar_)) - /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL)*sqr(k_) - /(epsilon_); - nut_.correctBoundaryConditions(); - - printCoeffs(); + if (type == typeName) + { + correctNut(); + printCoeffs(type); + } } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp LienLeschzinerLowRe::R() const -{ - tmp gradU = fvc::grad(U_); - - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - ((2.0/3.0)*I)*k_ - nut_*twoSymm(gradU), - k_.boundaryField().types() - ) - ); -} - - -tmp LienLeschzinerLowRe::devReff() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "devRhoReff", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - -nuEff()*dev(twoSymm(fvc::grad(U_))) - ) - ); -} - - -tmp LienLeschzinerLowRe::divDevReff(volVectorField& U) const -{ - return - ( - - fvm::laplacian(nuEff(), U) - - fvc::div(nuEff()*T(fvc::grad(U))) - ); -} - - -tmp LienLeschzinerLowRe::divDevRhoReff -( - const volScalarField& rho, - volVectorField& U -) const -{ - volScalarField muEff("muEff", rho*nuEff()); - - return - ( - - fvm::laplacian(muEff, U) - - fvc::div(muEff*dev(T(fvc::grad(U)))) - ); -} - - bool LienLeschzinerLowRe::read() { - if (RASModel::read()) + if (eddyViscosity::read()) { C1_.readIfPresent(coeffDict()); C2_.readIfPresent(coeffDict()); @@ -289,7 +236,7 @@ bool LienLeschzinerLowRe::read() void LienLeschzinerLowRe::correct() { - RASModel::correct(); + eddyViscosity::correct(); if (!turbulence_) { @@ -306,15 +253,9 @@ void LienLeschzinerLowRe::correct() yStar_ = sqrt(k_)*y_/nu() + SMALL; tmp Rt = sqr(k_)/(nu()*epsilon_); - volScalarField fMu - ( - (scalar(1) - exp(-Am_*yStar_)) - /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL) - ); - const volScalarField f2(scalar(1) - 0.3*exp(-sqr(Rt))); - volScalarField G(GName(), Cmu_*fMu*sqr(k_)/epsilon_*S2); + volScalarField G(GName(), Cmu_*fMu()*sqr(k_)/epsilon_*S2); // Dissipation equation @@ -357,9 +298,7 @@ void LienLeschzinerLowRe::correct() solve(kEqn); bound(k_, kMin_); - - // Re-calculate viscosity - nut_ = Cmu_*fMu*sqr(k_)/epsilon_; + correctNut(); } diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H similarity index 82% rename from src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H index c9d664ce0..206abb09b 100644 --- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H @@ -39,8 +39,8 @@ SourceFiles #ifndef LienLeschzinerLowRe_H #define LienLeschzinerLowRe_H -#include "RASModel.H" -#include "wallDist.H" +#include "turbulentTransportModel.H" +#include "eddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -57,7 +57,7 @@ namespace RASModels class LienLeschzinerLowRe : - public RASModel + public eddyViscosity { protected: @@ -90,7 +90,12 @@ protected: volScalarField yStar_; - volScalarField nut_; + + // Protected Member Functions + + tmp fMu(); + + virtual void correctNut(); public: @@ -102,11 +107,14 @@ public: //- Construct from components LienLeschzinerLowRe ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName, - const word& modelName = typeName + const word& propertiesName = turbulenceModel::propertiesName, + const word& type = typeName ); @@ -117,11 +125,8 @@ public: // Member Functions - //- Return the turbulence viscosity - virtual tmp nut() const - { - return nut_; - } + //- Read RASProperties dictionary + virtual bool read(); //- Return the effective diffusivity for k tmp DkEff() const @@ -153,27 +158,8 @@ public: return epsilon_; } - //- Return the Reynolds stress tensor - virtual tmp R() const; - - //- Return the effective stress tensor including the laminar stress - virtual tmp devReff() const; - - //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; - - //- Return the source term for the momentum equation - virtual tmp divDevRhoReff - ( - const volScalarField& rho, - volVectorField& U - ) const; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); - - //- Read RASProperties dictionary - virtual bool read(); }; diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H similarity index 100% rename from src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C similarity index 71% rename from src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C index 12cbbfcd8..1dd886498 100644 --- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C @@ -24,10 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "RNGkEpsilon.H" +#include "bound.H" #include "addToRunTimeSelectionTable.H" -#include "backwardsCompatibilityWallFunctions.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -42,18 +41,40 @@ namespace RASModels defineTypeNameAndDebug(RNGkEpsilon, 0); addToRunTimeSelectionTable(RASModel, RNGkEpsilon, dictionary); +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +void RNGkEpsilon::correctNut() +{ + nut_ = Cmu_*sqr(k_)/epsilon_; + nut_.correctBoundaryConditions(); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // RNGkEpsilon::RNGkEpsilon ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName, - const word& modelName + const word& propertiesName, + const word& type ) : - RASModel(modelName, U, phi, transport, turbulenceModelName), + eddyViscosity + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), Cmu_ ( @@ -123,122 +144,43 @@ RNGkEpsilon::RNGkEpsilon ( IOobject ( - "k", + IOobject::groupName("k", U.group()), runTime_.timeName(), mesh_, - IOobject::NO_READ, + IOobject::MUST_READ, IOobject::AUTO_WRITE ), - autoCreateK("k", mesh_) + mesh_ ), epsilon_ ( IOobject ( - "epsilon", + IOobject::groupName("epsilon", U.group()), runTime_.timeName(), mesh_, - IOobject::NO_READ, + IOobject::MUST_READ, IOobject::AUTO_WRITE ), - autoCreateEpsilon("epsilon", mesh_) - ), - nut_ - ( - IOobject - ( - "nut", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - autoCreateNut("nut", mesh_) + mesh_ ) { bound(k_, kMin_); bound(epsilon_, epsilonMin_); - nut_ = Cmu_*sqr(k_)/epsilon_; - nut_.correctBoundaryConditions(); - - printCoeffs(); + if (type == typeName) + { + correctNut(); + printCoeffs(type); + } } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -tmp RNGkEpsilon::R() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)), - k_.boundaryField().types() - ) - ); -} - - -tmp RNGkEpsilon::devReff() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "devRhoReff", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - -nuEff()*dev(twoSymm(fvc::grad(U_))) - ) - ); -} - - -tmp RNGkEpsilon::divDevReff(volVectorField& U) const -{ - return - ( - - fvm::laplacian(nuEff(), U) - - fvc::div(nuEff()*dev(T(fvc::grad(U)))) - ); -} - - -tmp RNGkEpsilon::divDevRhoReff -( - const volScalarField& rho, - volVectorField& U -) const -{ - volScalarField muEff("muEff", rho*nuEff()); - - return - ( - - fvm::laplacian(muEff, U) - - fvc::div(muEff*dev(T(fvc::grad(U)))) - ); -} - - bool RNGkEpsilon::read() { - if (RASModel::read()) + if (eddyViscosity::read()) { Cmu_.readIfPresent(coeffDict()); C1_.readIfPresent(coeffDict()); @@ -259,7 +201,7 @@ bool RNGkEpsilon::read() void RNGkEpsilon::correct() { - RASModel::correct(); + eddyViscosity::correct(); if (!turbulence_) { @@ -286,7 +228,6 @@ void RNGkEpsilon::correct() - fvm::laplacian(DepsilonEff(), epsilon_) == (C1_ - R)*G*epsilon_/k_ - //- fvm::SuSp(R*G/k_, epsilon_) - fvm::Sp(C2_*epsilon_/k_, epsilon_) ); @@ -313,10 +254,7 @@ void RNGkEpsilon::correct() solve(kEqn); bound(k_, kMin_); - - // Re-calculate viscosity - nut_ = Cmu_*sqr(k_)/epsilon_; - nut_.correctBoundaryConditions(); + correctNut(); } diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H similarity index 83% rename from src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H index caaa4f2d8..1d32e4aaa 100644 --- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H @@ -60,7 +60,8 @@ SourceFiles #ifndef RNGkEpsilon_H #define RNGkEpsilon_H -#include "RASModel.H" +#include "turbulentTransportModel.H" +#include "eddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -77,7 +78,7 @@ namespace RASModels class RNGkEpsilon : - public RASModel + public eddyViscosity { protected: @@ -99,7 +100,11 @@ protected: volScalarField k_; volScalarField epsilon_; - volScalarField nut_; + + + // Protected Member Functions + + virtual void correctNut(); public: @@ -112,11 +117,14 @@ public: //- Construct from components RNGkEpsilon ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName, - const word& modelName = typeName + const word& propertiesName = turbulenceModel::propertiesName, + const word& type = typeName ); @@ -127,11 +135,8 @@ public: // Member Functions - //- Return the turbulence viscosity - virtual tmp nut() const - { - return nut_; - } + //- Read RASProperties dictionary + virtual bool read(); //- Return the effective diffusivity for k tmp DkEff() const @@ -163,27 +168,8 @@ public: return epsilon_; } - //- Return the Reynolds stress tensor - virtual tmp R() const; - - //- Return the effective stress tensor including the laminar stress - virtual tmp devReff() const; - - //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; - - //- Return the source term for the momentum equation - virtual tmp divDevRhoReff - ( - const volScalarField& rho, - volVectorField& U - ) const; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); - - //- Read RASProperties dictionary - virtual bool read(); }; diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C similarity index 92% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C index c24937c52..fa2652446 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,11 +24,10 @@ License \*---------------------------------------------------------------------------*/ #include "fWallFunctionFvPatchScalarField.H" -#include "RASModel.H" +#include "v2f.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "wallFvPatch.H" -#include "v2f.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -174,13 +173,19 @@ void fWallFunctionFvPatchScalarField::updateCoeffs() return; } - const label patchI = patch().index(); + const label patchi = patch().index(); - const turbulenceModel& turbulence = - db().lookupObject("turbulenceModel"); + const turbulenceModel& turbulence = db().lookupObject + ( + IOobject::groupName + ( + turbulenceModel::propertiesName, + dimensionedInternalField().group() + ) + ); const v2f& v2fModel = refCast(turbulence); - const scalarField& y = v2fModel.y()[patchI]; + const scalarField& y = v2fModel.y()[patchi]; const tmp tk = v2fModel.k(); const volScalarField& k = tk(); @@ -191,8 +196,8 @@ void fWallFunctionFvPatchScalarField::updateCoeffs() const tmp tv2 = v2fModel.v2(); const volScalarField& v2 = tv2(); - const tmp tnu = v2fModel.nu(); - const scalarField& nuw = tnu().boundaryField()[patchI]; + const tmp tnuw = turbulence.nu(patchi); + const scalarField& nuw = tnuw(); const scalar Cmu25 = pow025(Cmu_); diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H similarity index 97% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H index b5d92d942..d99d16102 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,10 +22,10 @@ License along with OpenFOAM. If not, see . Class - Foam::incompressible::RASModels::fWallFunctionFvPatchScalarField + Foam::RASModels::fWallFunctionFvPatchScalarField Group - grpIcoWallFunctions + grpWallFunctions Description This boundary condition provides a turbulence damping function, f, wall diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C similarity index 92% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C index 19ae103d7..c2df8e4a9 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "v2WallFunctionFvPatchScalarField.H" -#include "RASModel.H" +#include "turbulenceModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -173,17 +173,23 @@ void v2WallFunctionFvPatchScalarField::updateCoeffs() return; } - const label patchI = patch().index(); + const label patchi = patch().index(); - const turbulenceModel& turbulence = - db().lookupObject("turbulenceModel"); - const scalarField& y = turbulence.y()[patchI]; + const turbulenceModel& turbulence = db().lookupObject + ( + IOobject::groupName + ( + turbulenceModel::propertiesName, + dimensionedInternalField().group() + ) + ); + const scalarField& y = turbulence.y()[patchi]; const tmp tk = turbulence.k(); const volScalarField& k = tk(); - const tmp tnu = turbulence.nu(); - const scalarField& nuw = tnu().boundaryField()[patchI]; + const tmp tnuw = turbulence.nu(patchi); + const scalarField& nuw = tnuw(); const scalar Cmu25 = pow025(Cmu_); diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H similarity index 97% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H index a0a8cde8e..e4e8fdafa 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/derivedFvPatchFields/wallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,10 +22,10 @@ License along with OpenFOAM. If not, see . Class - Foam::incompressible::RASModels::v2WallFunctionFvPatchScalarField + Foam::RASModels::v2WallFunctionFvPatchScalarField Group - grpIcoWallFunctions + grpWallFunctions Description This boundary condition provides a turbulence stress normal to streamlines diff --git a/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/nonLinearWallFunctionsI.H similarity index 98% rename from src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/nonLinearWallFunctionsI.H index 90b21921b..46bf81176 100644 --- a/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/nonLinearWallFunctionsI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallDissipationI.H similarity index 95% rename from src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallDissipationI.H index 3e60bffec..a51933362 100644 --- a/src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallDissipationI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallNonlinearViscosityI.H similarity index 97% rename from src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallNonlinearViscosityI.H index 6b1080d2a..b6936b49c 100644 --- a/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/include/wallNonlinearViscosityI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/Changes b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/Changes new file mode 100644 index 000000000..51cb377b0 --- /dev/null +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/Changes @@ -0,0 +1,144 @@ +turbulenceModelName -> propertiesName +modelName -> type + +* Header +*** Includes + - Remove + #include "RASModel.H" + + Add + #include "turbulentTransportModel.H" + #include "eddyViscosity.H" +*** Base class + - Change + RASModel -> eddyViscosity +*** Protected data + - Remove + volScalarField nut_; +*** Constructor + + Add + const geometricOneField& alpha, + const geometricOneField& rho, + . + const surfaceScalarField& alphaRhoPhi, + +*** Private member functions + + Add + // Protected Member Functions + + virtual void correctNut(); + +*** Member functions + - Remove + //- Return the turbulence viscosity + virtual tmp nut() const + { + return nut_; + } + + //- Return the Reynolds stress tensor + virtual tmp R() const; + + //- Return the effective stress tensor including the laminar stress + virtual tmp devReff() const; + + //- Return the source term for the momentum equation + virtual tmp divDevReff(volVectorField& U) const; + + //- Return the source term for the momentum equation + virtual tmp divDevRhoReff + ( + const volScalarField& rho, + volVectorField& U + ) const; + + + Move to top + //- Read RASProperties dictionary + virtual bool read(); + +* Source +*** Includes + + Add + #include "bound.H" + - Remove + #include "backwardsCompatibilityWallFunctions.H" +*** Constructor + + Add arguments + const geometricOneField& alpha, + const geometricOneField& rho, + . + const surfaceScalarField& alphaRhoPhi, + + Replace + RASModel(modelName, U, phi, transport, turbulenceModelName), + with + eddyViscosity + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), + + Replace + autoCreate.*mesh_) -> mesh_ + NO_READ -> MUST_READ + - Remove + nut_ + ( + IOobject + ( + "nut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateNut("nut", mesh_) + ) + + Replace + nut_ = k_/omega_; + nut_.correctBoundaryConditions(); + + printCoeffs(); + + with + + if (type == typeName) + { + correctNut(); + printCoeffs(type); + } +*** Member functions + + Move read to top + + Add after read +void kOmega::correctNut() +{ + .... + nut_.correctBoundaryConditions(); +} + - Remove + //- Return the Reynolds stress tensor + virtual tmp R() const; + + //- Return the effective stress tensor including the laminar stress + virtual tmp devReff() const; + + //- Return the source term for the momentum equation + virtual tmp divDevReff(volVectorField& U) const; + + //- Return the source term for the momentum equation + virtual tmp divDevRhoReff + ( + const volScalarField& rho, + volVectorField& U + ) const; + +*** correct() + - Replace + // Re-calculate viscosity + nut_ = Cmu_*sqr(k_)/epsilon_; + nut_.correctBoundaryConditions(); + with + correctNut(); diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.C similarity index 68% rename from src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.C index 8394f986e..12a95d07f 100644 --- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.C @@ -24,10 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "kOmega.H" +#include "bound.H" #include "addToRunTimeSelectionTable.H" -#include "backwardsCompatibilityWallFunctions.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -42,18 +41,40 @@ namespace RASModels defineTypeNameAndDebug(kOmega, 0); addToRunTimeSelectionTable(RASModel, kOmega, dictionary); +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +void kOmega::correctNut() +{ + nut_ = k_/omega_; + nut_.correctBoundaryConditions(); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // kOmega::kOmega ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName, - const word& modelName + const word& propertiesName, + const word& type ) : - RASModel(modelName, U, phi, transport, turbulenceModelName), + eddyViscosity + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), Cmu_ ( @@ -105,121 +126,43 @@ kOmega::kOmega ( IOobject ( - "k", + IOobject::groupName("k", U.group()), runTime_.timeName(), mesh_, - IOobject::NO_READ, + IOobject::MUST_READ, IOobject::AUTO_WRITE ), - autoCreateK("k", mesh_) + mesh_ ), omega_ ( IOobject ( - "omega", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - autoCreateOmega("omega", mesh_) - ), - nut_ - ( - IOobject - ( - "nut", + IOobject::groupName("omega", U.group()), runTime_.timeName(), mesh_, - IOobject::NO_READ, + IOobject::MUST_READ, IOobject::AUTO_WRITE ), - autoCreateNut("nut", mesh_) + mesh_ ) { bound(k_, kMin_); bound(omega_, omegaMin_); - nut_ = k_/omega_; - nut_.correctBoundaryConditions(); - - printCoeffs(); + if (type == typeName) + { + correctNut(); + printCoeffs(type); + } } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp kOmega::R() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)), - k_.boundaryField().types() - ) - ); -} - - -tmp kOmega::devReff() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "devRhoReff", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - -nuEff()*dev(twoSymm(fvc::grad(U_))) - ) - ); -} - - -tmp kOmega::divDevReff(volVectorField& U) const -{ - return - ( - - fvm::laplacian(nuEff(), U) - - fvc::div(nuEff()*dev(T(fvc::grad(U)))) - ); -} - - -tmp kOmega::divDevRhoReff -( - const volScalarField& rho, - volVectorField& U -) const -{ - volScalarField muEff("muEff", rho*nuEff()); - - return - ( - - fvm::laplacian(muEff, U) - - fvc::div(muEff*dev(T(fvc::grad(U)))) - ); -} - - bool kOmega::read() { - if (RASModel::read()) + if (eddyViscosity::read()) { Cmu_.readIfPresent(coeffDict()); beta_.readIfPresent(coeffDict()); @@ -237,7 +180,7 @@ bool kOmega::read() void kOmega::correct() { - RASModel::correct(); + eddyViscosity::correct(); if (!turbulence_) { @@ -283,10 +226,7 @@ void kOmega::correct() solve(kEqn); bound(k_, kMin_); - - // Re-calculate viscosity - nut_ = k_/omega_; - nut_.correctBoundaryConditions(); + correctNut(); } diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.H similarity index 84% rename from src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.H index f2c091305..a0b6b732c 100644 --- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kOmega/kOmega.H @@ -62,7 +62,8 @@ SourceFiles #ifndef kOmega_H #define kOmega_H -#include "RASModel.H" +#include "turbulentTransportModel.H" +#include "eddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -79,7 +80,7 @@ namespace RASModels class kOmega : - public RASModel + public eddyViscosity { protected: @@ -99,7 +100,11 @@ protected: volScalarField k_; volScalarField omega_; - volScalarField nut_; + + + // Protected Member Functions + + virtual void correctNut(); public: @@ -107,16 +112,20 @@ public: //- Runtime type information TypeName("kOmega"); + // Constructors //- Construct from components kOmega ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName, - const word& modelName = typeName + const word& propertiesName = turbulenceModel::propertiesName, + const word& type = typeName ); @@ -127,11 +136,8 @@ public: // Member Functions - //- Return the turbulence viscosity - virtual tmp nut() const - { - return nut_; - } + //- Read RASProperties dictionary + virtual bool read(); //- Return the effective diffusivity for k tmp DkEff() const @@ -182,27 +188,8 @@ public: ); } - //- Return the Reynolds stress tensor - virtual tmp R() const; - - //- Return the effective stress tensor including the laminar stress - virtual tmp devReff() const; - - //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; - - //- Return the source term for the momentum equation - virtual tmp divDevRhoReff - ( - const volScalarField& rho, - volVectorField& U - ) const; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); - - //- Read RASProperties dictionary - virtual bool read(); }; diff --git a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C similarity index 87% rename from src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C index b7e8231ca..a32ce3b4a 100644 --- a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C @@ -24,10 +24,10 @@ License \*---------------------------------------------------------------------------*/ #include "kkLOmega.H" +#include "bound.H" +#include "wallDist.H" #include "addToRunTimeSelectionTable.H" -#include "backwardsCompatibilityWallFunctions.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -42,7 +42,7 @@ namespace RASModels defineTypeNameAndDebug(kkLOmega, 0); addToRunTimeSelectionTable(RASModel, kkLOmega, dictionary); -// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // +// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // tmp kkLOmega::fv(const volScalarField& Ret) const { @@ -200,18 +200,40 @@ tmp kkLOmega::gammaNAT } +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +void kkLOmega::correctNut() +{ + nut_ = kt_/omega_; + nut_.correctBoundaryConditions(); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // kkLOmega::kkLOmega ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName, - const word& modelName + const word& propertiesName, + const word& type ) : - RASModel(modelName, U, phi, transport, turbulenceModelName), + eddyViscosity + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), A0_ ( @@ -460,49 +482,37 @@ kkLOmega::kkLOmega ( IOobject ( - "kt", + IOobject::groupName("kt", U.group()), runTime_.timeName(), mesh_, - IOobject::NO_READ, + IOobject::MUST_READ, IOobject::AUTO_WRITE ), - autoCreateK("kt", mesh_) + mesh_ ), omega_ ( IOobject ( - "omega", + IOobject::groupName("omega", U.group()), runTime_.timeName(), mesh_, - IOobject::NO_READ, + IOobject::MUST_READ, IOobject::AUTO_WRITE ), - autoCreateOmega("omega", mesh_) + mesh_ ), kl_ ( IOobject ( - "kl", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - autoCreateK("kl", mesh_) - ), - nut_ - ( - IOobject - ( - "nut", + IOobject::groupName("kl", U.group()), runTime_.timeName(), mesh_, - IOobject::NO_READ, + IOobject::MUST_READ, IOobject::AUTO_WRITE ), - autoCreateNut("nut", mesh_) + mesh_ ), y_(wallDist::New(mesh_).y()) { @@ -510,85 +520,22 @@ kkLOmega::kkLOmega bound(kl_, kMin_); bound(omega_, omegaMin_); - nut_ = kt_/(omega_ + omegaMin_); - nut_.correctBoundaryConditions(); + if (type == typeName) + { + // This is only an approximate nut, so only good for initialization + // not restart + // correctNut(); - printCoeffs(); + printCoeffs(type); + } } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp kkLOmega::R() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - ((2.0/3.0)*I)*(kt_) - nut_*twoSymm(fvc::grad(U_)), - kt_.boundaryField().types() - ) - ); -} - - -tmp kkLOmega::devReff() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "devRhoReff", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - -nuEff()*dev(twoSymm(fvc::grad(U_))) - ) - ); -} - - -tmp kkLOmega::divDevReff(volVectorField& U) const -{ - return - ( - - fvm::laplacian(nuEff(), U) - - fvc::div(nuEff()*dev(T(fvc::grad(U)))) - ); -} - - -tmp kkLOmega::divDevRhoReff -( - const volScalarField& rho, - volVectorField& U -) const -{ - volScalarField muEff("muEff", rho*nuEff()); - - return - ( - - fvm::laplacian(muEff, U) - - fvc::div(muEff*dev(T(fvc::grad(U)))) - ); -} - - bool kkLOmega::read() { - if (RASModel::read()) + if (eddyViscosity::read()) { A0_.readIfPresent(coeffDict()); As_.readIfPresent(coeffDict()); @@ -630,7 +577,7 @@ bool kkLOmega::read() void kkLOmega::correct() { - RASModel::correct(); + eddyViscosity::correct(); if (!turbulence_) { @@ -641,7 +588,6 @@ void kkLOmega::correct() const volScalarField kT(kt_ + kl_); const volScalarField lambdaT(sqrt(kT)/(omega_ + omegaMin_)); - const volScalarField lambdaEff(min(Clambda_*y_, lambdaT)); const volScalarField fw @@ -650,9 +596,7 @@ void kkLOmega::correct() ); const volTensorField gradU(fvc::grad(U_)); - const volScalarField omega(sqrt(2.0)*mag(skew(gradU))); - const volScalarField S2(2.0*magSqr(symm(gradU))); const volScalarField ktS(fSS(omega)*fw*kt_); @@ -663,6 +607,7 @@ void kkLOmega::correct() *fINT() *Cmu(sqrt(S2))*sqrt(ktS)*lambdaEff ); + const volScalarField Pkt(nuts*S2); const volScalarField ktL(kt_ - ktS); @@ -674,7 +619,7 @@ void kkLOmega::correct() C11_*fTaul(lambdaEff, ktL)*omega*sqr(lambdaEff) * sqrt(ktL)*lambdaEff/nu() + C12_*BetaTS(ReOmega)*ReOmega*sqr(y_)*omega - , + , 0.5*(kl_ + ktL)/sqrt(S2) ) ); @@ -748,6 +693,7 @@ void kkLOmega::correct() omega_.boundaryField().updateCoeffs(); + // Turbulence specific dissipation rate equation tmp omegaEqn ( diff --git a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H similarity index 89% rename from src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H index 65a14ce35..0b45136b8 100644 --- a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H @@ -80,8 +80,8 @@ SourceFiles #ifndef kkLOmega_H #define kkLOmega_H -#include "RASModel.H" -#include "wallDist.H" +#include "turbulentTransportModel.H" +#include "eddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -98,7 +98,7 @@ namespace RASModels class kkLOmega : - public RASModel + public eddyViscosity { // Private memmber functions @@ -180,7 +180,6 @@ protected: volScalarField kt_; volScalarField omega_; volScalarField kl_; - volScalarField nut_; //- Wall distance // Note: different to wall distance in parent RASModel @@ -188,21 +187,30 @@ protected: const volScalarField& y_; + // Protected Member Functions + + virtual void correctNut(); + + public: //- Runtime type information TypeName("kkLOmega"); + // Constructors //- Construct from components kkLOmega ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName, - const word& modelName = typeName + const word& propertiesName = turbulenceModel::propertiesName, + const word& type = typeName ); @@ -213,11 +221,8 @@ public: // Member Functions - //- Return the turbulence viscosity - virtual tmp nut() const - { - return nut_; - } + //- Read RASProperties dictionary + virtual bool read(); //- Return the effective diffusivity for k tmp DkEff(const volScalarField& alphaT) const @@ -274,27 +279,8 @@ public: ); } - //- Return the Reynolds stress tensor - virtual tmp R() const; - - //- Return the effective stress tensor including the laminar stress - virtual tmp devReff() const; - - //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; - - //- Return the source term for the momentum equation - virtual tmp divDevRhoReff - ( - const volScalarField& rho, - volVectorField& U - ) const; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); - - //- Read RASProperties dictionary - virtual bool read(); }; diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C similarity index 73% rename from src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C index 5883278c6..20c71af7b 100644 --- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C @@ -23,10 +23,11 @@ License \*---------------------------------------------------------------------------*/ -#include "NonlinearKEShih.H" -#include "addToRunTimeSelectionTable.H" +#include "nonlinearKEShih.H" +#include "bound.H" #include "wallFvPatch.H" #include "nutkWallFunctionFvPatchScalarField.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -39,21 +40,61 @@ namespace RASModels // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -defineTypeNameAndDebug(NonlinearKEShih, 0); -addToRunTimeSelectionTable(RASModel, NonlinearKEShih, dictionary); +defineTypeNameAndDebug(nonlinearKEShih, 0); +addToRunTimeSelectionTable(RASModel, nonlinearKEShih, dictionary); + +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +void nonlinearKEShih::correctNut() +{ + nut_ = Cmu_*sqr(k_)/epsilon_; + #include "wallNonlinearViscosityI.H" +} + + +void nonlinearKEShih::correctNonlinearStress(const volTensorField& gradU) +{ + nonlinearStress_ = symm + ( + pow(k_, 3.0)/sqr(epsilon_) + *( + Ctau1_/fEta_ + *( + (gradU & gradU) + + (gradU & gradU)().T() + ) + + Ctau2_/fEta_*(gradU & T(gradU)) + + Ctau3_/fEta_*(T(gradU) & gradU) + ) + ); +} + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -NonlinearKEShih::NonlinearKEShih +nonlinearKEShih::nonlinearKEShih ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName, - const word& modelName + const word& propertiesName, + const word& type ) : - RASModel(modelName, U, phi, transport, turbulenceModelName), + nonlinearEddyViscosity + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), C1_ ( @@ -169,7 +210,7 @@ NonlinearKEShih::NonlinearKEShih ( IOobject ( - "k", + IOobject::groupName("k", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -182,7 +223,7 @@ NonlinearKEShih::NonlinearKEShih ( IOobject ( - "epsilon", + IOobject::groupName("epsilon", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -202,111 +243,25 @@ NonlinearKEShih::NonlinearKEShih *sqrt(2.0*magSqr(0.5*(fvc::grad(U) - T(fvc::grad(U))))) ), Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))), - fEta_(A2_ + pow(eta_, 3.0)), - - nut_("nut", Cmu_*sqr(k_)/epsilon_), - - nonlinearStress_ - ( - "nonlinearStress", - symm - ( - pow3(k_)/sqr(epsilon_) - *( - Ctau1_/fEta_ - *( - (fvc::grad(U) & fvc::grad(U)) - + (fvc::grad(U) & fvc::grad(U))().T() - ) - + Ctau2_/fEta_*(fvc::grad(U) & T(fvc::grad(U))) - + Ctau3_/fEta_*(T(fvc::grad(U)) & fvc::grad(U)) - ) - ) - ) + fEta_(A2_ + pow(eta_, 3.0)) { bound(k_, kMin_); // already bounded: bound(epsilon_, epsilonMin_); - #include "wallNonlinearViscosityI.H" - - printCoeffs(); + if (type == typeName) + { + correctNut(); + correctNonlinearStress(fvc::grad(U)); + printCoeffs(type); + } } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp NonlinearKEShih::R() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)) + nonlinearStress_, - k_.boundaryField().types() - ) - ); -} - - -tmp NonlinearKEShih::devReff() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "devRhoReff", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - -nuEff()*dev(twoSymm(fvc::grad(U_))) + nonlinearStress_ - ) - ); -} - - -tmp NonlinearKEShih::divDevReff(volVectorField& U) const +bool nonlinearKEShih::read() { - return - ( - fvc::div(nonlinearStress_) - - fvm::laplacian(nuEff(), U) - - fvc::div(nuEff()*dev(T(fvc::grad(U)))) - ); -} - - -tmp NonlinearKEShih::divDevRhoReff -( - const volScalarField& rho, - volVectorField& U -) const -{ - volScalarField muEff("muEff", rho*nuEff()); - - return - ( - fvc::div(rho*nonlinearStress_) - - fvm::laplacian(muEff, U) - - fvc::div(muEff*dev(T(fvc::grad(U)))) - ); -} - - -bool NonlinearKEShih::read() -{ - if (RASModel::read()) + if (nonlinearEddyViscosity::read()) { C1_.readIfPresent(coeffDict()); C2_.readIfPresent(coeffDict()); @@ -331,9 +286,9 @@ bool NonlinearKEShih::read() } -void NonlinearKEShih::correct() +void nonlinearKEShih::correct() { - RASModel::correct(); + nonlinearEddyViscosity::correct(); if (!turbulence_) { @@ -397,23 +352,8 @@ void NonlinearKEShih::correct() Cmu_ = 2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_)); fEta_ = A2_ + pow(eta_, 3.0); - nut_ = Cmu_*sqr(k_)/epsilon_; - - #include "wallNonlinearViscosityI.H" - - nonlinearStress_ = symm - ( - pow(k_, 3.0)/sqr(epsilon_) - *( - Ctau1_/fEta_ - *( - (gradU & gradU) - + (gradU & gradU)().T() - ) - + Ctau2_/fEta_*(gradU & T(gradU)) - + Ctau3_/fEta_*(T(gradU) & gradU) - ) - ); + correctNut(); + correctNonlinearStress(gradU); } diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.H similarity index 76% rename from src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.H index 10d51669b..9037328e6 100644 --- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::incompressible::RASModels::NonlinearKEShih + Foam::incompressible::RASModels::nonlinearKEShih Group grpIcoRASTurbulence @@ -32,14 +32,15 @@ Description incompressible flows SourceFiles - NonlinearKEShih.C + nonlinearKEShih.C \*---------------------------------------------------------------------------*/ -#ifndef NonlinearKEShih_H -#define NonlinearKEShih_H +#ifndef nonlinearKEShih_H +#define nonlinearKEShih_H -#include "RASModel.H" +#include "turbulentTransportModel.H" +#include "nonlinearEddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,12 +52,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class NonlinearKEShih Declaration + Class nonlinearKEShih Declaration \*---------------------------------------------------------------------------*/ -class NonlinearKEShih +class nonlinearKEShih : - public RASModel + public nonlinearEddyViscosity { protected: @@ -90,41 +91,44 @@ protected: volScalarField Cmu_; volScalarField fEta_; - volScalarField nut_; - volSymmTensorField nonlinearStress_; + // Protected Member Functions + + virtual void correctNut(); + virtual void correctNonlinearStress(const volTensorField& gradU); public: //- Runtime type information - TypeName("NonlinearKEShih"); + TypeName("nonlinearKEShih"); + // Constructors //- Construct from components - NonlinearKEShih + nonlinearKEShih ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName, - const word& modelName = typeName + const word& propertiesName = turbulenceModel::propertiesName, + const word& type = typeName ); //- Destructor - virtual ~NonlinearKEShih() + virtual ~nonlinearKEShih() {} // Member Functions - //- Return the turbulence viscosity - virtual tmp nut() const - { - return nut_; - } + //- Read RASProperties dictionary + virtual bool read(); //- Return the effective diffusivity for k tmp DkEff() const @@ -156,27 +160,8 @@ public: return epsilon_; } - //- Return the Reynolds stress tensor - virtual tmp R() const; - - //- Return the effective stress tensor including the laminar stress - virtual tmp devReff() const; - - //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; - - //- Return the source term for the momentum equation - virtual tmp divDevRhoReff - ( - const volScalarField& rho, - volVectorField& U - ) const; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); - - //- Read RASProperties dictionary - virtual bool read(); }; diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C similarity index 72% rename from src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C index c6b20e54f..7d62a6259 100644 --- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C @@ -24,10 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "qZeta.H" +#include "bound.H" #include "addToRunTimeSelectionTable.H" -#include "backwardsCompatibilityWallFunctions.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -68,18 +67,38 @@ tmp qZeta::f2() const } +void qZeta::correctNut() +{ + nut_ = Cmu_*fMu()*sqr(k_)/epsilon_; + nut_.correctBoundaryConditions(); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // qZeta::qZeta ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName, - const word& modelName + const word& propertiesName, + const word& type ) : - RASModel(modelName, U, phi, transport, turbulenceModelName), + eddyViscosity + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), Cmu_ ( @@ -127,14 +146,14 @@ qZeta::qZeta ) ), - qMin_("qMin", dimVelocity, SMALL), - zetaMin_("zetaMin", dimVelocity/dimTime, SMALL), + qMin_("qMin", sqrt(kMin_)), + zetaMin_("zetaMin", epsilonMin_/(2*qMin_)), k_ ( IOobject ( - "k", + IOobject::groupName("k", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -147,7 +166,7 @@ qZeta::qZeta ( IOobject ( - "epsilon", + IOobject::groupName("epsilon", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -160,13 +179,13 @@ qZeta::qZeta ( IOobject ( - "q", + IOobject::groupName("q", U.group()), runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::AUTO_WRITE ), - sqrt(k_), + sqrt(bound(k_, kMin_)), k_.boundaryField().types() ), @@ -174,113 +193,31 @@ qZeta::qZeta ( IOobject ( - "zeta", + IOobject::groupName("zeta", U.group()), runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::AUTO_WRITE ), - epsilon_/(2.0*bound(q_, qMin_)), + bound(epsilon_, epsilonMin_)/(2.0*q_), epsilon_.boundaryField().types() - ), - - nut_ - ( - IOobject - ( - "nut", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - autoCreateNut("nut", mesh_) ) { - bound(k_, kMin_); - bound(epsilon_, epsilonMin_); - // already bounded: bound(q_, qMin_); bound(zeta_, zetaMin_); - nut_ = Cmu_*fMu()*sqr(k_)/epsilon_; - nut_.correctBoundaryConditions(); - - printCoeffs(); + if (type == typeName) + { + correctNut(); + printCoeffs(type); + } } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp qZeta::R() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)), - k_.boundaryField().types() - ) - ); -} - - -tmp qZeta::devReff() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "devRhoReff", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - -nuEff()*dev(twoSymm(fvc::grad(U_))) - ) - ); -} - - -tmp qZeta::divDevReff(volVectorField& U) const -{ - return - ( - - fvm::laplacian(nuEff(), U) - - fvc::div(nuEff()*dev(T(fvc::grad(U)))) - ); -} - - -tmp qZeta::divDevRhoReff -( - const volScalarField& rho, - volVectorField& U -) const -{ - volScalarField muEff("muEff", rho*nuEff()); - - return - ( - - fvm::laplacian(muEff, U) - - fvc::div(muEff*dev(T(fvc::grad(U)))) - ); -} - - bool qZeta::read() { - if (RASModel::read()) + if (eddyViscosity::read()) { Cmu_.readIfPresent(coeffDict()); C1_.readIfPresent(coeffDict()); @@ -302,7 +239,7 @@ bool qZeta::read() void qZeta::correct() { - RASModel::correct(); + eddyViscosity::correct(); if (!turbulence_) { @@ -356,10 +293,7 @@ void qZeta::correct() epsilon_ = 2*q_*zeta_; epsilon_.correctBoundaryConditions(); - - // Re-calculate viscosity - nut_ = Cmu_*fMu()*sqr(k_)/epsilon_; - nut_.correctBoundaryConditions(); + correctNut(); } diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H similarity index 75% rename from src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H index dc9e1f6b5..9393e0237 100644 --- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H @@ -52,7 +52,8 @@ SourceFiles #ifndef qZeta_H #define qZeta_H -#include "RASModel.H" +#include "turbulentTransportModel.H" +#include "eddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,7 +70,7 @@ namespace RASModels class qZeta : - public RASModel + public eddyViscosity { protected: @@ -98,13 +99,12 @@ protected: volScalarField q_; volScalarField zeta_; - volScalarField nut_; - // Protected Member Functions tmp fMu() const; tmp f2() const; + virtual void correctNut(); public: @@ -117,11 +117,14 @@ public: //- Construct from components qZeta ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName, - const word& modelName = typeName + const word& propertiesName = turbulenceModel::propertiesName, + const word& type = typeName ); @@ -132,37 +135,31 @@ public: // Member Functions - // Access - - //- Return the lower allowable limit for q (default: SMALL) - const dimensionedScalar& qMin() const - { - return qMin_; - } - - //- Return the lower allowable limit for zeta (default: SMALL) - const dimensionedScalar& zetaMin() const - { - return zetaMin_; - } + //- Read RASProperties dictionary + virtual bool read(); - //- Allow qMin to be changed - dimensionedScalar& qMin() - { - return qMin_; - } + //- Return the lower allowable limit for q (default: SMALL) + const dimensionedScalar& qMin() const + { + return qMin_; + } - //- Allow zetaMin to be changed - dimensionedScalar& zetaMin() - { - return zetaMin_; - } + //- Return the lower allowable limit for zeta (default: SMALL) + const dimensionedScalar& zetaMin() const + { + return zetaMin_; + } + //- Allow qMin to be changed + dimensionedScalar& qMin() + { + return qMin_; + } - //- Return the turbulence viscosity - virtual tmp nut() const + //- Allow zetaMin to be changed + dimensionedScalar& zetaMin() { - return nut_; + return zetaMin_; } //- Return the effective diffusivity for q @@ -195,9 +192,6 @@ public: return epsilon_; } - //- Return the Reynolds stress tensor - virtual tmp R() const; - virtual const volScalarField& q() const { return q_; @@ -208,24 +202,8 @@ public: return zeta_; } - //- Return the effective stress tensor including the laminar stress - virtual tmp devReff() const; - - //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; - - //- Return the source term for the momentum equation - virtual tmp divDevRhoReff - ( - const volScalarField& rho, - volVectorField& U - ) const; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); - - //- Read RASProperties dictionary - virtual bool read(); }; diff --git a/src/turbulenceModels/incompressible/RAS/v2f/v2f.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.C similarity index 74% rename from src/turbulenceModels/incompressible/RAS/v2f/v2f.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.C index 8b5ad858d..5ad491497 100644 --- a/src/turbulenceModels/incompressible/RAS/v2f/v2f.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.C @@ -24,6 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "v2f.H" +#include "bound.H" #include "fixedValueFvPatchField.H" #include "zeroGradientFvPatchField.H" #include "addToRunTimeSelectionTable.H" @@ -44,37 +45,6 @@ addToRunTimeSelectionTable(RASModel, v2f, dictionary); // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -wordList v2f::RBoundaryTypes() const -{ - const volScalarField::GeometricBoundaryField& bf(k_.boundaryField()); - - wordList bTypes - ( - bf.size(), - zeroGradientFvPatchField::typeName - ); - - forAll(bf, patchI) - { - if (bf[patchI].fixesValue()) - { - bTypes[patchI] = fixedValueFvPatchField::typeName; - } - } - - return bTypes; -} - - -tmp v2f::davidsonCorrectNut -( - const tmp& value -) const -{ - return min(CmuKEps_*sqr(k_)/epsilon_, value); -} - - tmp v2f::Ts() const { return max(k_/epsilon_, 6.0*sqrt(nu()/epsilon_)); @@ -87,18 +57,38 @@ tmp v2f::Ls() const } +void v2f::correctNut() +{ + nut_ = min(CmuKEps_*sqr(k_)/epsilon_, Cmu_*v2_*Ts()); + nut_.correctBoundaryConditions(); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // v2f::v2f ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName, - const word& modelName + const word& propertiesName, + const word& type ) : - RASModel(modelName, U, phi, transport, turbulenceModelName), + eddyViscosity + ( + type, + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport, + propertiesName + ), Cmu_ ( @@ -186,7 +176,7 @@ v2f::v2f ( IOobject ( - "k", + IOobject::groupName("k", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -198,7 +188,7 @@ v2f::v2f ( IOobject ( - "epsilon", + IOobject::groupName("epsilon", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -210,7 +200,7 @@ v2f::v2f ( IOobject ( - "v2", + IOobject::groupName("v2", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -222,19 +212,7 @@ v2f::v2f ( IOobject ( - "f", - runTime_.timeName(), - mesh_, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh_ - ), - nut_ - ( - IOobject - ( - "nut", + IOobject::groupName("f", U.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -250,85 +228,19 @@ v2f::v2f bound(v2_, v2Min_); bound(f_, fMin_); - nut_ = davidsonCorrectNut(Cmu_*v2_*Ts()); - nut_.correctBoundaryConditions(); - - printCoeffs(); + if (type == typeName) + { + correctNut(); + printCoeffs(type); + } } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp v2f::R() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "R", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)), - RBoundaryTypes() - ) - ); -} - - -tmp v2f::devReff() const -{ - return tmp - ( - new volSymmTensorField - ( - IOobject - ( - "devRhoReff", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - -nuEff()*dev(twoSymm(fvc::grad(U_))) - ) - ); -} - - -tmp v2f::divDevReff(volVectorField& U) const -{ - return - ( - - fvm::laplacian(nuEff(), U) - - fvc::div(nuEff()*dev(T(fvc::grad(U)))) - ); -} - - -tmp v2f::divDevRhoReff -( - const volScalarField& rho, - volVectorField& U -) const -{ - volScalarField muEff("muEff", rho*nuEff()); - - return - ( - - fvm::laplacian(muEff, U) - - fvc::div(muEff*dev(T(fvc::grad(U)))) - ); -} - - bool v2f::read() { - if (RASModel::read()) + if (eddyViscosity::read()) { Cmu_.readIfPresent(coeffDict()); CmuKEps_.readIfPresent(coeffDict()); @@ -351,7 +263,7 @@ bool v2f::read() void v2f::correct() { - RASModel::correct(); + eddyViscosity::correct(); if (!turbulence_) { @@ -373,7 +285,6 @@ void v2f::correct() 1.0/T*((C1_ - N)*v2_ - 2.0/3.0*k_*(C1_ - 1.0)) ); - tmp Ceps1 = 1.4*(1.0 + 0.05*min(sqrt(k_/v2_), scalar(100.0))); @@ -444,10 +355,7 @@ void v2f::correct() solve(v2Eqn); bound(v2_, v2Min_); - - // Re-calculate viscosity - nut_ = davidsonCorrectNut(Cmu_*v2_*T); - nut_.correctBoundaryConditions(); + correctNut(); } diff --git a/src/turbulenceModels/incompressible/RAS/v2f/v2f.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.H similarity index 77% rename from src/turbulenceModels/incompressible/RAS/v2f/v2f.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.H index 04b0fcde0..4d1fdc33f 100644 --- a/src/turbulenceModels/incompressible/RAS/v2f/v2f.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/v2f/v2f.H @@ -31,9 +31,11 @@ Description Lien and Kalitzin's v2-f turbulence model for incompressible flows, with a limit imposed on the turbulent viscosity given by Davidson et al. - The model solves for turbulence k and epsilon, with additional equations - for the turbulence stress normal to streamlines, v2, and elliptic damping - function, f. The variant implemented employs N=6, such that f=0 on walls. + The model solves for turbulence kinetic energy k and turbulence dissipation + rate epsilon, with additional equations for the turbulence stress normal to + streamlines, v2, and elliptic damping function, f. + + The variant implemented employs N=6, such that f=0 on walls. Wall boundary conditions are: @@ -49,15 +51,17 @@ Description v2 = 2/3 k f = zero-gradient - References: - - Lien F-S, Kalitzin G, 2001. Computations of transonic flow with the v2-f - turbulence model. Int. J. Heat Fluid Flow 22, pp 53-61 - - Davidson L, Nielsen P, Sveningsson A, 2003. Modifications of the v2-f - model for computing the flow in a 3D wall jet. Turbulence, Heat and Mass - Transfer 4, pp 577-584 + \verbatim + Lien F-S, Kalitzin G, + "Computations of transonic flow with the v2-f turbulence model", + Int. J. Heat Fluid Flow 22, 2001, pp 53-61 + + Davidson L, Nielsen P, Sveningsson A, + "Modifications of the v2-f model for computing the flow in a + 3D wall jet", + Turbulence, Heat and Mass Transfer 4, 2003, pp 577-584 + \endverbatim The default model coefficients are given as: \verbatim @@ -81,7 +85,7 @@ Note k variants (nutk...) for this case will not behave correctly. SeeAlso - Foam::kEpsilon + Foam::incompressible::RASModels::kEpsilon Foam::kLowReWallFunctionFvPatchScalarField Foam::epsilonLowReWallFunctionFvPatchScalarField Foam::v2WallFunctionFvPatchScalarField @@ -95,7 +99,8 @@ SourceFiles #ifndef v2f_H #define v2f_H -#include "RASModel.H" +#include "turbulentTransportModel.H" +#include "eddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -112,7 +117,7 @@ namespace RASModels class v2f : - public RASModel + public eddyViscosity { protected: @@ -146,9 +151,6 @@ protected: //- Damping function volScalarField f_; - //- Turbulence viscosity - volScalarField nut_; - // Bounding values @@ -158,14 +160,7 @@ protected: // Protected Member Functions - //- Return boundary type names for the R field - wordList RBoundaryTypes() const; - - //- Apply Davidson correction to nut - tmp davidsonCorrectNut - ( - const tmp& value - ) const; + virtual void correctNut(); //- Return time scale, Ts tmp Ts() const; @@ -184,11 +179,14 @@ public: //- Construct from components v2f ( + const geometricOneField& alpha, + const geometricOneField& rho, const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName, - const word& modelName = typeName + const word& propertiesName = turbulenceModel::propertiesName, + const word& type = typeName ); @@ -199,11 +197,8 @@ public: // Member Functions - //- Return the turbulence viscosity - virtual tmp nut() const - { - return nut_; - } + //- Read RASProperties dictionary + virtual bool read(); //- Return the effective diffusivity for k tmp DkEff() const @@ -247,27 +242,8 @@ public: return f_; } - //- Return the Reynolds stress tensor - virtual tmp R() const; - - //- Return the effective stress tensor including the laminar stress - virtual tmp devReff() const; - - //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; - - //- Return the source term for the momentum equation - virtual tmp divDevRhoReff - ( - const volScalarField& rho, - volVectorField& U - ) const; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); - - //- Read RASProperties dictionary - virtual bool read(); }; diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C similarity index 93% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C index f311165eb..46051f0a6 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "alphatJayatillekeWallFunctionFvPatchScalarField.H" -#include "incompressible/turbulenceModel/turbulenceModel.H" +#include "turbulenceModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "wallFvPatch.H" @@ -202,14 +202,22 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() const label patchi = patch().index(); // Retrieve turbulence properties from model - const turbulenceModel& turbModel = - db().lookupObject("turbulenceModel"); + + const turbulenceModel& turbulence = db().lookupObject + ( + IOobject::groupName + ( + turbulenceModel::propertiesName, + dimensionedInternalField().group() + ) + ); + const scalar Cmu25 = pow(Cmu_, 0.25); - const scalarField& y = turbModel.y()[patchi]; - const tmp tnu = turbModel.nu(); + const scalarField& y = turbulence.y()[patchi]; + const tmp tnu = turbulence.nu(); const volScalarField& nu = tnu(); const scalarField& nuw = nu.boundaryField()[patchi]; - const tmp tk = turbModel.k(); + const tmp tk = turbulence.k(); const volScalarField& k = tk(); const IOdictionary& transportProperties = diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H similarity index 98% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H index f4064c4ef..b4a9005ff 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H similarity index 58% rename from src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H rename to src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H index 946f45d07..72818e7f3 100644 --- a/src/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,27 +21,52 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -\*---------------------------------------------------------------------------*/ +Typedef + Foam::incompressible::turbulenceModel -#ifndef porousBafflePressureFvPatchFieldsFwd_H -#define porousBafflePressureFvPatchFieldsFwd_H +Typedef + Foam::incompressible::RASModel -#include "fieldTypes.H" +Typedef + Foam::incompressible::LESModel -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +Description + Typedefs for turbulence, RAS and LES models for incompressible flow + based on the standard laminar transport package. -namespace Foam -{ +SourceFiles + turbulentTransportModels.C -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +\*---------------------------------------------------------------------------*/ -template class porousBafflePressureFvPatchField; +#ifndef turbulentTransportModel_H +#define turbulentTransportModel_H -makePatchTypeFieldTypedefs(porousBafflePressure); +#include "SpecificIncompressibleTurbulenceModel.H" +#include "RASModel.H" +#include "LESModel.H" +#include "incompressible/transportModel/transportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace Foam +namespace Foam +{ + namespace incompressible + { + typedef IncompressibleTurbulenceModel turbulenceModel; + + typedef SpecificIncompressibleTurbulenceModel + < + RASModel + > RASModel; + + typedef SpecificIncompressibleTurbulenceModel + < + LESModel + > LESModel; + } +} + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModels.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C similarity index 82% rename from src/TurbulenceModels/incompressible/incompressibleTurbulenceModels.C rename to src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C index 361c6f4b7..c97c42fdb 100644 --- a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModels.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "IncompressibleTurbulenceModel.H" -#include "transportModel.H" +#include "incompressible/transportModel/transportModel.H" #include "addToRunTimeSelectionTable.H" #include "makeTurbulenceModel.H" @@ -49,9 +49,15 @@ makeBaseTurbulenceModel makeTemplatedTurbulenceModel \ (transportModelIncompressibleTurbulenceModel, LES, Type) +#include "SpalartAllmaras.H" +makeRASModel(SpalartAllmaras); + #include "kEpsilon.H" makeRASModel(kEpsilon); +#include "LaunderSharmaKE.H" +makeRASModel(LaunderSharmaKE); + #include "kOmegaSST.H" makeRASModel(kOmegaSST); @@ -61,5 +67,14 @@ makeLESModel(Smagorinsky); #include "kEqn.H" makeLESModel(kEqn); +#include "SpalartAllmarasDES.H" +makeLESModel(SpalartAllmarasDES); + +#include "SpalartAllmarasDDES.H" +makeLESModel(SpalartAllmarasDDES); + +#include "SpalartAllmarasIDDES.H" +makeLESModel(SpalartAllmarasIDDES); + // ************************************************************************* // diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C index 35af8e742..a09689d06 100644 --- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,6 +31,7 @@ template Foam::PhaseCompressibleTurbulenceModel:: PhaseCompressibleTurbulenceModel ( + const word& type, const volScalarField& alpha, const volScalarField& rho, const volVectorField& U, diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H index d39949c9d..7ebabf307 100644 --- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H +++ b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,6 +72,7 @@ public: //- Construct PhaseCompressibleTurbulenceModel ( + const word& type, const alphaField& alpha, const volScalarField& rho, const volVectorField& U, diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C index 163318083..25539ac16 100644 --- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,6 +31,7 @@ template Foam::PhaseIncompressibleTurbulenceModel:: PhaseIncompressibleTurbulenceModel ( + const word& type, const volScalarField& alpha, const geometricOneField& rho, const volVectorField& U, diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H index 836deaaa4..fb4ee56c3 100644 --- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H +++ b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,6 +72,7 @@ public: //- Construct PhaseIncompressibleTurbulenceModel ( + const word& type, const alphaField& alpha, const geometricOneField& rho, const volVectorField& U, diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C index 11ab976a8..c3586574b 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,6 +54,7 @@ Foam::LESModel::LESModel : BasicTurbulenceModel ( + type, alpha, rho, U, @@ -84,7 +85,7 @@ Foam::LESModel::LESModel LESdelta::New ( IOobject::groupName("delta", U.group()), - U.mesh(), + *this, LESDict_ ) ) diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C similarity index 60% rename from src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C rename to src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C index e7c459b88..301638dd5 100644 --- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C @@ -30,20 +30,24 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam +{ +namespace LESModels { defineTypeNameAndDebug(IDDESDelta, 0); addToRunTimeSelectionTable(LESdelta, IDDESDelta, dictionary); } +} // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::IDDESDelta::calcDelta() +void Foam::LESModels::IDDESDelta::calcDelta() { - const volScalarField& hmax = hmax_(); + const volScalarField& hmax = hmax_; + const fvMesh& mesh = turbulenceModel_.mesh(); - // Wall-reflection vectors - const volVectorField& n = wallDist::New(mesh()).n(); + // Wall-normal vectors + const volVectorField& n = wallDist::New(mesh).n(); tmp tfaceToFacenMax ( @@ -52,46 +56,50 @@ void Foam::IDDESDelta::calcDelta() IOobject ( "faceToFaceMax", - mesh().time().timeName(), - mesh(), + mesh.time().timeName(), + mesh, IOobject::NO_READ, IOobject::NO_WRITE ), - mesh(), - dimensionedScalar("zrero", dimLength, 0.0) + mesh, + dimensionedScalar("zero", dimLength, 0.0) ) ); scalarField& faceToFacenMax = tfaceToFacenMax().internalField(); - const cellList& cells = mesh().cells(); - const vectorField& faceCentres = mesh().faceCentres(); + const cellList& cells = mesh.cells(); + const vectorField& faceCentres = mesh.faceCentres(); - forAll(cells, cellI) + forAll(cells, celli) { - scalar deltaMaxTmp = 0.0; - const labelList& cFaces = cells[cellI]; - const vector nCell = n[cellI]; - forAll(cFaces, cFaceI) + scalar maxDelta = 0.0; + const labelList& cFaces = cells[celli]; + const vector nci = n[celli]; + + forAll(cFaces, cFacei) { - label faceI = cFaces[cFaceI]; - const point& faceCentreI = faceCentres[faceI]; - forAll(cFaces, cFaceJ) + label facei = cFaces[cFacei]; + const point& fci = faceCentres[facei]; + + forAll(cFaces, cFacej) { - label faceJ = cFaces[cFaceJ]; - const point& faceCentreJ = faceCentres[faceJ]; - scalar tmp = (faceCentreJ - faceCentreI) & nCell; - if (tmp > deltaMaxTmp) + label facej = cFaces[cFacej]; + const point& fcj = faceCentres[facej]; + scalar ndfc = nci & (fcj - fci); + + if (ndfc > maxDelta) { - deltaMaxTmp = tmp; + maxDelta = ndfc; } } } - faceToFacenMax[cellI] = deltaMaxTmp; + + faceToFacenMax[celli] = maxDelta; } - label nD = mesh().nGeometricD(); + label nD = mesh.nGeometricD(); if (nD == 2) { @@ -106,15 +114,14 @@ void Foam::IDDESDelta::calcDelta() } delta_.internalField() = - deltaCoeff_ - *min + min ( max ( max ( - cw_*wallDist::New(mesh()).y(), - cw_*hmax + Cw_*wallDist::New(mesh).y(), + Cw_*hmax ), tfaceToFacenMax ), @@ -125,38 +132,47 @@ void Foam::IDDESDelta::calcDelta() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::IDDESDelta::IDDESDelta +Foam::LESModels::IDDESDelta::IDDESDelta ( const word& name, - const fvMesh& mesh, - const dictionary& dd + const turbulenceModel& turbulence, + const dictionary& dict ) : - LESdelta(name, mesh), - hmax_(LESdelta::New("hmax", mesh, dd.parent())), - deltaCoeff_(readScalar(dd.subDict(type()+"Coeffs").lookup("deltaCoeff"))), - cw_(0.15) + LESdelta(name, turbulence), + hmax_ + ( + IOobject::groupName("hmax", turbulence.U().group()), + turbulence, + dict + ), + Cw_ + ( + dict.subDict(type() + "Coeffs").lookupOrDefault("Cw", 0.15) + ) { - dd.subDict(type() + "Coeffs").readIfPresent("cw", cw_); calcDelta(); } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::IDDESDelta::read(const dictionary& dd) +void Foam::LESModels::IDDESDelta::read(const dictionary& dict) { - dd.subDict(type() + "Coeffs").lookup("deltaCoeff") >> deltaCoeff_; + const dictionary& coeffsDict(dict.subDict(type() + "Coeffs")); + + coeffsDict.readIfPresent("Cw", Cw_); + calcDelta(); } -void Foam::IDDESDelta::correct() +void Foam::LESModels::IDDESDelta::correct() { - if (mesh_.changing()) + if (turbulenceModel_.mesh().changing()) { + hmax_.correct(); calcDelta(); - hmax_().correct(); } } diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H similarity index 88% rename from src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H rename to src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H index 0274a192f..4f1bf55b1 100644 --- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,12 +37,14 @@ SourceFiles #ifndef IDDESDeltaDelta_H #define IDDESDeltaDelta_H -#include "incompressibleLESdelta.H" +#include "maxDeltaxyz.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { +namespace LESModels +{ /*---------------------------------------------------------------------------*\ Class IDDESDelta Declaration @@ -54,9 +56,9 @@ class IDDESDelta { // Private data - autoPtr hmax_; - scalar deltaCoeff_; - scalar cw_; + maxDeltaxyz hmax_; + + scalar Cw_; // Private Member Functions @@ -81,7 +83,7 @@ public: IDDESDelta ( const word& name, - const fvMesh& mesh, + const turbulenceModel& turbulence, const dictionary& ); @@ -97,6 +99,12 @@ public: //- Read the LESdelta dictionary void read(const dictionary&); + //- Return the hmax delta field + const volScalarField& hmax() const + { + return hmax_; + } + // Correct values void correct(); }; @@ -104,6 +112,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace LESModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C index 5a8ff1c3f..a685bd5e5 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,20 +36,24 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::LESdelta::LESdelta(const word& name, const fvMesh& mesh) +Foam::LESdelta::LESdelta +( + const word& name, + const turbulenceModel& turbulence +) : - mesh_(mesh), + turbulenceModel_(turbulence), delta_ ( IOobject ( name, - mesh.time().timeName(), - mesh, + turbulence.mesh().time().timeName(), + turbulence.mesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - mesh, + turbulence.mesh(), dimensionedScalar(name, dimLength, SMALL), calculatedFvPatchScalarField::typeName ) @@ -61,7 +65,7 @@ Foam::LESdelta::LESdelta(const word& name, const fvMesh& mesh) Foam::autoPtr Foam::LESdelta::New ( const word& name, - const fvMesh& mesh, + const turbulenceModel& turbulence, const dictionary& dict ) { @@ -76,7 +80,7 @@ Foam::autoPtr Foam::LESdelta::New { FatalErrorIn ( - "LESdelta::New(const fvMesh&, const dictionary&)" + "LESdelta::New(const word& name, const turbulenceModel& turbulence)" ) << "Unknown LESdelta type " << deltaType << nl << nl << "Valid LESdelta types are :" << endl @@ -84,14 +88,14 @@ Foam::autoPtr Foam::LESdelta::New << exit(FatalError); } - return autoPtr(cstrIter()(name, mesh, dict)); + return autoPtr(cstrIter()(name, turbulence, dict)); } Foam::autoPtr Foam::LESdelta::New ( const word& name, - const fvMesh& mesh, + const turbulenceModel& turbulence, const dictionary& dict, const dictionaryConstructorTable& additionalConstructors ) @@ -106,7 +110,7 @@ Foam::autoPtr Foam::LESdelta::New if (cstrIter != additionalConstructors.end()) { - return autoPtr(cstrIter()(name, mesh, dict)); + return autoPtr(cstrIter()(name, turbulence, dict)); } else { @@ -117,7 +121,9 @@ Foam::autoPtr Foam::LESdelta::New { FatalErrorIn ( - "LESdelta::New(const fvMesh&, const dictionary&)" + "LESdelta::New(const word& name, " + "const turbulenceModel& turbulence, " + "const dictionaryConstructorTable&)" ) << "Unknown LESdelta type " << deltaType << nl << nl << "Valid LESdelta types are :" << endl @@ -129,7 +135,7 @@ Foam::autoPtr Foam::LESdelta::New } else { - return autoPtr(cstrIter()(name, mesh, dict)); + return autoPtr(cstrIter()(name, turbulence, dict)); } } } diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H index c84ae74c3..35aea4620 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,9 +35,8 @@ SourceFiles #ifndef LESdelta_H #define LESdelta_H +#include "turbulenceModel.H" #include "volFields.H" -#include "typeInfo.H" -#include "autoPtr.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,8 +44,6 @@ SourceFiles namespace Foam { -class fvMesh; - /*---------------------------------------------------------------------------*\ Class LESdelta Declaration \*---------------------------------------------------------------------------*/ @@ -58,7 +55,7 @@ protected: // Protected data - const fvMesh& mesh_; + const turbulenceModel& turbulenceModel_; volScalarField delta_; @@ -87,17 +84,21 @@ public: dictionary, ( const word& name, - const fvMesh& mesh, - const dictionary& LESdeltaDict + const turbulenceModel& turbulence, + const dictionary& dict ), - (name, mesh, LESdeltaDict) + (name, turbulence, dict) ); // Constructors - //- Construct from name and mesh - LESdelta(const word& name, const fvMesh&); + //- Construct from name, turbulenceModel and dictionary + LESdelta + ( + const word& name, + const turbulenceModel& turbulence + ); // Selectors @@ -106,16 +107,16 @@ public: static autoPtr New ( const word& name, - const fvMesh&, - const dictionary& + const turbulenceModel& turbulence, + const dictionary& dict ); //- Return a reference to the selected LES delta static autoPtr New ( const word& name, - const fvMesh&, - const dictionary&, + const turbulenceModel& turbulence, + const dictionary& dict, const dictionaryConstructorTable& ); @@ -127,10 +128,10 @@ public: // Member Functions - //- Return mesh reference - const fvMesh& mesh() const + //- Return turbulenceModel reference + const turbulenceModel& turbulence() const { - return mesh_; + return turbulenceModel_; } //- Read the LESdelta dictionary diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C index 9d90e7c69..d2b9f762b 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C @@ -30,35 +30,46 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam +{ +namespace LESModels { defineTypeNameAndDebug(PrandtlDelta, 0); addToRunTimeSelectionTable(LESdelta, PrandtlDelta, dictionary); } +} // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::PrandtlDelta::calcDelta() +void Foam::LESModels::PrandtlDelta::calcDelta() { delta_ = min ( static_cast(geometricDelta_()), - (kappa_/Cdelta_)*wallDist::New(mesh_).y() + (kappa_/Cdelta_)*wallDist::New(turbulenceModel_.mesh()).y() ); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::PrandtlDelta::PrandtlDelta +Foam::LESModels::PrandtlDelta::PrandtlDelta ( const word& name, - const fvMesh& mesh, + const turbulenceModel& turbulence, const dictionary& dict ) : - LESdelta(name, mesh), - geometricDelta_(LESdelta::New(name, mesh, dict.subDict(type() + "Coeffs"))), + LESdelta(name, turbulence), + geometricDelta_ + ( + LESdelta::New + ( + name, + turbulence, + dict.subDict(type() + "Coeffs") + ) + ), kappa_(dict.lookupOrDefault("kappa", 0.41)), Cdelta_ ( @@ -71,7 +82,7 @@ Foam::PrandtlDelta::PrandtlDelta // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::PrandtlDelta::read(const dictionary& dict) +void Foam::LESModels::PrandtlDelta::read(const dictionary& dict) { const dictionary& coeffDict(dict.subDict(type() + "Coeffs")); @@ -82,11 +93,11 @@ void Foam::PrandtlDelta::read(const dictionary& dict) } -void Foam::PrandtlDelta::correct() +void Foam::LESModels::PrandtlDelta::correct() { geometricDelta_().correct(); - if (mesh_.changing()) + if (turbulenceModel_.mesh().changing()) { calcDelta(); } diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H index d8840ff1a..3cb8b7742 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,6 +41,8 @@ SourceFiles namespace Foam { +namespace LESModels +{ /*---------------------------------------------------------------------------*\ Class PrandtlDelta Declaration @@ -75,11 +77,11 @@ public: // Constructors - //- Construct from name, mesh and IOdictionary + //- Construct from name, turbulenceModel and dictionary PrandtlDelta ( const word& name, - const fvMesh& mesh, + const turbulenceModel& turbulence, const dictionary& ); @@ -101,6 +103,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace LESModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C index cdacbc669..4767c400c 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,21 +29,26 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam +{ +namespace LESModels { defineTypeNameAndDebug(cubeRootVolDelta, 0); addToRunTimeSelectionTable(LESdelta, cubeRootVolDelta, dictionary); } +} // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::cubeRootVolDelta::calcDelta() +void Foam::LESModels::cubeRootVolDelta::calcDelta() { - label nD = mesh().nGeometricD(); + const fvMesh& mesh = turbulenceModel_.mesh(); + + label nD = mesh.nGeometricD(); if (nD == 3) { - delta_.internalField() = deltaCoeff_*pow(mesh().V(), 1.0/3.0); + delta_.internalField() = deltaCoeff_*pow(mesh.V(), 1.0/3.0); } else if (nD == 2) { @@ -51,19 +56,19 @@ void Foam::cubeRootVolDelta::calcDelta() << "Case is 2D, LES is not strictly applicable\n" << endl; - const Vector