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

src/turbulenceModels/RAS/incompressible/kOmega/kOmega.C

@@ -44,7 +44,6 @@ addToRunTimeSelectionTable(RASModel, kOmega, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 kOmega::kOmega
 (
     const volVectorField& U,
@@ -72,6 +71,15 @@ kOmega::kOmega
             0.072
         )
     ),
+    alpha_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alpha",
+            coeffDict_,
+            0.52
+        )
+    ),
     alphaK_
     (
         dimensioned<scalar>::lookupOrAddToDict
@@ -222,7 +230,7 @@ void kOmega::correct()
       - fvm::Sp(fvc::div(phi_), omega_)
       - fvm::laplacian(DomegaEff(), omega_)
      ==
-        G*omega_/k_
+        alpha_*G*omega_/k_
       - fvm::Sp(beta_*omega_, omega_)
     );
 

src/turbulenceModels/RAS/incompressible/kOmega/kOmega.H

@@ -35,6 +35,9 @@ Description
         D. C. Wilcox,
         DCW Industries, Inc., La Canada,
         California, 1998.
+
+        See also:
+        http://www.cfd-online.com/Wiki/Wilcox's_k-omega_model
     @endverbatim
 
     The default model coefficients correspond to the following:
@@ -42,6 +45,7 @@ Description
         kOmegaCoeffs
         {
             Cmu         0.09;  // Equivalent to betaStar
+            alpha       0.52;
             beta        0.072;
             alphak      0.5;
             alphaOmega  0.5;
@@ -81,6 +85,7 @@ class kOmega
 
             dimensionedScalar Cmu_;
             dimensionedScalar beta_;
+            dimensionedScalar alpha_;
             dimensionedScalar alphaK_;
             dimensionedScalar alphaOmega_;