From 9544280e658025107b80fa7877cfecb4ab158e95 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 11 Jun 2010 16:39:16 +0100
Subject: [PATCH] ENH: Register turbulenceModel with optional name (default is
'turbulenceModel')
Now instead of looking up RASModel we can lookup turbulenceModel instead.
---
.../turbulence/PDRkEpsilon/PDRkEpsilon.C | 5 +-
.../turbulence/PDRkEpsilon/PDRkEpsilon.H | 3 +-
.../DeardorffDiffStress/DeardorffDiffStress.C | 5 +-
.../DeardorffDiffStress/DeardorffDiffStress.H | 3 +-
.../LES/GenEddyVisc/GenEddyVisc.C | 10 ++-
.../LES/GenEddyVisc/GenEddyVisc.H | 3 +-
.../LES/GenSGSStress/GenSGSStress.C | 6 +-
.../LES/GenSGSStress/GenSGSStress.H | 3 +-
.../compressible/LES/LESModel/LESModel.C | 32 ++++++--
.../compressible/LES/LESModel/LESModel.H | 11 ++-
.../LES/Smagorinsky/Smagorinsky.C | 5 +-
.../LES/Smagorinsky/Smagorinsky.H | 3 +-
.../LES/SpalartAllmaras/SpalartAllmaras.C | 5 +-
.../LES/SpalartAllmaras/SpalartAllmaras.H | 3 +-
.../LES/dynOneEqEddy/dynOneEqEddy.C | 5 +-
.../LES/dynOneEqEddy/dynOneEqEddy.H | 3 +-
.../LES/lowReOneEqEddy/lowReOneEqEddy.C | 5 +-
.../LES/lowReOneEqEddy/lowReOneEqEddy.H | 3 +-
.../compressible/LES/oneEqEddy/oneEqEddy.C | 5 +-
.../compressible/LES/oneEqEddy/oneEqEddy.H | 3 +-
.../compressible/RAS/LRR/LRR.C | 5 +-
.../compressible/RAS/LRR/LRR.H | 3 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 5 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H | 3 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 5 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 3 +-
.../compressible/RAS/Make/files | 4 -
.../compressible/RAS/Make/options | 1 +
.../compressible/RAS/RASModel/RASModel.C | 30 ++++++--
.../compressible/RAS/RASModel/RASModel.H | 11 ++-
.../RAS/RNGkEpsilon/RNGkEpsilon.C | 5 +-
.../RAS/RNGkEpsilon/RNGkEpsilon.H | 3 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.C | 5 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.H | 3 +-
.../compressible/RAS/kEpsilon/kEpsilon.C | 5 +-
.../compressible/RAS/kEpsilon/kEpsilon.H | 3 +-
.../compressible/RAS/kOmegaSST/kOmegaSST.C | 5 +-
.../compressible/RAS/kOmegaSST/kOmegaSST.H | 3 +-
.../compressible/RAS/laminar/laminar.C | 5 +-
.../compressible/RAS/laminar/laminar.H | 3 +-
.../RAS/realizableKE/realizableKE.C | 5 +-
.../RAS/realizableKE/realizableKE.H | 3 +-
.../compressible/turbulenceModel/Make/files | 7 ++
.../compressible/turbulenceModel/Make/options | 10 ++-
.../temperatureCoupledBase.C | 24 +++---
.../temperatureCoupledBase.H | 18 ++---
...entHeatFluxTemperatureFvPatchScalarField.C | 23 +++---
...entHeatFluxTemperatureFvPatchScalarField.H | 7 +-
.../regionProperties.C | 0
.../regionProperties.H | 0
...mperatureCoupledBaffleFvPatchScalarField.C | 74 +++----------------
...mperatureCoupledBaffleFvPatchScalarField.H | 16 ++--
...tureCoupledBaffleMixedFvPatchScalarField.C | 74 +++----------------
...tureCoupledBaffleMixedFvPatchScalarField.H | 22 +++---
.../turbulenceModel/laminar/laminar.C | 13 +++-
.../turbulenceModel/laminar/laminar.H | 6 +-
.../turbulenceModel/turbulenceModel.C | 21 +++++-
.../turbulenceModel/turbulenceModel.H | 20 ++++-
.../DeardorffDiffStress/DeardorffDiffStress.C | 5 +-
.../DeardorffDiffStress/DeardorffDiffStress.H | 3 +-
.../LES/GenEddyVisc/GenEddyVisc.C | 5 +-
.../LES/GenEddyVisc/GenEddyVisc.H | 3 +-
.../LES/GenSGSStress/GenSGSStress.C | 5 +-
.../LES/GenSGSStress/GenSGSStress.H | 3 +-
.../incompressible/LES/LESModel/LESModel.C | 33 +++++++--
.../incompressible/LES/LESModel/LESModel.H | 11 ++-
.../LES/LRRDiffStress/LRRDiffStress.C | 5 +-
.../LES/LRRDiffStress/LRRDiffStress.H | 3 +-
.../LES/Smagorinsky/Smagorinsky.C | 5 +-
.../LES/Smagorinsky/Smagorinsky.H | 3 +-
.../LES/Smagorinsky2/Smagorinsky2.C | 5 +-
.../LES/Smagorinsky2/Smagorinsky2.H | 3 +-
.../LES/SpalartAllmaras/SpalartAllmaras.C | 3 +-
.../LES/SpalartAllmaras/SpalartAllmaras.H | 1 +
.../SpalartAllmarasDDES/SpalartAllmarasDDES.C | 5 +-
.../SpalartAllmarasDDES/SpalartAllmarasDDES.H | 3 +-
.../SpalartAllmarasIDDES.C | 5 +-
.../SpalartAllmarasIDDES.H | 3 +-
.../dynMixedSmagorinsky/dynMixedSmagorinsky.C | 5 +-
.../dynMixedSmagorinsky/dynMixedSmagorinsky.H | 3 +-
.../LES/dynOneEqEddy/dynOneEqEddy.C | 5 +-
.../LES/dynOneEqEddy/dynOneEqEddy.H | 3 +-
.../LES/dynSmagorinsky/dynSmagorinsky.C | 5 +-
.../LES/dynSmagorinsky/dynSmagorinsky.H | 3 +-
.../LES/kOmegaSSTSAS/kOmegaSSTSAS.C | 3 +-
.../LES/kOmegaSSTSAS/kOmegaSSTSAS.H | 1 +
.../incompressible/LES/laminar/laminar.C | 5 +-
.../incompressible/LES/laminar/laminar.H | 3 +-
.../LES/locDynOneEqEddy/locDynOneEqEddy.C | 5 +-
.../LES/locDynOneEqEddy/locDynOneEqEddy.H | 3 +-
.../LES/mixedSmagorinsky/mixedSmagorinsky.C | 5 +-
.../LES/mixedSmagorinsky/mixedSmagorinsky.H | 3 +-
.../incompressible/LES/oneEqEddy/oneEqEddy.C | 5 +-
.../incompressible/LES/oneEqEddy/oneEqEddy.H | 3 +-
.../LES/scaleSimilarity/scaleSimilarity.C | 5 +-
.../LES/scaleSimilarity/scaleSimilarity.H | 3 +-
.../LES/spectEddyVisc/spectEddyVisc.C | 5 +-
.../LES/spectEddyVisc/spectEddyVisc.H | 3 +-
.../incompressible/RAS/LRR/LRR.C | 5 +-
.../incompressible/RAS/LRR/LRR.H | 3 +-
.../RAS/LamBremhorstKE/LamBremhorstKE.C | 5 +-
.../RAS/LamBremhorstKE/LamBremhorstKE.H | 3 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 5 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H | 3 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 5 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 3 +-
.../RAS/LienCubicKE/LienCubicKE.C | 5 +-
.../RAS/LienCubicKE/LienCubicKE.H | 3 +-
.../RAS/LienCubicKELowRe/LienCubicKELowRe.C | 5 +-
.../RAS/LienCubicKELowRe/LienCubicKELowRe.H | 3 +-
.../LienLeschzinerLowRe/LienLeschzinerLowRe.C | 5 +-
.../LienLeschzinerLowRe/LienLeschzinerLowRe.H | 3 +-
.../RAS/NonlinearKEShih/NonlinearKEShih.C | 5 +-
.../RAS/NonlinearKEShih/NonlinearKEShih.H | 3 +-
.../incompressible/RAS/RASModel/RASModel.C | 33 +++++++--
.../incompressible/RAS/RASModel/RASModel.H | 11 ++-
.../RAS/RNGkEpsilon/RNGkEpsilon.C | 5 +-
.../RAS/RNGkEpsilon/RNGkEpsilon.H | 3 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.C | 5 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.H | 3 +-
.../incompressible/RAS/kEpsilon/kEpsilon.C | 5 +-
.../incompressible/RAS/kEpsilon/kEpsilon.H | 3 +-
.../incompressible/RAS/kOmega/kOmega.C | 5 +-
.../incompressible/RAS/kOmega/kOmega.H | 3 +-
.../incompressible/RAS/kOmegaSST/kOmegaSST.C | 5 +-
.../incompressible/RAS/kOmegaSST/kOmegaSST.H | 3 +-
.../incompressible/RAS/laminar/laminar.C | 5 +-
.../incompressible/RAS/laminar/laminar.H | 3 +-
.../incompressible/RAS/qZeta/qZeta.C | 5 +-
.../incompressible/RAS/qZeta/qZeta.H | 3 +-
.../RAS/realizableKE/realizableKE.C | 5 +-
.../RAS/realizableKE/realizableKE.H | 3 +-
.../turbulenceModel/laminar/laminar.C | 14 +++-
.../turbulenceModel/laminar/laminar.H | 7 +-
.../turbulenceModel/turbulenceModel.C | 24 +++++-
.../turbulenceModel/turbulenceModel.H | 19 ++++-
136 files changed, 586 insertions(+), 412 deletions(-)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C (88%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H (87%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C (92%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H (96%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C (100%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H (100%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C (82%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H (93%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C (79%)
rename src/turbulenceModels/compressible/{RAS => turbulenceModel}/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H (91%)
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 39c2158ddaa..7cc76e0f8d0 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 483c7257dc6..c5e641012cc 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 bfbff460d8f..0ae14cbcfa8 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 308f8ca669c..5400e8cf004 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 d379ce27512..9d00a040d2e 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 d27132c0008..7fa5fb056e0 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 bd70457c9f2..eeff8aa1c9e 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 0eaedf16a2a..0ebcce8408b 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 bf1f726c32c..1933b0b68c2 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 a1a05c83db2..a4fd1a3246f 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 d525ab2513d..8370b5e50b4 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 88f943366c2..4ef0452cfc6 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 1ca27f56f6e..fbe4bfa1af5 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 b3f2f5692f7..17949151df2 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 80b6cd6928e..b3beef1246c 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 6685160e8f2..d2546bf4e20 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 8c5cd799672..48e89e77929 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 babd2fdde15..693b80adcea 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 961ffed4dfa..593ba56a69a 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 ac83307700e..de962849324 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 a67a4978515..0b0efbb58b6 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 e1241528d6d..d9394d2f3ad 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 43103326a96..1a4ebdbf63a 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 e9343bec598..9a9f81ccd4c 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 b7d12e08230..455b65f48f3 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 ce85709cfea..c2952c3b4d1 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 4301cde4259..ccfc9b6b27a 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 b2b75c89904..0e3ec0f8fbe 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 64594ff010e..b0d48870d1f 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 331f86457ad..fd55a3b671f 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 3aa82622fb8..44c5c0fbc11 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 43b39a7ac12..c0baeb01e88 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 821f2cdb207..ce16b21445c 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 8164624bddc..c29146f1b91 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 023cf7d9b6f..efc93ab95ee 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 ca00c5d267b..9269be0620f 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 b7644b3d543..d0c7b9b5177 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 0ee1502aa9e..240a3bb99d9 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 6467eba7a02..f0069c4e9a1 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 5543d532a14..c465fc9a4ae 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 9a1c2a405c8..4490a43506f 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 ab86cd0015b..45332c79881 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 3f01b203540..8bd26ec944e 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 075a03796ee..1a60c8b98c6 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 1026ca123cb..3fe205f4562 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 35b4de5e238..57ed78cefa5 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 f529a8caf1c..4b2a0c20b95 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 d40ec1ab7c8..8d9024daf73 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 381b24ae0c0..9dc81a1f44f 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 2128c39d211..5236f5f9422 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 278320f2531..e159c15df2b 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 72ee4daf160..3561c957040 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 a8a625e71d2..79432eecb69 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 67296b79505..666d7bf7762 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 da27aa55ec9..46ba3145041 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 420b24f680d..3f0f763783d 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 fd5f421aa96..67840e4bcbd 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 43c8c5425aa..e3fb0e13dd7 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 4e44ed284f8..b479e7bdf1a 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 3a30dbf22b3..44bea7082b5 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 f8e04ecd47d..f75d2d68eca 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 4a977b1c34e..1cb78c415ef 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 1246bdc801b..530c9549f19 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 0d16f7e784c..eafb352fb2c 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 59b160e317d..2b1e589bcbf 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 b780a01e072..f149913d034 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 660c2df1895..6aa639ccf1d 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 2be97332569..469c49f2476 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 ee1391dc83a..ba03035bdf8 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 1cbc1067ba4..1bb1e16e027 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 8f0885139e4..b4e2ca3da89 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 c7b93f95152..d2861d3a4c5 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 9d448f777ef..414ce5558b0 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 7ae6df7ba42..77cdc5e95d1 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 884fcc96d5f..a6a9d326581 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 a241d2a05c3..9225f4791c8 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 a98b4be0550..4e1e4094352 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 0ae54425e03..be742b8bde7 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 2c78f83eeeb..89849140ae5 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 6aec69cd557..2504778f13d 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 9e1a260d4ee..1832b461a38 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 33eebd6d129..d7c0356aee6 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 36e3605c923..25aaf37ef40 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 31e454145bd..8a27d515a22 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 ae8bc9ddc4c..a7e54b14af9 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 addec386a3b..cdc2e00c88f 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 0d0e52524ee..ab1d090a772 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 fe5ae52ddac..3dbfa514d22 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 15de0f53ad9..a2b40f0722f 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 da6506d2b09..ffb54f3e778 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 4d360140f74..235a48f1d29 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 cdb58e8bff5..71e389a99e7 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 4e406cfbf7d..6b1526d0ece 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 7911d7b237d..95aa681ab32 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 3369845aa13..694b93f57f7 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 615abaa6e50..d8bfdd9b0cd 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 1463556ca27..32733b9a2d1 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 2b916f182a0..f359fd0f2eb 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 90f9d3dc3d6..4670e24b7a0 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 c246518cab9..673c1db7c68 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 b42d67284cb..b8fdf50165a 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 7df7624f820..f6f1153c1d8 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 38c789d3223..f7b50029863 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 05cfafa5c80..e20f9aaf592 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 eac566e5e52..bc501c1334e 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 d7c616d50b1..ae6fc56bb20 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 264293e0fad..dd2954d96f9 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 39420789162..975f2670ccd 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 ba2483529cf..413203d87c2 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 0cd19ca629f..096f92a442b 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 f5ece338cfe..9424f3fb122 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 1ca72f44f43..dc3b31f1d87 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 27e465720fa..2b93114c49f 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 3fb426e4a20..1485f9516c7 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 8ee789e9bdf..e927f484214 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 be56746b162..e0d55e02e89 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 3d3b3dd1ee3..1c894f26792 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 6763149306b..65bae4e6c68 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 b6c407d44d4..0bd74b65caa 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 b13666dacfa..0c5139fae0e 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 e4e8b9b0218..c9611790eb9 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 1027e5eec58..c53dfcb3963 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 d841dd69114..5c502cc1b5d 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 c233a52e6c6..e03442523ec 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 ddd04612417..066a68ffa81 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 8217044927f..34c5120b74d 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 206db4fdec9..b72ea68054c 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 c8961d52288..0369f9256c8 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 53b19dd899f..432c74f1435 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 b1495aa6e87..447f022e42a 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 01d50d4b220..b36ce1da1e5 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 6c59eb30e96..affe6165fc0 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 79e94c07415..39ee72bf2c4 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 c970a650192..40f9321b803 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;
+ }
};
--
GitLab