From d40a374cbc6249dbb4138d07412164a478d1cdca Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 12 Oct 2012 12:47:54 +0100
Subject: [PATCH] dictionary: changes field scoping operator from "::" to '.'
---
.../turbulence/PDRkEpsilon/PDRkEpsilon.C | 2 +-
.../applyBoundaryLayer/applyBoundaryLayer.C | 2 +-
src/OpenFOAM/db/dictionary/dictionary.C | 10 +++----
src/OpenFOAM/db/dictionary/dictionary.H | 2 +-
src/OpenFOAM/db/dictionary/dictionaryIO.C | 2 +-
.../primitiveEntry/primitiveEntry.C | 2 +-
.../primitiveEntry/primitiveEntryIO.C | 4 +--
.../pressureGradientExplicitSource.C | 2 +-
.../finiteVolume/fvSchemes/fvSchemes.C | 30 +++++++++----------
.../Templates/KinematicCloud/KinematicCloud.C | 8 ++---
.../KinematicCloud/KinematicCloudI.H | 6 ++--
.../Templates/ReactingCloud/ReactingCloudI.H | 8 ++---
.../Templates/ThermoCloud/ThermoCloud.C | 20 ++++++-------
.../LocalInteraction/LocalInteraction.C | 8 ++---
.../field/turbulenceFields/turbulenceFields.C | 2 +-
.../turbulenceFieldsTemplates.C | 2 +-
.../noRadiation/noRadiation.C | 2 +-
.../standardRadiation/standardRadiation.C | 2 +-
.../thermoBaffleModels/noThermo/noThermo.C | 18 +++++++----
.../chemistryModel/chemistryModel.C | 2 +-
.../ODESolidChemistryModel.C | 4 +--
.../compressible/RAS/LRR/LRR.C | 2 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 2 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 2 +-
.../RAS/RNGkEpsilon/RNGkEpsilon.C | 2 +-
.../epsilonWallFunctionFvPatchScalarField.C | 6 ++--
.../omegaWallFunctionFvPatchScalarField.C | 6 ++--
.../compressible/RAS/kEpsilon/kEpsilon.C | 2 +-
.../compressible/RAS/kOmegaSST/kOmegaSST.C | 2 +-
.../RAS/realizableKE/realizableKE.C | 2 +-
.../incompressible/RAS/LRR/LRR.C | 2 +-
.../RAS/LamBremhorstKE/LamBremhorstKE.C | 2 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 2 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 2 +-
.../RAS/LienCubicKE/LienCubicKE.C | 2 +-
.../RAS/LienCubicKELowRe/LienCubicKELowRe.C | 2 +-
.../LienLeschzinerLowRe/LienLeschzinerLowRe.C | 2 +-
.../RAS/NonlinearKEShih/NonlinearKEShih.C | 2 +-
.../RAS/RNGkEpsilon/RNGkEpsilon.C | 2 +-
.../epsilonWallFunctionFvPatchScalarField.C | 6 ++--
.../omegaWallFunctionFvPatchScalarField.C | 6 ++--
.../incompressible/RAS/kEpsilon/kEpsilon.C | 2 +-
.../incompressible/RAS/kOmega/kOmega.C | 2 +-
.../incompressible/RAS/kOmegaSST/kOmegaSST.C | 2 +-
.../RAS/kOmegaSST/kOmegaSST.C.new | 2 +-
.../incompressible/RAS/qZeta/qZeta.C | 2 +-
.../RAS/realizableKE/realizableKE.C | 2 +-
47 files changed, 106 insertions(+), 100 deletions(-)
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 79b9fb7756f..44c4f6052fb 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -116,7 +116,7 @@ void PDRkEpsilon::correct()
}
tmp<volTensorField> tgradU = fvc::grad(U_);
- volScalarField G("RASModel::G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
+ volScalarField G("RASModel.G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
tgradU.clear();
// Update espsilon and G at the wall
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 69cee38a01c..13c5841c3ae 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
}
// Create G field - used by RAS wall functions
- volScalarField G("RASModel::G", nut*2*sqr(S));
+ volScalarField G("RASModel.G", nut*2*sqr(S));
//--- Read and modify turbulence fields
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 40abb17d470..295749ea4c8 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -189,7 +189,7 @@ Foam::dictionary::dictionary
parent_(parentDict)
{
transfer(dict());
- name() = parentDict.name() + "::" + name();
+ name() = parentDict.name() + '.' + name();
}
@@ -622,7 +622,7 @@ Foam::dictionary Foam::dictionary::subOrEmptyDict
}
else
{
- return dictionary(*this, dictionary(name() + "::" + keyword));
+ return dictionary(*this, dictionary(name() + '.' + keyword));
}
}
else
@@ -690,7 +690,7 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
if (hashedEntries_.insert(entryPtr->keyword(), entryPtr))
{
- entryPtr->name() = name() + "::" + entryPtr->keyword();
+ entryPtr->name() = name() + '.' + entryPtr->keyword();
if (entryPtr->keyword().isPattern())
{
@@ -718,7 +718,7 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
if (hashedEntries_.insert(entryPtr->keyword(), entryPtr))
{
- entryPtr->name() = name() + "::" + entryPtr->keyword();
+ entryPtr->name() = name() + '.' + entryPtr->keyword();
IDLList<entry>::append(entryPtr);
if (entryPtr->keyword().isPattern())
@@ -925,7 +925,7 @@ bool Foam::dictionary::changeKeyword
// change name and HashTable, but leave DL-List untouched
iter()->keyword() = newKeyword;
- iter()->name() = name() + "::" + newKeyword;
+ iter()->name() = name() + '.' + newKeyword;
hashedEntries_.erase(oldKeyword);
hashedEntries_.insert(newKeyword, iter());
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 17901737caa..2eab9e2778b 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -117,7 +117,7 @@ public:
{
const word scopedName = name_.name();
- string::size_type i = scopedName.rfind(':');
+ string::size_type i = scopedName.rfind('.');
if (i == scopedName.npos)
{
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index aa1321d9147..48e92e5340e 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -37,7 +37,7 @@ Foam::dictionary::dictionary
Istream& is
)
:
- dictionaryName(parentDict.name() + "::" + name),
+ dictionaryName(parentDict.name() + '.' + name),
parent_(parentDict)
{
read(is);
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
index c91f3df5aa7..1349e66ebff 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
@@ -81,7 +81,7 @@ Foam::primitiveEntry::primitiveEntry(const keyType& key, const ITstream& is)
entry(key),
ITstream(is)
{
- name() += "::" + keyword();
+ name() += '.' + keyword();
}
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
index fd442af47ae..763981488c6 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
@@ -186,7 +186,7 @@ Foam::primitiveEntry::primitiveEntry
entry(key),
ITstream
(
- is.name() + "::" + key,
+ is.name() + '.' + key,
tokenList(10),
is.format(),
is.version()
@@ -201,7 +201,7 @@ Foam::primitiveEntry::primitiveEntry(const keyType& key, Istream& is)
entry(key),
ITstream
(
- is.name() + "::" + key,
+ is.name() + '.' + key,
tokenList(10),
is.format(),
is.version()
diff --git a/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C b/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C
index 02bd8ae0dcb..790fac2c8bf 100644
--- a/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C
+++ b/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C
@@ -210,7 +210,7 @@ void Foam::pressureGradientExplicitSource::setValue
(
IOobject
(
- name_ + "::invA",
+ name_ + ".invA",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index bdbe5db0923..fdc3ed23f73 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
@@ -269,98 +269,98 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
(
ITstream
(
- objectPath() + "::ddtSchemes",
+ objectPath() + ".ddtSchemes",
tokenList()
)()
),
defaultDdtScheme_
(
- ddtSchemes_.name() + "::default",
+ ddtSchemes_.name() + ".default",
tokenList()
),
d2dt2Schemes_
(
ITstream
(
- objectPath() + "::d2dt2Schemes",
+ objectPath() + ".d2dt2Schemes",
tokenList()
)()
),
defaultD2dt2Scheme_
(
- d2dt2Schemes_.name() + "::default",
+ d2dt2Schemes_.name() + ".default",
tokenList()
),
interpolationSchemes_
(
ITstream
(
- objectPath() + "::interpolationSchemes",
+ objectPath() + ".interpolationSchemes",
tokenList()
)()
),
defaultInterpolationScheme_
(
- interpolationSchemes_.name() + "::default",
+ interpolationSchemes_.name() + ".default",
tokenList()
),
divSchemes_
(
ITstream
(
- objectPath() + "::divSchemes",
+ objectPath() + ".divSchemes",
tokenList()
)()
),
defaultDivScheme_
(
- divSchemes_.name() + "::default",
+ divSchemes_.name() + ".default",
tokenList()
),
gradSchemes_
(
ITstream
(
- objectPath() + "::gradSchemes",
+ objectPath() + ".gradSchemes",
tokenList()
)()
),
defaultGradScheme_
(
- gradSchemes_.name() + "::default",
+ gradSchemes_.name() + ".default",
tokenList()
),
snGradSchemes_
(
ITstream
(
- objectPath() + "::snGradSchemes",
+ objectPath() + ".snGradSchemes",
tokenList()
)()
),
defaultSnGradScheme_
(
- snGradSchemes_.name() + "::default",
+ snGradSchemes_.name() + ".default",
tokenList()
),
laplacianSchemes_
(
ITstream
(
- objectPath() + "::laplacianSchemes",
+ objectPath() + ".laplacianSchemes",
tokenList()
)()
),
defaultLaplacianScheme_
(
- laplacianSchemes_.name() + "::default",
+ laplacianSchemes_.name() + ".default",
tokenList()
),
fluxRequired_
(
ITstream
(
- objectPath() + "::fluxRequired",
+ objectPath() + ".fluxRequired",
tokenList()
)()
),
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index ef332fa673e..e9cd4a0ac85 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -346,7 +346,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
(
IOobject
(
- this->name() + "::UTrans",
+ this->name() + ".UTrans",
this->db().time().timeName(),
this->db(),
IOobject::READ_IF_PRESENT,
@@ -362,7 +362,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
(
IOobject
(
- this->name() + "::UCoeff",
+ this->name() + ".UCoeff",
this->db().time().timeName(),
this->db(),
IOobject::READ_IF_PRESENT,
@@ -426,7 +426,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
(
IOobject
(
- this->name() + "::UTrans",
+ this->name() + ".UTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
@@ -442,7 +442,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
(
IOobject
(
- name + "::UCoeff",
+ name + ".UCoeff",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 2e793ac71e3..e1c4cf41984 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -564,7 +564,7 @@ Foam::KinematicCloud<CloudType>::theta() const
(
IOobject
(
- this->name() + "::theta",
+ this->name() + ".theta",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
@@ -603,7 +603,7 @@ Foam::KinematicCloud<CloudType>::alpha() const
(
IOobject
(
- this->name() + "::alpha",
+ this->name() + ".alpha",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
@@ -640,7 +640,7 @@ Foam::KinematicCloud<CloudType>::rhoEff() const
(
IOobject
(
- this->name() + "::rhoEff",
+ this->name() + ".rhoEff",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 66cb73b85f7..bfa14486821 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -107,7 +107,7 @@ inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
(
IOobject
(
- this->name() + "::rhoTrans",
+ this->name() + ".rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
@@ -155,7 +155,7 @@ Foam::ReactingCloud<CloudType>::Srho(const label i) const
(
IOobject
(
- this->name() + "::rhoTrans",
+ this->name() + ".rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
@@ -192,7 +192,7 @@ Foam::ReactingCloud<CloudType>::Srho() const
(
IOobject
(
- this->name() + "::rhoTrans",
+ this->name() + ".rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
@@ -236,7 +236,7 @@ Foam::ReactingCloud<CloudType>::Srho(volScalarField& rho) const
(
IOobject
(
- this->name() + "::rhoTrans",
+ this->name() + ".rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index c7e5c9814d1..b756ad9911e 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -64,7 +64,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
(
IOobject
(
- this->name() + "::radAreaP",
+ this->name() + ".radAreaP",
this->db().time().timeName(),
this->db(),
IOobject::READ_IF_PRESENT,
@@ -81,7 +81,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
(
IOobject
(
- this->name() + "::radT4",
+ this->name() + ".radT4",
this->db().time().timeName(),
this->db(),
IOobject::READ_IF_PRESENT,
@@ -98,7 +98,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
(
IOobject
(
- this->name() + "::radAreaPT4",
+ this->name() + ".radAreaPT4",
this->db().time().timeName(),
this->db(),
IOobject::READ_IF_PRESENT,
@@ -169,7 +169,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
(
IOobject
(
- this->name() + "::hsTrans",
+ this->name() + ".hsTrans",
this->db().time().timeName(),
this->db(),
IOobject::READ_IF_PRESENT,
@@ -185,7 +185,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
(
IOobject
(
- this->name() + "::hsCoeff",
+ this->name() + ".hsCoeff",
this->db().time().timeName(),
this->db(),
IOobject::READ_IF_PRESENT,
@@ -239,7 +239,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
(
IOobject
(
- this->name() + "::hsTrans",
+ this->name() + ".hsTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
@@ -255,7 +255,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
(
IOobject
(
- this->name() + "::hsCoeff",
+ this->name() + ".hsCoeff",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
@@ -274,7 +274,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
(
IOobject
(
- this->name() + "::radAreaP",
+ this->name() + ".radAreaP",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
@@ -291,7 +291,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
(
IOobject
(
- this->name() + "::radT4",
+ this->name() + ".radT4",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
@@ -308,7 +308,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
(
IOobject
(
- this->name() + "::radAreaPT4",
+ this->name() + ".radAreaPT4",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 8ffae4f75ff..fc4ed0de563 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -46,8 +46,8 @@ Foam::LocalInteraction<CloudType>::LocalInteraction
{
if (writeFields_)
{
- word massEscapeName(this->owner().name() + "::massEscape");
- word massStickName(this->owner().name() + "::massStick");
+ word massEscapeName(this->owner().name() + ".massEscape");
+ word massStickName(this->owner().name() + ".massStick");
Info<< " Interaction fields will be written to " << massEscapeName
<< " and " << massStickName << endl;
@@ -121,7 +121,7 @@ Foam::volScalarField& Foam::LocalInteraction<CloudType>::massEscape()
(
IOobject
(
- this->owner().name() + "::massEscape",
+ this->owner().name() + ".massEscape",
mesh.time().timeName(),
mesh,
IOobject::READ_IF_PRESENT,
@@ -150,7 +150,7 @@ Foam::volScalarField& Foam::LocalInteraction<CloudType>::massStick()
(
IOobject
(
- this->owner().name() + "::massStick",
+ this->owner().name() + ".massStick",
mesh.time().timeName(),
mesh,
IOobject::READ_IF_PRESENT,
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C
index 74fe73b80ca..fd4ba20b65e 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C
+++ b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.C
@@ -141,7 +141,7 @@ void Foam::turbulenceFields::read(const dictionary& dict)
Info<< "storing fields:" << nl;
forAllConstIter(wordHashSet, fieldSet_, iter)
{
- Info<< " " << modelName << "::" << iter.key() << nl;
+ Info<< " " << modelName << '.' << iter.key() << nl;
}
Info<< endl;
}
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
index 67ac423e1fa..bee58240135 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
+++ b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
@@ -36,7 +36,7 @@ void Foam::turbulenceFields::processField
{
typedef GeometricField<Type, fvPatchField, volMesh> FieldType;
- const word scopedName = modelName + "::" + fieldName;
+ const word scopedName = modelName + '.' + fieldName;
if (obr_.foundObject<FieldType>(scopedName))
{
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
index 2c682e7a609..c119df00844 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
@@ -82,7 +82,7 @@ tmp<volScalarField> noRadiation::Shs()
(
IOobject
(
- typeName + "::Shs",
+ typeName + ".Shs",
owner().time().timeName(),
owner().regionMesh(),
IOobject::NO_READ,
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
index ba158571300..4e01e574c8b 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
@@ -115,7 +115,7 @@ tmp<volScalarField> standardRadiation::Shs()
(
IOobject
(
- typeName + "::Shs",
+ typeName + ".Shs",
owner().time().timeName(),
owner().regionMesh(),
IOobject::NO_READ,
diff --git a/src/regionModels/thermoBaffleModels/noThermo/noThermo.C b/src/regionModels/thermoBaffleModels/noThermo/noThermo.C
index aabcfd204b1..3928c376b4b 100644
--- a/src/regionModels/thermoBaffleModels/noThermo/noThermo.C
+++ b/src/regionModels/thermoBaffleModels/noThermo/noThermo.C
@@ -88,7 +88,8 @@ void noThermo::evolveRegion()
const tmp<volScalarField> noThermo::Cp() const
{
FatalErrorIn("const tmp<volScalarField>& noThermo::Cp() const")
- << "Cp field not available for " << type() << abort(FatalError);
+ << "Cp field not available for " << type()
+ << abort(FatalError);
return tmp<volScalarField>
(
@@ -112,7 +113,8 @@ const tmp<volScalarField> noThermo::Cp() const
const volScalarField& noThermo::kappaRad() const
{
FatalErrorIn("const volScalarField& noThermo::kappaRad() const")
- << "kappa field not available for " << type() << abort(FatalError);
+ << "kappa field not available for " << type()
+ << abort(FatalError);
return volScalarField::null();
}
@@ -120,7 +122,8 @@ const volScalarField& noThermo::kappaRad() const
const volScalarField& noThermo::rho() const
{
FatalErrorIn("const volScalarField& noThermo::rho() const")
- << "rho field not available for " << type() << abort(FatalError);
+ << "rho field not available for " << type()
+ << abort(FatalError);
return volScalarField::null();
}
@@ -128,7 +131,8 @@ const volScalarField& noThermo::rho() const
const volScalarField& noThermo::kappa() const
{
FatalErrorIn("const volScalarField& noThermo::kappa() const")
- << "K field not available for " << type() << abort(FatalError);
+ << "K field not available for " << type()
+ << abort(FatalError);
return volScalarField::null();
}
@@ -136,7 +140,8 @@ const volScalarField& noThermo::kappa() const
const volScalarField& noThermo::T() const
{
FatalErrorIn("const volScalarField& noThermo::T() const")
- << "T field not available for " << type() << abort(FatalError);
+ << "T field not available for " << type()
+ << abort(FatalError);
return volScalarField::null();
}
@@ -144,7 +149,8 @@ const volScalarField& noThermo::T() const
const solidThermo& noThermo::thermo() const
{
FatalErrorIn("const volScalarField& noThermo::T() const")
- << "T field not available for " << type() << abort(FatalError);
+ << "T field not available for " << type()
+ << abort(FatalError);
return reinterpret_cast<const solidThermo&>(null);
}
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index 1b6db173ce7..226e19c2263 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -62,7 +62,7 @@ Foam::chemistryModel<CompType, ThermoType>::chemistryModel
(
IOobject
(
- "RR::" + Y_[fieldI].name(),
+ "RR." + Y_[fieldI].name(),
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
diff --git a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
index 6823a603bdb..6bc25ebc2c8 100644
--- a/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/ODESolidChemistryModel/ODESolidChemistryModel.C
@@ -78,7 +78,7 @@ ODESolidChemistryModel
(
IOobject
(
- "RRs::" + Ys_[fieldI].name(),
+ "RRs." + Ys_[fieldI].name(),
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
@@ -166,7 +166,7 @@ ODESolidChemistryModel
(
IOobject
(
- "RRg::" + pyrolisisGases_[fieldI],
+ "RRg." + pyrolisisGases_[fieldI],
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index e115680164d..1528ba2affc 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -342,7 +342,7 @@ void LRR::correct()
RASModel::correct();
volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
- volScalarField G("RASModel::G", 0.5*mag(tr(P)));
+ volScalarField G("RASModel.G", 0.5*mag(tr(P)));
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index b4e906cfb47..7273efc82cd 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -379,7 +379,7 @@ void LaunderGibsonRSTM::correct()
}
volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
- volScalarField G("RASModel::G", 0.5*mag(tr(P)));
+ volScalarField G("RASModel.G", 0.5*mag(tr(P)));
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index 4e246491e49..048f15eec62 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -304,7 +304,7 @@ void LaunderSharmaKE::correct()
}
tmp<volTensorField> tgradU = fvc::grad(U_);
- volScalarField G("RASModel::G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
+ volScalarField G("RASModel.G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
tgradU.clear();
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 2048e4d2d0c..70094c353b6 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -303,7 +303,7 @@ void RNGkEpsilon::correct()
volScalarField S2((tgradU() && dev(twoSymm(tgradU()))));
tgradU.clear();
- volScalarField G("RASModel::G", mut_*S2);
+ volScalarField G("RASModel.G", mut_*S2);
volScalarField eta(sqrt(mag(S2))*k_/epsilon_);
volScalarField eta3(eta*sqr(eta));
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index e8e4e70a18a..c2cce3febdb 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -58,7 +58,7 @@ void epsilonWallFunctionFvPatchScalarField::checkType()
void epsilonWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
{
- writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+ writeEntryIfDifferent<word>(os, "G", "RASModel.G", GName_);
os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
@@ -74,7 +74,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
)
:
fixedInternalValueFvPatchField<scalar>(p, iF),
- GName_("RASModel::G"),
+ GName_("RASModel.G"),
Cmu_(0.09),
kappa_(0.41),
E_(9.8)
@@ -109,7 +109,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
)
:
fixedInternalValueFvPatchField<scalar>(p, iF, dict),
- GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+ GName_(dict.lookupOrDefault<word>("G", "RASModel.G")),
Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
E_(dict.lookupOrDefault<scalar>("E", 9.8))
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 3fb0f1c36b3..d7f2f4fa5ed 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -58,7 +58,7 @@ void omegaWallFunctionFvPatchScalarField::checkType()
void omegaWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
{
- writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+ writeEntryIfDifferent<word>(os, "G", "RASModel.G", GName_);
os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
@@ -75,7 +75,7 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
)
:
fixedInternalValueFvPatchField<scalar>(p, iF),
- GName_("RASModel::G"),
+ GName_("RASModel.G"),
Cmu_(0.09),
kappa_(0.41),
E_(9.8),
@@ -115,7 +115,7 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
)
:
fixedInternalValueFvPatchField<scalar>(p, iF, dict),
- GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+ GName_(dict.lookupOrDefault<word>("G", "RASModel.G")),
Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
E_(dict.lookupOrDefault<scalar>("E", 9.8)),
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
index 3aa8ee2ec1e..7475a39f5bd 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
@@ -281,7 +281,7 @@ void kEpsilon::correct()
}
tmp<volTensorField> tgradU = fvc::grad(U_);
- volScalarField G("RASModel::G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
+ volScalarField G("RASModel.G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
tgradU.clear();
// Update epsilon and G at the wall
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index 229fb3e2913..066e427741e 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -392,7 +392,7 @@ void kOmegaSST::correct()
tmp<volTensorField> tgradU = fvc::grad(U_);
volScalarField S2(2*magSqr(symm(tgradU())));
volScalarField GbyMu((tgradU() && dev(twoSymm(tgradU()))));
- volScalarField G("RASModel::G", mut_*GbyMu);
+ volScalarField G("RASModel.G", mut_*GbyMu);
tgradU.clear();
// Update omega and G at the wall
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
index f248d98138c..537a2c8e44c 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -321,7 +321,7 @@ void realizableKE::correct()
volScalarField eta(magS*k_/epsilon_);
volScalarField C1(max(eta/(scalar(5) + eta), scalar(0.43)));
- volScalarField G("RASModel::G", mut_*(gradU && dev(twoSymm(gradU))));
+ volScalarField G("RASModel.G", mut_*(gradU && dev(twoSymm(gradU))));
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index 14683732b21..68f0d2b2b09 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -339,7 +339,7 @@ void LRR::correct()
}
volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
- volScalarField G("RASModel::G", 0.5*mag(tr(P)));
+ volScalarField G("RASModel.G", 0.5*mag(tr(P)));
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 10de46f5870..17d9157c905 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -252,7 +252,7 @@ void LamBremhorstKE::correct()
y_.correct();
}
- volScalarField G("RASModel::G", nut_*2*magSqr(symm(fvc::grad(U_))));
+ volScalarField G("RASModel.G", nut_*2*magSqr(symm(fvc::grad(U_))));
// Calculate parameters and coefficients for low-Reynolds number model
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 1231be6d5df..c6ee7a7d448 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -386,7 +386,7 @@ void LaunderGibsonRSTM::correct()
}
volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
- volScalarField G("RASModel::G", 0.5*mag(tr(P)));
+ volScalarField G("RASModel.G", 0.5*mag(tr(P)));
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index c514a378e20..53cc490f297 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -255,7 +255,7 @@ void LaunderSharmaKE::correct()
tmp<volScalarField> S2 = 2*magSqr(symm(fvc::grad(U_)));
- volScalarField G("RASModel::G", nut_*S2);
+ volScalarField G("RASModel.G", nut_*S2);
const volScalarField E(2.0*nu()*nut_*fvc::magSqrGradGrad(U_));
const volScalarField D(2.0*nu()*magSqr(fvc::grad(sqrt(k_))));
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index 20d8dee9514..8eb972dcfbd 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -356,7 +356,7 @@ void LienCubicKE::correct()
volScalarField G
(
- "RASModel::G",
+ "RASModel.G",
Cmu_*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU)
);
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
index da81b66eddd..5162fa78bda 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
@@ -446,7 +446,7 @@ void LienCubicKELowRe::correct()
volScalarField G
(
- "RASModel::G",
+ "RASModel.G",
Cmu_*fMu*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU)
);
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index 15296cdf5bb..6daecaae6ba 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -319,7 +319,7 @@ void LienLeschzinerLowRe::correct()
const volScalarField f2(scalar(1) - 0.3*exp(-sqr(Rt)));
- volScalarField G("RASModel::G", Cmu_*fMu*sqr(k_)/epsilon_*S2);
+ volScalarField G("RASModel.G", Cmu_*fMu*sqr(k_)/epsilon_*S2);
// Dissipation equation
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
index 4dbb7b7b683..750a4dc15b5 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
@@ -348,7 +348,7 @@ void NonlinearKEShih::correct()
volScalarField G
(
- "RASModel::G",
+ "RASModel.G",
Cmu_*sqr(k_)/epsilon_*S2
- (nonlinearStress_ && gradU)
);
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 460a6609acd..20ed988ca7e 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -267,7 +267,7 @@ void RNGkEpsilon::correct()
}
const volScalarField S2(2*magSqr(symm(fvc::grad(U_))));
- volScalarField G("RASModel::G", nut_*S2);
+ volScalarField G("RASModel.G", nut_*S2);
const volScalarField eta(sqrt(S2)*k_/epsilon_);
volScalarField R
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index 17247003e36..3fcb175fb36 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -59,7 +59,7 @@ void epsilonWallFunctionFvPatchScalarField::checkType()
void epsilonWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
{
- writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+ writeEntryIfDifferent<word>(os, "G", "RASModel.G", GName_);
os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
@@ -75,7 +75,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
)
:
fixedInternalValueFvPatchField<scalar>(p, iF),
- GName_("RASModel::G"),
+ GName_("RASModel.G"),
Cmu_(0.09),
kappa_(0.41),
E_(9.8)
@@ -110,7 +110,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
)
:
fixedInternalValueFvPatchField<scalar>(p, iF, dict),
- GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+ GName_(dict.lookupOrDefault<word>("G", "RASModel.G")),
Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
E_(dict.lookupOrDefault<scalar>("E", 9.8))
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 8d412c466ae..0ad2595c7c6 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -59,7 +59,7 @@ void omegaWallFunctionFvPatchScalarField::checkType()
void omegaWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
{
- writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+ writeEntryIfDifferent<word>(os, "G", "RASModel.G", GName_);
os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
@@ -76,7 +76,7 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
)
:
fixedInternalValueFvPatchField<scalar>(p, iF),
- GName_("RASModel::G"),
+ GName_("RASModel.G"),
Cmu_(0.09),
kappa_(0.41),
E_(9.8),
@@ -115,7 +115,7 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
)
:
fixedInternalValueFvPatchField<scalar>(p, iF, dict),
- GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+ GName_(dict.lookupOrDefault<word>("G", "RASModel.G")),
Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
E_(dict.lookupOrDefault<scalar>("E", 9.8)),
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
index 673a8f719f9..c12783bcdbb 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
@@ -235,7 +235,7 @@ void kEpsilon::correct()
return;
}
- volScalarField G("RASModel::G", nut_*2*magSqr(symm(fvc::grad(U_))));
+ volScalarField G("RASModel.G", nut_*2*magSqr(symm(fvc::grad(U_))));
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
index 052e9629c71..f2faf19966b 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
@@ -244,7 +244,7 @@ void kOmega::correct()
return;
}
- volScalarField G("RASModel::G", nut_*2*magSqr(symm(fvc::grad(U_))));
+ volScalarField G("RASModel.G", nut_*2*magSqr(symm(fvc::grad(U_))));
// Update omega and G at the wall
omega_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index 9344ca0d7e3..02899ec4c9b 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -364,7 +364,7 @@ void kOmegaSST::correct()
}
const volScalarField S2(2*magSqr(symm(fvc::grad(U_))));
- volScalarField G("RASModel::G", nut_*S2);
+ volScalarField G("RASModel.G", nut_*S2);
// Update omega and G at the wall
omega_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C.new b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C.new
index df658f5ca90..b28e14bce9e 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C.new
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C.new
@@ -341,7 +341,7 @@ void kOmegaSST::correct()
}
volScalarField S2 = magSqr(symm(fvc::grad(U_)));
- volScalarField G("RASModel::G", nut_*2*S2);
+ volScalarField G("RASModel.G", nut_*2*S2);
// Update omega and G at the wall
omega_.boundaryField().updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
index 1fd761b1d7e..03a3b8a5a6e 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
@@ -311,7 +311,7 @@ void qZeta::correct()
tmp<volScalarField> S2 = 2*magSqr(symm(fvc::grad(U_)));
- volScalarField G("RASModel::G", nut_/(2.0*q_)*S2);
+ volScalarField G("RASModel.G", nut_/(2.0*q_)*S2);
const volScalarField E(nu()*nut_/q_*fvc::magSqrGradGrad(U_));
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
index 5ea6831ea21..3161d16371a 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
@@ -297,7 +297,7 @@ void realizableKE::correct()
const volScalarField eta(magS*k_/epsilon_);
tmp<volScalarField> C1 = max(eta/(scalar(5) + eta), scalar(0.43));
- volScalarField G("RASModel::G", nut_*S2);
+ volScalarField G("RASModel.G", nut_*S2);
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
--
GitLab