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

8
applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
View File

@ -241,14 +241,15 @@ int main(int argc, char *argv[])
// Where to write VTK output files
const fileName vtkOutputDir = runTime.constantPath()/"triSurface";
forAllConstIters(dict, iter)
for (const entry& dEntry : dict)
{
if (!iter().isDict() || iter().keyword().isPattern())
if (!dEntry.isDict() || dEntry.keyword().isPattern()) // safety
{
continue;
}
const dictionary& surfaceDict = iter().dict();
const word& dictName = dEntry.keyword();
const dictionary& surfaceDict = dEntry.dict();
if (!surfaceDict.found("extractionMethod"))
{
@ -257,7 +258,6 @@ int main(int argc, char *argv[])
}
// The output name based in dictionary name (without extensions)
const word& dictName = iter().keyword();
const word outputName = dictName.lessExt();
autoPtr<surfaceFeaturesExtraction::method> extractor =

15
applications/utilities/surface/surfacePatch/surfacePatch.C
View File

@ -84,12 +84,12 @@ int main(int argc, char *argv[])
const dictionary& surfacesDict = meshDict.subDict("surfaces");
forAllConstIter(dictionary, surfacesDict, surfacesIter)
for (const entry& dEntry : surfacesDict)
{
if (surfacesIter().isDict())
if (dEntry.isDict())
{
const word& surfName = surfacesIter().keyword();
const dictionary& surfDict = surfacesIter().dict();
const word& surfName = dEntry.keyword();
const dictionary& surfDict = dEntry.dict();
// Look up surface
searchableSurface& surf = allGeometry[surfName];
@ -120,10 +120,11 @@ int main(int argc, char *argv[])
if (surfDict.found("regions"))
{
const dictionary& regionsDict = surfDict.subDict("regions");
forAllConstIter(dictionary, regionsDict, regionsIter)
for (const entry& e : regionsDict)
{
const dictionary& regionDict = regionsIter().dict();
const keyType& regionName = regionsIter().keyword();
const keyType& regionName = e.keyword();
const dictionary& regionDict = e.dict();
autoPtr<searchableSurfaceModifier> modifier
(