From 560fb1a64b274ca30fbf147e8da5d4900657b17b Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sun, 20 Sep 2020 09:28:20 +0100 Subject: [PATCH] foamDictionary: Ignore function name in substitution list so that foamDictionary conveniently supports the same format as the #includeFunc argument list, e.g. foamDictionary -set 'fieldAverage(U, p, prime2Mean = yes)' fieldAverage The unnamed field arguments 'U' and 'p' are ignored by foamDictionary. --- .../utilities/miscellaneous/foamDictionary/foamDictionary.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C index 144bec118a..b0a5a51aad 100644 --- a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C +++ b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C @@ -269,8 +269,8 @@ void substitute(dictionary& dict, string substitutions) { // Add '()' delimiters to the substitutions if not present const string whitespace(" \t"); - string::size_type first = substitutions.find_first_not_of(whitespace); - if (substitutions[first] != '(') + string::size_type last = substitutions.find_last_not_of(whitespace); + if (substitutions[last] != ')') { substitutions = '(' + substitutions + ')'; }