Commit d40a374c authored by Henry's avatar Henry
Browse files

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

parent 7db3286f
......@@ -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
......
......@@ -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
......
......@@ -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());
......
......@@ -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)
{
......
......@@ -37,7 +37,7 @@ Foam::dictionary::dictionary
Istream& is
)
:
dictionaryName(parentDict.name() + "::" + name),
dictionaryName(parentDict.name() + '.' + name),
parent_(parentDict)
{
read(is);
......
......@@ -81,7 +81,7 @@ Foam::primitiveEntry::primitiveEntry(const keyType& key, const ITstream& is)
entry(key),
ITstream(is)
{
name() += "::" + keyword();
name() += '.' + keyword();
}
......
......@@ -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()
......
......@@ -210,7 +210,7 @@ void Foam::pressureGradientExplicitSource::setValue
(
IOobject
(
name_ + "::invA",
name_ + ".invA",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
......
......@@ -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()
)()
),
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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;
}
......
......@@ -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))
{
......
......@@ -82,7 +82,7 @@ tmp<volScalarField> noRadiation::Shs()
(
IOobject
(
typeName + "::Shs",
typeName + ".Shs",
owner().time().timeName(),
owner().regionMesh(),
IOobject::NO_READ,
......
......@@ -115,7 +115,7 @@ tmp<volScalarField> standardRadiation::Shs()
(
IOobject
(
typeName + "::Shs",
typeName + ".Shs",
owner().time().timeName(),
owner().regionMesh(),
IOobject::NO_READ,
......
......@@ -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);
}
......
......@@ -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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment