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

STYLE: use range-for when looping dictionary entries.

Browse Source 
- as part of the cleanup of dictionary access methods (c6520033c9)
  made the dictionary class single inheritance from IDLList<entry>.

  This eliminates any ambiguities for iterators and allows
  for simple use of range-for looping.

  Eg,
      for (const entry& e : topDict))
      {
          Info<< "entry:" << e.keyword() << " is dict:" << e.isDict() << nl;
      }

   vs

      forAllConstIter(dictionary, topDict, iter))
      {
          Info<< "entry:" << iter().keyword()
              << " is dict:" << iter().isDict() << nl;
      }
This commit is contained in:
Mark Olesen
2018-10-19 13:08:24 +02:00
parent 4e04c1966f
commit 07dafe7b0b
60 changed files with 636 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
applications/utilities/preProcessing/createZeroDirectory/boundaryTemplates.C
View File

@ -54,9 +54,9 @@ Foam::boundaryTemplates::boundaryTemplates
)
);
forAllConstIter(dictionary, regionBCs, iter)
for (const entry& dEntry : regionBCs)
{
const word& regionType = iter().keyword();
const word& regionType = dEntry.keyword();
wordList patchTypes(regionBCs.lookup(regionType));
dictionary regionTemplate = dictionary::null;
@ -175,7 +175,7 @@ Foam::dictionary Foam::boundaryTemplates::generatePatchDict
// look for inlet, outlet, wall etc
if (regionTemplates.found(category))
{
const dictionary& categoryDict(regionTemplates.subDict(category));
const dictionary& categoryDict = regionTemplates.subDict(category);
// look for subSonic, slip etc
if (categoryDict.found(patchType))
@ -199,10 +199,8 @@ Foam::dictionary Foam::boundaryTemplates::generatePatchDict
const wordList requiredOptions(patchDict.lookup("OPTIONS"));
forAll(requiredOptions, i)
for (const word& option : requiredOptions)
{
const word& option = requiredOptions[i];
word selected;
if (!conditionOptions.readIfPresent(option, selected))
{
@ -252,18 +250,19 @@ Foam::dictionary Foam::boundaryTemplates::generatePatchDict
dictionary dict(dictionary::null);
const dictionary& fieldDict(patchDict.subDict(fieldName));
forAllConstIter(IDLList<entry>, fieldDict, iter)
for (const entry& dEntry : fieldDict)
{
OStringStream oss;
oss << iter();
oss << dEntry;
string s(oss.str());
s.replace(iter().keyword(), "");
s.replace(dEntry.keyword(), "");
s.replace
(
"VALUE",
"boundaryConditions." + condition + ".values"
);
dict.add(iter().keyword(), s.c_str());
dict.add(dEntry.keyword(), s.c_str());
}
return dict;
@ -344,7 +343,7 @@ bool Foam::boundaryTemplates::optionsRequired
if (regionTemplates.found(category))
{
const dictionary& categoryDict(regionTemplates.subDict(category));
const dictionary& categoryDict = regionTemplates.subDict(category);
if (categoryDict.found(patchType))
{