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

src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C

@@ -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()
 {}
 

src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H

@@ -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;