STYLE: mark compatibility level for keyword redirectType (issue #912)

- was replaced with "name" in 1706
This commit is contained in:
Mark Olesen
2018-07-05 09:26:26 +02:00
parent f3f30c94b4
commit f7dc92d744
12 changed files with 33 additions and 76 deletions

View File

@ -217,12 +217,7 @@ Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
fixedValuePointPatchField<Type>(p, iF, dict, valueRequired), fixedValuePointPatchField<Type>(p, iF, dict, valueRequired),
codedBase(), codedBase(),
dict_(dict), dict_(dict),
name_ name_(dict.getCompat<word>("name", {{"redirectType", 1706}})),
(
dict.found("redirectType")
? dict.lookup("redirectType")
: dict.lookup("name")
),
redirectPatchFieldPtr_() redirectPatchFieldPtr_()
{ {
updateLibrary(name_); updateLibrary(name_);

View File

@ -120,15 +120,7 @@ Foam::codedPoints0MotionSolver::codedPoints0MotionSolver
motionSolver(mesh, dict, typeName), motionSolver(mesh, dict, typeName),
codedBase() codedBase()
{ {
// Backward compatibility dict.readCompat<word>("name", {{"redirectType", 1706}}, name_);
if (dict.found("redirectType"))
{
dict.lookup("redirectType") >> name_;
}
else
{
dict.lookup("name") >> name_;
}
updateLibrary(name_); updateLibrary(name_);
redirectMotionSolver(); redirectMotionSolver();

View File

@ -215,12 +215,7 @@ Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
fixedValueFvPatchField<Type>(p, iF, dict), fixedValueFvPatchField<Type>(p, iF, dict),
codedBase(), codedBase(),
dict_(dict), dict_(dict),
name_ name_(dict.getCompat<word>("name", {{"redirectType", 1706}})),
(
dict.found("redirectType")
? dict.lookup("redirectType")
: dict.lookup("name")
),
redirectPatchFieldPtr_() redirectPatchFieldPtr_()
{ {
updateLibrary(name_); updateLibrary(name_);

View File

@ -215,12 +215,7 @@ Foam::codedMixedFvPatchField<Type>::codedMixedFvPatchField
mixedFvPatchField<Type>(p, iF, dict), mixedFvPatchField<Type>(p, iF, dict),
codedBase(), codedBase(),
dict_(dict), dict_(dict),
name_ name_(dict.getCompat<word>("name", {{"redirectType", 1706}})),
(
dict.found("redirectType")
? dict.lookup("redirectType")
: dict.lookup("name")
),
redirectPatchFieldPtr_() redirectPatchFieldPtr_()
{ {
updateLibrary(name_); updateLibrary(name_);

View File

@ -191,15 +191,7 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
{ {
functionObject::read(dict); functionObject::read(dict);
// Backward compatibility dict.readCompat<word>("name", {{"redirectType", 1706}}, name_);
if (dict.found("redirectType"))
{
dict.lookup("redirectType") >> name_;
}
else
{
dict.lookup("name") >> name_;
}
const entry* dataPtr = dict.lookupEntryPtr const entry* dataPtr = dict.lookupEntryPtr
( (

View File

@ -36,15 +36,7 @@ bool Foam::fv::CodedSource<Type>::read(const dictionary& dict)
coeffs_.lookup("fields") >> fieldNames_; coeffs_.lookup("fields") >> fieldNames_;
applied_.setSize(fieldNames_.size(), false); applied_.setSize(fieldNames_.size(), false);
// Backward compatibility dict.readCompat<word>("name", {{"redirectType", 1706}}, name_);
if (coeffs_.found("redirectType"))
{
coeffs_.lookup("redirectType") >> name_;
}
else
{
coeffs_.lookup("name") >> name_;
}
// Code snippets // Code snippets
{ {

View File

@ -49,13 +49,9 @@ functions
{ {
error error
{ {
// Load the library containing the 'coded' functionObject name error;
libs ("libutilityFunctionObjects.so"); type coded;
libs ("libutilityFunctionObjects.so");
type coded;
// Name of on-the-fly generated functionObject
name error;
codeEnd codeEnd
#{ #{

View File

@ -23,13 +23,13 @@ boundaryField
{ {
walls walls
{ {
type fixedValue; type fixedValue;
value $internalField; value $internalField;
} }
cylinder cylinder
{ {
type codedFixedValue; name pointDisplacementy_cylinder;
name pointDisplacementy_cylinder; type codedFixedValue;
code code
#{ #{
const scalar t = this->db().time().value(); const scalar t = this->db().time().value();
@ -37,21 +37,21 @@ boundaryField
const scalar f = 200; const scalar f = 200;
operator==(a*sin(constant::mathematical::twoPi*f*t)); operator==(a*sin(constant::mathematical::twoPi*f*t));
#}; #};
value $internalField; value $internalField;
} }
"inlet.*" "inlet.*"
{ {
type fixedValue; type fixedValue;
value $internalField; value $internalField;
} }
outlet outlet
{ {
type fixedValue; type fixedValue;
value $internalField; value $internalField;
} }
frontAndBack frontAndBack
{ {
type empty; type empty;
} }
} }

View File

@ -55,9 +55,9 @@ functions
{ {
timeStep timeStep
{ {
type coded; name setDeltaT;
libs ("libutilityFunctionObjects.so"); type coded;
name setDeltaT; libs ("libutilityFunctionObjects.so");
code code
#{ #{

View File

@ -19,10 +19,10 @@ functions
{ {
createVortex createVortex
{ {
type coded; name createVortices;
libs ("libutilityFunctionObjects.so"); type coded;
name createVortices; libs ("libutilityFunctionObjects.so");
enabled yes; enabled yes;
codeInclude codeInclude
#{ #{

View File

@ -24,8 +24,8 @@ boundaryField
inlet inlet
{ {
type codedFixedValue;
name swirl; name swirl;
type codedFixedValue;
code code
#{ #{

View File

@ -8,8 +8,8 @@
inletMassFlowRate inletMassFlowRate
{ {
type surfaceFieldValue; type surfaceFieldValue;
libs ("libfieldFunctionObjects.so"); libs ("libfieldFunctionObjects.so");
fields fields
( (
@ -31,8 +31,8 @@ inletMassFlowRate
outletMassFlowRate outletMassFlowRate
{ {
type surfaceFieldValue; type surfaceFieldValue;
libs ("libfieldFunctionObjects.so"); libs ("libfieldFunctionObjects.so");
fields fields
( (
@ -54,9 +54,9 @@ outletMassFlowRate
totalMass totalMass
{ {
type coded;
libs ("libutilityFunctionObjects.so");
name error; name error;
type coded;
libs ("libutilityFunctionObjects.so");
code code
#{ #{