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

functionObjectList: Added support for arguments to added to the object list

Browse Source 
If the functionObject requires an object list rather than a field list the
non-named arguments are now inserted into the object list, for example

functions
{
    #includeFunc writeObjects(kEpsilon:G)
}

which is equivalent to

functions
{
    #includeFunc writeObjects(objects = (kEpsilon:G))
}
This commit is contained in:
Henry Weller
2019-09-01 15:30:09 +01:00
parent 30cceb42c0
commit 6e9801e7e8
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,17 +349,37 @@ bool Foam::functionObjectList::readFunctionObject
// fields to requiredFields
if (args.size() == 1)
{
funcDict.set("field", args[0]);
funcDict.set("fields", args);
if (funcDict.found("objects"))
{
funcDict.set("objects", args);
}
else
{
funcDict.set("field", args[0]);
funcDict.set("fields", args);
}
}
else if (args.size() > 1)
{
funcDict.set("fields", args);
if (funcDict.found("objects"))
{
funcDict.set("objects", args);
}
else
{
funcDict.set("fields", args);
}
}
// Insert named arguments
forAll(namedArgs, i)
{
if (!funcDict.found(namedArgs[i].first()))
{
IOWarningInFunction(funcDict)
<< "Keyword " << namedArgs[i].first() << " not found" << endl;
}
IStringStream entryStream
(
namedArgs[i].first() + ' ' + namedArgs[i].second() + ';'