diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 39c2158ddaa8189903d227bedf27b1f43d1ade68..7cc76e0f8d058d641dbb95c4065ee4ceeb117264 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -50,10 +50,11 @@ PDRkEpsilon::PDRkEpsilon
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, 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 483c7257dc6968cb87c8d37e91ea438b9a5fe76b..c5e641012cccdc67934f307cc13de0debd5aef23 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
@@ -112,7 +112,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
index bfbff460d8fe0c6829e9f140ce560faae30b0d18..0ae14cbcfa8516ab973d3cbd080c6ffeee3675f9 100644
--- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -60,10 +60,11 @@ DeardorffDiffStress::DeardorffDiffStress
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, 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 308f8ca669c4d415772c92505658cd1a6bceb61d..5400e8cf0040adddde73ef93357c25addbb81792 100644
--- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -101,7 +101,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
index d379ce2751281bc0f578b2d057105272e277053b..9d00a040d2e711715ca391e7e76992c9d9859dd8 100644
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -41,12 +41,18 @@ GenEddyVisc::GenEddyVisc
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
LESModel
(
- word("GenEddyVisc"), rho, U, phi, thermoPhysicalModel
+ word("GenEddyVisc"),
+ 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 d27132c00088db98823fdb27c9891aeeb71218ba..7fa5fb056e02ed2722cb24e03e06038c4397a290 100644
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
@@ -90,7 +90,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
index bd70457c9f270998eb575e48742700278d0b528e..eeff8aa1c9e2ffb577b760035884250b04d916a1 100644
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
@@ -41,7 +41,8 @@ GenSGSStress::GenSGSStress
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
LESModel
@@ -50,7 +51,8 @@ GenSGSStress::GenSGSStress
rho,
U,
phi,
- thermoPhysicalModel
+ thermoPhysicalModel,
+ turbulenceModelName
),
ce_
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
index 0eaedf16a2a09a3ce5395b442534b8ee57f399f4..0ebcce8408b6642a6f4f2461ef09c274286030a3 100644
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
@@ -90,7 +90,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
index bf1f726c32c01cc70e7e8814420beaf4d22ba737..1933b0b68c20c2f9ddbd96f7e415f0e31419a9da 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
@@ -58,10 +58,11 @@ LESModel::LESModel
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- turbulenceModel(rho, U, phi, thermoPhysicalModel),
+ turbulenceModel(rho, U, phi, thermoPhysicalModel, turbulenceModelName),
IOdictionary
(
@@ -97,7 +98,8 @@ autoPtr<LESModel> LESModel::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -129,9 +131,11 @@ autoPtr<LESModel> LESModel::New
(
"LESModel::New"
"("
+ "const volScalarField&, "
"const volVectorField&, "
"const surfaceScalarField&, "
- "const basicThermo&"
+ "const basicThermo&, "
+ "const word&"
")"
) << "Unknown LESModel type "
<< modelType << nl << nl
@@ -140,7 +144,10 @@ autoPtr<LESModel> LESModel::New
<< exit(FatalError);
}
- return autoPtr<LESModel>(cstrIter()(rho, U, phi, thermoPhysicalModel));
+ return autoPtr<LESModel>
+ (
+ cstrIter()(rho, U, phi, thermoPhysicalModel, turbulenceModelName)
+ );
}
@@ -160,7 +167,20 @@ void LESModel::correct()
bool LESModel::read()
{
- if (regIOobject::read())
+ // Bit of trickery : we are both IOdictionary ('RASProperties') and
+ // an regIOobject (from the turbulenceModel). Problem is to distinguish
+ // between the two - we only want to reread the IOdictionary.
+
+ bool ok = IOdictionary::readData
+ (
+ IOdictionary::readStream
+ (
+ IOdictionary::type()
+ )
+ );
+ IOdictionary::close();
+
+ if (ok)
{
if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
{
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
index a1a05c83db227111e83a4a27e574c840da8e59a0..a4fd1a3246f6af8f5dda3b560f238cc2b6245625 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
@@ -121,9 +121,10 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
),
- (rho, U, phi, thermoPhysicalModel)
+ (rho, U, phi, thermoPhysicalModel, turbulenceModelName)
);
@@ -136,7 +137,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -148,7 +150,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
index d525ab2513df52238b78d895c3a620546c6b6af9..8370b5e50b4437fba690736bd3c3c747231549f3 100644
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
@@ -68,10 +68,11 @@ Smagorinsky::Smagorinsky
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, 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 88f943366c2bdda700dd9d608fc2052959afe39f..4ef0452cfc677766e93bc5a00f94d3f15251ea14 100644
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
@@ -96,7 +96,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 1ca27f56f6e287d4dc48cf66b545c25866c49459..fbe4bfa1af5d89b685c5872e2229ffea97f6d41b 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -106,10 +106,11 @@ SpalartAllmaras::SpalartAllmaras
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, 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 b3f2f5692f748f27d2ca3f406f11b1a3be015f83..17949151df2f3df82a768f01d4e45ac8d7689408 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -111,7 +111,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
index 80b6cd6928e69fe668adda15b3837943e49aab0e..b3beef1246cab28c84a55e97c3041515c368e70b 100644
--- a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
@@ -90,10 +90,11 @@ dynOneEqEddy::dynOneEqEddy
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, 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 6685160e8f2ab7f80652e136ea5c082c34e97101..d2546bf4e20b4fb6c9a95a65fd6087aff6727669 100644
--- a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
@@ -107,7 +107,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
index 8c5cd79967245e7b8e6b34db68f885392f3370e8..48e89e77929231c4c61405c8df441dd7294cac6a 100644
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
@@ -63,10 +63,11 @@ lowReOneEqEddy::lowReOneEqEddy
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, 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 babd2fdde150c2bda70197f560132a2cbc5523ce..693b80adcea6d3b8804bb6654a4744ed81181ff2 100644
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
@@ -98,7 +98,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
index 961ffed4dfabea6fb25ea75fd3980979c2b0681f..593ba56a69a6998dca1922fedfbbb3a24297214a 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
@@ -59,10 +59,11 @@ oneEqEddy::oneEqEddy
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, rho, U, phi, thermoPhysicalModel),
+ LESModel(typeName, 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 ac83307700e571f85ef3ed8e5d55deb20b4f3a2f..de962849324d08dd86bf5233045689cbba45bb63 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
@@ -101,7 +101,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index a67a4978515e3a1c3449c5e50aaa4c1861086f89..0b0efbb58b6f9d493cc750d0a8856e207294fd40 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -50,10 +50,11 @@ LRR::LRR
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, 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 e1241528d6d1ac7d01525e7c3a4045172ec05652..d9394d2f3ad162925e215ed9a2a3db94a2c69c3b 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.H
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.H
@@ -116,7 +116,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 43103326a96e9b0fb321ecca94c5c27fe7bc8e96..1a4ebdbf63ae74612a70e565872d3fa9c8ace433 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -50,10 +50,11 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, 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 e9343bec59868cd9bb43d61f9d3d013be639de01..9a9f81ccd4c8add62d384c4a4b67df623f1dea9d 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -125,7 +125,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index b7d12e0823088f97d46f0819979349947c6223ca..455b65f48f302d970bd224795fadbfa6669d2803 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -65,10 +65,11 @@ LaunderSharmaKE::LaunderSharmaKE
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, 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 ce85709cfea4a8cd4c33cd4dc7470a79555ff79a..c2952c3b4d1caa107f46b4a8ff6a08a29b5dd298 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -109,7 +109,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files
index 4301cde42596cba22b42bcd182566a2e6bb0ad62..ccfc9b6b27a16a05e40975bb1648c891fc74f054 100644
--- a/src/turbulenceModels/compressible/RAS/Make/files
+++ b/src/turbulenceModels/compressible/RAS/Make/files
@@ -35,12 +35,8 @@ kqRWallFunctions = $(wallFunctions)/kqRWallFunctions
$(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
/* Patch fields */
-derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
-derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
-derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
-derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
LIB = $(FOAM_LIBBIN)/libcompressibleRASModels
diff --git a/src/turbulenceModels/compressible/RAS/Make/options b/src/turbulenceModels/compressible/RAS/Make/options
index b2b75c89904ed0b46986a88d2e05a86cee9effa7..0e3ec0f8fbef11be7d6a1875006fbb3b1d9fc8bb 100644
--- a/src/turbulenceModels/compressible/RAS/Make/options
+++ b/src/turbulenceModels/compressible/RAS/Make/options
@@ -1,6 +1,7 @@
EXE_INC = \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index 64594ff010ebe4ffbe8c32ffeedc5e1f067d9984..b0d48870d1f0a144860293282a92589b5642f484 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -59,10 +59,11 @@ RASModel::RASModel
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- turbulenceModel(rho, U, phi, thermophysicalModel),
+ turbulenceModel(rho, U, phi, thermophysicalModel, turbulenceModelName),
IOdictionary
(
@@ -103,7 +104,8 @@ autoPtr<RASModel> RASModel::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -138,7 +140,8 @@ autoPtr<RASModel> RASModel::New
"const volScalarField&, "
"const volVectorField&, "
"const surfaceScalarField&, "
- "basicThermo&"
+ "basicThermo&, "
+ "const word&"
")"
) << "Unknown RASModel type "
<< modelType << nl << nl
@@ -149,7 +152,7 @@ autoPtr<RASModel> RASModel::New
return autoPtr<RASModel>
(
- cstrIter()(rho, U, phi, thermophysicalModel)
+ cstrIter()(rho, U, phi, thermophysicalModel, turbulenceModelName)
);
}
@@ -212,7 +215,22 @@ void RASModel::correct()
bool RASModel::read()
{
- if (regIOobject::read())
+ //if (regIOobject::read())
+
+ // Bit of trickery : we are both IOdictionary ('RASProperties') and
+ // an regIOobject from the turbulenceModel level. Problem is to distinguish
+ // between the two - we only want to reread the IOdictionary.
+
+ bool ok = IOdictionary::readData
+ (
+ IOdictionary::readStream
+ (
+ IOdictionary::type()
+ )
+ );
+ IOdictionary::close();
+
+ if (ok)
{
lookup("turbulence") >> turbulence_;
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
index 331f86457ad62fdc7fe893cdc4f22fc4d0232b78..fd55a3b671fc9688721cc469dbbd77e4971ec1ab 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
@@ -134,9 +134,10 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
),
- (rho, U, phi, thermoPhysicalModel)
+ (rho, U, phi, thermoPhysicalModel, turbulenceModelName)
);
@@ -149,7 +150,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -161,7 +163,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 3aa82622fb85fbff85df8ed7bee402fd496bc4a2..44c5c0fbc11199c52263392664448c317dc8d2b9 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -49,10 +49,11 @@ RNGkEpsilon::RNGkEpsilon
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, 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 43b39a7ac12fe1b3526c29fbe72695fca5bda1ca..c0baeb01e887261b340c655e9f423bc731af627a 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -105,7 +105,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 821f2cdb207afd29eb8720285445d0dc892106d9..ce16b21445cbaf52718c696fcc82ef11ee981d35 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -109,10 +109,11 @@ SpalartAllmaras::SpalartAllmaras
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, 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 8164624bddc7caa7d8396af5f0e7f2d81fbef89e..c29146f1b9168673d25d87c3edbb8341990ada8a 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -146,7 +146,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
index 023cf7d9b6f4c793ade9b1391d4a5997d4080622..efc93ab95eebea9f01918edf3b1446bec43cb49f 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
@@ -49,10 +49,11 @@ kEpsilon::kEpsilon
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, 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 ca00c5d267b1fb9a6a98596fdde8080a57d92cc2..9269be0620fd0b560a385ba945445ed13665480c 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
@@ -101,7 +101,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index b7644b3d543241df1a67a1889cf162f0b7611bd3..d0c7b9b5177d3d8e44bdd8197ca40798e24dcf47 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -92,10 +92,11 @@ kOmegaSST::kOmegaSST
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, 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 0ee1502aa9e7b8451c0d8f6254bb6220bc2e5587..240a3bb99d931be7de162faa31858166b4a84f56 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
@@ -184,7 +184,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C
index 6467eba7a027e5ab73239175670bebd1a2a334cb..f0069c4e9a140ea74b5782d30a4b5d5a7936778c 100644
--- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C
+++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C
@@ -47,10 +47,11 @@ laminar::laminar
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel)
+ RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName)
{}
diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H
index 5543d532a14df0e06635528423db28e8241b72dd..c465fc9a4aef52ed9cf476a654d35a54ce24c8d6 100644
--- a/src/turbulenceModels/compressible/RAS/laminar/laminar.H
+++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.H
@@ -68,7 +68,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
index 9a1c2a405c8f5c580c4a06f9334fc89778411499..4490a43506f16f690831804e9624d3b856fc5a39 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -90,10 +90,11 @@ realizableKE::realizableKE
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, rho, U, phi, thermophysicalModel),
+ RASModel(typeName, 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 ab86cd0015becd6723ab9043e55a0f394c22ea4f..45332c798814bb95961a17a43eaebe06f0a1019b 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
@@ -123,7 +123,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/files b/src/turbulenceModels/compressible/turbulenceModel/Make/files
index 3f01b203540f2e54e5d05e0ab46f66cd5284405a..8bd26ec944e639545dffdd4e8bc81a6e3830784d 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/Make/files
+++ b/src/turbulenceModels/compressible/turbulenceModel/Make/files
@@ -1,4 +1,11 @@
turbulenceModel.C
laminar/laminar.C
+derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
+derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
+
+
LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModel
diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/options b/src/turbulenceModels/compressible/turbulenceModel/Make/options
index 075a03796ee454c87f1bc296e0e921bf21ef3019..1a60c8b98c64d49964d8c053e9737c5ca5ce8c7c 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/Make/options
+++ b/src/turbulenceModels/compressible/turbulenceModel/Make/options
@@ -1,8 +1,14 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/turbulenceModels \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude
LIB_LIBS = \
- -lfiniteVolume
+ -lbasicSolidThermo \
+ -lbasicThermophysicalModels \
+ -lspecie \
+ -lfiniteVolume \
+ -lmeshTools
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
similarity index 88%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
index 1026ca123cb5c8019b3154b97fcd7ac3191c5827..3fe205f4562f8aeb495b8c26fe7c9c57589cdc0a 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
@@ -2,16 +2,16 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
- OpenFOAM is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,15 +19,14 @@ License
for more details.
You should have received a copy of the GNU General Public License
- along with OpenFOAM; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "temperatureCoupledBase.H"
#include "volFields.H"
#include "basicSolidThermo.H"
-#include "RASModel.H"
+#include "turbulenceModel.H"
#include "basicThermo.H"
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
@@ -87,11 +86,14 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::K
{
case BASICTHERMO:
{
- const compressible::RASModel& model =
- mesh.lookupObject<compressible::RASModel>("RASProperties");
+ const compressible::turbulenceModel& model =
+ mesh.lookupObject<compressible::turbulenceModel>
+ (
+ "turbulenceModel"
+ );
return
- model.alphaEff(patch_.index())
+ model.alphaEff()().boundaryField()[patch_.index()]
*model.thermo().Cp(Tp, patch_.index());
}
break;
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
similarity index 87%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
index 35b4de5e238e4ac097536a094ea4db44a666a61d..57ed78cefa546cd7c0ba5cf72791bed6eb1f0d62 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
@@ -2,16 +2,16 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
- OpenFOAM is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,8 +19,7 @@ License
for more details.
You should have received a copy of the GNU General Public License
- along with OpenFOAM; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
temperatureCoupledBase
@@ -31,7 +30,8 @@ Description
K() : heat conduction at patch. Gets supplied how to lookup/calculate K:
- 'lookup' : lookup volScalarField (or volSymmTensorField) with name
- - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate K
+ - 'basicThermo' : use basicThermo and default compressible::turbulenceModel
+ to calculate K
- 'solidThermo' : use basicSolidThermo K()
- 'directionalSolidThermo' directionalK()
@@ -68,7 +68,7 @@ public:
LOOKUP
};
-//private:
+private:
// Private data
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
similarity index 92%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
index f529a8caf1c11ceda285e9be1e2730a2db1b05f2..4b2a0c20b95a5f6f8e2918cf18aa0b9064cee195 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -27,7 +27,6 @@ License
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
-#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -62,6 +61,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
)
:
fixedGradientFvPatchScalarField(p, iF),
+ temperatureCoupledBase(patch(), "undefined", "undefined-K"),
heatSource_(hsPower),
q_(p.size(), 0.0)
{}
@@ -77,6 +77,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
)
:
fixedGradientFvPatchScalarField(ptf, p, iF, mapper),
+ temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()),
heatSource_(ptf.heatSource_),
q_(ptf.q_, mapper)
{}
@@ -91,6 +92,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
)
:
fixedGradientFvPatchScalarField(p, iF),
+ temperatureCoupledBase(patch(), dict),
heatSource_(heatSourceTypeNames_.read(dict.lookup("heatSource"))),
q_("q", dict, p.size())
{
@@ -106,6 +108,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
)
:
fixedGradientFvPatchScalarField(thftpsf),
+ temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.KName()),
heatSource_(thftpsf.heatSource_),
q_(thftpsf.q_)
{}
@@ -119,6 +122,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
)
:
fixedGradientFvPatchScalarField(thftpsf, iF),
+ temperatureCoupledBase(patch(), thftpsf.KMethod(), thftpsf.KName()),
heatSource_(thftpsf.heatSource_),
q_(thftpsf.q_)
{}
@@ -161,27 +165,19 @@ void turbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
return;
}
- const label patchI = patch().index();
-
- const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-
- const scalarField alphaEffp = rasModel.alphaEff(patchI);
-
const scalarField& Tp = *this;
- const scalarField Cpp = rasModel.thermo().Cp(Tp, patchI);
-
switch (heatSource_)
{
case hsPower:
{
const scalar Ap = gSum(patch().magSf());
- gradient() = q_/(Ap*Cpp*alphaEffp);
+ gradient() = q_/(Ap*K(Tp));
break;
}
case hsFlux:
{
- gradient() = q_/(Cpp*alphaEffp);
+ gradient() = q_/K(Tp);
break;
}
default:
@@ -208,12 +204,11 @@ void turbulentHeatFluxTemperatureFvPatchScalarField::write
Ostream& os
) const
{
- fvPatchScalarField::write(os);
+ fixedGradientFvPatchScalarField::write(os);
os.writeKeyword("heatSource") << heatSourceTypeNames_[heatSource_]
<< token::END_STATEMENT << nl;
+ temperatureCoupledBase::write(os);
q_.writeEntry("q", os);
- gradient().writeEntry("gradient", os);
- writeEntry("value", os);
}
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
similarity index 96%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
index d40ec1ab7c87d6cc0ada916079f3b738272e8afa..8d9024daf73410f8c27f6b4038bf88a07cd128d2 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
@@ -36,6 +36,7 @@ Description
type compressible::turbulentHeatFluxTemperature;
heatSource flux; // power [W]; flux [W/m2]
q uniform 10; // heat power or flux
+ K basicThermo; // calculate K by alphaEff*thermo.Cp
value uniform 300; // initial temperature value
}
@@ -48,9 +49,8 @@ SourceFiles
#ifndef turbulentHeatFluxTemperatureFvPatchScalarFields_H
#define turbulentHeatFluxTemperatureFvPatchScalarFields_H
-#include "fvPatchFields.H"
#include "fixedGradientFvPatchFields.H"
-#include "NamedEnum.H"
+#include "temperatureCoupledBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,7 +65,8 @@ namespace compressible
class turbulentHeatFluxTemperatureFvPatchScalarField
:
- public fixedGradientFvPatchScalarField
+ public fixedGradientFvPatchScalarField,
+ public temperatureCoupledBase
{
public:
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
similarity index 100%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
similarity index 100%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
similarity index 82%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
index 381b24ae0c0f4bf4de772ee725105498a32b552f..9dc81a1f44fb36298b080e8690341cb3914d61cd 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
@@ -29,8 +29,6 @@ License
#include "volFields.H"
#include "directMappedPatchBase.H"
#include "regionProperties.H"
-#include "basicThermo.H"
-#include "RASModel.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -111,8 +109,8 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField
)
:
fixedValueFvPatchScalarField(p, iF),
- neighbourFieldName_("undefined-neighbourFieldName"),
- KName_("undefined-K")
+ temperatureCoupledBase(patch(), "undefined", "undefined-K"),
+ neighbourFieldName_("undefined-neighbourFieldName")
{}
@@ -126,8 +124,8 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField
)
:
fixedValueFvPatchScalarField(ptf, p, iF, mapper),
- neighbourFieldName_(ptf.neighbourFieldName_),
- KName_(ptf.KName_)
+ temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()),
+ neighbourFieldName_(ptf.neighbourFieldName_)
{}
@@ -140,8 +138,8 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField
)
:
fixedValueFvPatchScalarField(p, iF, dict),
- neighbourFieldName_(dict.lookup("neighbourFieldName")),
- KName_(dict.lookup("K"))
+ temperatureCoupledBase(patch(), dict),
+ neighbourFieldName_(dict.lookup("neighbourFieldName"))
{
if (!isA<directMappedPatchBase>(this->patch().patch()))
{
@@ -172,61 +170,13 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField
)
:
fixedValueFvPatchScalarField(wtcsf, iF),
- neighbourFieldName_(wtcsf.neighbourFieldName_),
- KName_(wtcsf.KName_)
+ temperatureCoupledBase(patch(), wtcsf.KMethod(), wtcsf.KName()),
+ neighbourFieldName_(wtcsf.neighbourFieldName_)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::scalarField>
-Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const
-{
- const fvMesh& mesh = patch().boundaryMesh().mesh();
-
- if (KName_ == "none")
- {
- const compressible::RASModel& model =
- db().lookupObject<compressible::RASModel>("RASProperties");
-
- tmp<volScalarField> talpha = model.alphaEff();
-
- const basicThermo& thermo =
- db().lookupObject<basicThermo>("thermophysicalProperties");
-
- return
- talpha().boundaryField()[patch().index()]
- *thermo.Cp()().boundaryField()[patch().index()];
- }
- else if (mesh.objectRegistry::foundObject<volScalarField>(KName_))
- {
- return patch().lookupPatchField<volScalarField, scalar>(KName_);
- }
- else if (mesh.objectRegistry::foundObject<volSymmTensorField>(KName_))
- {
- const symmTensorField& KWall =
- patch().lookupPatchField<volSymmTensorField, scalar>(KName_);
-
- vectorField n = patch().nf();
-
- return n & KWall & n;
- }
- else
- {
- FatalErrorIn
- (
- "turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const"
- ) << "Did not find field " << KName_
- << " on mesh " << mesh.name() << " patch " << patch().name()
- << endl
- << "Please set 'K' to 'none', a valid volScalarField"
- << " or a valid volSymmTensorField." << exit(FatalError);
-
- return scalarField(0);
- }
-}
-
-
void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
{
if (updated())
@@ -283,7 +233,7 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
);
// Swap to obtain full local values of neighbour K*delta
- scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs();
+ scalarField nbrKDelta = nbrField.K(nbrField)*nbrPatch.deltaCoeffs();
mapDistribute::distribute
(
Pstream::defaultCommsType,
@@ -294,7 +244,7 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
nbrKDelta
);
- tmp<scalarField> myKDelta = K()*patch().deltaCoeffs();
+ tmp<scalarField> myKDelta = K(*this)*patch().deltaCoeffs();
// Calculate common wall temperature. Reuse *this to store common value.
scalarField Twall
@@ -326,7 +276,7 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
// (*this-intFld())
// * patch().deltaCoeffs();
- scalar Q = gSum(K()*patch().magSf()*snGrad());
+ scalar Q = gSum(K(*this)*patch().magSf()*snGrad());
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
@@ -354,7 +304,7 @@ void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::write
fixedValueFvPatchScalarField::write(os);
os.writeKeyword("neighbourFieldName")<< neighbourFieldName_
<< token::END_STATEMENT << nl;
- os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl;
+ temperatureCoupledBase::write(os);
}
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
similarity index 93%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
index 2128c39d211ab5723f3a8a40d858ab575cd77516..5236f5f942221cb239374c6b5300cbad4aa694d7 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
@@ -37,14 +37,14 @@ Description
{
type compressible::turbulentTemperatureCoupledBaffle;
neighbourFieldName T;
- K K; // or none
+ K lookup;
+ KName K; // or none
value uniform 300;
}
Needs to be on underlying directMapped(Wall)FvPatch.
- Note: if K is "none" looks up RASModel and basicThermo, otherwise expects
- the solver to calculate a 'K' field.
+ Note: see temperatureCoupledBase on ways to specify K.
Note: runs in parallel with arbitrary decomposition. Uses directMapped
functionality to calculate exchange.
@@ -64,6 +64,7 @@ SourceFiles
#define turbulentTemperatureCoupledBaffleFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
+#include "temperatureCoupledBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -76,16 +77,14 @@ namespace Foam
class turbulentTemperatureCoupledBaffleFvPatchScalarField
:
- public fixedValueFvPatchScalarField
+ public fixedValueFvPatchScalarField,
+ public temperatureCoupledBase
{
// Private data
//- Name of field on the neighbour region
const word neighbourFieldName_;
- //- Name of thermal conductivity field
- const word KName_;
-
// Private Member Functions
@@ -161,9 +160,6 @@ public:
// Member functions
- //- Get corresponding K field
- tmp<scalarField> K() const;
-
//- Update the coefficients associated with the patch field
virtual void updateCoeffs();
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
similarity index 79%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index 278320f25318ec3f5fa2424c49a347b405eb2e05..e159c15df2b3c3dfd501fb70937896439e4d22ac 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -28,9 +28,6 @@ License
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "directMappedPatchBase.H"
-#include "regionProperties.H"
-#include "basicThermo.H"
-#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,8 +49,8 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
)
:
mixedFvPatchScalarField(p, iF),
- neighbourFieldName_("undefined-neighbourFieldName"),
- KName_("undefined-K")
+ temperatureCoupledBase(patch(), "undefined", "undefined-K"),
+ neighbourFieldName_("undefined-neighbourFieldName")
{
this->refValue() = 0.0;
this->refGrad() = 0.0;
@@ -71,8 +68,8 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
)
:
mixedFvPatchScalarField(ptf, p, iF, mapper),
- neighbourFieldName_(ptf.neighbourFieldName_),
- KName_(ptf.KName_)
+ temperatureCoupledBase(patch(), ptf.KMethod(), ptf.KName()),
+ neighbourFieldName_(ptf.neighbourFieldName_)
{}
@@ -85,8 +82,8 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
)
:
mixedFvPatchScalarField(p, iF),
- neighbourFieldName_(dict.lookup("neighbourFieldName")),
- KName_(dict.lookup("K"))
+ temperatureCoupledBase(patch(), dict),
+ neighbourFieldName_(dict.lookup("neighbourFieldName"))
{
if (!isA<directMappedPatchBase>(this->patch().patch()))
{
@@ -134,60 +131,13 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
)
:
mixedFvPatchScalarField(wtcsf, iF),
- neighbourFieldName_(wtcsf.neighbourFieldName_),
- KName_(wtcsf.KName_)
+ temperatureCoupledBase(patch(), wtcsf.KMethod(), wtcsf.KName()),
+ neighbourFieldName_(wtcsf.neighbourFieldName_)
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-tmp<scalarField>
-turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::K() const
-{
- const fvMesh& mesh = patch().boundaryMesh().mesh();
-
- if (KName_ == "none")
- {
- const compressible::RASModel& model =
- db().lookupObject<compressible::RASModel>("RASProperties");
-
- const basicThermo& thermo =
- db().lookupObject<basicThermo>("thermophysicalProperties");
-
- return
- model.alphaEff()().boundaryField()[patch().index()]
- *thermo.Cp()().boundaryField()[patch().index()];
- }
- else if (mesh.objectRegistry::foundObject<volScalarField>(KName_))
- {
- return patch().lookupPatchField<volScalarField, scalar>(KName_);
- }
- else if (mesh.objectRegistry::foundObject<volSymmTensorField>(KName_))
- {
- const symmTensorField& KWall =
- patch().lookupPatchField<volSymmTensorField, scalar>(KName_);
-
- vectorField n = patch().nf();
-
- return n & KWall & n;
- }
- else
- {
- FatalErrorIn
- (
- "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::K()"
- " const"
- ) << "Did not find field " << KName_
- << " on mesh " << mesh.name() << " patch " << patch().name()
- << endl
- << "Please set 'K' to 'none', a valid volScalarField"
- << " or a valid volSymmTensorField." << exit(FatalError);
-
- return scalarField(0);
- }
-}
-
-
void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
{
if (updated())
@@ -240,7 +190,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
);
// Swap to obtain full local values of neighbour K*delta
- scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs();
+ scalarField nbrKDelta = nbrField.K(nbrField)*nbrPatch.deltaCoeffs();
mapDistribute::distribute
(
Pstream::defaultCommsType,
@@ -251,7 +201,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
nbrKDelta
);
- tmp<scalarField> myKDelta = K()*patch().deltaCoeffs();
+ tmp<scalarField> myKDelta = K(*this)*patch().deltaCoeffs();
// Both sides agree on
@@ -281,7 +231,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
if (debug)
{
- scalar Q = gSum(K()*patch().magSf()*snGrad());
+ scalar Q = gSum(K(*this)*patch().magSf()*snGrad());
Info<< patch().boundaryMesh().mesh().name() << ':'
<< patch().name() << ':'
@@ -307,7 +257,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write
mixedFvPatchScalarField::write(os);
os.writeKeyword("neighbourFieldName")<< neighbourFieldName_
<< token::END_STATEMENT << nl;
- os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl;
+ temperatureCoupledBase::write(os);
}
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
similarity index 91%
rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
rename to src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
index 72ee4daf1609a9041aa774ce4279aed62c26c958..3561c9570406c89d48e1dc9d9729a19dde802de1 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
@@ -38,14 +38,18 @@ Description
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
neighbourFieldName T;
- K K; // or none
+ K lookup;
+ KName K;
value uniform 300;
}
Needs to be on underlying directMapped(Wall)FvPatch.
- Note: if K is "none" looks up RASModel and basicThermo, otherwise expects
- the solver to calculate a 'K' field.
+ Note: K : heat conduction at patch. Gets supplied how to lookup/calculate K:
+ - 'lookup' : lookup volScalarField (or volSymmTensorField) with name
+ - 'basicThermo' : use basicThermo and compressible::RASmodel to calculate K
+ - 'solidThermo' : use basicSolidThermo K()
+ - 'directionalSolidThermo' directionalK()
Note: runs in parallel with arbitrary decomposition. Uses directMapped
functionality to calculate exchange.
@@ -64,9 +68,8 @@ SourceFiles
#ifndef turbulentTemperatureCoupledBaffleMixedFvPatchScalarField_H
#define turbulentTemperatureCoupledBaffleMixedFvPatchScalarField_H
-//#include "fvPatchFields.H"
#include "mixedFvPatchFields.H"
-//#include "fvPatch.H"
+#include "temperatureCoupledBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -81,16 +84,14 @@ namespace compressible
class turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
:
- public mixedFvPatchScalarField
+ public mixedFvPatchScalarField,
+ public temperatureCoupledBase
{
// Private data
//- Name of field on the neighbour region
const word neighbourFieldName_;
- //- Name of thermal conductivity field
- const word KName_;
-
public:
@@ -164,9 +165,6 @@ public:
// Member functions
- //- Get corresponding K field
- tmp<scalarField> K() const;
-
//- Update the coefficients associated with the patch field
virtual void updateCoeffs();
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
index a8a625e71d2c2027d7be65ccbb0ab25ef9504b9e..79432eecb6976be5fd58f3a0d602f436a718c598 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
@@ -51,10 +51,11 @@ laminar::laminar
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
- turbulenceModel(rho, U, phi, thermophysicalModel)
+ turbulenceModel(rho, U, phi, thermophysicalModel, turbulenceModelName)
{}
@@ -65,10 +66,14 @@ autoPtr<laminar> laminar::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
{
- return autoPtr<laminar>(new laminar(rho, U, phi, thermophysicalModel));
+ return autoPtr<laminar>
+ (
+ new laminar(rho, U, phi, thermophysicalModel, turbulenceModelName)
+ );
}
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
index 67296b795057e39ae2ccb500801b326f3612183b..666d7bf776217163dda16d626b6f68125dc9d8ae 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
@@ -66,7 +66,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -78,7 +79,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
index da27aa55ec99cb6124d24e80a04c89543a048591..46ba314504187d261a67ec59656b95ac8250b1ec 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
@@ -47,9 +47,21 @@ turbulenceModel::turbulenceModel
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
:
+ regIOobject
+ (
+ IOobject
+ (
+ turbulenceModelName,
+ U.time().constant(),
+ U.db(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ )
+ ),
runTime_(U.time()),
mesh_(U.mesh()),
@@ -67,7 +79,8 @@ autoPtr<turbulenceModel> turbulenceModel::New
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermophysicalModel
+ const basicThermo& thermophysicalModel,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -99,7 +112,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
(
"turbulenceModel::New(const volScalarField&, "
"const volVectorField&, const surfaceScalarField&, "
- "basicThermo&)"
+ "basicThermo&, const word&)"
) << "Unknown turbulenceModel type "
<< modelType << nl << nl
<< "Valid turbulenceModel types:" << endl
@@ -109,7 +122,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
return autoPtr<turbulenceModel>
(
- cstrIter()(rho, U, phi, thermophysicalModel)
+ cstrIter()(rho, U, phi, thermophysicalModel, turbulenceModelName)
);
}
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
index 420b24f680d9dcde2ae14f36812c8cad47869c3b..3f0f763783d4f9a55d901af6394ec15590d843d7 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
@@ -68,6 +68,8 @@ namespace compressible
\*---------------------------------------------------------------------------*/
class turbulenceModel
+:
+ public regIOobject
{
protected:
@@ -112,9 +114,10 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName
),
- (rho, U, phi, thermoPhysicalModel)
+ (rho, U, phi, thermoPhysicalModel, turbulenceModelName)
);
@@ -126,7 +129,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = typeName
);
@@ -138,7 +142,8 @@ public:
const volScalarField& rho,
const volVectorField& U,
const surfaceScalarField& phi,
- const basicThermo& thermoPhysicalModel
+ const basicThermo& thermoPhysicalModel,
+ const word& turbulenceModelName = typeName
);
@@ -224,6 +229,13 @@ public:
//- Read LESProperties or RASProperties dictionary
virtual bool read() = 0;
+
+ //- Default dummy write function
+ virtual bool writeData(Ostream&) const
+ {
+ return true;
+ }
+
};
diff --git a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
index fd5f421aa96d9ab306958f23a90bb86b3db60a34..67840e4bcbd0f8c977cd835c5caf9571a0b5bdc3 100644
--- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -55,10 +55,11 @@ DeardorffDiffStress::DeardorffDiffStress
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 43c8c5425aab8107efcc5672dff20c02689f368f..e3fb0e13dd7905981cc30e50b738f2fdaf6b5393 100644
--- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -100,7 +100,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
index 4e44ed284f87ac44976f2be53a41f751fdeaee5c..b479e7bdf1a8463970dc330c21f05f7ce215be6d 100644
--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -40,10 +40,11 @@ GenEddyVisc::GenEddyVisc
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(word("GenEddyVisc"), U, phi, transport),
+ LESModel(word("GenEddyVisc"), U, phi, transport, turbulenceModelName),
ce_
(
diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
index 3a30dbf22b3fdc6542f584c6caebd27587f76d2e..44bea7082b5a61e0c47bd1b48056191b519b04bb 100644
--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
@@ -81,7 +81,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
index f8e04ecd47d69e1b2b2b4a39ef6a143f09a26dcd..f75d2d68ecaf94349f17ec7d72254db8e9c43559 100644
--- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
@@ -40,10 +40,11 @@ GenSGSStress::GenSGSStress
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(word("GenSGSStress"), U, phi, transport),
+ LESModel(word("GenSGSStress"), U, phi, transport, turbulenceModelName),
ce_
(
diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
index 4a977b1c34e592a1ae022788b3b96999c48ea5ce..1cb78c415ef6250d9061d06202336ddd3b5d43ce 100644
--- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
@@ -85,7 +85,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
index 1246bdc801b3d167e3c004899368c928c960683c..530c9549f198ef808f5193150937ac18413d21cd 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
@@ -57,10 +57,11 @@ LESModel::LESModel
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- turbulenceModel(U, phi, transport),
+ turbulenceModel(U, phi, transport, turbulenceModelName),
IOdictionary
(
@@ -94,7 +95,8 @@ autoPtr<LESModel> LESModel::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -128,7 +130,8 @@ autoPtr<LESModel> LESModel::New
"("
"const volVectorField&, "
"const surfaceScalarField& ,"
- "transportModel&"
+ "transportModel&, "
+ "const word&"
")"
) << "Unknown LESModel type "
<< modelType << nl << nl
@@ -137,7 +140,10 @@ autoPtr<LESModel> LESModel::New
<< exit(FatalError);
}
- return autoPtr<LESModel>(cstrIter()(U, phi, transport));
+ return autoPtr<LESModel>
+ (
+ cstrIter()(U, phi, transport, turbulenceModelName)
+ );
}
@@ -158,7 +164,22 @@ void LESModel::correct()
bool LESModel::read()
{
- if (regIOobject::read())
+ //if (regIOobject::read())
+
+ // Bit of trickery : we are both IOdictionary ('RASProperties') and
+ // an regIOobject from the turbulenceModel level. Problem is to distinguish
+ // between the two - we only want to reread the IOdictionary.
+
+ bool ok = IOdictionary::readData
+ (
+ IOdictionary::readStream
+ (
+ IOdictionary::type()
+ )
+ );
+ IOdictionary::close();
+
+ if (ok)
{
if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
{
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
index 0d16f7e784cfb79172fd513e56f8a498b5da0642..eafb352fb2c9b501d2cba7e6caa96068a1f20b1a 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
@@ -120,9 +120,10 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
),
- (U, phi, transport)
+ (U, phi, transport, turbulenceModelName)
);
@@ -134,7 +135,8 @@ public:
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -145,7 +147,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
index 59b160e317d07503c6af8c515b2e63094f12b0ec..2b1e589bcbf970497730332155549d7719f4f361 100644
--- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
+++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
@@ -55,10 +55,11 @@ LRRDiffStress::LRRDiffStress
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 b780a01e07263680c84caba6a9eeb34ab5e74c9f..f149913d03435bcc422634457b8849343872c6b8 100644
--- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
+++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
@@ -99,7 +99,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
index 660c2df189530111a80d19611d8ba4aac8943fae..6aa639ccf1de46d730990ac81f22fbfed27c1beb 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
@@ -55,10 +55,11 @@ Smagorinsky::Smagorinsky
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 2be973325699f2da460c9e749fe78de13d5110dc..469c49f2476745bd2f0c60b943393050c06fafe1 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
@@ -96,7 +96,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
index ee1391dc83a78b1b503dc64a8b9a6888fe7051d5..ba03035bdf8ef9d79b55ecf20e3cab42935ec391 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
@@ -46,10 +46,11 @@ Smagorinsky2::Smagorinsky2
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 1cbc1067ba421ce60552e0310ceca2cf3234dbbf..1bb1e16e027c34dac5fbe6e6cdb9f4cedaeb4ffa 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
@@ -93,7 +93,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 8f0885139e4465c079de12490528b8fed28da049..b4e2ca3da89b0a274c8345db61832c8023fa0753 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -149,10 +149,11 @@ SpalartAllmaras::SpalartAllmaras
const volVectorField& U,
const surfaceScalarField& phi,
transportModel& transport,
+ const word& turbulenceModelName,
const word& modelName
)
:
- LESModel(modelName, U, phi, transport),
+ LESModel(modelName, U, phi, transport, turbulenceModelName),
sigmaNut_
(
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
index c7b93f9515286d2d6d812d5a8bc835df1f17a0d5..d2861d3a4c56d33ad426c2f892607649423ad9e2 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -138,6 +138,7 @@ public:
const volVectorField& U,
const surfaceScalarField& phi,
transportModel& transport,
+ 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 9d448f777efaf141cd0ae7aa054b45b2a417e2cb..414ce5558b0c65440d5c401e21de921d66d5fa63 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
@@ -93,10 +93,11 @@ SpalartAllmarasDDES::SpalartAllmarasDDES
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- SpalartAllmaras(U, phi, transport, typeName)
+ SpalartAllmaras(U, phi, transport, turbulenceModelName, typeName)
{}
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
index 7ae6df7ba42fe5a1de8fda7a35357328308e7c26..77cdc5e95d1e10812901c27a7d3d4f25a84e5551 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
@@ -95,7 +95,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
index 884fcc96d5f404fa5b952375ca3ee5ead6ef81de..a6a9d3265813c5b083669223870157d46bd6d25f 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
@@ -143,10 +143,11 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- SpalartAllmaras(U, phi, transport, typeName),
+ SpalartAllmaras(U, phi, transport, turbulenceModelName, typeName),
fwStar_
(
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
index a241d2a05c34fae99899d3f59fa9912675e07fc3..9225f4791c871bd37b754108ccf1fc7479e6f932 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -104,7 +104,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C
index a98b4be0550c4ff84432aa012371aa31829a2740..4e1e409435289450cb41e9c05d8964025a150011 100644
--- a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C
@@ -46,10 +46,11 @@ dynMixedSmagorinsky::dynMixedSmagorinsky
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 0ae54425e033a8843816b55a5d3c4203ec5e008e..be742b8bde73969b3f45c2ed3dc0d08eaed06a54 100644
--- a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
@@ -99,7 +99,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
index 2c78f83eeeb9b3eea70e3e07c5aea10a39aa00d4..89849140ae5231cafa559c48696123e9ee81cacb 100644
--- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
@@ -104,10 +104,11 @@ dynOneEqEddy::dynOneEqEddy
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 6aec69cd557e62c67e0bb79f78881852fad56dd6..2504778f13d1da8c18234b2ce08ff0e4bbe3e5e2 100644
--- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
@@ -110,7 +110,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C
index 9e1a260d4ee2f6148ad71a88e7777deb6c598913..1832b461a38b47fcde0bc4f8f3f32ad06509be45 100644
--- a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C
@@ -95,10 +95,11 @@ dynSmagorinsky::dynSmagorinsky
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 33eebd6d1294b69811802e5918fcd50840da9aff..d7c0356aee6f5bfc25479e326835c9d71b7d2e68 100644
--- a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H
@@ -119,7 +119,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
index 36e3605c923c8f48d2b8e1c19a6b81284441b974..25aaf37ef40c52e4b6c09901df51130a7e239b84 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
@@ -121,10 +121,11 @@ kOmegaSSTSAS::kOmegaSSTSAS
const volVectorField& U,
const surfaceScalarField& phi,
transportModel& transport,
+ const word& turbulenceModelName,
const word& modelName
)
:
- LESModel(modelName, U, phi, transport),
+ LESModel(modelName, U, phi, transport, turbulenceModelName),
alphaK1_
(
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
index 31e454145bd8ac9f2cc861c24228a371f934bc99..8a27d515a22276d55a593a1e4f4d605b343b5344 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -183,6 +183,7 @@ public:
const volVectorField& U,
const surfaceScalarField& phi,
transportModel& transport,
+ 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 ae8bc9ddc4cbb3613e3e1bc3356a67bde6991008..a7e54b14af966e139569051b2f6a081e9d1185db 100644
--- a/src/turbulenceModels/incompressible/LES/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.C
@@ -47,10 +47,11 @@ laminar::laminar
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport)
+ LESModel(typeName, U, phi, transport, turbulenceModelName)
{}
diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.H b/src/turbulenceModels/incompressible/LES/laminar/laminar.H
index addec386a3b8a7720f02806c2a42326c75c3a6a5..cdc2e00c88fa446b3db67b525dfcb4f83b473499 100644
--- a/src/turbulenceModels/incompressible/LES/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.H
@@ -76,7 +76,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C
index 0d0e52524ee215f0cae3361330d2fa47c5554e58..ab1d090a7720e5944770054a5b1c52cc9afdf6af 100644
--- a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C
@@ -95,10 +95,11 @@ locDynOneEqEddy::locDynOneEqEddy
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 fe5ae52ddacf9156014facef390212579b801876..3dbfa514d22c224dd6474092290e413cb26b33c3 100644
--- a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H
@@ -132,7 +132,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
index 15de0f53ad9f6c1aed9f02aeb7a5bc3d898375f4..a2b40f0722f317a0db23b810fabd826e69e8a74a 100644
--- a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
@@ -46,10 +46,11 @@ mixedSmagorinsky::mixedSmagorinsky
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 da6506d2b095573be8616f846cad2059fa1ae184..ffb54f3e77827a2695b988ef58913088a443c64d 100644
--- a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
@@ -99,7 +99,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
index 4d360140f74ed0c98c488f3990af668446c00788..235a48f1d29251a5aa9c3abba36c9b4796fb5df3 100644
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
@@ -56,10 +56,11 @@ oneEqEddy::oneEqEddy
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 cdb58e8bff513e643a7abe30e271a4947c3d17d4..71e389a99e7536be5e71f6941867e8af297ac76e 100644
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
@@ -102,7 +102,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
index 4e406cfbf7d9ce381556297b5ef815bf75834604..6b1526d0eced9b523d08f3cead3a45b70606ad33 100644
--- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
+++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
@@ -44,10 +44,11 @@ scaleSimilarity::scaleSimilarity
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 7911d7b237dc81629e487ad1e21d3d715e3daea9..95aa681ab32d6d4fc7ffd6d47a13709aa70a91b2 100644
--- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
+++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
@@ -84,7 +84,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
index 3369845aa1368837c9dd8a86ba36924c9e8ea624..694b93f57f78c247ed302b006d076dbe62ccf644 100644
--- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
@@ -65,10 +65,11 @@ spectEddyVisc::spectEddyVisc
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- LESModel(typeName, U, phi, transport),
+ LESModel(typeName, 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 615abaa6e50e82e8224347025a321687b0c5578b..d8bfdd9b0cd4fb773897aac3a3d5b7a9f8e6067d 100644
--- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
+++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
@@ -104,7 +104,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index 1463556ca27f8dc50a9e911b812822347ffa8379..32733b9a2d196a1565cffba45629b830789b675d 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -49,10 +49,11 @@ LRR::LRR
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
index 2b916f182a07a119274c8ec23d89e8e739c08051..f359fd0f2eb8085fbebc5937e32405da98f62d31 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
@@ -109,7 +109,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 90f9d3dc3d618b4486b9b49946eb7b43c00397e0..4670e24b7a0d253d373305f2a668f05d8b1f9ffd 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -48,10 +48,11 @@ LamBremhorstKE::LamBremhorstKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
index c246518cab91e1da34ab256d07c89939a3bfcd9a..673c1db7c68325c04ba55bf4a38b0ecf7bca12e2 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
@@ -86,7 +86,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index b42d67284cb564d1107f9e08e1075c65a2416f00..b8fdf50165a262b6058f996aae7c54e1d5514157 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -49,10 +49,11 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 7df7624f820350db734d521919d6c5018edc4a0e..f6f1153c1d82990f6bb21dc5c576b84918d3c9cc 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -120,7 +120,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index 38c789d3223bcc4dfd3b9c95c2996ebf3bbc40d0..f7b50029863c2a9b4a63b384e1dae117436f17b6 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -64,10 +64,11 @@ LaunderSharmaKE::LaunderSharmaKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 05cfafa5c80d2636fc7ee5397d560dcf17df2fab..e20f9aaf592f8bca0c045fb1b2726364fb1feeec 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -102,7 +102,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index eac566e5e5292316ca0485c503287b098c450930..bc501c1334ed83864b1abf8738e13ca607313673 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -48,10 +48,11 @@ LienCubicKE::LienCubicKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
C1_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
index d7c616d50b14006c3c8ef0711d4491bab0d55b01..ae6fc56bb2078295af914669cc4d29e41f35f875 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
@@ -99,7 +99,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
index 264293e0fad29a675a6e73c8ab2689f24843b5c3..dd2954d96f9d51c8e83a855991d8c7da8d0b97f0 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
@@ -49,10 +49,11 @@ LienCubicKELowRe::LienCubicKELowRe
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
C1_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
index 39420789162a1c7fb8ff705f97c4ebaf7659ab3e..975f2670ccdd8d1cf785c568109668c6ea4cf72b 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
@@ -126,7 +126,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index ba2483529cf70f099944440a2224c16aebaa13ce..413203d87c27b301de3e7488f2236b7e309df345 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -49,10 +49,11 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
C1_
(
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
index 0cd19ca629f01e58cd966f1e238c8cb886d63dbc..096f92a442bcd96fb562f8728c456d8dca73ab18 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
@@ -95,7 +95,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
index f5ece338cfec2b3c7e43c5b44a6c237a166be196..9424f3fb122b45506b8ee1e7ef8433d06c60982a 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
@@ -47,10 +47,11 @@ NonlinearKEShih::NonlinearKEShih
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
C1_
(
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
index 1ca72f44f433c8d7e0e5b4b3b76ad053c0fc95a4..dc3b31f1d8744e8abe9759c90e8998aa30ce7aef 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
@@ -102,7 +102,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index 27e465720fae6118f146993f4058402c16db7453..2b93114c49f7e9939ea5454dc70eea3bf46b54e2 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -58,10 +58,11 @@ RASModel::RASModel
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- turbulenceModel(U, phi, transport),
+ turbulenceModel(U, phi, transport, turbulenceModelName),
IOdictionary
(
@@ -101,7 +102,8 @@ autoPtr<RASModel> RASModel::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -135,7 +137,8 @@ autoPtr<RASModel> RASModel::New
"("
"const volVectorField&, "
"const surfaceScalarField&, "
- "transportModel&"
+ "transportModel&, "
+ "const word&"
")"
) << "Unknown RASModel type "
<< modelType << nl << nl
@@ -144,7 +147,10 @@ autoPtr<RASModel> RASModel::New
<< exit(FatalError);
}
- return autoPtr<RASModel>(cstrIter()(U, phi, transport));
+ return autoPtr<RASModel>
+ (
+ cstrIter()(U, phi, transport, turbulenceModelName)
+ );
}
@@ -206,7 +212,22 @@ void RASModel::correct()
bool RASModel::read()
{
- if (regIOobject::read())
+ //if (regIOobject::read())
+
+ // Bit of trickery : we are both IOdictionary ('RASProperties') and
+ // an regIOobject from the turbulenceModel level. Problem is to distinguish
+ // between the two - we only want to reread the IOdictionary.
+
+ bool ok = IOdictionary::readData
+ (
+ IOdictionary::readStream
+ (
+ IOdictionary::type()
+ )
+ );
+ IOdictionary::close();
+
+ if (ok)
{
lookup("turbulence") >> turbulence_;
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
index 3fb426e4a2054fcdc36334cb4eecffcbde991ff3..1485f9516c78db62f89704ec16bbfb9483511ac8 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
@@ -131,9 +131,10 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
),
- (U, phi, transport)
+ (U, phi, transport, turbulenceModelName)
);
@@ -145,7 +146,8 @@ public:
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -156,7 +158,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 8ee789e9bdf2b60adba8de2cbc38ff2e646a8dbe..e927f484214bb3bb875e830f9dbbfef42d9b2616 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -48,10 +48,11 @@ RNGkEpsilon::RNGkEpsilon
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
index be56746b162198ce5f10155e243ca2cae613b3af..e0d55e02e898069afc583e8335751c12c65cc1ba 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -100,7 +100,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 3d3b3dd1ee30edad364e491121f012ba2905bef4..1c894f2679267618146421c66d3500a53a2f6a3a 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -106,10 +106,11 @@ SpalartAllmaras::SpalartAllmaras
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
sigmaNut_
(
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index 6763149306bfd331020df44c4156742a93dea4bf..65bae4e6c688de434b1e0b6011d702d21665807f 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -144,7 +144,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
index b6c407d44d44a91ba74fa997c5ee4f82bbb760f4..0bd74b65caad2a18798f0e19510f8a8832a407f7 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
@@ -48,10 +48,11 @@ kEpsilon::kEpsilon
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
index b13666dacfa345b59957320769515c03732517de..0c5139fae0e441262928e5f28b23c25c0bed1ff1 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
@@ -94,7 +94,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
index e4e8b9b0218c78c50812c9f21adda2b5bc211232..c9611790eb9cdce2879a2fdeacb0a721d7f6ba16 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
@@ -48,10 +48,11 @@ kOmega::kOmega
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
index 1027e5eec58f748aa920b66ebf7ac8f55f5baae5..c53dfcb3963d18eccfb2a23c480210c2b4e4f7af 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
@@ -108,7 +108,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index d841dd691144d4003b4ec36160e03daa400218a5..5c502cc1b5d2fc41079b3d2202ab38232af40c0c 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -91,10 +91,11 @@ kOmegaSST::kOmegaSST
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
alphaK1_
(
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
index c233a52e6c6f1fab937fe310f28c1e8271ee975b..e03442523ec28727c38b6a59d0c7f4744e226605 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
@@ -178,7 +178,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
index ddd04612417ae0ae89557f9b1acf24dd679d752b..066a68ffa81875b36c1145cede0c7ae81987df07 100644
--- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
@@ -46,10 +46,11 @@ laminar::laminar
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport)
+ RASModel(typeName, U, phi, transport, turbulenceModelName)
{}
diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
index 8217044927fea5e52ea20164005d1e807ca0a551..34c5120b74d8dda3b9307bb5eed390cb264b0ef7 100644
--- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
@@ -67,7 +67,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
index 206db4fdec9b0802e982afe12fe48d5fa7798f0b..b72ea68054c4e10afb08ee91a68120cf005b3f84 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
@@ -74,10 +74,11 @@ qZeta::qZeta
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
index c8961d52288dffde028ed53afd5d2473f50ca9ae..0369f9256c83dfc9569576c2148857635d17de5a 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
@@ -100,7 +100,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
index 53b19dd899ff0a6a2b5cbf97c8fa14c23068ff7f..432c74f1435f4467c86f4f1045d5b73ac954eef8 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
@@ -89,10 +89,11 @@ realizableKE::realizableKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
- RASModel(typeName, U, phi, transport),
+ RASModel(typeName, U, phi, transport, turbulenceModelName),
Cmu_
(
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
index b1495aa6e871b20598c857659acdc67b587b8cbc..447f022e42aa8acd6fbe520bb43fc35b86adff2d 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
@@ -119,7 +119,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
index 01d50d4b220271f3bfe47811eedc777a82b6ed53..b36ce1da1e57bb7307eb67ad7444c3f1115ea58c 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
@@ -50,10 +50,12 @@ laminar::laminar
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
+
)
:
- turbulenceModel(U, phi, transport)
+ turbulenceModel(U, phi, transport, turbulenceModelName)
{}
@@ -63,10 +65,14 @@ autoPtr<laminar> laminar::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
{
- return autoPtr<laminar>(new laminar(U, phi, transport));
+ return autoPtr<laminar>
+ (
+ new laminar(U, phi, transport, turbulenceModelName)
+ );
}
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
index 6c59eb30e96ace2dd9b936b6984e5c704bd9df21..affe6165fc079dd55be3305ecbd86424a59ebea2 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
@@ -65,7 +65,9 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
+
);
@@ -76,7 +78,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
index 79e94c0741565e1ecec842b3ecfcc614a63d9e11..39ee72bf2c44a8f9d82bd187741e0f303860a676 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
@@ -45,9 +45,21 @@ turbulenceModel::turbulenceModel
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
:
+ regIOobject
+ (
+ IOobject
+ (
+ turbulenceModelName,
+ U.time().constant(),
+ U.db(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE
+ )
+ ),
runTime_(U.time()),
mesh_(U.mesh()),
@@ -63,7 +75,8 @@ autoPtr<turbulenceModel> turbulenceModel::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
)
{
// get model name, but do not register the dictionary
@@ -94,7 +107,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
FatalErrorIn
(
"turbulenceModel::New(const volVectorField&, "
- "const surfaceScalarField&, transportModel&)"
+ "const surfaceScalarField&, transportModel&, const word&)"
) << "Unknown turbulenceModel type "
<< modelType << nl << nl
<< "Valid turbulenceModel types:" << endl
@@ -102,7 +115,10 @@ autoPtr<turbulenceModel> turbulenceModel::New
<< exit(FatalError);
}
- return autoPtr<turbulenceModel>(cstrIter()(U, phi, transport));
+ return autoPtr<turbulenceModel>
+ (
+ cstrIter()(U, phi, transport, turbulenceModelName)
+ );
}
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
index c970a6501920524f5fd5322d9e295342a956674c..40f9321b803c5066a066ee5b451562157d9ca6c2 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
@@ -67,6 +67,8 @@ namespace incompressible
\*---------------------------------------------------------------------------*/
class turbulenceModel
+:
+ public regIOobject
{
protected:
@@ -109,9 +111,10 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName
),
- (U, phi, transport)
+ (U, phi, transport, turbulenceModelName)
);
@@ -122,7 +125,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = typeName
);
@@ -133,7 +137,8 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport
+ transportModel& transport,
+ const word& turbulenceModelName = typeName
);
@@ -194,6 +199,12 @@ public:
//- Read LESProperties or RASProperties dictionary
virtual bool read() = 0;
+
+ //- Default dummy write function
+ virtual bool writeData(Ostream&) const
+ {
+ return true;
+ }
};