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

functionObject: Added support for scoped keyword lookup in the argument list

Browse Source 
functions
{
    #includeFunc        singleGraph(setConfig/axis = y)
    .
    .
    .
}
This commit is contained in:
Henry Weller
2020-09-18 21:39:40 +01:00
parent 312a56e7e3
commit ad33cc2cc8
4 changed files with 121 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,7 +292,8 @@ bool Foam::functionObjectList::readFunctionObject
}
else if (c == '=')
{
argName = string::validate<word>(funcCall(start, i - start));
argName = funcCall(start, i - start);
string::stripInvalid<variable>(argName);
start = i+1;
namedArg = true;
}
@ -381,11 +382,13 @@ bool Foam::functionObjectList::readFunctionObject
&& namedArgs[i].first() != "objects"
)
{
const Pair<word> dAk(dictAndKeyword(namedArgs[i].first()));
dictionary& subDict(funcDict.scopedDict(dAk.first()));
IStringStream entryStream
(
namedArgs[i].first() + ' ' + namedArgs[i].second() + ';'
dAk.second() + ' ' + namedArgs[i].second() + ';'
);
funcDict.set(entry::New(entryStream).ptr());
subDict.set(entry::New(entryStream).ptr());
}
}