From 62fc3bbc33dd3894a0af2927b9cb71693617c0a0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 10 Mar 2022 21:54:52 +0100
Subject: [PATCH] STYLE: broadcast instead of
 combineScatter/listCombineScatter/mapCombineScatter

- these are the same thing now and 'broadcast' expresses the intention
  more directly/consistently
---
 .../extrudeToRegionMesh/extrudeToRegionMesh.C     | 11 ++++++-----
 .../conformalVoronoiMeshConformToSurface.C        |  4 ++--
 .../mesh/generation/snappyHexMesh/snappyHexMesh.C |  2 +-
 .../mesh/manipulation/checkMesh/checkTopology.C   |  2 +-
 .../mesh/manipulation/createPatch/createPatch.C   |  2 +-
 .../splitMeshRegions/splitMeshRegions.C           |  5 ++---
 .../redistributePar/parLagrangianRedistributor.C  |  4 ++--
 .../parLagrangianRedistributorFields.C            |  2 +-
 .../foamToEnsight/findCloudFields.H               |  2 +-
 .../dataConversion/foamToVTK/convertLagrangian.H  | 10 ++++++----
 .../lagrangian/particleTracks/particleTracks.C    |  2 +-
 .../particleTracksSamplerTemplates.C              |  2 +-
 .../postChannel/channelIndexTemplates.C           |  2 +-
 .../utilities/preProcessing/setFields/setFields.C |  5 ++---
 .../surfaceMeshExtract/surfaceMeshExtract.C       |  4 +---
 .../MSwindows/fileMonitor/fileMonitor.C           |  6 +++---
 src/OSspecific/POSIX/fileMonitor/fileMonitor.C    |  6 +++---
 src/OpenFOAM/db/IOobjectList/IOobjectList.C       |  2 +-
 .../extrudePatchMesh/extrudePatchMesh.C           |  2 +-
 src/dynamicMesh/fvMeshSubset/fvMeshSubset.C       |  2 +-
 .../polyTopoChange/hexRef8/hexRef8.C              |  4 ++--
 src/fileFormats/ensight/part/cells/ensightCells.C |  4 ++--
 src/fileFormats/ensight/part/faces/ensightFaces.C |  4 ++--
 .../turbulentDFSEMInletFvPatchVectorField.C       |  2 +-
 src/functionObjects/field/Curle/Curle.C           |  2 +-
 .../field/columnAverage/columnAverageTemplates.C  |  4 ++--
 .../extractEulerianParticles.C                    |  4 ++--
 .../regionSizeDistribution.C                      |  4 ++--
 src/functionObjects/forces/forces/forces.C        |  4 ++--
 .../forces/propellerInfo/propellerInfo.C          |  4 ++--
 .../lagrangian/vtkCloud/vtkCloudTemplates.C       |  2 +-
 .../utilities/areaWrite/areaWrite.C               |  2 +-
 .../utilities/areaWrite/areaWriteTemplates.C      |  2 +-
 src/lagrangian/basic/Cloud/CloudIO.C              |  2 +-
 .../CellZoneInjection/CellZoneInjection.C         |  2 +-
 .../PatchInjection/patchInjectionBase.C           |  2 +-
 .../movement/lumpedPointMovement.C                |  7 +++----
 .../snappyHexMesh/meshRefinement/meshRefinement.C | 15 +++++++++------
 .../meshRefinement/meshRefinementBaffles.C        | 10 +++++-----
 .../snappyHexMeshDriver/snappyRefineDriver.C      | 12 ++++++------
 .../mappedPolyPatch/mappedPatchBase.C             |  6 +++---
 src/meshTools/regionSplit2D/regionSplit2D.C       |  2 +-
 .../cellSources/nearestToCell/nearestToCell.C     |  2 +-
 .../planeToFaceZone/planeToFaceZone.C             | 14 +++++++++-----
 .../pointSources/nearestToPoint/nearestToPoint.C  |  2 +-
 .../NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C   |  4 ++--
 .../cellVolumeWeightCellCellStencil.C             |  4 ++--
 .../inverseDistanceCellCellStencil.C              |  4 ++--
 .../trackingInverseDistanceCellCellStencil.C      |  2 +-
 src/overset/regionsToCell/findRefCells.C          |  4 ++--
 .../multiLevelDecomp/multiLevelDecomp.C           |  5 +++--
 .../distributedTriSurfaceMesh.C                   | 10 +++++-----
 .../singleLayerRegion/singleLayerRegion.C         |  2 +-
 src/sampling/probes/patchProbes.C                 |  2 +-
 src/sampling/probes/patchProbesTemplates.C        |  4 ++--
 src/sampling/probes/probesTemplates.C             |  4 ++--
 src/sampling/sampledSet/cloud/cloudSet.C          |  8 ++++----
 .../sampledSet/patchCloud/patchCloudSet.C         |  2 +-
 src/sampling/sampledSet/patchSeed/patchSeedSet.C  |  2 +-
 src/sampling/sampledSet/sampledSets/sampledSets.C |  2 +-
 .../sampledSet/sampledSets/sampledSetsImpl.C      | 14 +++++++-------
 .../sampledMeshedSurface/sampledMeshedSurface.C   |  2 +-
 .../sampledSurfaces/sampledSurfaces.C             |  2 +-
 .../distanceSurface/distanceSurfaceFilter.C       |  6 +++---
 src/sampling/surface/isoSurface/isoSurfacePoint.C |  2 +-
 .../TDACChemistryModel/TDACChemistryModel.C       |  2 +-
 .../solarLoad/faceReflecting/faceReflecting.C     |  8 ++++----
 .../radiationModels/viewFactor/viewFactor.C       | 11 +++++------
 68 files changed, 153 insertions(+), 148 deletions(-)

diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index c11783e342..0eee01dc5a 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -313,7 +313,7 @@ void deleteEmptyPatches(fvMesh& mesh)
     {
         masterNames = patches.names();
     }
-    Pstream::scatter(masterNames);
+    Pstream::broadcast(masterNames);
 
 
     labelList oldToNew(patches.size(), -1);
@@ -662,9 +662,10 @@ void countExtrudePatches
     // Synchronise decision. Actual numbers are not important, just make
     // sure that they're > 0 on all processors.
     Pstream::listCombineGather(zoneSidePatch, plusEqOp<label>());
-    Pstream::listCombineScatter(zoneSidePatch);
     Pstream::listCombineGather(zoneZonePatch, plusEqOp<label>());
-    Pstream::listCombineScatter(zoneZonePatch);
+
+    Pstream::broadcast(zoneSidePatch);
+    Pstream::broadcast(zoneZonePatch);
 }
 
 
@@ -1858,7 +1859,7 @@ int main(int argc, char *argv[])
 
 
     Pstream::listCombineGather(isInternal, orEqOp<bool>());
-    Pstream::listCombineScatter(isInternal);
+    Pstream::broadcast(isInternal);
 
     // Check zone either all internal or all external faces
     checkZoneInside(mesh, zoneNames, zoneID, extrudeMeshFaces, isInternal);
@@ -2320,7 +2321,7 @@ int main(int argc, char *argv[])
 
         // Reduce
         Pstream::mapCombineGather(globalSum, plusEqOp<point>());
-        Pstream::mapCombineScatter(globalSum);
+        Pstream::broadcast(globalSum);
 
         forAll(localToGlobalRegion, localRegionI)
         {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index fa734f5a18..46166f4f1a 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -733,7 +733,7 @@ Foam::label Foam::conformalVoronoiMesh::synchroniseSurfaceTrees
     }
 
     Pstream::listCombineGather(hits, plusEqOp<labelHashSet>());
