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

22
src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
View File

@ -161,26 +161,26 @@ void Foam::multiLevelDecomp::createMethodsDict()
// - Only consider sub-dictionaries with a "numberOfSubdomains" entry
// This automatically filters out any coeffs dictionaries
forAllConstIters(coeffsDict_, iter)
for (const entry& dEntry : coeffsDict_)
{
word methodName;
if
(
iter().isDict()
dEntry.isDict()
// non-recursive, no patterns
&& iter().dict().found("numberOfSubdomains", keyType::LITERAL)
&& dEntry.dict().found("numberOfSubdomains", keyType::LITERAL)
)
{
// No method specified? can use a default method?
const bool addDefaultMethod
(
!(iter().dict().found("method", keyType::LITERAL))
!(dEntry.dict().found("method", keyType::LITERAL))
&& !defaultMethod.empty()
);
entry* e = methodsDict_.add(iter());
entry* e = methodsDict_.add(dEntry);
if (addDefaultMethod && e && e->isDict())
{
@ -201,17 +201,17 @@ void Foam::multiLevelDecomp::setMethods()
methods_.clear();
methods_.setSize(methodsDict_.size());
forAllConstIters(methodsDict_, iter)
for (const entry& dEntry : methodsDict_)
{
// Dictionary entries only
// - these method dictionaries are non-regional
if (iter().isDict())
if (dEntry.isDict())
{
methods_.set
(
nLevels++,
// non-verbose would be nicer
decompositionMethod::New(iter().dict())
decompositionMethod::New(dEntry.dict())
);
}
}
@ -475,11 +475,11 @@ void Foam::multiLevelDecomp::decompose
// Get original level0 dictionary and modify numberOfSubdomains
dictionary level0Dict;
forAllConstIters(methodsDict_, iter)
for (const entry& dEntry : methodsDict_)
{
if (iter().isDict())
if (dEntry.isDict())
{
level0Dict = iter().dict();
level0Dict = dEntry.dict();
break;
}
}