ENH: Register RAS/LES models with (optional) alternative name

- allows better inheritance of models, since the coefficients
  dictionary can be made to match the derived class.

  related to commits 9544280e + 14b4c384

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C

@@ -51,10 +51,11 @@ PDRkEpsilon::PDRkEpsilon
     const volVectorField& U,
     const surfaceScalarField& phi,
     const basicThermo& thermophysicalModel,
-    const word& turbulenceModelName
+    const word& turbulenceModelName,
+    const word& modelName
 )
 :
-    RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName),
+    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName),
 
     Cmu_
     (

applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H

@@ -116,7 +116,8 @@ public:
             const volVectorField& U,
             const surfaceScalarField& phi,
             const basicThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
+            const word& turbulenceModelName = turbulenceModel::typeName,
+            const word& modelName = typeName
         );
 
 

src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C

@@ -61,10 +61,11 @@ DeardorffDiffStress::DeardorffDiffStress
     const volVectorField& U,
     const surfaceScalarField& phi,
     const basicThermo& thermoPhysicalModel,
-    const word& turbulenceModelName
+    const word& turbulenceModelName,
+    const word& modelName
 )
 :
-    LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
+    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
     GenSGSStress(rho, U, phi, thermoPhysicalModel),
 
     ck_

src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H

@@ -102,7 +102,8 @@ public:
             const volVectorField& U,
             const surfaceScalarField& phi,
             const basicThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
+            const word& turbulenceModelName = turbulenceModel::typeName,
+            const word& modelName = typeName
         );
 
 

src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C

@@ -42,18 +42,11 @@ GenEddyVisc::GenEddyVisc
     const volVectorField& U,
     const surfaceScalarField& phi,
     const basicThermo& thermoPhysicalModel,
-    const word& turbulenceModelName
+    const word& turbulenceModelName,
+    const word& modelName
 )
 :
-    LESModel
-    (
-        word("GenEddyVisc"),
-        rho,
-        U,
-        phi,
-        thermoPhysicalModel,
-        turbulenceModelName
-    ),
+    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
 
     ce_
     (

src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H

@@ -91,7 +91,8 @@ public:
             const volVectorField& U,
             const surfaceScalarField& phi,
             const basicThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
+            const word& turbulenceModelName = turbulenceModel::typeName,
+            const word& modelName = "GenEddyVisc"
         );
 
 

src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C

@@ -42,18 +42,11 @@ GenSGSStress::GenSGSStress
     const volVectorField& U,
     const surfaceScalarField& phi,
     const basicThermo& thermoPhysicalModel,
-    const word& turbulenceModelName
+    const word& turbulenceModelName,
+    const word& modelName
 )
 :
-    LESModel
-    (
-        word("GenSGSStress"),
-        rho,
-        U,
-        phi,
-        thermoPhysicalModel,
-        turbulenceModelName
-    ),
+    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
 
     ce_
     (

src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H

@@ -91,7 +91,8 @@ public:
             const volVectorField& U,
             const surfaceScalarField& phi,
             const basicThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
+            const word& turbulenceModelName = turbulenceModel::typeName,
+            const word& modelName = "GenSGSStress"
         );
 
 

src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C

@@ -69,10 +69,11 @@ Smagorinsky::Smagorinsky
     const volVectorField& U,
     const surfaceScalarField& phi,
     const basicThermo& thermoPhysicalModel,
-    const word& turbulenceModelName
+    const word& turbulenceModelName,
+    const word& modelName
 )
 :
-    LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
+    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
     GenEddyVisc(rho, U, phi, thermoPhysicalModel),
 
     ck_

src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H

@@ -97,7 +97,8 @@ public:
             const volVectorField& U,
             const surfaceScalarField& phi,
             const basicThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
+            const word& turbulenceModelName = turbulenceModel::typeName,
+            const word& modelName = typeName
         );
 
 

src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C

@@ -107,10 +107,11 @@ SpalartAllmaras::SpalartAllmaras
     const volVectorField& U,
     const surfaceScalarField& phi,
     const basicThermo& thermoPhysicalModel,
-    const word& turbulenceModelName
+    const word& turbulenceModelName,
+    const word& modelName
 )
 :
-    LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
+    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
 
     sigmaNut_
     (

src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H

@@ -112,7 +112,8 @@ public:
             const volVectorField& U,
             const surfaceScalarField& phi,
             const basicThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
+            const word& turbulenceModelName = turbulenceModel::typeName,
+            const word& modelName = typeName
         );
 
 

src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C

@@ -91,10 +91,11 @@ dynOneEqEddy::dynOneEqEddy
     const volVectorField& U,
     const surfaceScalarField& phi,
     const basicThermo& thermoPhysicalModel,
-    const word& turbulenceModelName
+    const word& turbulenceModelName,
+    const word& modelName
 )
 :
-    LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
+    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
     GenEddyVisc(rho, U, phi, thermoPhysicalModel),
 
     filterPtr_(LESfilter::New(U.mesh(), coeffDict())),

src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H

@@ -108,7 +108,8 @@ public:
             const volVectorField& U,
             const surfaceScalarField& phi,
             const basicThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
+            const word& turbulenceModelName = turbulenceModel::typeName,
+            const word& modelName = typeName
         );
 
 

src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C

@@ -64,10 +64,11 @@ lowReOneEqEddy::lowReOneEqEddy
     const volVectorField& U,
     const surfaceScalarField& phi,
     const basicThermo& thermoPhysicalModel,
-    const word& turbulenceModelName
+    const word& turbulenceModelName,
+    const word& modelName
 )
 :
-    LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
+    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
     GenEddyVisc(rho, U, phi, thermoPhysicalModel),
 
     ck_

src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H

@@ -99,7 +99,8 @@ public:
             const volVectorField& U,
             const surfaceScalarField& phi,
             const basicThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
+            const word& turbulenceModelName = turbulenceModel::typeName,
+            const word& modelName = typeName
         );
 
 

src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C

@@ -60,10 +60,11 @@ oneEqEddy::oneEqEddy
     const volVectorField& U,
     const surfaceScalarField& phi,
     const basicThermo& thermoPhysicalModel,
-    const word& turbulenceModelName
+    const word& turbulenceModelName,
+    const word& modelName
 )
 :
-    LESModel(typeName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
+    LESModel(modelName, rho, U, phi, thermoPhysicalModel, turbulenceModelName),
     GenEddyVisc(rho, U, phi, thermoPhysicalModel),
 
     ck_

src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H

@@ -102,7 +102,8 @@ public:
             const volVectorField& U,
             const surfaceScalarField& phi,
             const basicThermo& thermoPhysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
+            const word& turbulenceModelName = turbulenceModel::typeName,
+            const word& modelName = typeName
         );
 
 

src/turbulenceModels/compressible/RAS/LRR/LRR.C

@@ -51,10 +51,11 @@ LRR::LRR
     const volVectorField& U,
     const surfaceScalarField& phi,
     const basicThermo& thermophysicalModel,
-    const word& turbulenceModelName
+    const word& turbulenceModelName,
+    const word& modelName
 )
 :
-    RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName),
+    RASModel(modelName, rho, U, phi, thermophysicalModel, turbulenceModelName),
 
     Cmu_
     (

src/turbulenceModels/compressible/RAS/LRR/LRR.H

@@ -120,7 +120,8 @@ public:
             const volVectorField& U,
             const surfaceScalarField& phi,
             const basicThermo& thermophysicalModel,
-            const word& turbulenceModelName = turbulenceModel::typeName
+            const word& turbulenceModelName = turbulenceModel::typeName,
+            const word& modelName = typeName
         );