-    Pstream::listCombineScatter(hits);
+    Pstream::broadcast(hits);
 
     forAll(surfaceHits, eI)
     {
@@ -824,7 +824,7 @@ Foam::label Foam::conformalVoronoiMesh::synchroniseEdgeTrees
     }
 
     Pstream::listCombineGather(hits, plusEqOp<labelHashSet>());
-    Pstream::listCombineScatter(hits);
+    Pstream::broadcast(hits);
 
     forAll(featureEdgeHits, eI)
     {
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 12959d2361..1c9e886c28 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -421,7 +421,7 @@ void extractSurface
         label sz = compactZoneID.size();
         compactZoneID.insert(iter.key(), sz);
     }
-    Pstream::mapCombineScatter(compactZoneID);
+    Pstream::broadcast(compactZoneID);
 
 
     // Rework HashTable into labelList just for speed of conversion
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 0629a864fd..6edf38ea6f 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -475,7 +475,7 @@ Foam::label Foam::checkTopology
                 }
 
                 Pstream::listCombineGather(regionDisconnected, andEqOp<bool>());
-                Pstream::listCombineScatter(regionDisconnected);
+                Pstream::broadcast(regionDisconnected);
             }
 
 
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 0276c89bb3..5c112c81f8 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -715,7 +715,7 @@ void syncPoints
 
         // Combine on master.
         Pstream::listCombineGather(sharedPts, cop);
-        Pstream::listCombineScatter(sharedPts);
+        Pstream::broadcast(sharedPts);
 
         // Now we will all have the same information. Merge it back with
         // my local information.
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index a330fbd96a..b1d4691206 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -452,8 +452,7 @@ void getInterfaceSizes
 
     // Rework
 
-    Pstream::scatter(regionsToSize);
-
+    Pstream::broadcast(regionsToSize);
 
 
     // Now we have the global sizes of all inter-regions.
@@ -1113,7 +1112,7 @@ label findCorrespondingRegion
     }
 
     Pstream::listCombineGather(cellsInZone, plusEqOp<label>());
-    Pstream::listCombineScatter(cellsInZone);
+    Pstream::broadcast(cellsInZone);
 
     // Pick region with largest overlap of zoneI
     label regionI = findMax(cellsInZone);
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
index e7e0bfe0fd..ee52b18bbb 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
@@ -85,7 +85,7 @@ void Foam::parLagrangianRedistributor::findClouds
 
     // Synchronise cloud names
     Pstream::combineGather(cloudNames, ListOps::uniqueEqOp<word>());
-    Pstream::combineScatter(cloudNames);
+    Pstream::broadcast(cloudNames);
 
     objectNames.setSize(cloudNames.size());
 
@@ -123,7 +123,7 @@ void Foam::parLagrangianRedistributor::findClouds
     forAll(objectNames, i)
     {
         Pstream::combineGather(objectNames[i], ListOps::uniqueEqOp<word>());
-        Pstream::combineScatter(objectNames[i]);
+        Pstream::broadcast(objectNames[i]);
     }
 }
 
diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorFields.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorFields.C
index 10a90315cd..0bbf52f8ff 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorFields.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorFields.C
@@ -54,7 +54,7 @@ Foam::wordList Foam::parLagrangianRedistributor::filterObjects
     // - Combine names from all processors
 
     Pstream::combineGather(fieldNames, ListOps::uniqueEqOp<word>());
-    Pstream::combineScatter(fieldNames);
+    Pstream::broadcast(fieldNames);
 
     // Sort for consistent order on all processors
     Foam::sort(fieldNames);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/findCloudFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/findCloudFields.H
index 4dde1d66ae..600c5248e0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/findCloudFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/findCloudFields.H
@@ -109,7 +109,7 @@ if (timeDirs.size() && doLagrangian)
                 cloudFields,
                 HashTableOps::plusEqOp<word>()
             );
-            Pstream::mapCombineScatter(cloudFields);
+            Pstream::broadcast(cloudFields);
         }
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H
index e932299787..aa92c3bc0a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H
@@ -43,10 +43,12 @@ if (doLagrangian)
         nameOp<fileName>()
     );
 
-    // Synchronise cloud names
-    Pstream::combineGather(cloudNames, ListOps::uniqueEqOp<word>());
-    Pstream::combineScatter(cloudNames);
-
+    if (Pstream::parRun())
+    {
+        // Synchronise cloud names
+        Pstream::combineGather(cloudNames, ListOps::uniqueEqOp<word>());
+        Pstream::broadcast(cloudNames);
+    }
     // Consistent order
     Foam::sort(cloudNames);
 
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index abcb49de3f..a21db2813a 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
         maxIds.resize(maxNProcs, -1);
 
         Pstream::listCombineGather(maxIds, maxEqOp<label>());
-        Pstream::listCombineScatter(maxIds);
+        Pstream::broadcast(maxIds);
 
         // From ids to count
         const labelList numIds = maxIds + 1;
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracksSamplerTemplates.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracksSamplerTemplates.C
index 71c663c74e..d43b0eb7f7 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracksSamplerTemplates.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracksSamplerTemplates.C
@@ -78,7 +78,7 @@ Foam::label Foam::particleTracksSampler::setTrackFields
         if (Pstream::parRun())
         {
             Pstream::combineGather(fieldNames, ListOps::uniqueEqOp<word>());
-            Pstream::combineScatter(fieldNames);
+            Pstream::broadcast(fieldNames);
         }
 
         for (const word& fieldName : fieldNames)
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C
index 6dcf0ab82c..046df992ae 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C
@@ -41,7 +41,7 @@ Foam::Field<T> Foam::channelIndex::regionSum(const Field<T>& cellField) const
 
     // Global sum
     Pstream::listCombineGather(regionField, plusEqOp<T>());
-    Pstream::listCombineScatter(regionField);
+    Pstream::broadcast(regionField);
 
     return regionField;
 }
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index 14f3a5acf7..e9487faacf 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -288,10 +288,9 @@ bool setFaceFieldType
         }
 
         Pstream::listCombineGather(nChanged, plusEqOp<label>());
-        Pstream::listCombineScatter(nChanged);
+        Pstream::broadcast(nChanged);
 
-        typename GeometricField<Type, fvPatchField, volMesh>::
-            Boundary& fieldBf = field.boundaryFieldRef();
+        auto& fieldBf = field.boundaryFieldRef();
 
         // Reassign.
         forAll(field.boundaryField(), patchi)
diff --git a/applications/utilities/surface/surfaceMeshExtract/surfaceMeshExtract.C b/applications/utilities/surface/surfaceMeshExtract/surfaceMeshExtract.C
index 25e6bac8a9..a8b386cb7a 100644
--- a/applications/utilities/surface/surfaceMeshExtract/surfaceMeshExtract.C
+++ b/applications/utilities/surface/surfaceMeshExtract/surfaceMeshExtract.C
@@ -303,7 +303,6 @@ int main(int argc, char *argv[])
             Pstream::mapCombineGather(patchSize, plusEqOp<label>());
             Pstream::mapCombineGather(zoneSize, plusEqOp<label>());
 
-
             // Allocate compact numbering for all patches/faceZones
             forAllConstIters(patchSize, iter)
             {
@@ -315,8 +314,7 @@ int main(int argc, char *argv[])
                 compactZoneID.insert(iter.key(), compactZoneID.size());
             }
 
-
-            Pstream::mapCombineScatter(compactZoneID);
+            Pstream::broadcast(compactZoneID);
 
 
             // Rework HashTable into labelList just for speed of conversion
