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

- was replaced with "name" in 1706
2025-11-28 03:28:01 +00:00 · 2018-07-05 09:26:26 +02:00
parent f3f30c94b4
commit f7dc92d744
12 changed files with 33 additions and 76 deletions
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
@ -217,12 +217,7 @@ Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
    fixedValuePointPatchField<Type>(p, iF, dict, valueRequired),
    codedBase(),
    dict_(dict),
-    name_
-    (
-        dict.found("redirectType")
-      ? dict.lookup("redirectType")
-      : dict.lookup("name")
-    ),
+    name_(dict.getCompat<word>("name", {{"redirectType", 1706}})),
    redirectPatchFieldPtr_()
 {
    updateLibrary(name_);
--- a/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.C
@ -120,15 +120,7 @@ Foam::codedPoints0MotionSolver::codedPoints0MotionSolver
    motionSolver(mesh, dict, typeName),
    codedBase()
 {
-    // Backward compatibility
-    if (dict.found("redirectType"))
-    {
-        dict.lookup("redirectType") >> name_;
-    }
-    else
-    {
-        dict.lookup("name") >> name_;
-    }
+    dict.readCompat<word>("name", {{"redirectType", 1706}}, name_);

    updateLibrary(name_);
    redirectMotionSolver();
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
@ -215,12 +215,7 @@ Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
    fixedValueFvPatchField<Type>(p, iF, dict),
    codedBase(),
    dict_(dict),
-    name_
-    (
-        dict.found("redirectType")
-      ? dict.lookup("redirectType")
-      : dict.lookup("name")
-    ),
+    name_(dict.getCompat<word>("name", {{"redirectType", 1706}})),
    redirectPatchFieldPtr_()
 {
    updateLibrary(name_);
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C
@ -215,12 +215,7 @@ Foam::codedMixedFvPatchField<Type>::codedMixedFvPatchField
    mixedFvPatchField<Type>(p, iF, dict),
    codedBase(),
    dict_(dict),
-    name_
-    (
-        dict.found("redirectType")
-      ? dict.lookup("redirectType")
-      : dict.lookup("name")
-    ),
+    name_(dict.getCompat<word>("name", {{"redirectType", 1706}})),
    redirectPatchFieldPtr_()
 {
    updateLibrary(name_);
--- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
+++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
@ -191,15 +191,7 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
 {
    functionObject::read(dict);

-    // Backward compatibility
-    if (dict.found("redirectType"))
-    {
-        dict.lookup("redirectType") >> name_;
-    }
-    else
-    {
-        dict.lookup("name") >> name_;
-    }
+    dict.readCompat<word>("name", {{"redirectType", 1706}}, name_);

    const entry* dataPtr = dict.lookupEntryPtr
    (
--- a/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
@ -36,15 +36,7 @@ bool Foam::fv::CodedSource<Type>::read(const dictionary& dict)
        coeffs_.lookup("fields") >> fieldNames_;
        applied_.setSize(fieldNames_.size(), false);

-        // Backward compatibility
-        if (coeffs_.found("redirectType"))
-        {
-            coeffs_.lookup("redirectType") >> name_;
-        }
-        else
-        {
-            coeffs_.lookup("name") >> name_;
-        }
+        dict.readCompat<word>("name", {{"redirectType", 1706}}, name_);

        // Code snippets
        {
--- a/tutorials/basic/potentialFoam/cylinder/system/controlDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict
@ -49,13 +49,9 @@ functions
 {
    error
    {
-        // Load the library containing the 'coded' functionObject
-        libs            ("libutilityFunctionObjects.so");
-
-        type coded;
-
-        // Name of on-the-fly generated functionObject
        name    error;
+        type    coded;
+        libs    ("libutilityFunctionObjects.so");

        codeEnd
        #{
--- a/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/pointDisplacementy
+++ b/tutorials/combustion/XiDyMFoam/oscillatingCylinder/0/pointDisplacementy
@ -28,8 +28,8 @@ boundaryField
    }
    cylinder
    {
-        type            codedFixedValue;
        name    pointDisplacementy_cylinder;
+        type    codedFixedValue;
        code
        #{
            const scalar t = this->db().time().value();
--- a/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict
@ -55,9 +55,9 @@ functions
 {
    timeStep
    {
+        name    setDeltaT;
        type    coded;
        libs    ("libutilityFunctionObjects.so");
-        name setDeltaT;

        code
        #{
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
@ -19,9 +19,9 @@ functions
 {
    createVortex
    {
+        name    createVortices;
        type    coded;
        libs    ("libutilityFunctionObjects.so");
-        name            createVortices;
        enabled yes;

        codeInclude
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
@ -24,8 +24,8 @@ boundaryField

    inlet
    {
-        type    codedFixedValue;
        name    swirl;
+        type    codedFixedValue;

        code
        #{
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions
@ -54,9 +54,9 @@ outletMassFlowRate

 totalMass
 {
+    name    error;
    type    coded;
    libs    ("libutilityFunctionObjects.so");
-    name    error;

    code
    #{