changeDictionary: Simplified by removing the need for the superfluous dictionaryReplacement sub-dictionary

Added the option '-subDict' to specify a sub-dictionary if multiple replacement sets are present in the same file. This also provides backward compatibility by setting '-subDict dictionaryReplacement'
2016-06-15 09:03:05 +01:00
parent a1cc51b116
commit 685afaafbf
25 changed files with 1653 additions and 1711 deletions
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@ -33,8 +33,6 @@ Description
    \em Walls a zeroGradient boundary condition, the
    \c system/changeDictionaryDict would contain the following:
    \verbatim
-    dictionaryReplacement
-    {
    p                           // field to change
    {
        boundaryField
@ -50,23 +48,25 @@ Description
            }
        }
    }
-    }
    \endverbatim
    Replacement entries starting with '~' will remove the entry.

 Usage

-    - changeDictionary [OPTION]
+    changeDictionary [OPTION]
+
+    \param -subDict \n
+    Specify the subDict name of the replacements dictionary.

    \param -literalRE \n
-    Do not interpret regular expressions or patchGroups;
-    treat them as any other keyword.
+    Do not interpret regular expressions or patchGroups; treat them as any
+    other keyword.

    \param -enableFunctionEntries \n
-    By default all dictionary preprocessing of fields is disabled
+    Enable function entries (default: disabled)

    \param -disablePatchGroups \n
-    By default all keys are also checked for being patchGroups
+    Disable the default checking for keys being patchGroups

 \*---------------------------------------------------------------------------*/

@ -89,7 +89,7 @@ namespace Foam

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-// Extract groupPatch (= shortcut) info from boundary file info
+// Extract groupPatch info from boundary file info
 HashTable<wordList, word> extractPatchGroups(const dictionary& boundaryDict)
 {
    HashTable<wordList, word> groupToPatch;
@ -268,7 +268,6 @@ bool merge

            if (entryPtr)
            {
-
                // Mark thisDict entry as having been match for wildcard
                // handling later on.
                thisKeysSet.erase(entryPtr->keyword());
@ -386,6 +385,12 @@ int main(int argc, char *argv[])
 {
    #include "addDictOption.H"
    argList::addOption
+    (
+        "subDict",
+        "name",
+        "specify the subDict name of the replacements dictionary"
+    );
+    argList::addOption
    (
        "instance",
        "name",
@ -479,7 +484,16 @@ int main(int argc, char *argv[])
    #include "setSystemMeshDictionaryIO.H"
    IOdictionary dict(dictIO);

-    const dictionary& replaceDicts = dict.subDict("dictionaryReplacement");
+    const dictionary* replaceDictsPtr = &dict;
+
+    if (args.optionFound("subDict"))
+    {
+        word subDictName(args.optionLookup("subDict")());
+        replaceDictsPtr = &dict.subDict(subDictName);
+    }
+
+    const dictionary& replaceDicts = *replaceDictsPtr;
+
    Info<< "Read dictionary " << dict.name()
        << " with replacements for dictionaries "
        << replaceDicts.toc() << endl;
@ -514,6 +528,7 @@ int main(int argc, char *argv[])
        )
    );
    const_cast<word&>(IOPtrList<entry>::typeName) = oldTypeName;
+
    // Fake type back to what was in field
    const_cast<word&>(dictList.type()) = dictList.headerClassName();

@ -632,6 +647,7 @@ int main(int argc, char *argv[])
            );

            const_cast<word&>(IOdictionary::typeName) = oldTypeName;
+
            // Fake type back to what was in field
            const_cast<word&>(fieldDict.type()) = fieldDict.headerClassName();

@ -652,9 +668,7 @@ int main(int argc, char *argv[])

    entry::disableFunctionEntries = oldFlag;

-    Info<< endl;
-
-    Info<< "End\n" << endl;
+    Info<< "\nEnd\n" << endl;

    return 0;
 }
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionaryDict
@ -14,18 +14,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    ".*"
    {
        type            mappedPatch;
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -41,10 +39,10 @@ dictionaryReplacement
            value           uniform 500;
        }
    }