diff --git a/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C b/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C
index 2a34a5c42d..d6b9f0295c 100644
--- a/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C
+++ b/src/OSspecific/MSwindows/fileMonitor/fileMonitor.C
@@ -549,14 +549,14 @@ void Foam::fileMonitor::updateStates
         // Scatter or reduce to synchronise state
         if (masterOnly)
         {
-            // Scatter
+            // Broadcast
             if (stats.storage().size() == 1)
             {
-                Pstream::scatter(stats.storage()[0]);
+                Pstream::broadcast(stats.storage()[0]);
             }
             else
             {
-                Pstream::listCombineScatter(stats.storage());
+                Pstream::broadcast(stats.storage());
             }
         }
         else
diff --git a/src/OSspecific/POSIX/fileMonitor/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor/fileMonitor.C
index 4f9a95b450..5241a5b4ba 100644
--- a/src/OSspecific/POSIX/fileMonitor/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor/fileMonitor.C
@@ -545,14 +545,14 @@ void Foam::fileMonitor::updateStates
         // Scatter or reduce to synchronise state
         if (masterOnly)
         {
-            // Scatter
+            // Broadcast
             if (stats.storage().size() == 1)
             {
-                Pstream::scatter(stats.storage()[0]);
+                Pstream::broadcast(stats.storage()[0]);
             }
             else
             {
-                Pstream::listCombineScatter(stats.storage());
+                Pstream::broadcast(stats.storage());
             }
         }
         else
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index adb874df6f..876ce1f007 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -68,7 +68,7 @@ void Foam::IOobjectList::syncNames(wordList& objNames)
     {
         // Synchronize names
         Pstream::combineGather(objNames, ListOps::uniqueEqOp<word>());
-        Pstream::combineScatter(objNames);
+        Pstream::broadcast(objNames);
     }
 
     // Sort for consistent order on all processors
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
index 7407eaef85..02e1c285ff 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -215,7 +215,7 @@ void Foam::extrudePatchMesh::extrudeMesh(const List<polyPatch*>& regionPatches)
 
             // Reduce
             Pstream::mapCombineGather(globalSum, plusEqOp<point>());
-            Pstream::mapCombineScatter(globalSum);
+            Pstream::broadcast(globalSum);
 
             forAll(localToGlobalRegion, localRegionI)
             {
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
index 305f4515ea..59419c2a20 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
@@ -1018,7 +1018,7 @@ void Foam::fvMeshSubset::setCellSubset
         // Note that up to nextPatchID the globalPatchMap is an identity so
         // no need to index through that.
         Pstream::listCombineGather(globalPatchSizes, plusEqOp<label>());
-        Pstream::listCombineScatter(globalPatchSizes);
+        Pstream::broadcast(globalPatchSizes);
 
         // Now all processors have all the patchnames.
         // Decide: if all processors have the same patch names and size is zero
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 6ca627a331..bf65c55859 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -437,7 +437,7 @@ Foam::scalar Foam::hexRef8::getLevel0EdgeLength() const
     // Get the minimum per level over all processors. Note minimum so if
     // cells are not cubic we use the smallest edge side.
     Pstream::listCombineGather(typEdgeLenSqr, minEqOp<scalar>());
-    Pstream::listCombineScatter(typEdgeLenSqr);
+    Pstream::broadcast(typEdgeLenSqr);
 
     if (debug)
     {
@@ -472,7 +472,7 @@ Foam::scalar Foam::hexRef8::getLevel0EdgeLength() const
     }
 
     Pstream::listCombineGather(maxEdgeLenSqr, maxEqOp<scalar>());
-    Pstream::listCombineScatter(maxEdgeLenSqr);
+    Pstream::broadcast(maxEdgeLenSqr);
 
     if (debug)
     {
diff --git a/src/fileFormats/ensight/part/cells/ensightCells.C b/src/fileFormats/ensight/part/cells/ensightCells.C
index 2aca01bd25..92164841d6 100644
--- a/src/fileFormats/ensight/part/cells/ensightCells.C
+++ b/src/fileFormats/ensight/part/cells/ensightCells.C
@@ -134,12 +134,12 @@ void Foam::ensightCells::clearOut()
 
 void Foam::ensightCells::reduce()
 {
-    // No listCombineGather, listCombineScatter for FixedList
     forAll(sizes_, typei)
     {
         sizes_[typei] = size(elemType(typei));
-        Foam::reduce(sizes_[typei], sumOp<label>());
     }
+    // Can reduce FixedList with sumOp<label> in a single operation
+    Foam::reduce(sizes_, sumOp<label>());
 }
 
 
diff --git a/src/fileFormats/ensight/part/faces/ensightFaces.C b/src/fileFormats/ensight/part/faces/ensightFaces.C
index e3ee917d12..22095fdeaf 100644
--- a/src/fileFormats/ensight/part/faces/ensightFaces.C
+++ b/src/fileFormats/ensight/part/faces/ensightFaces.C
@@ -163,12 +163,12 @@ void Foam::ensightFaces::clearOut()
 
 void Foam::ensightFaces::reduce()
 {
-    // No listCombineGather, listCombineScatter for FixedList
     forAll(sizes_, typei)
     {
         sizes_[typei] = size(elemType(typei));
-        Foam::reduce(sizes_[typei], sumOp<label>());
     }
+    // Can reduce FixedList with sumOp<label> in a single operation
+    Foam::reduce(sizes_, sumOp<label>());
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index 2cfa15b8fd..bd80ea9766 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -169,7 +169,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::initialisePatch()
     sumTriMagSf_[Pstream::myProcNo() + 1] = sum(triMagSf);
 
     Pstream::listCombineGather(sumTriMagSf_, maxEqOp<scalar>());
-    Pstream::listCombineScatter(sumTriMagSf_);
+    Pstream::broadcast(sumTriMagSf_);
 
     for (label i = 1; i < triMagSf.size(); ++i)
     {
diff --git a/src/functionObjects/field/Curle/Curle.C b/src/functionObjects/field/Curle/Curle.C
index 1a8133a83d..eb5cef166b 100644
--- a/src/functionObjects/field/Curle/Curle.C
+++ b/src/functionObjects/field/Curle/Curle.C
@@ -224,7 +224,7 @@ bool Foam::functionObjects::Curle::execute()
     pDash /= 4*mathematical::pi;
 
     Pstream::listCombineGather(pDash, plusEqOp<scalar>());
-    Pstream::listCombineScatter(pDash);
+    Pstream::broadcast(pDash);
 
     if (surfaceWriterPtr_)
     {
diff --git a/src/functionObjects/field/columnAverage/columnAverageTemplates.C b/src/functionObjects/field/columnAverage/columnAverageTemplates.C
index f585c95fe5..33c94412b3 100644
--- a/src/functionObjects/field/columnAverage/columnAverageTemplates.C
+++ b/src/functionObjects/field/columnAverage/columnAverageTemplates.C
@@ -88,9 +88,9 @@ bool Foam::functionObjects::columnAverage::columnAverageField
 
         // Global sum
         Pstream::listCombineGather(regionField, plusEqOp<Type>());
-        Pstream::listCombineScatter(regionField);
         Pstream::listCombineGather(regionCount, plusEqOp<label>());
-        Pstream::listCombineScatter(regionCount);
+        Pstream::broadcast(regionField);
+        Pstream::broadcast(regionCount);
 
         forAll(regionField, regioni)
         {
diff --git a/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.C b/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.C
index 935cba3ee1..4fbcabdbaa 100644
--- a/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.C
+++ b/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.C
@@ -334,7 +334,7 @@ void Foam::functionObjects::extractEulerianParticles::calculateAddressing
     // Create map from new regions to slots in particles list
     // - filter through new-to-new addressing to identify new particles
     Pstream::listCombineGather(newToNewRegion, maxEqOp<label>());
-    Pstream::listCombineScatter(newToNewRegion);
+    Pstream::broadcast(newToNewRegion);
 
     label nParticle = -1;
     labelHashSet newRegions;
@@ -354,7 +354,7 @@ void Foam::functionObjects::extractEulerianParticles::calculateAddressing
     // Accumulate old region data or create a new particle if there is no
     // mapping from the old-to-new region
     Pstream::listCombineGather(oldToNewRegion, maxEqOp<label>());
-    Pstream::listCombineScatter(oldToNewRegion);
+    Pstream::broadcast(oldToNewRegion);
     List<eulerianParticle> newParticles(newRegionToParticleMap.size());
     forAll(oldToNewRegion, oldRegioni)
     {
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index 25a7c3f89a..250939c015 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -67,7 +67,7 @@ static Map<Type> regionSum(const regionSplit& regions, const Field<Type>& fld)
     }
 
     Pstream::mapCombineGather(regionToSum, plusEqOp<Type>());
-    Pstream::mapCombineScatter(regionToSum);
+    Pstream::broadcast(regionToSum);
 
     return regionToSum;
 }
@@ -216,7 +216,7 @@ Foam::functionObjects::regionSizeDistribution::findPatchRegions
 
     // Make sure all the processors have the same set of regions
     Pstream::mapCombineGather(patchRegions, minEqOp<label>());
-    Pstream::mapCombineScatter(patchRegions);
+    Pstream::broadcast(patchRegions);
 
     return patchRegions;
 }
diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C
index 7d6b61f480..8040ee589a 100644
--- a/src/functionObjects/forces/forces/forces.C
+++ b/src/functionObjects/forces/forces/forces.C
@@ -1065,8 +1065,8 @@ void Foam::functionObjects::forces::calcForcesMoment()
 
     Pstream::listCombineGather(force_, plusEqOp<vectorField>());
     Pstream::listCombineGather(moment_, plusEqOp<vectorField>());
-    Pstream::listCombineScatter(force_);
-    Pstream::listCombineScatter(moment_);
+    Pstream::broadcast(force_);
+    Pstream::broadcast(moment_);
 }
 
 
diff --git a/src/functionObjects/forces/propellerInfo/propellerInfo.C b/src/functionObjects/forces/propellerInfo/propellerInfo.C
index e696b9d1fb..11da8c638e 100644
--- a/src/functionObjects/forces/propellerInfo/propellerInfo.C
+++ b/src/functionObjects/forces/propellerInfo/propellerInfo.C
@@ -469,7 +469,7 @@ void Foam::functionObjects::propellerInfo::updateSampleDiskCells()
     }
 
     Pstream::listCombineGather(pointMask_, orEqOp<bool>());
-    Pstream::listCombineScatter(pointMask_);
+    Pstream::broadcast(pointMask_);
 }
 
 
@@ -775,7 +775,7 @@ Foam::tmp<Foam::Field<Type>> Foam::functionObjects::propellerInfo::interpolate
     }
 
     Pstream::listCombineGather(field, maxEqOp<Type>());
