From c2cae92fc5468cbfb517aeb36efbd08cc767c777 Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 1 Aug 2022 15:16:28 +0100 Subject: [PATCH] ENH: changeDictionary: support collated format. Fixes #2533 --- .../changeDictionary/changeDictionary.C | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C index b28e45f831..568f8586c8 100644 --- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C +++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C @@ -662,8 +662,8 @@ int main(int argc, char *argv[]) // Read dictionary // Note: disable class type checking so we can load field Info<< "Loading dictionary " << fieldName << endl; - const word oldTypeName = IOdictionary::typeName; - const_cast(IOdictionary::typeName) = word::null; + const word oldTypeName = localIOdictionary::typeName; + const_cast(localIOdictionary::typeName) = word::null; IOobject fieldHeader ( @@ -675,11 +675,15 @@ int main(int argc, char *argv[]) false ); - if (fieldHeader.typeHeaderOk(false)) + if (fieldHeader.typeHeaderOk(false)) { - IOdictionary fieldDict(fieldHeader); + //IOdictionary fieldDict(fieldHeader); + //- dictionaries to-be-changed are either boundary + // or field dictionary. Both are processor-local. + localIOdictionary fieldDict(fieldHeader); - const_cast(IOdictionary::typeName) = oldTypeName; + const_cast(localIOdictionary::typeName) = + oldTypeName; // Fake type back to what was in field const_cast(fieldDict.type()) =