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

src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C

@@ -47,7 +47,7 @@ void dynLagrangian::updateSubGridScaleFields
     const tmp<volTensorField>& gradU
 )
 {
-    nuSgs_ = (flm_/fmm_)*delta()*sqrt(k(gradU));
+    nuSgs_ = 2.0*(flm_/fmm_)*sqr(delta())*mag(dev(symm(gradU)));
     nuSgs_.correctBoundaryConditions();
 }
 

src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,7 +153,10 @@ public:
         //- Return SGS kinetic energy
         tmp<volScalarField> k(const tmp<volTensorField>& gradU) const
         {
-            return 2.0*sqr(delta())*magSqr(dev(symm(gradU)));
+            return
+                2.0
+              * pow((2.0/sqrt(2.0))*sqrt(ce_)*flm_/fmm_, 2.0/3.0)/ce_
+              * sqr(delta())*magSqr(dev(symm(gradU)));
         }
 
         //- Return SGS kinetic energy