-    Pstream::listCombineScatter(field);
+    Pstream::broadcast(field);
 
     return tfield;
 }
diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C b/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C
index 8aa3dda9e6..0917da8c46 100644
--- a/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C
+++ b/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C
@@ -57,7 +57,7 @@ Foam::wordList Foam::functionObjects::vtkCloud::writeFields
 
     wordList fieldNames(obrTmp.names<IOField<Type>>());
     Pstream::combineGather(fieldNames, ListOps::uniqueEqOp<word>());
-    Pstream::combineScatter(fieldNames);
+    Pstream::broadcast(fieldNames);
 
     // Consistent order on all processors
     Foam::sort(fieldNames);
diff --git a/src/functionObjects/utilities/areaWrite/areaWrite.C b/src/functionObjects/utilities/areaWrite/areaWrite.C
index 346a0ae1bc..50824c226f 100644
--- a/src/functionObjects/utilities/areaWrite/areaWrite.C
+++ b/src/functionObjects/utilities/areaWrite/areaWrite.C
@@ -266,7 +266,7 @@ bool Foam::areaWrite::write()
         if (Pstream::parRun())
         {
             Pstream::mapCombineGather(selected, HashSetOps::plusEqOp<word>());
-            Pstream::mapCombineScatter(selected);
+            Pstream::broadcast(selected);
         }
 
         missed.clear();
diff --git a/src/functionObjects/utilities/areaWrite/areaWriteTemplates.C b/src/functionObjects/utilities/areaWrite/areaWriteTemplates.C
index f100554d6e..b68d656a35 100644
--- a/src/functionObjects/utilities/areaWrite/areaWriteTemplates.C
+++ b/src/functionObjects/utilities/areaWrite/areaWriteTemplates.C
@@ -78,7 +78,7 @@ void Foam::areaWrite::performAction
         {
             // Synchronize names
             Pstream::combineGather(fieldNames, ListOps::uniqueEqOp<word>());
-            Pstream::combineScatter(fieldNames);
+            Pstream::broadcast(fieldNames);
         }
 
         // Sort for consistent order on all processors
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index b1af9902be..4e571c68e9 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -105,7 +105,7 @@ void Foam::Cloud<ParticleType>::writeCloudUniformProperties() const
     np[Pstream::myProcNo()] = ParticleType::particleCount_;
 
     Pstream::listCombineGather(np, maxEqOp<label>());
-    Pstream::listCombineScatter(np);
+    Pstream::broadcast(np);
 
     uniformPropsDict.add
     (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
index c4e651ae74..250f3e6691 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
@@ -121,7 +121,7 @@ void Foam::CellZoneInjection<CloudType>::setPositions
     ) = positions;
 
     Pstream::listCombineGather(allPositions, minEqOp<point>());
-    Pstream::listCombineScatter(allPositions);
+    Pstream::broadcast(allPositions);
 
     // Gather local cell tet and tet-point Ids, but leave non-local ids set -1
     SubList<label>
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
index e3c495ec93..c1c216f033 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
@@ -119,7 +119,7 @@ void Foam::patchInjectionBase::updateMesh(const polyMesh& mesh)
     sumTriMagSf_[Pstream::myProcNo() + 1] = sum(triMagSf);
 
     Pstream::listCombineGather(sumTriMagSf_, maxEqOp<scalar>());
-    Pstream::listCombineScatter(sumTriMagSf_);
+    Pstream::broadcast(sumTriMagSf_);
 
     for (label i = 1; i < triMagSf.size(); i++)
     {
diff --git a/src/lumpedPointMotion/movement/lumpedPointMovement.C b/src/lumpedPointMotion/movement/lumpedPointMovement.C
index 1a6601d38f..3c6f2b4759 100644
--- a/src/lumpedPointMotion/movement/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/movement/lumpedPointMovement.C
@@ -881,7 +881,7 @@ Foam::List<Foam::scalar> Foam::lumpedPointMovement::areas
     }
 
     Pstream::listCombineGather(zoneAreas, plusEqOp<scalar>());
-    Pstream::listCombineScatter(zoneAreas);
+    Pstream::broadcast(zoneAreas);
 
     return zoneAreas;
 }
@@ -1010,10 +1010,9 @@ bool Foam::lumpedPointMovement::forcesAndMoments
     }
 
     Pstream::listCombineGather(forces, plusEqOp<vector>());
