Commit bee7ba14 authored by mattijs's avatar mattijs
Browse files

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

parents 1c5a9745 a575aecc
......@@ -26,6 +26,7 @@ License
#include "turbulenceModel.H"
#include "volFields.H"
#include "surfaceFields.H"
#include "fvcGrad.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -115,6 +116,13 @@ autoPtr<turbulenceModel> turbulenceModel::New
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
tmp<volScalarField> turbulenceModel::rhoEpsilonEff() const
{
tmp<volTensorField> tgradU = fvc::grad(U_);
return mu()*(tgradU() && dev(twoSymm(tgradU()))) + rho_*epsilon();
}
void turbulenceModel::correct()
{}
......
......@@ -206,6 +206,10 @@ public:
//- Return the turbulence kinetic energy dissipation rate
virtual tmp<volScalarField> epsilon() const = 0;
//- Return the laminar+turbulence kinetic energy dissipation rate
// Used as the viscous contribution to the energy equations
virtual tmp<volScalarField> rhoEpsilonEff() const;
//- Return the Reynolds stress tensor
virtual tmp<volSymmTensorField> R() const = 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment