diff --git a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H index d481d45b95..b92d9a8c73 100644 --- a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H +++ b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H @@ -143,7 +143,7 @@ class DEShybrid //- Maximum bound for sigma (0 <= sigmaMax <= 1) scalar sigmaMax_; - //- constants of scheme + //- Scheme constants scalar CH1_; scalar CH2_; scalar CH3_; @@ -174,11 +174,11 @@ class DEShybrid const volScalarField B ( CH3_*Omega*max(S, Omega) - /max(0.5*(sqr(S)+sqr(Omega)), sqr(1.0e-3/tau0_)) + /max(0.5*(sqr(S) + sqr(Omega)), sqr(1.0e-3/tau0_)) ); const volScalarField K ( - max(Foam::sqrt(0.5*(sqr(S)+sqr(Omega))), 0.1/tau0_) + max(Foam::sqrt(0.5*(sqr(S) + sqr(Omega))), 0.1/tau0_) ); const volScalarField lTurb(Foam::sqrt(nuEff/(pow(0.09, 1.5)*K))); @@ -188,11 +188,11 @@ class DEShybrid CH2_*max(scalar(0), CDES_*delta/max(lTurb*g, 1.0e-15*L0_) - 0.5) ); - const volScalarField IOhybrid + const volScalarField factor ( IOobject ( - "DEShybridFactor", + typeName + ":Factor", this->mesh().time().timeName(), this->mesh(), IOobject::NO_READ, @@ -200,17 +200,18 @@ class DEShybrid ), max(sigmaMax_*tanh(pow(A, CH1_)), sigmaMin_) ); - if (this->mesh().time().outputTime()) - { - IOhybrid.write(); - } + + // if (this->mesh().time().outputTime()) + // { + // factor.write(); + // } return tmp ( new surfaceScalarField ( vf.name() + "BlendingFactor", - fvc::interpolate(IOhybrid) + fvc::interpolate(factor) ) ); } diff --git a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C index 2ef1428d79..81ac361b0c 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C @@ -82,7 +82,7 @@ tmp SpalartAllmarasDDES::dTilda const volTensorField& gradU ) const { - const volScalarField lRAS(this->y_); + const volScalarField& lRAS(this->y_); const volScalarField lLES(this->psi(chi, fv1)*this->CDES_*this->delta()); return max diff --git a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C index ea6e934268..7ce8a1fae1 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C @@ -93,7 +93,7 @@ tmp SpalartAllmarasIDDES::rd magGradU, dimensionedScalar("SMALL", magGradU.dimensions(), SMALL) ) - *sqr(this->kappa_*this->y_) + *sqr(this->kappa_*this->y_) ), scalar(10) ) @@ -127,7 +127,7 @@ tmp SpalartAllmarasIDDES::dTilda const volScalarField magGradU(mag(gradU)); const volScalarField psi(this->psi(chi, fv1)); - const volScalarField lRAS(this->y_); + const volScalarField& lRAS(this->y_); const volScalarField lLES(psi*this->CDES_*this->delta()); const volScalarField alpha(this->alpha()); @@ -142,20 +142,16 @@ tmp SpalartAllmarasIDDES::dTilda const volScalarField fdTilda(max(1 - fdt(magGradU), fB)); // Simplified formulation from Gritskevich et al. paper (2011) where fe = 0 - /* - return max - ( - fdTilda*lRAS - + (1 - fdTilda)*lLES, - dimensionedScalar("SMALL", dimLength, SMALL) - ); - */ + // return max + // ( + // fdTilda*lRAS + (1 - fdTilda)*lLES, + // dimensionedScalar("SMALL", dimLength, SMALL) + // ); // Original formulation from Shur et al. paper (2008) return max ( - fdTilda*(1 + fe)*lRAS - + (1 - fdTilda)*lLES, + fdTilda*(1 + fe)*lRAS + (1 - fdTilda)*lLES, dimensionedScalar("SMALL", dimLength, SMALL) ); } diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C index df888a7ebe..a3e3bc8104 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C @@ -141,20 +141,16 @@ tmp kOmegaSSTIDDES::dTilda const volScalarField fdTilda(max(1 - fdt(magGradU), fB)); // Simplified formulation from Gritskevich et al. paper (2011) where fe = 0 - /* - return max - ( - fdTilda*lRAS - + (1 - fdTilda)*lLES, - dimensionedScalar("SMALL", dimLength, SMALL) - ); - */ + // return max + // ( + // fdTilda*lRAS + (1 - fdTilda)*lLES, + // dimensionedScalar("SMALL", dimLength, SMALL) + // ); // Original formulation from Shur et al. paper (2008) return max ( - fdTilda*(1 + fe)*lRAS - + (1 - fdTilda)*lLES, + fdTilda*(1 + fe)*lRAS + (1 - fdTilda)*lLES, dimensionedScalar("SMALL", dimLength, SMALL) ); }