-    Pstream::listCombineScatter(forces);
-
     Pstream::listCombineGather(moments, plusEqOp<vector>());
-    Pstream::listCombineScatter(moments);
+    Pstream::broadcast(forces);
+    Pstream::broadcast(moments);
 
     return true;
 }
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 8f44de8a79..c9eec5a15b 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -1954,7 +1954,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
             Pout<< "Wanted distribution:" << nProcCells << endl;
 
             Pstream::listCombineGather(nProcCells, plusEqOp<label>());
-            Pstream::listCombineScatter(nProcCells);
+            Pstream::broadcast(nProcCells);
 
             Pout<< "Wanted resulting decomposition:" << endl;
             forAll(nProcCells, proci)
@@ -3531,13 +3531,16 @@ const
         }
 
         Pstream::listCombineGather(nCells, plusEqOp<label>());
-        Pstream::listCombineScatter(nCells);
 
-        Info<< "Cells per refinement level:" << endl;
-        forAll(nCells, leveli)
+        /// Pstream::broadcast(nCells);
+        if (Pstream::master())
         {
-            Info<< "    " << leveli << '\t' << nCells[leveli]
-                << endl;
+            Info<< "Cells per refinement level:" << endl;
+            forAll(nCells, leveli)
+            {
+                Info<< "    " << leveli << '\t' << nCells[leveli]
+                    << endl;
+            }
         }
     }
 }
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index 30c4a6b30f..6ab46e3ca4 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -821,7 +821,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::createZoneBaffles
         if (nTotalBaffles > 0)
         {
             Pstream::listCombineGather(nBaffles, plusEqOp<label>());
-            Pstream::listCombineScatter(nBaffles);
+            Pstream::broadcast(nBaffles);
 
             Info<< nl
                 << setf(ios_base::left)
@@ -1948,7 +1948,7 @@ void Foam::meshRefinement::findCellZoneTopo
     // - keepRegion is identical ,,
     // - cellZones are identical ,,
     Pstream::listCombineGather(regionToCellZone, maxEqOp<label>());
-    Pstream::listCombineScatter(regionToCellZone);
+    Pstream::broadcast(regionToCellZone);
 
 
     // Find the region containing the keepPoint
@@ -1999,7 +1999,7 @@ void Foam::meshRefinement::findCellZoneTopo
         // This done at top of loop to account for geometric matching
         // not being synchronised.
         Pstream::listCombineGather(regionToCellZone, maxEqOp<label>());
-        Pstream::listCombineScatter(regionToCellZone);
+        Pstream::broadcast(regionToCellZone);
 
 
         bool changed = false;
@@ -5733,7 +5733,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
         // 2.Combine faceZoneNames allocated on different processors
 
         Pstream::mapCombineGather(zonesToFaceZone, eqOp<word>());
-        Pstream::mapCombineScatter(zonesToFaceZone);
+        Pstream::broadcast(zonesToFaceZone);
 
 
         // 3. Allocate faceZones from (now synchronised) faceZoneNames
@@ -5957,7 +5957,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
                 }
             }
             Pstream::mapCombineGather(nPosOrientation, plusEqOp<label>());
-            Pstream::mapCombineScatter(nPosOrientation);
+            Pstream::broadcast(nPosOrientation);
 
 
             Info<< "Split " << nFreeStanding << " free-standing zone faces"
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index 7ac7028708..cf5b05890c 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -2498,9 +2498,9 @@ Foam::label Foam::snappyRefineDriver::directionalSmooth
 
             {
                 scalar minSeed = min(allSeedPointDist);
-                Pstream::scatter(minSeed);
                 scalar maxSeed = max(allSeedPointDist);
-                Pstream::scatter(maxSeed);
+                Pstream::broadcast(minSeed);
+                Pstream::broadcast(maxSeed);
 
                 forAll(normalizedPosition, posI)
                 {
@@ -2551,7 +2551,7 @@ Foam::label Foam::snappyRefineDriver::directionalSmooth
                 );
             }
 
-            Pstream::scatter(keyAndValue);
+            Pstream::broadcast(keyAndValue);
 
             // Construct an iterpolation table for further queries
             // - although normalized values are used for query,
@@ -3248,11 +3248,11 @@ void Foam::snappyRefineDriver::deleteSmallRegions
         nCellsPerZone[zonei]++;
     }
     Pstream::listCombineGather(nCellsPerRegion, plusEqOp<label>());
-    Pstream::listCombineScatter(nCellsPerRegion);
     Pstream::listCombineGather(regionToZone, maxEqOp<label>());
-    Pstream::listCombineScatter(regionToZone);
     Pstream::listCombineGather(nCellsPerZone, plusEqOp<label>());
-    Pstream::listCombineScatter(nCellsPerZone);
+    Pstream::broadcast(nCellsPerRegion);
+    Pstream::broadcast(regionToZone);
+    Pstream::broadcast(nCellsPerZone);
 
 
     // Mark small regions. Note that all processors have the same information
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index 1857ffa774..cd685968c5 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -245,12 +245,12 @@ void Foam::mappedPatchBase::collectSamples
         (
             UPstream::listGatherValues<label>(mySampleWorld, myComm)
         );
-        Pstream::broadcast(procToWorldIndex, myComm);
-
         labelList nPerProc
         (
             UPstream::listGatherValues<label>(patch_.size(), myComm)
         );
+
+        Pstream::broadcast(procToWorldIndex, myComm);
         Pstream::broadcast(nPerProc, myComm);
 
         patchFaceWorlds.setSize(patchFaces.size());
@@ -680,7 +680,7 @@ void Foam::mappedPatchBase::findSamples
         Pstream::msgType(),
         myComm
     );
-    Pstream::listCombineScatter(nearest, Pstream::msgType(), myComm);
+    Pstream::broadcast(nearest, myComm);
 
     //if (debug)
     //{
diff --git a/src/meshTools/regionSplit2D/regionSplit2D.C b/src/meshTools/regionSplit2D/regionSplit2D.C
index 36f20aa239..45d584860a 100644
--- a/src/meshTools/regionSplit2D/regionSplit2D.C
+++ b/src/meshTools/regionSplit2D/regionSplit2D.C
@@ -140,7 +140,7 @@ Foam::regionSplit2D::regionSplit2D
     // - not concerned about the op (keys are unique)
     // - map size will be the number of regions in the set of faces
     Pstream::mapCombineGather(regionToCompactAddr, minEqOp<label>());
-    Pstream::mapCombineScatter(regionToCompactAddr);
+    Pstream::broadcast(regionToCompactAddr);
 
     nRegions_ = regionToCompactAddr.size();
 
diff --git a/src/meshTools/topoSet/cellSources/nearestToCell/nearestToCell.C b/src/meshTools/topoSet/cellSources/nearestToCell/nearestToCell.C
index f46c53b191..11a97ee049 100644
--- a/src/meshTools/topoSet/cellSources/nearestToCell/nearestToCell.C
+++ b/src/meshTools/topoSet/cellSources/nearestToCell/nearestToCell.C
@@ -86,7 +86,7 @@ void Foam::nearestToCell::combine(topoSet& set, const bool add) const
     }
 
     Pstream::listCombineGather(nearest, mappedPatchBase::nearestEqOp());
