diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C index 918331d8ec1f716baca535515af75771f7d745a6..97ecb28ec423f03c9f3345b7d918484c997fb3fa 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 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ CompressibleTurbulenceModel const geometricOneField& alpha, const volScalarField& rho, const volVectorField& U, - const surfaceScalarField& alphaPhi, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, const word& propertiesName @@ -51,7 +51,7 @@ CompressibleTurbulenceModel alpha, rho, U, - alphaPhi, + alphaRhoPhi, phi, transport, propertiesName diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H index ba118c0b02c71bc2cf74ee6ac912d92755a0e0ac..38ba5f90fdc04aff5b6948f8485d5057353f282d 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 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,7 +75,7 @@ public: const geometricOneField& alpha, const volScalarField& rho, const volVectorField& U, - const surfaceScalarField& alphaPhi, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& trasport, const word& propertiesName diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C index a9e7794cff42ba6188d9cc1fed967f49a11455fa..1fbebad3eea3df415f03951439da42b7f7734ae8 100644 --- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C +++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.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-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,6 +24,8 @@ License \*---------------------------------------------------------------------------*/ #include "compressibleTurbulenceModel.H" +#include "surfaceInterpolate.H" +#include "surfaceFields.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -39,7 +41,7 @@ Foam::compressibleTurbulenceModel::compressibleTurbulenceModel ( const volScalarField& rho, const volVectorField& U, - const surfaceScalarField& alphaPhi, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const word& propertiesName ) @@ -47,7 +49,7 @@ Foam::compressibleTurbulenceModel::compressibleTurbulenceModel turbulenceModel ( U, - alphaPhi, + alphaRhoPhi, phi, propertiesName ), @@ -55,4 +57,20 @@ Foam::compressibleTurbulenceModel::compressibleTurbulenceModel {} +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::tmp<Foam::surfaceScalarField> +Foam::compressibleTurbulenceModel::phi() const +{ + if (phi_.dimensions() == dimensionSet(0, 3, -1, 0, 0)) + { + return phi_; + } + else + { + return phi_/fvc::interpolate(rho_); + } +} + + // ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H index 0754085f4aeaa053281147116ed93b4430e46aa3..533d8992bc9f585803994390294ac814e3f0ccbc 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 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,7 +85,7 @@ public: ( const volScalarField& rho, const volVectorField& U, - const surfaceScalarField& alphaPhi, + const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const word& propertiesName ); @@ -98,6 +98,9 @@ public: // Member functions + //- Return the volumetric flux field + virtual tmp<surfaceScalarField> phi() const; + //- Return the effective stress tensor including the laminar stress virtual tmp<volSymmTensorField> devRhoReff() const = 0;