TurbulenceModels: Update non-linear models to use the new innerSqr function

src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H

@@ -1,71 +0,0 @@
-// Set the dissipation in the near-wall cell to the value prescribed by the
-// Lien-Leschziner low-Re model with Wolfstein length-scale prescription
-
-{
-    labelList cellBoundaryFaceCount(epsilon_.size(), 0);
-
-    //- Use constant Cmu for epsilon in the near-wall cell
-    scalar Cmu75 = pow(CmuWall_.value(), 0.75);
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    //- Initialise the near-wall epsilon field to zero
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                epsilon_[faceCelli] = 0.0;
-            }
-        }
-    }
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                // For corner cells (with two boundary or more faces),
-                // epsilon in the near-wall cell are calculated as an average
-
-                cellBoundaryFaceCount[faceCelli]++;
-
-                epsilon_[faceCelli] +=
-                     Cmu75*pow(k_[faceCelli], 1.5)
-                    /(
-                         kappa_.value()*y_[faceCelli]
-                        *(1.0 - exp(-Aepsilon_.value()*yStar_[faceCelli]))
-                     )
-                    *exp(-Amu_.value()*sqr(yStar_[faceCelli]));
-
-            }
-        }
-    }
-
-    // perform the averaging
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                epsilon_[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-            }
-        }
-    }
-}

src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H

@@ -1,71 +0,0 @@
-// Set the dissipation in the near-wall cell to the value prescribed by the
-// Lien-Leschziner low-Re model with Wolfstein length-scale prescription
-
-{
-    labelList cellBoundaryFaceCount(epsilon_.size(), 0);
-
-    //- Use constant Cmu for epsilon in the near-wall cell
-    scalar Cmu75 = pow(Cmu_.value(), 0.75);
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    //- Initialise the near-wall epsilon field to zero
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                epsilon_[faceCelli] = 0.0;
-            }
-        }
-    }
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                // For corner cells (with two boundary or more faces),
-                // epsilon in the near-wall cell are calculated as an average
-
-                cellBoundaryFaceCount[faceCelli]++;
-
-                epsilon_[faceCelli] +=
-                     Cmu75*pow(k_[faceCelli], 1.5)
-                    /(
-                         kappa_.value()*y_[faceCelli]
-                         *(1.0 - exp(-Aepsilon_.value()*yStar_[faceCelli]))
-                     )
-                    *exp(-Amu_.value()*sqr(yStar_[faceCelli]));
-
-            }
-        }
-    }
-
-    // perform the averaging
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isA<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                epsilon_[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-            }
-        }
-    }
-}

src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C

@@ -67,8 +67,8 @@ void ShihQuadraticKE::correctNonlinearStress(const volTensorField& gradU)
     nonlinearStress_ =
         pow3(k_)/((A1_ + pow3(sBar))*sqr(epsilon_))
        *(
-           beta1_*dev(symm(S&S))
+           beta1_*dev(innerSqr(S))
-         + beta2_*symm((W&S) - (S&W))
+         + beta2_*twoSymm(S&W)
          + beta3_*dev(symm(W&W))
         );
 }

tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties

@@ -19,8 +19,8 @@ simulationType RAS;
 
 RAS
 {
-    // Tested with ShihQuadraticKE, v2f, kEpsilon, realizableKE,
+    // Tested with kEpsilon, realizableKE, kOmega, kOmegaSST, v2f,
-    // kOmega, kOmegaSST;
+    // ShihQuadraticKE, LienCubicKE.
     RASModel        v2f;
 
     turbulence      on;