-    Pstream::listCombineScatter(nearest);
+    Pstream::broadcast(nearest);
 
     for (const auto& near : nearest)
     {
diff --git a/src/meshTools/topoSet/faceZoneSources/planeToFaceZone/planeToFaceZone.C b/src/meshTools/topoSet/faceZoneSources/planeToFaceZone/planeToFaceZone.C
index de811487f5..ca50d80545 100644
--- a/src/meshTools/topoSet/faceZoneSources/planeToFaceZone/planeToFaceZone.C
+++ b/src/meshTools/topoSet/faceZoneSources/planeToFaceZone/planeToFaceZone.C
@@ -219,7 +219,7 @@ void Foam::planeToFaceZone::combine(faceZoneSet& fzSet, const bool add) const
                 }
             }
             Pstream::listCombineGather(regionRegions, bitOrEqOp<bitSet>());
-            Pstream::listCombineScatter(regionRegions);
+            Pstream::broadcast(regionRegions);
 
             // Collapse the region connections into a map between each region
             // and the lowest numbered region that it connects to
@@ -261,7 +261,7 @@ void Foam::planeToFaceZone::combine(faceZoneSet& fzSet, const bool add) const
                 ++ regionNFaces[regioni];
             }
             Pstream::listCombineGather(regionNFaces, plusEqOp<label>());
-            Pstream::listCombineScatter(regionNFaces);
+            Pstream::broadcast(regionNFaces);
             Info<< "    Found " << nRegions << " contiguous regions with "
                 << regionNFaces << " faces" << endl;
         }
@@ -285,9 +285,13 @@ void Foam::planeToFaceZone::combine(faceZoneSet& fzSet, const bool add) const
             }
             Pstream::listCombineGather(regionWeights, plusEqOp<scalar>());
             Pstream::listCombineGather(regionCentres, plusEqOp<point>());
-            Pstream::listCombineScatter(regionWeights);
-            Pstream::listCombineScatter(regionCentres);
-            regionCentres /= regionWeights;
+
+            if (Pstream::master())
+            {
+                regionCentres /= regionWeights;
+            }
+            //Pstream::broadcast(regionWeights);
+            Pstream::broadcast(regionCentres);
 
             // Find the region centroid closest to the reference point
             selectedRegioni =
diff --git a/src/meshTools/topoSet/pointSources/nearestToPoint/nearestToPoint.C b/src/meshTools/topoSet/pointSources/nearestToPoint/nearestToPoint.C
index 452ad1e15c..195321b7bd 100644
--- a/src/meshTools/topoSet/pointSources/nearestToPoint/nearestToPoint.C
+++ b/src/meshTools/topoSet/pointSources/nearestToPoint/nearestToPoint.C
@@ -105,7 +105,7 @@ void Foam::nearestToPoint::combine(topoSet& set, const bool add) const
 
 
     Pstream::listCombineGather(nearest, mappedPatchBase::nearestEqOp());
-    Pstream::listCombineScatter(nearest);
+    Pstream::broadcast(nearest);
 
     for (const auto& near : nearest)
     {
diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
index d364114daa..411d3c8ecf 100644
--- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
+++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
@@ -996,7 +996,7 @@ Foam::vectorField Foam::NURBS3DVolume::computeControlPointSensitivities
 
     // Sum contributions from all processors
     Pstream::listCombineGather(controlPointDerivs, plusEqOp<vector>());
-    Pstream::listCombineScatter(controlPointDerivs);
+    Pstream::broadcast(controlPointDerivs);
 
     return controlPointDerivs;
 }
@@ -1082,7 +1082,7 @@ Foam::vectorField Foam::NURBS3DVolume::computeControlPointSensitivities
     }
     // Sum contributions from all processors
     Pstream::listCombineGather(controlPointDerivs, plusEqOp<vector>());
-    Pstream::listCombineScatter(controlPointDerivs);
+    Pstream::broadcast(controlPointDerivs);
 
     return controlPointDerivs;
 }
diff --git a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
index 51775fdd4a..4620c44e77 100644
--- a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
+++ b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
@@ -378,7 +378,7 @@ void Foam::cellCellStencils::cellVolumeWeight::findHoles
         // Synchronise region status on processors
         // (could instead swap status through processor patches)
         Pstream::listCombineGather(regionType, maxEqOp<label>());
-        Pstream::listCombineScatter(regionType);
+        Pstream::broadcast(regionType);
 
         // Communicate region status through interpolative cells
         labelList cellRegionType(labelUIndList(regionType, cellRegion));
@@ -756,7 +756,7 @@ bool Foam::cellCellStencils::cellVolumeWeight::update()
         nCellsPerZone[zoneID[cellI]]++;
     }
     Pstream::listCombineGather(nCellsPerZone, plusEqOp<label>());
-    Pstream::listCombineScatter(nCellsPerZone);
+    Pstream::broadcast(nCellsPerZone);
 
 
     Info<< typeName << " : detected " << nZones
diff --git a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
index ce5f1ef2d0..5ec55fbabb 100644
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
@@ -1152,7 +1152,7 @@ void Foam::cellCellStencils::inverseDistance::findHoles
         // Synchronise region status on processors
         // (could instead swap status through processor patches)
         Pstream::listCombineGather(regionType, maxEqOp<label>());
-        Pstream::listCombineScatter(regionType);
+        Pstream::broadcast(regionType);
 
         DebugInfo<< FUNCTION_NAME << " : Gathered region type" << endl;
 
@@ -1757,7 +1757,7 @@ bool Foam::cellCellStencils::inverseDistance::update()
         nCellsPerZone[zoneID[cellI]]++;
     }
     Pstream::listCombineGather(nCellsPerZone, plusEqOp<label>());
-    Pstream::listCombineScatter(nCellsPerZone);
+    Pstream::broadcast(nCellsPerZone);
 
 
     const boundBox& allBb(mesh_.bounds());
diff --git a/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
index b19b1b544f..0f0316aea6 100644
--- a/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
@@ -518,7 +518,7 @@ Foam::cellCellStencils::trackingInverseDistance::trackingInverseDistance
         nCellsPerZone[zoneID[celli]]++;
     }
     Pstream::listCombineGather(nCellsPerZone, plusEqOp<label>());
-    Pstream::listCombineScatter(nCellsPerZone);
+    Pstream::broadcast(nCellsPerZone);
 
     meshParts_.setSize(nZones);
     forAll(meshParts_, zonei)
diff --git a/src/overset/regionsToCell/findRefCells.C b/src/overset/regionsToCell/findRefCells.C
index e7cb48a748..922aa3fbb8 100644
--- a/src/overset/regionsToCell/findRefCells.C
+++ b/src/overset/regionsToCell/findRefCells.C
@@ -69,7 +69,7 @@ void Foam::setRefCells
         }
 
         Pstream::listCombineGather(regionNeedReference, orEqOp<bool>());
-        Pstream::listCombineScatter(regionNeedReference);
+        Pstream::broadcast(regionNeedReference);
     }
 
 
@@ -190,7 +190,7 @@ void Foam::setRefCells
         }
 
         Pstream::listCombineGather(hasRef, plusEqOp<label>());
-        Pstream::listCombineScatter(hasRef);
+        Pstream::broadcast(hasRef);
 
         forAll(hasRef, regionI)
         {
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
index 6558aa84da..5ac913fc80 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
@@ -419,7 +419,7 @@ void Foam::multiLevelDecomp::decompose
 
             label nPoints = returnReduce(domainPoints.size(), sumOp<label>());
             Pstream::listCombineGather(nOutsideConnections, plusEqOp<label>());
-            Pstream::listCombineScatter(nOutsideConnections);
+            Pstream::broadcast(nOutsideConnections);
             label nPatches = 0;
             label nFaces = 0;
             for (const label nConnect : nOutsideConnections)
@@ -531,7 +531,8 @@ void Foam::multiLevelDecomp::decompose
                     nOutsideConnections,
                     plusEqOp<label>()
                 );
