zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs
2018-06-06 09:07:32 +01:00
parent a7f076385c
commit 0a62fb4593
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/postProcessing/postProcess/postProcess.C
View File

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

1
modules/avalanche

Submodule modules/avalanche deleted from 6e6e105844

1
modules/catalyst

Submodule modules/catalyst deleted from eaa7f6836a

1
modules/cfmesh

Submodule modules/cfmesh deleted from 288f05e08f

4
src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
View File

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

4
src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H
View File

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