diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
index d97a0687cc1a5f9f927d14b3b28b8bd793eca760..71c5a113847e6602a9c8cbf79b5f13d9c21575f0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015-2016 OpenFOAM Foundation
@@ -206,7 +206,7 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::dmdt
const phaseModel* phase1 = &pair.phase1();
const phaseModel* phase2 = &pair.phase2();
- forAllConstIter(phasePair, pair, iter)
+ forAllConstIters(pair, iter)
{
if (phase1 == &phase)
{
@@ -303,7 +303,7 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
const volScalarField* K = &K1;
const volScalarField* otherK = &K2;
- forAllConstIter(phasePair, pair, iter)
+ forAllConstIters(pair, iter)
{
const volScalarField& he(phase->thermo().he());
volScalarField Cpv(phase->thermo().Cpv());
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
index 609924c5245751a7fa02970a0bae09a9380ef66c..e4db55591ab4ca52c730fb0372275aa6308884bc 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015-2016 OpenFOAM Foundation
@@ -131,7 +131,7 @@ Foam::HeatTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
const phaseModel* phase = &pair.phase1();
const phaseModel* otherPhase = &pair.phase2();
- forAllConstIter(phasePair, pair, iter)
+ forAllConstIters(pair, iter)
{
const volScalarField& he(phase->thermo().he());
volScalarField Cpv(phase->thermo().Cpv());
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index 157b8b9ab25fb04681642f483fae139bf061e481..c00e6322f91d70df5bd06e3366b9d640b2d892d3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015-2016 OpenFOAM Foundation
@@ -181,7 +181,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Kd
const phaseModel* phase1 = &pair.phase1();
const phaseModel* phase2 = &pair.phase2();
- forAllConstIter(phasePair, pair, iter)
+ forAllConstIters(pair, iter)
{
if (phase1 == &phase)
{
@@ -403,7 +403,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
const phaseModel* phase = &pair.phase1();
const phaseModel* otherPhase = &pair.phase2();
- forAllConstIter(phasePair, pair, iter)
+ forAllConstIters(pair, iter)
{
const volVectorField& U = phase->U();
@@ -429,7 +429,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
const phaseModel* phase = &pair.phase1();
const phaseModel* otherPhase = &pair.phase2();
- forAllConstIter(phasePair, pair, iter)
+ forAllConstIters(pair, iter)
{
const volVectorField& U = phase->U();
const surfaceScalarField& phi = phase->phi();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index 87df808f8197a2456bf16c8e29f1c65f799ee0ec..37787896fed9b6588cdea26e9c07168d8566f4bd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2015-2017 OpenFOAM Foundation
@@ -282,7 +282,7 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::iDmdt
const phaseModel* phase1 = &pair.phase1();
const phaseModel* phase2 = &pair.phase2();
- forAllConstIter(phasePair, pair, iter)
+ forAllConstIters(pair, iter)
{
if (phase1 == &phase)
{
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index 91e574bcd6447f583aff2d3717b7a68055defa05..16a7a193580a0ae679fd0183de515fcec0ffcd28 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -226,7 +226,7 @@ while (pimple.correct())
const phaseModel* phase1 = &pair.phase1();
const phaseModel* phase2 = &pair.phase2();
- forAllConstIter(phasePair, pair, iter)
+ forAllConstIters(pair, iter)
{
if (phase1 == &phase)
{
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
index 38a33940967cd19ea6e8cc40add6602954ddbfec..3e85c264ac11605a29950d333bbf74953573a31d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2013-2015 OpenFOAM Foundation
@@ -179,7 +179,7 @@ void Foam::pointPairs<Triangulation>::reIndex(const Map<label>& oldToNewIndices)
{
pointPairs<Triangulation> newTable(triangulation_);
- forAllConstIter(pointPairs, *this, iter)
+ forAllConstIters(*this, iter)
{
labelPairPair e = iter.key();