-                Pstream::listCombineScatter(nOutsideConnections);
+                Pstream::broadcast(nOutsideConnections);
+
                 label nPatches = 0;
                 label nFaces = 0;
                 for (const label nConnect : nOutsideConnections)
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 81d02cc131..13294f8a76 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -283,7 +283,7 @@ bool Foam::distributedTriSurfaceMesh::read()
         // Force underlying triSurfaceMesh to calculate volume type
         // (is topological walk; does not construct tree)
         surfaceClosed_ = triSurfaceMesh::hasVolumeType();
-        Pstream::scatter(surfaceClosed_);
+        Pstream::broadcast(surfaceClosed_);
         dict_.add("closed", surfaceClosed_);
 
         // Delay calculating outside vol type since constructs tree. Is ok
@@ -1720,8 +1720,8 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
         forAll(bbs, proci)
         {
             Pstream::listCombineGather(bbs[proci], plusEqOp<boundBox>());
-            Pstream::listCombineScatter(bbs[proci]);
         }
+        Pstream::broadcast(bbs);
     }
     else if (distType_ == DISTRIBUTED)
     {
@@ -1769,8 +1769,8 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
         forAll(bbs, proci)
         {
             Pstream::listCombineGather(bbs[proci], plusEqOp<boundBox>());
-            Pstream::listCombineScatter(bbs[proci]);
         }
+        Pstream::broadcast(bbs);
     }
 //    //// Tbd. initial duplicate filtering of border points only
 //    if (distType_ == DISTRIBUTED)
@@ -1967,8 +1967,8 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
 //        forAll(bbs, proci)
 //        {
 //            Pstream::listCombineGather(bbs[proci], plusEqOp<boundBox>());
-//            Pstream::listCombineScatter(bbs[proci]);
 //        }
+//        Pstream::broadcast(bbs);
 //    }
     else
     {
@@ -2070,8 +2070,8 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
         forAll(bbs, proci)
         {
             Pstream::listCombineGather(bbs[proci], plusEqOp<boundBox>());
-            Pstream::listCombineScatter(bbs[proci]);
         }
+        Pstream::broadcast(bbs);
     }
     return bbs;
 }
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
index e4afd0ddfd..c3fd5afaed 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
@@ -143,7 +143,7 @@ void Foam::regionModels::singleLayerRegion::initialise()
     }
 
     Pstream::listCombineGather(passivePatchIDs_, maxEqOp<label>());
-    Pstream::listCombineScatter(passivePatchIDs_);
+    Pstream::broadcast(passivePatchIDs_);
 
     magSf.field() = 0.5*(magSf + passiveMagSf);
     magSf.correctBoundaryConditions();
diff --git a/src/sampling/probes/patchProbes.C b/src/sampling/probes/patchProbes.C
index 1763352469..1afa7a111e 100644
--- a/src/sampling/probes/patchProbes.C
+++ b/src/sampling/probes/patchProbes.C
@@ -167,7 +167,7 @@ void Foam::patchProbes::findElements(const fvMesh& mesh)
 
     // Find nearest.
     Pstream::listCombineGather(nearest, mappedPatchBase::nearestEqOp());
-    Pstream::listCombineScatter(nearest);
+    Pstream::broadcast(nearest);
 
     oldPoints_.resize(this->size());
 
diff --git a/src/sampling/probes/patchProbesTemplates.C b/src/sampling/probes/patchProbesTemplates.C
index 7ba5c78dc5..8cc8089e5b 100644
--- a/src/sampling/probes/patchProbesTemplates.C
+++ b/src/sampling/probes/patchProbesTemplates.C
@@ -112,7 +112,7 @@ Foam::patchProbes::sample(const VolumeField<Type>& vField) const
     }
 
     Pstream::listCombineGather(values, isNotEqOp<Type>());
-    Pstream::listCombineScatter(values);
+    Pstream::broadcast(values);
 
     return tvalues;
 }
@@ -143,7 +143,7 @@ Foam::patchProbes::sample(const SurfaceField<Type>& sField) const
     }
 
     Pstream::listCombineGather(values, isNotEqOp<Type>());
-    Pstream::listCombineScatter(values);
+    Pstream::broadcast(values);
 
     return tvalues;
 }
diff --git a/src/sampling/probes/probesTemplates.C b/src/sampling/probes/probesTemplates.C
index d2d8e3b63b..9a23fee796 100644
--- a/src/sampling/probes/probesTemplates.C
+++ b/src/sampling/probes/probesTemplates.C
@@ -226,7 +226,7 @@ Foam::probes::sample(const VolumeField<Type>& vField) const
     }
 
     Pstream::listCombineGather(values, isNotEqOp<Type>());
-    Pstream::listCombineScatter(values);
+    Pstream::broadcast(values);
 
     return tvalues;
 }
@@ -250,7 +250,7 @@ Foam::probes::sample(const SurfaceField<Type>& sField) const
     }
 
     Pstream::listCombineGather(values, isNotEqOp<Type>());
-    Pstream::listCombineScatter(values);
+    Pstream::broadcast(values);
 
     return tvalues;
 }
diff --git a/src/sampling/sampledSet/cloud/cloudSet.C b/src/sampling/sampledSet/cloud/cloudSet.C
index 634c4d8dbc..e8e9e4f62f 100644
--- a/src/sampling/sampledSet/cloud/cloudSet.C
+++ b/src/sampling/sampledSet/cloud/cloudSet.C
@@ -76,9 +76,6 @@ void Foam::cloudSet::calcSamples
 
     // Check that all have been found
     labelList maxFoundProc(foundProc);
-    Pstream::listCombineGather(maxFoundProc, maxEqOp<label>());
-    Pstream::listCombineScatter(maxFoundProc);
-
     labelList minFoundProc(foundProc.size(), labelMax);
     forAll(foundProc, i)
     {
@@ -88,7 +85,10 @@ void Foam::cloudSet::calcSamples
         }
     }
     Pstream::listCombineGather(minFoundProc, minEqOp<label>());
-    Pstream::listCombineScatter(minFoundProc);
+    Pstream::listCombineGather(maxFoundProc, maxEqOp<label>());
+
+    Pstream::broadcast(minFoundProc);
+    Pstream::broadcast(maxFoundProc);
 
 
     DynamicField<point> missingPoints(sampleCoords_.size());
diff --git a/src/sampling/sampledSet/patchCloud/patchCloudSet.C b/src/sampling/sampledSet/patchCloud/patchCloudSet.C
index fadf87af6d..5be2459bde 100644
--- a/src/sampling/sampledSet/patchCloud/patchCloudSet.C
+++ b/src/sampling/sampledSet/patchCloud/patchCloudSet.C
@@ -156,7 +156,7 @@ void Foam::patchCloudSet::calcSamples
 
     // Find nearest.
     Pstream::listCombineGather(nearest, mappedPatchBase::nearestEqOp());
-    Pstream::listCombineScatter(nearest);
+    Pstream::broadcast(nearest);
 
 
     if (debug && Pstream::master())
diff --git a/src/sampling/sampledSet/patchSeed/patchSeedSet.C b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
index 0f6486dc67..c878b24ad7 100644
--- a/src/sampling/sampledSet/patchSeed/patchSeedSet.C
+++ b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
@@ -179,7 +179,7 @@ void Foam::patchSeedSet::calcSamples
 
             // Find nearest. Combine on master.
             Pstream::listCombineGather(nearest, mappedPatchBase::nearestEqOp());
