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: guard against non-dictionary entries in changeDictionary (#1092)

Browse Source
This commit is contained in:
Mark Olesen
2018-11-22 13:59:49 +01:00
parent 85ffe4c648
commit 343a3b958d
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
applications/utilities/preProcessing/changeDictionary/changeDictionary.C
View File

@ -99,6 +99,11 @@ HashTable<wordList> extractPatchGroups(const dictionary& boundaryDict)
for (const entry& dEntry : boundaryDict) for (const entry& dEntry : boundaryDict)
{ {
if (!dEntry.isDict())
{
continue;
}
const word& patchName = dEntry.keyword(); const word& patchName = dEntry.keyword();
const dictionary& patchDict = dEntry.dict(); const dictionary& patchDict = dEntry.dict();
@ -552,7 +557,10 @@ int main(int argc, char *argv[])
dictionary fieldDict; dictionary fieldDict;
for (const entry& e : dictList) for (const entry& e : dictList)
{ {
fieldDict.add(e.keyword(), e.dict()); if (e.isDict())
{
fieldDict.add(e.keyword(), e.dict());
}
} }
if (dictList.size()) if (dictList.size())
@ -584,6 +592,12 @@ int main(int argc, char *argv[])
for (const entry& replaceEntry : replaceDicts) for (const entry& replaceEntry : replaceDicts)
{ {
if (!replaceEntry.isDict())
{
// Could also warn
continue;
}
const word& fieldName = replaceEntry.keyword(); const word& fieldName = replaceEntry.keyword();
const dictionary& replaceDict = replaceEntry.dict(); const dictionary& replaceDict = replaceEntry.dict();