-    }
+}

-    rho
-    {
+rho
+{
    internalField   uniform 8000;

    boundaryField
@ -55,10 +53,10 @@ dictionaryReplacement
        }

    }
-    }
+}

-    K
-    {
+K
+{
    internalField   uniform 80;

    boundaryField
@ -69,10 +67,10 @@ dictionaryReplacement
        }

    }
-    }
+}

-    cp
-    {
+cp
+{
    internalField   uniform 450;

    boundaryField
@ -83,7 +81,6 @@ dictionaryReplacement
        }

    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+p
 {
-    p
-    {
    boundaryField
    {
        blockedFaces
@ -37,10 +35,10 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
+}

-    U
-    {
+U
+{
    boundaryField
    {
        blockedFaces
@ -69,10 +67,10 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
+}

-    epsilon
-    {
+epsilon
+{
    boundaryField
    {
        blockedFaces
@ -94,10 +92,10 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
+}

-    k
-    {
+k
+{
    boundaryField
    {
        blockedFaces
@ -119,10 +117,10 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
+}

-    Su
-    {
+Su
+{
    boundaryField
    {
        blockedFaces
@ -142,10 +140,10 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
+}

-    Xi
-    {
+Xi
+{
    boundaryField
    {
        blockedFaces
@ -167,10 +165,10 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
+}

-    T
-    {
+T
+{
    boundaryField
    {
        blockedFaces
@ -192,10 +190,10 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
+}

-    Tu
-    {
+Tu
+{
    boundaryField
    {
        blockedFaces
@ -217,10 +215,10 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
+}

-    b
-    {
+b
+{
    boundaryField
    {
        blockedFaces
@ -242,10 +240,10 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
+}

-    ft
-    {
+ft
+{
    boundaryField
    {
        blockedFaces
@ -266,10 +264,10 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
+}

-    Aw
-    {
+Aw
+{
    boundaryField
    {
        blockedFaces
@ -291,9 +289,9 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
-    B
-    {
+}
+B
+{
    boundaryField
    {
        blockedFaces
@ -315,9 +313,9 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
-    betav
-    {
+}
+betav
+{
    boundaryField
    {
        blockedFaces
@ -339,9 +337,9 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
-    CR
-    {
+}
+CR
+{
    boundaryField
    {
        blockedFaces
@ -363,9 +361,9 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
-    CT
-    {
+}
+CT
+{
    boundaryField
    {
        blockedFaces
@ -387,9 +385,9 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
-    Nv
-    {
+}
+Nv
+{
    boundaryField
    {
        blockedFaces
@ -411,9 +409,9 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
-    nsv
-    {
+}
+nsv
+{
    boundaryField
    {
        blockedFaces
@ -435,9 +433,9 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
-    Lobs
-    {
+}
+Lobs
+{
    boundaryField
    {
        blockedFaces
@ -459,7 +457,6 @@ dictionaryReplacement
            type        cyclic;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/system/filmRegion/changeDictionaryDict
@ -14,16 +14,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    region0_to_filmRegion_coupledWall
    {
        samplePatch    region0_to_pyrolysisRegion_coupledWall;
    }
-    }
 }

-
 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+U
 {
-    U
-    {
    internalField   uniform (0.001 0 0);

    boundaryField
@ -40,10 +38,10 @@ dictionaryReplacement
            value           uniform (0 0 0);
        }
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -74,10 +72,10 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
+}

-    epsilon
-    {
+epsilon
+{
    internalField   uniform 0.01;

    boundaryField
@ -100,10 +98,10 @@ dictionaryReplacement
            value           uniform 0.01;
        }
    }
-    }
+}

-    k
-    {
+k
+{
    internalField   uniform 0.1;

    boundaryField
@ -126,10 +124,10 @@ dictionaryReplacement
            value           uniform 0.1;
        }
    }
-    }
+}

-    p_rgh
-    {
+p_rgh
+{
    internalField   uniform 0;

    boundaryField
@ -152,10 +150,10 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
+}

-    p
-    {
+p
+{
    internalField   uniform 0;

    boundaryField
@ -166,7 +164,6 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    minY
    {
        type            patch;
@ -30,10 +28,10 @@ dictionaryReplacement
    {
        type            patch;
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -67,7 +65,6 @@ dictionaryReplacement
            value           uniform 500;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    minZ
    {
        type            patch;
@ -26,10 +24,10 @@ dictionaryReplacement
    {
        type            patch;
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -57,7 +55,6 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    minZ
    {
        type            patch;
@ -26,10 +24,10 @@ dictionaryReplacement
    {
        type            patch;
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -47,7 +45,6 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+U
 {
-    U
-    {
    internalField   uniform (0.1 0 0);

    boundaryField
@ -39,10 +37,10 @@ dictionaryReplacement
            value           uniform (0.1 0 0);
        }
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -72,10 +70,10 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
+}

-    epsilon
-    {
+epsilon
+{
    internalField   uniform 0.01;

    boundaryField
@ -98,10 +96,10 @@ dictionaryReplacement
            value           uniform 0.01;
        }
    }
-    }
+}

-    k
-    {
+k
+{
    internalField   uniform 0.1;

    boundaryField
@ -124,10 +122,10 @@ dictionaryReplacement
            value           uniform 0.1;
        }
    }
-    }
+}

-    p_rgh
-    {
+p_rgh
+{
    internalField   uniform 1e5;

    boundaryField
@ -144,10 +142,10 @@ dictionaryReplacement
            value           uniform 1e5;
        }
    }
-    }
+}

-    p
-    {
+p
+{
    internalField   uniform 1e5;

    boundaryField
@ -164,7 +162,6 @@ dictionaryReplacement
            value           uniform 1e5;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    minX
    {
        type            wall;
@ -26,10 +24,10 @@ dictionaryReplacement
    {
        type            wall;
    }
-    }
+}

-    U
-    {
+U
+{
    internalField   uniform (0.01 0 0);

    boundaryField
@ -40,10 +38,10 @@ dictionaryReplacement
            value           uniform (0 0 0);
        }
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -61,10 +59,10 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
+}

-    epsilon
-    {
+epsilon
+{
    // Set the value on all bc to non-zero. Not used in simulation
    // since zeroGradient; only used in initialisation.
    internalField   uniform 0.01;
@ -77,10 +75,10 @@ dictionaryReplacement
            value           uniform 0.01;
        }
    }
-    }
+}

-    k
-    {
+k
+{
    internalField   uniform 0.1;

    boundaryField
@ -91,10 +89,10 @@ dictionaryReplacement
            value           uniform 0.1;
        }
    }
-    }
+}

-    p_rgh
-    {
+p_rgh
+{
    internalField   uniform 1e5;

    boundaryField
@ -105,10 +103,10 @@ dictionaryReplacement
            value           uniform 1e5;
        }
    }
-    }
+}

-    p
-    {
+p
+{
    internalField   uniform 1e5;

    boundaryField
@ -119,7 +117,6 @@ dictionaryReplacement
            value           uniform 1e5;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    minY
    {
        type            patch;
@ -30,10 +28,10 @@ dictionaryReplacement
    {
        type            patch;
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -56,7 +54,6 @@ dictionaryReplacement
            value           uniform 500;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    minZ
    {
        type            patch;
@ -26,10 +24,10 @@ dictionaryReplacement
    {
        type            patch;
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -47,7 +45,6 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    minZ
    {
        type            patch;
@ -26,10 +24,10 @@ dictionaryReplacement
    {
        type            patch;
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -47,7 +45,6 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+U
 {
-    U
-    {
    internalField   uniform (0.1 0 0);

    boundaryField
@ -39,10 +37,10 @@ dictionaryReplacement
            value           uniform (0.1 0 0);
        }
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -72,10 +70,10 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
+}

-    epsilon
-    {
+epsilon
+{
    internalField   uniform 0.01;

    boundaryField
@ -98,10 +96,10 @@ dictionaryReplacement
            value           uniform 0.01;
        }
    }
-    }
+}

-    k
-    {
+k
+{
    internalField   uniform 0.1;

    boundaryField
@ -124,10 +122,10 @@ dictionaryReplacement
            value           uniform 0.1;
        }
    }
-    }
+}

-    p_rgh
-    {
+p_rgh
+{
    internalField   uniform 1e5;

    boundaryField
@ -144,10 +142,10 @@ dictionaryReplacement
            value           uniform 1e5;
        }
    }
-    }
+}

-    p
-    {
+p
+{
    internalField   uniform 1e5;

    boundaryField
@ -164,7 +162,6 @@ dictionaryReplacement
            value           uniform 1e5;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    minX
    {
        type            wall;
@ -26,10 +24,10 @@ dictionaryReplacement
    {
        type            wall;
    }
-    }
+}

-    U
-    {
+U
+{
    internalField   uniform (0.01 0 0);
    boundaryField
    {
@ -39,10 +37,10 @@ dictionaryReplacement
            value           uniform (0 0 0);
        }
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;
    boundaryField
    {
@ -61,10 +59,10 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
+}

-    epsilon
-    {
+epsilon
+{
    internalField   uniform 0.01;
    boundaryField
    {
@ -74,10 +72,10 @@ dictionaryReplacement
            value           uniform 0.01;
        }
    }
-    }
+}

-    k
-    {
+k
+{
    internalField   uniform 0.1;
    boundaryField
    {
@ -87,10 +85,10 @@ dictionaryReplacement
            value           uniform 0.1;
        }
    }
-    }
+}

-    p_rgh
-    {
+p_rgh
+{
    internalField   uniform 1e5;
    boundaryField
    {
@ -100,10 +98,10 @@ dictionaryReplacement
            value           uniform 1e5;
        }
    }
-    }
+}

-    p
-    {
+p
+{
    internalField   uniform 1e5;
    boundaryField
    {
@ -113,10 +111,10 @@ dictionaryReplacement
            value           uniform 1e5;
        }
    }
-    }
+}

-    Qr
-    {
+Qr
+{
    internalField   uniform 0;
    boundaryField
    {
@ -137,10 +135,10 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
+}

-    G
-    {
+G
+{
    internalField   uniform 0;
    boundaryField
    {
@ -159,10 +157,10 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
+}

-    IDefault
-    {
+IDefault
+{
    internalField   uniform 0;
    boundaryField
    {
@ -181,9 +179,6 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
-
-
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    minY
    {
        type            patch;
@ -30,10 +28,10 @@ dictionaryReplacement
    {
        type            patch;
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -77,7 +75,6 @@ dictionaryReplacement
            value           uniform 500;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    minZ
    {
        type            patch;
@ -26,10 +24,10 @@ dictionaryReplacement
    {
        type            patch;
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -68,7 +66,6 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+boundary
 {
-    boundary
-    {
    minZ
    {
        type            patch;
@ -26,10 +24,10 @@ dictionaryReplacement
    {
        type            patch;
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;

    boundaryField
@ -68,7 +66,6 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+U
 {
-    U
-    {
    internalField   uniform (0.1 0 0);
    boundaryField
    {
@ -38,10 +36,10 @@ dictionaryReplacement
            value           uniform (0.1 0 0);
        }
    }
-    }
+}

-    T
-    {
+T
+{
    internalField   uniform 300;
    boundaryField
    {
@ -72,10 +70,10 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
+}

-    epsilon
-    {
+epsilon
+{
    internalField   uniform 0.01;
    boundaryField
    {
@ -97,10 +95,10 @@ dictionaryReplacement
            value           uniform 0.01;
        }
    }
-    }
+}

-    k
-    {
+k
+{
    internalField   uniform 0.1;
    boundaryField
    {
@ -122,10 +120,10 @@ dictionaryReplacement
            value           uniform 0.1;
        }
    }
-    }
+}

-    p_rgh
-    {
+p_rgh
+{
    internalField   uniform 1e5;
    boundaryField
    {
@ -141,10 +139,10 @@ dictionaryReplacement
            value           uniform 1e5;
        }
    }
-    }
+}

-    p
-    {
+p
+{
    internalField   uniform 1e5;
    boundaryField
    {
@ -160,10 +158,10 @@ dictionaryReplacement
            value           uniform 1e5;
        }
    }
-    }
+}

-    Qr
-    {
+Qr
+{
    internalField   uniform 0;
    boundaryField
    {
@ -184,10 +182,10 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
+}

-    G
-    {
+G
+{
    internalField   uniform 0;
    boundaryField
    {
@ -206,10 +204,10 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
+}

-    IDefault
-    {
+IDefault
+{
    internalField   uniform 0;
    boundaryField
    {
@ -228,7 +226,6 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict
@ -14,15 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+mirrorMeshDict
 {
-    mirrorMeshDict
-    {
    pointAndNormalDict
    {
        basePoint       (0 0 0);
        normalVector    (0 -1 0);
    }
-    }
 }
+
 // ************************************************************************* //
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.X
@ -14,15 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+mirrorMeshDict
 {
-    mirrorMeshDict
-    {
    pointAndNormalDict
    {
        basePoint       (0 0 0);
        normalVector    (-1 0 0);
    }
-    }
 }
+
 // ************************************************************************* //
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/changeDictionaryDict.Y
@ -14,15 +14,13 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+mirrorMeshDict
 {
-    mirrorMeshDict
-    {
    pointAndNormalDict
    {
        basePoint       (0 0 0);
        normalVector    (0 -1 0);
    }
-    }
 }
+
 // ************************************************************************* //
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+T
 {
-    T
-    {
    boundaryField
    {
        wallFilm
@ -29,10 +27,10 @@ dictionaryReplacement
            value           uniform 300;
        }
    }
-    }
+}

-    U
-    {
+U
+{
    boundaryField
    {
        wallFilm
@ -44,10 +42,10 @@ dictionaryReplacement
            value           uniform (0 0 0);
        }
    }
-    }
+}

-    "nut"
-    {
+"nut"
+{
    boundaryField
    {
        wallFilm
@ -55,10 +53,10 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
+}

-    "alphat"
-    {
+"alphat"
+{
    boundaryField
    {
        wallFilm
@ -66,7 +64,6 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+alphat
 {
-    alphat
-    {
    boundaryField
    {
        cycLeft
@ -31,9 +29,9 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
-    epsilon
-    {
+}
+epsilon
+{
    boundaryField
    {
        cycLeft
@ -47,9 +45,9 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
-    G
-    {
+}
+G
+{
    boundaryField
    {
        cycLeft
@ -63,9 +61,9 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
-    H2O
-    {
+}
+H2O
+{
    boundaryField
    {
        cycLeft
@ -79,9 +77,9 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
-    k
-    {
+}
+k
+{
    boundaryField
    {
        cycLeft
@ -95,9 +93,9 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
-    nut
-    {
+}
+nut
+{
    boundaryField
    {
        cycLeft
@ -111,9 +109,9 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
-    N2
-    {
+}
+N2
+{
    boundaryField
    {
        cycLeft
@ -127,9 +125,9 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
-    O2
-    {
+}
+O2
+{
    boundaryField
    {
        cycLeft
@ -143,9 +141,9 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
-    p
-    {
+}
+p
+{
    boundaryField
    {
        cycLeft
@ -159,9 +157,9 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
-    T
-    {
+}
+T
+{
    boundaryField
    {
        cycLeft
@ -175,9 +173,9 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
-    U
-    {
+}
+U
+{
    boundaryField
    {
        cycLeft
@ -191,7 +189,6 @@ dictionaryReplacement
            value           uniform (0 0 0);
        }
    }
-    }
 }

 // ************************************************************************* //
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/changeDictionaryDict
@ -14,10 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dictionaryReplacement
+p_rgh
 {
-    p_rgh
-    {
    boundaryField
    {
        porous_half0
@ -41,7 +39,6 @@ dictionaryReplacement
            value           uniform 0;
        }
    }
-    }
 }

 // ************************************************************************* //