diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H index 4c512487a3fee7c5015f41307990af99dc4af588..b64ed0d593f1270c314ad1cd38a6e7718cd7b5d4 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H @@ -184,7 +184,7 @@ public: // Member Functions - //- Read LESProperties dictionary + //- Read model coefficients if they have changed virtual bool read(); //- Return the effective diffusivity for nuTilda diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H index 2bfaf6089a18c4418f51e9c5a69f0471b8226d09..e2f64aa6bbc13ebfd8a7c24acbe6994495f38921 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H @@ -146,7 +146,7 @@ public: // Member Functions - //- Read LESProperties dictionary + //- Read model coefficients if they have changed virtual bool read(); }; diff --git a/src/combustionModels/FSD/FSD.C b/src/combustionModels/FSD/FSD.C index 9d79904cd40e578b30c2ee4982ff1e95886355a7..6d846b3d95e07d811ed4d1e539bc6a44f8749e94 100644 --- a/src/combustionModels/FSD/FSD.C +++ b/src/combustionModels/FSD/FSD.C @@ -189,7 +189,10 @@ void FSD<CombThermoType, ThermoType>::calculateSourceNorm() // Calculation of the mixture fraction variance (ftVar) const compressible::LESModel& lesModel = - YO2.db().lookupObject<compressible::LESModel>("LESProperties"); + YO2.db().lookupObject<compressible::LESModel> + ( + turbulenceModel::propertiesName + ); const volScalarField& delta = lesModel.delta(); const volScalarField ftVar(Cv_*sqr(delta)*sqr(mgft)); diff --git a/src/combustionModels/FSD/FSD.H b/src/combustionModels/FSD/FSD.H index 6e3609abdb9f9c6541d024022c4e26fe5d01c869..10be2acdfa0fb763ba7eecb906ae2a43649d654a 100644 --- a/src/combustionModels/FSD/FSD.H +++ b/src/combustionModels/FSD/FSD.H @@ -52,7 +52,7 @@ Description is large (>1e-04) then a beta pdf is used for filtering. At the moment the flame area combustion model is only fit to work in a LES - frame work. In RAS the subgrid fluctiuation has to be solved by an extra + frame work. In RAS the subgrid fluctuation has to be solved by an extra transport equation. SourceFiles diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C index 9352dd83961d30200f03284794755ea513c570b0..f26b698b6fec6614f95ea27a700a1dca1ce252fe 100644 --- a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C +++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.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 @@ -75,7 +75,6 @@ void Foam::reactionRateFlameAreaModels::relaxation::correct const volScalarField& sigma ) { - dimensionedScalar omega0 ( "omega0", @@ -97,13 +96,19 @@ void Foam::reactionRateFlameAreaModels::relaxation::correct 1e-4 ); - const compressible::LESModel& lesModel = - omega_.db().lookupObject<compressible::LESModel>("LESProperties"); + dimensionedScalar kMin + ( + "kMin", + sqr(dimVelocity), + SMALL + ); + + const compressibleTurbulenceModel& turbulence = combModel_.turbulence(); - // Total strain : resolved and sub-grid (just LES for now) + // Total strain const volScalarField sigmaTotal ( - sigma + alpha_*lesModel.epsilon()/(lesModel.k() + lesModel.kMin()) + sigma + alpha_*turbulence.epsilon()/(turbulence.k() + kMin) ); const volScalarField omegaInf(correlation_.omega0Sigma(sigmaTotal));