zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

functionEntry: Simplified the primitiveEntry created when functions are disabled

Browse Source
This commit is contained in:
Henry Weller
2019-08-20 23:36:49 +01:00
parent c5d4d5e17b
commit da52b23f41
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,7 +373,6 @@ bool Foam::functionObjectList::readFunctionObject
funcDict.set("region", region);
}
// Merge this functionObject dictionary into functionsDict
const word funcCallKeyword = string::validate<word>(funcCall);
dictionary funcArgsDict;
funcArgsDict.add(funcCallKeyword, funcDict);
@ -400,6 +399,7 @@ bool Foam::functionObjectList::readFunctionObject
requiredFields.insert(wordList(expandedFuncDict.lookup("fields")));
}
// Merge this functionObject dictionary into functionsDict
functionsDict.merge(funcArgsDict);
functionsDict.subDict(funcCallKeyword).name() = funcDict.name();