dictionary: changes field scoping operator from "::" to '.'

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

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

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());
 

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)
             {

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);

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();
 }
 
 

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()

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,

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()
         )()
     ),

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,

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,

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,

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,

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 massEscapeName(this->owner().name() + ".massEscape");
-        word massStickName(this->owner().name() + "::massStick");
+        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,

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;
         }

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))
     {

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,

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,

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);
 }
 

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,

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,

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();

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();

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();
 
 

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));

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))

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)),

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

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

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();

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();

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

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();

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_))));

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)
     );
 

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)
     );
 

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

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)
     );

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

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))

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)),

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();

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();

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();

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();

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_));
 
 

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();