-            Pstream::listCombineScatter(nearest);
+            Pstream::broadcast(nearest);
 
 
             // 3. Pick up my local faces that have won
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 0d5c07e265..c39e3854c1 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -203,7 +203,7 @@ Foam::IOobjectList Foam::sampledSets::preCheckFields(unsigned request)
     // if (Pstream::parRun())
     // {
     //     Pstream::mapCombineGather(selected, HashSetOps::plusEqOp<word>());
-    //     Pstream::mapCombineScatter(selected);
+    //     Pstream::broadcast(selected);
     // }
 
 
diff --git a/src/sampling/sampledSet/sampledSets/sampledSetsImpl.C b/src/sampling/sampledSet/sampledSets/sampledSetsImpl.C
index d1df7a63d4..18520dbf98 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSetsImpl.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSetsImpl.C
@@ -82,7 +82,7 @@ void Foam::sampledSets::writeCoordSet
     {
         outputName = writer.write(fieldName, values);
     }
-    Pstream::scatter(outputName);
+    UPstream::broadcast(outputName);
 
     if (outputName.size())
     {
@@ -207,9 +207,9 @@ void Foam::sampledSets::performAction
             // Use sorted order
             values = UIndirectList<Type>(values, globOrder)();
         }
-        Pstream::scatter(avgValue);
-        Pstream::scatter(sizeValue);
-        Pstream::scatter(limits);
+        Pstream::broadcast(avgValue);
+        Pstream::broadcast(sizeValue);
+        Pstream::broadcast(limits);
 
         // Store results: min/max/average/size with the name of the set
         // for scoping.
@@ -261,9 +261,9 @@ void Foam::sampledSets::performAction
 
     if (size())
     {
-        Pstream::scatter(avgEnsemble);
-        Pstream::scatter(sizeEnsemble);
-        Pstream::scatter(limitsEnsemble);
+        Pstream::broadcast(avgEnsemble);
+        Pstream::broadcast(sizeEnsemble);
+        Pstream::broadcast(limitsEnsemble);
 
         // Store results: min/max/average/size for the ensemble
         // Eg, average(T) ...
diff --git a/src/sampling/sampledSurface/sampledMeshedSurface/sampledMeshedSurface.C b/src/sampling/sampledSurface/sampledMeshedSurface/sampledMeshedSurface.C
index a8d6379a0c..673b49cf32 100644
--- a/src/sampling/sampledSurface/sampledMeshedSurface/sampledMeshedSurface.C
+++ b/src/sampling/sampledSurface/sampledMeshedSurface/sampledMeshedSurface.C
@@ -228,7 +228,7 @@ bool Foam::sampledMeshedSurface::update(const meshSearch& meshSearcher)
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Pstream::listCombineGather(nearest, minFirstEqOp<scalar>{});
-    Pstream::listCombineScatter(nearest);
+    Pstream::broadcast(nearest);
 
     labelList cellOrFaceLabels(fc.size(), -1);
 
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index aab748c4e5..bcdb34fcdd 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -121,7 +121,7 @@ Foam::IOobjectList Foam::sampledSurfaces::preCheckFields()
     if (Pstream::parRun())
     {
         Pstream::mapCombineGather(selected, HashSetOps::plusEqOp<word>());
-        Pstream::mapCombineScatter(selected);
+        Pstream::broadcast(selected);
     }
 
 
diff --git a/src/sampling/surface/distanceSurface/distanceSurfaceFilter.C b/src/sampling/surface/distanceSurface/distanceSurfaceFilter.C
index b3e8779a04..566a7639c1 100644
--- a/src/sampling/surface/distanceSurface/distanceSurfaceFilter.C
+++ b/src/sampling/surface/distanceSurface/distanceSurfaceFilter.C
@@ -171,7 +171,7 @@ void Foam::distanceSurface::filterKeepLargestRegion
         }
     }
 
-    Pstream::scatter(keepRegion);
+    Pstream::broadcast(keepRegion);
 
     forAll(regionColour, celli)
     {
@@ -295,7 +295,7 @@ void Foam::distanceSurface::filterKeepNearestRegions
         }
     }
 
-    Pstream::scatter(keepRegion);
+    Pstream::broadcast(keepRegion);
 
     forAll(regionColour, celli)
     {
@@ -366,7 +366,7 @@ void Foam::distanceSurface::filterRegionProximity
         }
     }
 
-    Pstream::listCombineScatter(distRegion);
+    Pstream::broadcast(distRegion);
 
 
     // Define the per-face acceptance based on the region average distance
diff --git a/src/sampling/surface/isoSurface/isoSurfacePoint.C b/src/sampling/surface/isoSurface/isoSurfacePoint.C
index 78f58dc8a8..73c97ad488 100644
--- a/src/sampling/surface/isoSurface/isoSurfacePoint.C
+++ b/src/sampling/surface/isoSurface/isoSurfacePoint.C
@@ -278,7 +278,7 @@ void Foam::isoSurfacePoint::syncUnseparatedPoints
 
         // Combine on master.
         Pstream::listCombineGather(sharedPts, minEqOp<point>());
-        Pstream::listCombineScatter(sharedPts);
+        Pstream::broadcast(sharedPts);
 
         // Now we will all have the same information. Merge it back with
         // my local information.
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C
index a35fdf1759..1fbee4961d 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C
@@ -868,7 +868,7 @@ Foam::scalar Foam::TDACChemistryModel<ReactionThermo, ThermoType>::solve
     {
         List<bool> active(composition.active());
         Pstream::listCombineGather(active, orEqOp<bool>());
-        Pstream::listCombineScatter(active);
+        Pstream::broadcast(active);
 
         forAll(active, i)
         {
diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceReflecting/faceReflecting.C b/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceReflecting/faceReflecting.C
index b301f66041..6b7c840fb3 100644
--- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceReflecting/faceReflecting.C
+++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/faceReflecting/faceReflecting.C
@@ -328,11 +328,11 @@ void Foam::faceReflecting::calculate()
 
     // Distribute ray indexes to all proc's
     Pstream::listCombineGather(refDisDirsIndex, maxEqOp<label>());
-    Pstream::listCombineScatter(refDisDirsIndex);
-
-    // Make sure all the processors have the same map
     Pstream::mapCombineGather(refFacesDirIndex, minEqOp<label>());
-    Pstream::mapCombineScatter(refFacesDirIndex);
+
+    // Make sure all the processors have the same information
+    Pstream::broadcast(refDisDirsIndex);
+    Pstream::broadcast(refFacesDirIndex);
 
     scalar maxBounding = 5.0*mag(mesh_.bounds().max() - mesh_.bounds().min());
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index a67ec07694..4912800c66 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -504,9 +504,9 @@ void Foam::radiation::viewFactor::calculate()
         Pstream::listCombineGather(E, maxEqOp<scalar>());
         Pstream::listCombineGather(qrExt, maxEqOp<scalar>());
 
-        Pstream::listCombineScatter(T4);
-        Pstream::listCombineScatter(E);
-        Pstream::listCombineScatter(qrExt);
+        Pstream::broadcast(T4);
+        Pstream::broadcast(E);
+        Pstream::broadcast(qrExt);
 
         if (Pstream::master())
         {
@@ -601,9 +601,8 @@ void Foam::radiation::viewFactor::calculate()
         }
 
     }
-    // Scatter q and fill qr
-    Pstream::listCombineScatter(q);
-    Pstream::listCombineGather(q, maxEqOp<scalar>());
+    // Broadcast q and fill qr
+    Pstream::broadcast(q);
 
     label globCoarseId = 0;
     for (const label patchID : selectedPatches_)