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

11
src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
View File

@ -136,18 +136,19 @@ Foam::rigidBodyMeshMotion::rigidBodyMeshMotion
const dictionary& bodiesDict = coeffDict().subDict("bodies");
forAllConstIter(IDLList<entry>, bodiesDict, iter)
for (const entry& dEntry : bodiesDict)
{
const dictionary& bodyDict = iter().dict();
const keyType& bodyName = dEntry.keyword();
const dictionary& bodyDict = dEntry.dict();
if (bodyDict.found("patches"))
{
const label bodyID = model_.bodyID(iter().keyword());
const label bodyID = model_.bodyID(bodyName);
if (bodyID == -1)
{
FatalErrorInFunction
<< "Body " << iter().keyword()
<< "Body " << bodyName
<< " has been merged with another body"
" and cannot be assigned a set of patches"
<< exit(FatalError);
@ -158,7 +159,7 @@ Foam::rigidBodyMeshMotion::rigidBodyMeshMotion
new bodyMesh
(
mesh,
iter().keyword(),
bodyName,
bodyID,
bodyDict
)

11
src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
View File

@ -127,18 +127,19 @@ Foam::rigidBodyMeshMotionSolver::rigidBodyMeshMotionSolver
const dictionary& bodiesDict = coeffDict().subDict("bodies");
forAllConstIter(IDLList<entry>, bodiesDict, iter)
for (const entry& dEntry : bodiesDict)
{
const dictionary& bodyDict = iter().dict();
const keyType& bodyName = dEntry.keyword();
const dictionary& bodyDict = dEntry.dict();
if (bodyDict.found("patches"))
{
const label bodyID = model_.bodyID(iter().keyword());
const label bodyID = model_.bodyID(bodyName);
if (bodyID == -1)
{
FatalErrorInFunction
<< "Body " << iter().keyword()
<< "Body " << bodyName
<< " has been merged with another body"
" and cannot be assigned a set of patches"
<< exit(FatalError);
@ -149,7 +150,7 @@ Foam::rigidBodyMeshMotionSolver::rigidBodyMeshMotionSolver
new bodyMesh
(
mesh,
iter().keyword(),
bodyName,
bodyID,
bodyDict
)