diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index 680f25b95b..db09dbc5bc 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/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_ ( diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index bf5c838371..48d0904512 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/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 ); diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C index 0ae14cbcfa..ad26f52ffe 100644 --- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C +++ b/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_ diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H index 5400e8cf00..d8b0c07b87 100644 --- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H +++ b/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 ); diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C index 9d00a040d2..d15dc40da8 100644 --- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C +++ b/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_ ( diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H index 7fa5fb056e..8f1c287b8d 100644 --- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H +++ b/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" ); diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C index eeff8aa1c9..935bb8d845 100644 --- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C +++ b/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_ ( diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H index 0ebcce8408..54a8350036 100644 --- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H +++ b/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" ); diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C index 8370b5e50b..131f3dfad3 100644 --- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C +++ b/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_ diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H index 4ef0452cfc..5c9cd721b4 100644 --- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H +++ b/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 ); diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C index fbe4bfa1af..f9eaef6def 100644 --- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C +++ b/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_ ( diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H index 17949151df..94cf8d496b 100644 --- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H +++ b/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 ); diff --git a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C index b3beef1246..2f6960151a 100644 --- a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C +++ b/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())), diff --git a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H index d2546bf4e2..482987518c 100644 --- a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H +++ b/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 ); diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C index 48e89e7792..02099f6433 100644 --- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C +++ b/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_ diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H index 693b80adce..7b6bb89555 100644 --- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H +++ b/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 ); diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C index 593ba56a69..c2c4ef4a24 100644 --- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C +++ b/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_ diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H index de96284932..8cfeedec6c 100644 --- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H +++ b/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 ); diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C index dbdf0281fe..1fdeeebeb4 100644 --- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C +++ b/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_ ( diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.H b/src/turbulenceModels/compressible/RAS/LRR/LRR.H index f5c8601694..05dfce3101 100644 --- a/src/turbulenceModels/compressible/RAS/LRR/LRR.H +++ b/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 ); diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C index 01bd6c9e5d..3e35614ff2 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C +++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C @@ -51,10 +51,11 @@ LaunderGibsonRSTM::LaunderGibsonRSTM 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_ ( diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H index fe49f1bcd0..ebeb5a596c 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H +++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H @@ -129,7 +129,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 ); diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C index 455b65f48f..452e0b5a52 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -66,10 +66,11 @@ LaunderSharmaKE::LaunderSharmaKE 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_ ( diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H index e496cae66e..68bafcc76c 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H +++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H @@ -113,7 +113,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 ); diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C index 660bc06578..1e4fc21cb7 100644 --- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C @@ -50,10 +50,11 @@ RNGkEpsilon::RNGkEpsilon 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_ ( diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H index 7bd558a285..249c4aa4eb 100644 --- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H +++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H @@ -109,7 +109,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 ); diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C index ce16b21445..5ef5538f3e 100644 --- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -110,10 +110,11 @@ SpalartAllmaras::SpalartAllmaras 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), sigmaNut_ ( diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H index 664eea9079..e978416d97 100644 --- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H +++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H @@ -150,7 +150,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 ); diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C index 660682b24a..160ada3f60 100644 --- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C +++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C @@ -50,10 +50,11 @@ kEpsilon::kEpsilon 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_ ( diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H index fc687935bf..162561d5f8 100644 --- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H +++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H @@ -105,7 +105,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 ); diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C index d0c7b9b517..09e07ef57b 100644 --- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C +++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C @@ -93,10 +93,11 @@ kOmegaSST::kOmegaSST 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), alphaK1_ ( diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H index 199a9fceac..7128f14172 100644 --- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H +++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H @@ -188,7 +188,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 ); diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C index f0069c4e9a..9e5ac7d42b 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C @@ -48,10 +48,11 @@ laminar::laminar 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) {} diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H index c465fc9a4a..f3e58ec7cd 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.H @@ -69,7 +69,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 ); diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C index 1114bdc0ad..a81e76be6e 100644 --- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C +++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C @@ -91,10 +91,11 @@ realizableKE::realizableKE 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_ ( diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H index a4ab957c58..968114cf87 100644 --- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H +++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H @@ -127,7 +127,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 ); diff --git a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C index 67840e4bcb..b0b24389e8 100644 --- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C +++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C @@ -56,10 +56,11 @@ DeardorffDiffStress::DeardorffDiffStress const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), GenSGSStress(U, phi, transport), ck_ diff --git a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H index e3fb0e13dd..1e3bee70f8 100644 --- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H +++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H @@ -101,7 +101,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C index b479e7bdf1..8bb52eae3c 100644 --- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C +++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C @@ -41,10 +41,11 @@ GenEddyVisc::GenEddyVisc const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(word("GenEddyVisc"), U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), ce_ ( diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H index 44bea7082b..0debeca63d 100644 --- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H +++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H @@ -82,7 +82,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = "GenEddyVisc" ); diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C index f75d2d68ec..2af970382b 100644 --- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C +++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C @@ -41,10 +41,11 @@ GenSGSStress::GenSGSStress const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(word("GenSGSStress"), U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), ce_ ( diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H index 1cb78c415e..31e71144c2 100644 --- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H +++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H @@ -86,7 +86,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = "GenSGSStress" ); diff --git a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C index 2b1e589bcb..bc5264d680 100644 --- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C +++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C @@ -56,10 +56,11 @@ LRRDiffStress::LRRDiffStress const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), GenSGSStress(U, phi, transport), ck_ diff --git a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H index f149913d03..e8d5ecfc96 100644 --- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H +++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H @@ -100,7 +100,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C index 6aa639ccf1..a6483d28e3 100644 --- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C +++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C @@ -56,10 +56,11 @@ Smagorinsky::Smagorinsky const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), GenEddyVisc(U, phi, transport), ck_ diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H index 469c49f247..298950fe48 100644 --- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H +++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H @@ -97,7 +97,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C index ba03035bdf..8f09a3d2e0 100644 --- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C +++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C @@ -47,10 +47,11 @@ Smagorinsky2::Smagorinsky2 const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), Smagorinsky(U, phi, transport), cD2_ diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H index 1bb1e16e02..65fa5d4f42 100644 --- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H +++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H @@ -94,7 +94,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C index 414ce5558b..4bd5538bad 100644 --- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C +++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C @@ -94,10 +94,11 @@ SpalartAllmarasDDES::SpalartAllmarasDDES const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - SpalartAllmaras(U, phi, transport, turbulenceModelName, typeName) + SpalartAllmaras(U, phi, transport, turbulenceModelName, modelName) {} diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H index 77cdc5e95d..7b4093e174 100644 --- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H +++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H @@ -96,7 +96,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C index a6a9d32658..1665e7ce53 100644 --- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C +++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C @@ -144,10 +144,11 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - SpalartAllmaras(U, phi, transport, turbulenceModelName, typeName), + SpalartAllmaras(U, phi, transport, turbulenceModelName, modelName), fwStar_ ( diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H index 9225f4791c..72b64dba4c 100644 --- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H +++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H @@ -105,7 +105,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C index 4e1e409435..6f82dca3ce 100644 --- a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C +++ b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C @@ -47,10 +47,11 @@ dynMixedSmagorinsky::dynMixedSmagorinsky const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), scaleSimilarity(U, phi, transport), dynSmagorinsky(U, phi, transport) { diff --git a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H index be742b8bde..d73be82f76 100644 --- a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H +++ b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H @@ -100,7 +100,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C index 89849140ae..179326d835 100644 --- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C +++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C @@ -105,10 +105,11 @@ dynOneEqEddy::dynOneEqEddy const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), GenEddyVisc(U, phi, transport), k_ diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H index 2504778f13..b5a0b76f33 100644 --- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H +++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H @@ -111,7 +111,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C index 1832b461a3..f075214f50 100644 --- a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C +++ b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C @@ -96,10 +96,11 @@ dynSmagorinsky::dynSmagorinsky const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), GenEddyVisc(U, phi, transport), k_ diff --git a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H index d7c0356aee..541a77f51c 100644 --- a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H +++ b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H @@ -120,7 +120,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.C b/src/turbulenceModels/incompressible/LES/laminar/laminar.C index a7e54b14af..641bacb938 100644 --- a/src/turbulenceModels/incompressible/LES/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.C @@ -48,10 +48,11 @@ laminar::laminar const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName) + LESModel(modelName, U, phi, transport, turbulenceModelName) {} diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.H b/src/turbulenceModels/incompressible/LES/laminar/laminar.H index cdc2e00c88..9ccd6f792a 100644 --- a/src/turbulenceModels/incompressible/LES/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.H @@ -77,7 +77,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C index ab1d090a77..3eae38e2ab 100644 --- a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C +++ b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C @@ -96,10 +96,11 @@ locDynOneEqEddy::locDynOneEqEddy const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), GenEddyVisc(U, phi, transport), k_ diff --git a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H index 3dbfa514d2..81d0070f23 100644 --- a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H +++ b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H @@ -133,7 +133,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C index a2b40f0722..4b8cb023aa 100644 --- a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C +++ b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C @@ -47,10 +47,11 @@ mixedSmagorinsky::mixedSmagorinsky const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), scaleSimilarity(U, phi, transport), Smagorinsky(U, phi, transport) { diff --git a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H index ffb54f3e77..658433020b 100644 --- a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H +++ b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H @@ -100,7 +100,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C index 235a48f1d2..c18c505a9b 100644 --- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C +++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C @@ -57,10 +57,11 @@ oneEqEddy::oneEqEddy const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), GenEddyVisc(U, phi, transport), k_ diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H index 71e389a99e..c8d27d8d70 100644 --- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H +++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H @@ -103,7 +103,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C index 6b1526d0ec..870a1843c1 100644 --- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C +++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C @@ -45,10 +45,11 @@ scaleSimilarity::scaleSimilarity const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), filterPtr_(LESfilter::New(U.mesh(), coeffDict())), filter_(filterPtr_()) { diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H index 95aa681ab3..6a85082131 100644 --- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H +++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H @@ -85,7 +85,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C index 694b93f57f..28e1c3956b 100644 --- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C +++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C @@ -66,10 +66,11 @@ spectEddyVisc::spectEddyVisc const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - LESModel(typeName, U, phi, transport, turbulenceModelName), + LESModel(modelName, U, phi, transport, turbulenceModelName), GenEddyVisc(U, phi, transport), cB_ diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H index d8bfdd9b0c..7043f5182b 100644 --- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H +++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H @@ -105,7 +105,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C index c0439ee575..586032b0ed 100644 --- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C +++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C @@ -50,10 +50,11 @@ LRR::LRR const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), Cmu_ ( diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H index 9f384fa453..bc3d34ecb2 100644 --- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H +++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H @@ -113,7 +113,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C index 4670e24b7a..46fc6a8863 100644 --- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C +++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C @@ -49,10 +49,11 @@ LamBremhorstKE::LamBremhorstKE const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), Cmu_ ( diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H index 6f2c9d8dad..99c639cdde 100644 --- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H +++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H @@ -90,7 +90,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C index d060743caf..a72babb1a0 100644 --- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C +++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C @@ -50,10 +50,11 @@ LaunderGibsonRSTM::LaunderGibsonRSTM const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), Cmu_ ( diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H index 4b53a84a8c..4fa73955be 100644 --- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H +++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H @@ -124,7 +124,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C index f7b5002986..ee34ef8be7 100644 --- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -65,10 +65,11 @@ LaunderSharmaKE::LaunderSharmaKE const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), Cmu_ ( diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H index 8aaa0edca3..3eeeb5be6b 100644 --- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H +++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H @@ -106,7 +106,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C index 32fc1bd9ff..0154cf2c8b 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C @@ -49,10 +49,11 @@ LienCubicKE::LienCubicKE const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), C1_ ( diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H index 8254de5f4f..c6b16aa4b0 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H @@ -103,7 +103,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C index dd2954d96f..b961771ea2 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C @@ -50,10 +50,11 @@ LienCubicKELowRe::LienCubicKELowRe const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), C1_ ( diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H index 741c86cf32..f5c3501052 100644 --- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H +++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H @@ -130,7 +130,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C index 413203d87c..486eccaa98 100644 --- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C +++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C @@ -50,10 +50,11 @@ LienLeschzinerLowRe::LienLeschzinerLowRe const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), C1_ ( diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H index ff6f1ab941..529ce5af0f 100644 --- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H +++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H @@ -99,7 +99,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C index 9424f3fb12..facd5b4453 100644 --- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C +++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C @@ -48,10 +48,11 @@ NonlinearKEShih::NonlinearKEShih const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), C1_ ( diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H index 02dcfddfa0..a44a816005 100644 --- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H +++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H @@ -106,7 +106,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C index 34ab2cd8f0..b7ecd85483 100644 --- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C @@ -49,10 +49,11 @@ RNGkEpsilon::RNGkEpsilon const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), Cmu_ ( diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H index 87ced6b912..83fe2c11fb 100644 --- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H +++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H @@ -104,7 +104,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C index 1c894f2679..82bf739478 100644 --- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -107,10 +107,11 @@ SpalartAllmaras::SpalartAllmaras const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), sigmaNut_ ( diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H index 461e179e32..427ac8e67a 100644 --- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H +++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H @@ -148,7 +148,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C index 92b990f973..d7dd3c2578 100644 --- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C +++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C @@ -49,10 +49,11 @@ kEpsilon::kEpsilon const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), Cmu_ ( diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H index 64dcbdd513..63ae40a459 100644 --- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H +++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H @@ -98,7 +98,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C index c9611790eb..f316234661 100644 --- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C +++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C @@ -49,10 +49,11 @@ kOmega::kOmega const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), Cmu_ ( diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H index 7bc76953af..5bb72879af 100644 --- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H +++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H @@ -112,7 +112,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C index 5c502cc1b5..5ebacb3c2f 100644 --- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C +++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C @@ -92,10 +92,11 @@ kOmegaSST::kOmegaSST const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), alphaK1_ ( diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H index 801aa03ce7..a092637d38 100644 --- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H +++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H @@ -182,7 +182,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C index 066a68ffa8..5d6c3b9aa5 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C @@ -47,10 +47,11 @@ laminar::laminar const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName) + RASModel(modelName, U, phi, transport, turbulenceModelName) {} diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H index 34c5120b74..a4f21c6e71 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H @@ -68,7 +68,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C index b72ea68054..41929db9fe 100644 --- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C +++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C @@ -75,10 +75,11 @@ qZeta::qZeta const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), Cmu_ ( diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H index cf249d7507..39c0b61d43 100644 --- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H +++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H @@ -104,7 +104,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C index 0ae8dfccc3..5f870de0a7 100644 --- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C +++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C @@ -90,10 +90,11 @@ realizableKE::realizableKE const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, U, phi, transport, turbulenceModelName), + RASModel(modelName, U, phi, transport, turbulenceModelName), Cmu_ ( diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H index 0c727267e4..50a174cac6 100644 --- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H +++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H @@ -123,7 +123,8 @@ public: const volVectorField& U, const surfaceScalarField& phi, transportModel& transport, - const word& turbulenceModelName = turbulenceModel::typeName + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C index b36ce1da1e..09c0f8bc1e 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C @@ -52,7 +52,6 @@ laminar::laminar const surfaceScalarField& phi, transportModel& transport, const word& turbulenceModelName - ) : turbulenceModel(U, phi, transport, turbulenceModelName) diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H index affe6165fc..182b200f9c 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H @@ -67,7 +67,6 @@ public: const surfaceScalarField& phi, transportModel& transport, const word& turbulenceModelName = turbulenceModel::typeName - );