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: for-range, forAllIters() ... in applications/utilities

Browse Source 
- reduced clutter when iterating over containers
This commit is contained in:
Mark Olesen
2019-01-07 09:20:51 +01:00
parent 1458b4f689
commit 14a404170b
76 changed files with 592 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
applications/utilities/preProcessing/mapFields/mapLagrangian.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2018-2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -157,15 +157,15 @@ void mapLagrangian(const meshToMesh0& meshToMesh0Interp)
// This requires there to be no boundary in the way.
forAllConstIters(sourceParcels, iter)
for (const passiveParticle& p : sourceParcels)
{
bool foundCell = false;
// Assume that cell from read parcel is the correct one...
if (iter().cell() >= 0)
if (p.cell() >= 0)
{
const labelList& targetCells =
sourceToTargets[iter().cell()];
sourceToTargets[p.cell()];
// Particle probably in one of the targetcells. Try
// all by tracking from their cell centre to the parcel
@ -187,7 +187,7 @@ void mapLagrangian(const meshToMesh0& meshToMesh0Interp)
);
passiveParticle& newP = newPtr();
newP.track(iter().position() - newP.position(), 0);
newP.track(p.position() - newP.position(), 0);
if (!newP.onFace())
{
@ -221,12 +221,12 @@ void mapLagrangian(const meshToMesh0& meshToMesh0Interp)
{
sourceParticleI = 0;
forAllIters(sourceParcels, iter)
for (passiveParticle& p : sourceParcels)
{
if (unmappedSource.found(sourceParticleI))
{
const label targetCell =
findCell(targetParcels, iter().position());
findCell(targetParcels, p.position());
if (targetCell >= 0)
{
@ -237,11 +237,11 @@ void mapLagrangian(const meshToMesh0& meshToMesh0Interp)
new passiveParticle
(
meshTarget,
iter().position(),
p.position(),
targetCell
)
);
sourceParcels.remove(&iter());
sourceParcels.remove(&p);
}
}
sourceParticleI++;