From 2336d048f74dacf6afc9e33779aa2050d88201e0 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 27 Feb 2015 11:29:45 +0000
Subject: [PATCH] ShihQuadraticKE: renamed from nonlinearKEShih and added
 reference

---
 .../incompressible/Make/files                 |  2 +-
 .../ShihQuadraticKE.C}                        | 16 +++++------
 .../ShihQuadraticKE.H}                        | 27 ++++++++++++-------
 3 files changed, 26 insertions(+), 19 deletions(-)
 rename src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/{nonlinearKEShih/nonlinearKEShih.C => ShihQuadraticKE/ShihQuadraticKE.C} (95%)
 rename src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/{nonlinearKEShih/nonlinearKEShih.H => ShihQuadraticKE/ShihQuadraticKE.H} (88%)

diff --git a/src/TurbulenceModels/incompressible/Make/files b/src/TurbulenceModels/incompressible/Make/files
index afb44e8a105..8139eadca7d 100644
--- a/src/TurbulenceModels/incompressible/Make/files
+++ b/src/TurbulenceModels/incompressible/Make/files
@@ -7,7 +7,7 @@ turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
 turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
 turbulentTransportModels/RAS/LienCubicKELowRe/LienCubicKELowRe.C
 turbulentTransportModels/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
-turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C
+turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
 
 BCs = turbulentTransportModels/RAS/derivedFvPatchFields
 
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
similarity index 95%
rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
index 20c71af7bfb..ec0340f23ec 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "nonlinearKEShih.H"
+#include "ShihQuadraticKE.H"
 #include "bound.H"
 #include "wallFvPatch.H"
 #include "nutkWallFunctionFvPatchScalarField.H"
@@ -40,19 +40,19 @@ namespace RASModels
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(nonlinearKEShih, 0);
-addToRunTimeSelectionTable(RASModel, nonlinearKEShih, dictionary);
+defineTypeNameAndDebug(ShihQuadraticKE, 0);
+addToRunTimeSelectionTable(RASModel, ShihQuadraticKE, dictionary);
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void nonlinearKEShih::correctNut()
+void ShihQuadraticKE::correctNut()
 {
     nut_ = Cmu_*sqr(k_)/epsilon_;
     #include "wallNonlinearViscosityI.H"
 }
 
 
-void nonlinearKEShih::correctNonlinearStress(const volTensorField& gradU)
+void ShihQuadraticKE::correctNonlinearStress(const volTensorField& gradU)
 {
     nonlinearStress_ = symm
     (
@@ -72,7 +72,7 @@ void nonlinearKEShih::correctNonlinearStress(const volTensorField& gradU)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-nonlinearKEShih::nonlinearKEShih
+ShihQuadraticKE::ShihQuadraticKE
 (
     const geometricOneField& alpha,
     const geometricOneField& rho,
@@ -259,7 +259,7 @@ nonlinearKEShih::nonlinearKEShih
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool nonlinearKEShih::read()
+bool ShihQuadraticKE::read()
 {
     if (nonlinearEddyViscosity<incompressible::RASModel>::read())
     {
@@ -286,7 +286,7 @@ bool nonlinearKEShih::read()
 }
 
 
-void nonlinearKEShih::correct()
+void ShihQuadraticKE::correct()
 {
     nonlinearEddyViscosity<incompressible::RASModel>::correct();
 
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H
similarity index 88%
rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.H
rename to src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H
index 9037328e695..01c6fe83c9d 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/nonlinearKEShih/nonlinearKEShih.H
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H
@@ -22,22 +22,29 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::incompressible::RASModels::nonlinearKEShih
+    Foam::incompressible::RASModels::ShihQuadraticKE
 
 Group
     grpIcoRASTurbulence
 
 Description
-    Shih's quadratic non-linear k-epsilon turbulence model for
+    Shih's quadratic algebraic Reynolds stress k-epsilon turbulence model for
     incompressible flows
 
+    This turbulence model is described in:
+    \verbatim
+        Shih, T. H., Zhu, J., & Lumley, J. L. (1993).
+        A realizable Reynolds stress algebraic equation model.
+        NASA technical memorandum 105993.
+    \endverbatim
+
 SourceFiles
-    nonlinearKEShih.C
+    ShihQuadraticKE.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nonlinearKEShih_H
-#define nonlinearKEShih_H
+#ifndef ShihQuadraticKE_H
+#define ShihQuadraticKE_H
 
 #include "turbulentTransportModel.H"
 #include "nonlinearEddyViscosity.H"
@@ -52,10 +59,10 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class nonlinearKEShih Declaration
+                      Class ShihQuadraticKE Declaration
 \*---------------------------------------------------------------------------*/
 
-class nonlinearKEShih
+class ShihQuadraticKE
 :
     public nonlinearEddyViscosity<incompressible::RASModel>
 {
@@ -101,13 +108,13 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("nonlinearKEShih");
+    TypeName("ShihQuadraticKE");
 
 
     // Constructors
 
         //- Construct from components
-        nonlinearKEShih
+        ShihQuadraticKE
         (
             const geometricOneField& alpha,
             const geometricOneField& rho,
@@ -121,7 +128,7 @@ public:
 
 
     //- Destructor
-    virtual ~nonlinearKEShih()
+    virtual ~ShihQuadraticKE()
     {}
 
 
-- 
GitLab