GIT: Initial state after latest Foundation merge

applications/utilities/preProcessing/changeDictionary/changeDictionary.C

@@ -36,21 +36,18 @@ Description
     \em Walls a zeroGradient boundary condition, the
     \c system/changeDictionaryDict would contain the following:
     \verbatim
-    dictionaryReplacement
+    p                           // field to change
     {
-        p                           // field to change
+        boundaryField
         {
-            boundaryField
+            ".*Wall"            // entry to change
             {
-                ".*Wall"            // entry to change
-                {
-                    type            zeroGradient;
-                }
-                movingWall          // entry to change
-                {
-                    type            fixedValue;
-                    value           uniform 123.45;
-                }
+                type            zeroGradient;
+            }
+            movingWall          // entry to change
+            {
+                type            fixedValue;
+                value           uniform 123.45;
             }
         }
     }
@@ -58,18 +55,21 @@ Description
     Replacement entries starting with '~' will remove the entry.
 
 Usage
+    \b changeDictionary [OPTION]
 
-    - changeDictionary [OPTION]
+    Options:
+      - \par -subDict
+        Specify the subDict name of the replacements dictionary.
 
-    \param -literalRE \n
-    Do not interpret regular expressions or patchGroups;
-    treat them as any other keyword.
+      - \par -literalRE
+        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
+      - \par -enableFunctionEntries
+        Enable function entries (default: disabled)
 
-    \param -disablePatchGroups \n
-    By default all keys are also checked for being patchGroups
+      - \par -disablePatchGroups
+        Disable the default checking for keys being patchGroups
 
 \*---------------------------------------------------------------------------*/
 
@@ -92,7 +92,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;
@@ -274,7 +274,6 @@ bool merge
 
             if (entryPtr)
             {
-
                 // Mark thisDict entry as having been match for wildcard
                 // handling later on.
                 thisKeysSet.erase(entryPtr->keyword());
@@ -401,6 +400,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",
@@ -494,7 +499,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;
@@ -529,6 +543,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();
 
@@ -677,9 +692,7 @@ int main(int argc, char *argv[])
 
     entry::disableFunctionEntries = oldFlag;
 
-    Info<< endl;
-
-    Info<< "End\n" << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }