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: allow top-level definition of function object name scoping

Browse Source 
- this refines commit c233961d45, which added prefix scoping.

  Default is now off (v2106 behaviour).

  The 'useNamePrefix' keyword can be specified on a per function basis
  or at the top-level of "functions".

  ```
      functions
      {
          errors          warn;
          useNamePrefix   true;

          func1
          {
              type  ...;
              useNamePrefix   false;
          }

          func2
          {
              type  ...;
              // Uses current default for useNamePrefix
          }
      }
  ```
This commit is contained in:
Mark Olesen
2021-12-09 12:36:00 +01:00
parent 638d1fe8f6
commit c3c23c3cb2
7 changed files with 93 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ License
#include "timeControlFunctionObject.H"
#include "dictionaryEntry.H"
#include "stringOps.H"
#include "Switch.H"
#include "Tuple2.H"
#include "etcFiles.H"
#include "IOdictionary.H"
@ -1009,10 +1010,27 @@ bool Foam::functionObjectList::read()
if (!dEntry.isDict())
{
if (key != "errors" && key != "libs")
// Handle or ignore some known/expected keywords
if (key == "useNamePrefix") // As per functionObject
{
Switch sw(dEntry.stream().peekFirst());
if (sw.good())
{
functionObject::defaultUseNamePrefix = sw;
}
else
{
IOWarningInFunction(parentDict_)
<< "Entry '" << key << "' is not a valid switch"
<< endl;
}
}
else if (key != "errors" && key != "libs")
{
IOWarningInFunction(parentDict_)
<< "Entry " << key << " is not a dictionary" << endl;
<< "Entry '" << key << "' is not a dictionary"
<< endl;
}
continue;