ENH: postProcess: Clear dictionary to avoid merge warning. See #807.

applications/utilities/postProcessing/postProcess/postProcess.C

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -191,6 +191,8 @@ int main(int argc, char *argv[])
         if (mesh.readUpdate() != polyMesh::UNCHANGED)
         {
             // Update functionObjectList if mesh changes
+            // Note clearing the dictionary to avoid merge warning
+            functionsDict.clear();
             functionsPtr = functionObjectList::New
             (
                 args,

avalanche @ 6e6e1058

-Subproject commit 6e6e105844897d4bf780bbc8d14031bc827e4b04

catalyst @ eaa7f683

-Subproject commit eaa7f6836a1950fe8d40c13952aa85a1062f7f91

cfmesh @ 288f05e0

-Subproject commit 288f05e08f07e693d4222e7b84ea12430947e5bf

src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C

@@ -386,9 +386,11 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
     HashSet<wordRe>& requiredFields
 )
 {
+    // Merge any functions from the provided controlDict
     controlDict.add
     (
-        dictionaryEntry("functions", controlDict, dictionary::null)
+        dictionaryEntry("functions", controlDict, dictionary::null),
+        true
     );
 
     dictionary& functionsDict = controlDict.subDict("functions");

src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -113,6 +113,8 @@ if (argList::postProcess(argc, argv))
         if (mesh.readUpdate() != polyMesh::UNCHANGED)
         {
             // Update functionObjects if mesh changes
+            // Note clearing the dictionary to avoid merge warning
+            functionsDict.clear();
             functionsPtr = functionObjectList::New
             (
                 args,