polyMeshDistributionMap: renamed mapDistributePolyMesh -> polyMeshDistributionMap

This is a map data structure rather than a class or function which performs the
mapping operation so polyMeshDistributionMap is more logical and comprehensible
than mapDistributePolyMesh.

applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -166,7 +166,7 @@ void Foam::fv::VoFClouds::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::VoFClouds::distribute(const mapDistributePolyMesh& map)
+void Foam::fv::VoFClouds::distribute(const polyMeshDistributionMap& map)
 {
     clouds_.distribute(map);
 }

applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,7 +152,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();

applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -233,7 +233,7 @@ void Foam::fv::VoFSolidificationMeltingSource::updateMesh
 
 void Foam::fv::VoFSolidificationMeltingSource::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     set_.distribute(map);

applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,7 +194,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();

applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C

@@ -159,7 +159,7 @@ void Foam::fv::VoFSurfaceFilm::updateMesh(const mapPolyMesh&)
 }
 
 
-void Foam::fv::VoFSurfaceFilm::distribute(const mapDistributePolyMesh&)
+void Foam::fv::VoFSurfaceFilm::distribute(const polyMeshDistributionMap&)
 {
     NotImplemented;
 }

applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H

@@ -139,7 +139,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();

applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -211,7 +211,7 @@ void Foam::fv::VoFTurbulenceDamping::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::VoFTurbulenceDamping::distribute(const mapDistributePolyMesh&)
+void Foam::fv::VoFTurbulenceDamping::distribute(const polyMeshDistributionMap&)
 {}
 
 

applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -178,7 +178,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();

applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,7 +206,7 @@ void Foam::fv::VoFTurbulenceDamping::updateMesh(const mapPolyMesh&)
 {}
 
 
-void Foam::fv::VoFTurbulenceDamping::distribute(const mapDistributePolyMesh&)
+void Foam::fv::VoFTurbulenceDamping::distribute(const polyMeshDistributionMap&)
 {}
 
 

applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -177,7 +177,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();

applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C

@@ -310,7 +310,7 @@ void Foam::fv::interfaceTurbulenceDamping::updateMesh(const mapPolyMesh&)
 
 void Foam::fv::interfaceTurbulenceDamping::distribute
 (
-    const mapDistributePolyMesh&
+    const polyMeshDistributionMap&
 )
 {}
 

applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H

@@ -198,7 +198,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();

applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C

@@ -241,7 +241,7 @@ void Foam::fv::phaseTurbulenceStabilisation::updateMesh(const mapPolyMesh&)
 
 void Foam::fv::phaseTurbulenceStabilisation::distribute
 (
-    const mapDistributePolyMesh&
+    const polyMeshDistributionMap&
 )
 {}
 

applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H

@@ -168,7 +168,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();

applications/test/PatchTools/Test-PatchTools.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ using namespace Foam;
 //    const globalMeshData& globalData = mesh.globalData();
 //    const indirectPrimitivePatch& coupledPatch = globalData.coupledPatch();
 //    const Map<label>& coupledPatchMP = coupledPatch.meshPointMap();
-//    const mapDistribute& map = globalData.globalPointSlavesMap();
+//    const distributionMap& map = globalData.globalPointSlavesMap();
 //    const globalIndexAndTransform& transforms =
 //        globalData.globalTransforms();
 //
@@ -171,7 +171,7 @@ using namespace Foam;
 //        transforms,
 //        coupledPointNormals.size(),
 //        coupledPointNormals,
-//        mapDistribute::transform()
+//        distributionMap::transform()
 //    );
 //
 //

applications/test/extendedStencil/Test-ExtendedStencil.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
 #include "fvMesh.H"
 #include "volFields.H"
 #include "Time.H"
-//#include "mapDistribute.H"
+//#include "distributionMap.H"
 #include "OFstream.H"
 #include "meshTools.H"
 //#include "FECCellToFaceStencil.H"

applications/test/extendedStencil/Test-ExtendedStencil2.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
 
         // Construct exchange map and renumber stencil
         List<Map<label>> compactMap(Pstream::nProcs());
-        mapDistribute map
+        distributionMap map
         (
             stencil.globalNumbering(),
             stencil,

applications/test/globalMeshData/Test-globalMeshData.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ Description
 #include "argList.H"
 #include "polyMesh.H"
 #include "Time.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 using namespace Foam;
 
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 
     // Test:print shared points
     {
-        const mapDistribute& globalPointSlavesMap =
+        const distributionMap& globalPointSlavesMap =
             globalData.globalPointSlavesMap();
         const labelListList& slaves =
             globalData.globalPointSlaves();
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
         (
             transforms,
             coords,
-            mapDistribute::transformPosition()
+            distributionMap::transformPosition()
         );
 
         // Print
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
 
     // Test:print shared edges
     {
-        const mapDistribute& globalEdgeSlavesMap =
+        const distributionMap& globalEdgeSlavesMap =
             globalData.globalEdgeSlavesMap();
         const labelListList& slaves =
             globalData.globalEdgeSlaves();
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
         (
             transforms,
             ec,
-            mapDistribute::transformPosition()
+            distributionMap::transformPosition()
         );
 
         // Print
@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
 
     // Test: point to faces addressing
     {
-        const mapDistribute& globalPointBoundaryFacesMap =
+        const distributionMap& globalPointBoundaryFacesMap =
             globalData.globalPointBoundaryFacesMap();
         const labelListList& slaves =
             globalData.globalPointBoundaryFaces();
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
         (
             transforms,
             fc,
-            mapDistribute::transformPosition()
+            distributionMap::transformPosition()
         );
 
         // Print
@@ -241,7 +241,7 @@ int main(int argc, char *argv[])
     // Test: point to cells addressing
     {
         const labelList& boundaryCells = globalData.boundaryCells();
-        const mapDistribute& globalPointBoundaryCellsMap =
+        const distributionMap& globalPointBoundaryCellsMap =
             globalData.globalPointBoundaryCellsMap();
         const labelListList& slaves = globalData.globalPointBoundaryCells();
         const labelListList& transformedSlaves =
@@ -258,7 +258,7 @@ int main(int argc, char *argv[])
         (
             transforms,
             cc,
-            mapDistribute::transformPosition()
+            distributionMap::transformPosition()
         );
 
         // Print

applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "List.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "argList.H"
 #include "Time.H"
 #include "IPstream.H"

applications/test/parallel/Test-parallel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "List.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "argList.H"
 #include "Time.H"
 #include "IPstream.H"
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
 
 
-    // Test mapDistribute
+    // Test distributionMap
     // ~~~~~~~~~~~~~~~~~~
 
     if (true)
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
 
 
         // Construct distribute map (destructively)
-        mapDistribute map(constructSize, move(sendMap), move(recvMap));
+        distributionMap map(constructSize, move(sendMap), move(recvMap));
 
         // Distribute complexData
         map.distribute(complexData);

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -581,7 +581,7 @@ void calcEdgeMinMaxZone
     const primitiveFacePatch& extrudePatch,
     const labelList& extrudeMeshEdges,
     const labelList& zoneID,
-    const mapDistribute& extrudeEdgeFacesMap,
+    const distributionMap& extrudeEdgeFacesMap,
     const labelListList& extrudeEdgeGlobalFaces,
 
     labelList& minZoneID,
@@ -838,7 +838,7 @@ void addCoupledPatches
     const primitiveFacePatch& extrudePatch,
     const labelList& extrudeMeshFaces,
     const labelList& extrudeMeshEdges,
-    const mapDistribute& extrudeEdgeFacesMap,
+    const distributionMap& extrudeEdgeFacesMap,
     const labelListList& extrudeEdgeGlobalFaces,
 
     labelList& sidePatchID,
@@ -1786,7 +1786,7 @@ int main(int argc, char *argv[])
         )
     );
     List<Map<label>> compactMap;
-    const mapDistribute extrudeEdgeFacesMap
+    const distributionMap extrudeEdgeFacesMap
     (
         globalExtrudeFaces,
         extrudeEdgeGlobalFaces,

applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ namespace Foam
 class polyMesh;
 class polyTopoChange;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 class polyBoundaryMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -123,7 +123,7 @@ public:
         {}
 
         //- Force recalculation of locally stored data for mesh distribution
-        void distribute(const mapDistributePolyMesh&)
+        void distribute(const polyMeshDistributionMap&)
         {}
 
         label frontPatchi() const

applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,7 +90,7 @@ Foam::tmp<Foam::Field<Type>> filterFarPoints
 
 
 template<class T>
-autoPtr<mapDistribute> buildMap
+autoPtr<distributionMap> buildMap
 (
     const T& mesh,
     labelListList& pointPoints
@@ -141,9 +141,9 @@ autoPtr<mapDistribute> buildMap
 
     List<Map<label>> compactMap;
 
-    return autoPtr<mapDistribute>
+    return autoPtr<distributionMap>
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndexing,
             pointPoints,
@@ -483,7 +483,7 @@ int main(int argc, char *argv[])
 
 
     labelListList pointPoints;
-    autoPtr<mapDistribute> meshDistributor = buildMap(mesh, pointPoints);
+    autoPtr<distributionMap> meshDistributor = buildMap(mesh, pointPoints);
 
 
     triadField alignments(buildAlignmentField(mesh));

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 #include "DistributedDelaunayMesh.H"
 #include "meshSearch.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "zeroGradientFvPatchFields.H"
 #include "pointConversion.H"
 #include "indexedVertexEnum.H"
@@ -37,7 +37,7 @@ License
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
 
 template<class Triangulation>
-Foam::autoPtr<Foam::mapDistribute>
+Foam::autoPtr<Foam::distributionMap>
 Foam::DistributedDelaunayMesh<Triangulation>::buildMap
 (
     const List<label>& toProc
@@ -108,9 +108,9 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
         }
     }
 
-    return autoPtr<mapDistribute>
+    return autoPtr<distributionMap>
     (
-        new mapDistribute
+        new distributionMap
         (
             constructSize,
             move(sendMap),
@@ -494,7 +494,7 @@ Foam::label Foam::DistributedDelaunayMesh<Triangulation>::referVertices
 
     const label preDistributionSize = parallelVertices.size();
 
-    mapDistribute pointMap = buildMap(targetProcessor);
+    distributionMap pointMap = buildMap(targetProcessor);
 
     // Make a copy of the original list.
     DynamicList<Vb> originalParallelVertices(parallelVertices);
@@ -803,7 +803,7 @@ bool Foam::DistributedDelaunayMesh<Triangulation>::distribute
 
 
 template<class Triangulation>
-Foam::autoPtr<Foam::mapDistribute>
+Foam::autoPtr<Foam::distributionMap>
 Foam::DistributedDelaunayMesh<Triangulation>::distribute
 (
     const backgroundMeshDecomposition& decomposition,
@@ -812,12 +812,12 @@ Foam::DistributedDelaunayMesh<Triangulation>::distribute
 {
     if (!Pstream::parRun())
     {
-        return autoPtr<mapDistribute>();
+        return autoPtr<distributionMap>();
     }
 
     distributeBoundBoxes(decomposition.procBounds());
 
-    autoPtr<mapDistribute> mapDist = decomposition.distributePoints(points);
+    autoPtr<distributionMap> mapDist = decomposition.distributePoints(points);
 
     return mapDist;
 }

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ SourceFiles
 namespace Foam
 {
 
-class mapDistribute;
+class distributionMap;
 
 /*---------------------------------------------------------------------------*\
                    Class DistributedDelaunayMesh Declaration
@@ -158,13 +158,13 @@ public:
 
     // Member Functions
 
-        //- Build a mapDistribute for the supplied destination processor data
+        //- Build a distributionMap for the supplied destination processor data
-        static autoPtr<mapDistribute> buildMap(const List<label>& toProc);
+        static autoPtr<distributionMap> buildMap(const List<label>& toProc);
 
         //-
         bool distribute(const boundBox& bb);
 
-        autoPtr<mapDistribute> distribute
+        autoPtr<distributionMap> distribute
         (
             const backgroundMeshDecomposition& decomposition,
             List<Foam::point>& points

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,8 @@ namespace Foam
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
+Foam::autoPtr<Foam::distributionMap>
+Foam::backgroundMeshDecomposition::buildMap
 (
     const List<label>& toProc
 )
@@ -112,9 +113,9 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
         }
     }
 
-    return autoPtr<mapDistribute>
+    return autoPtr<distributionMap>
     (
-        new mapDistribute
+        new distributionMap
         (
             constructSize,
             move(sendMap),
@@ -408,7 +409,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
 
             fvMeshDistribute distributor(mesh_);
 
-            autoPtr<mapDistributePolyMesh> mapDist = distributor.distribute
+            autoPtr<polyMeshDistributionMap> mapDist = distributor.distribute
             (
                 newDecomp
             );
@@ -840,7 +841,7 @@ Foam::backgroundMeshDecomposition::~backgroundMeshDecomposition()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::mapDistributePolyMesh>
+Foam::autoPtr<Foam::polyMeshDistributionMap>
 Foam::backgroundMeshDecomposition::distribute
 (
     volScalarField& cellWeights
@@ -987,7 +988,8 @@ Foam::backgroundMeshDecomposition::distribute
 
     fvMeshDistribute distributor(mesh_);
 
-    autoPtr<mapDistributePolyMesh> mapDist = distributor.distribute(newDecomp);
+    autoPtr<polyMeshDistributionMap> mapDist =
+        distributor.distribute(newDecomp);
 
     meshCutter_.distribute(mapDist);
 
@@ -1122,7 +1124,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
     // Needed for reverseDistribute
     label preDistributionToCandidateProcSize = toCandidateProc.size();
 
-    autoPtr<mapDistribute> map(buildMap(toCandidateProc));
+    autoPtr<distributionMap> map(buildMap(toCandidateProc));
 
     map().distribute(testPoints);
 
@@ -1250,7 +1252,7 @@ Foam::backgroundMeshDecomposition::intersectsProcessors
     // Needed for reverseDistribute
     label preDistributionToCandidateProcSize = toCandidateProc.size();
 
-    autoPtr<mapDistribute> map(buildMap(toCandidateProc));
+    autoPtr<distributionMap> map(buildMap(toCandidateProc));
 
     map().distribute(testStarts);
     map().distribute(testEnds);
@@ -1411,7 +1413,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::overlapProcessors
 //    // Needed for reverseDistribute
 ////    label preDistributionToCandidateProcSize = toCandidateProc.size();
 ////
-////    autoPtr<mapDistribute> map(buildMap(toCandidateProc));
+////    autoPtr<distributionMap> map(buildMap(toCandidateProc));
 ////
 ////    map().distribute(testCentres);
 ////    map().distribute(testRadiusSqrs);
@@ -1528,7 +1530,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::overlapProcessors
 //    // Needed for reverseDistribute
 //    label preDistributionToCandidateProcSize = toCandidateProc.size();
 //
-//    autoPtr<mapDistribute> map(buildMap(toCandidateProc));
+//    autoPtr<distributionMap> map(buildMap(toCandidateProc));
 //
 //    map().distribute(testCentres);
 //    map().distribute(testRadiusSqrs);

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ SourceFiles
 #include "decompositionMethod.H"
 #include "fvMeshDistribute.H"
 #include "removeCells.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "globalIndex.H"
 #include "treeBoundBox.H"
 #include "primitivePatch.H"
@@ -205,19 +205,22 @@ public:
 
     // Member Functions
 
-        //- Build a mapDistribute for the supplied destination processor data
+        //- Build a distributionMap for the supplied destination processor data
-        static autoPtr<mapDistribute> buildMap(const List<label>& toProc);
+        static autoPtr<distributionMap> buildMap(const List<label>& toProc);
 
         //- Redistribute the background mesh based on a supplied weight field,
         //  returning a map to use to redistribute vertices.
-        autoPtr<mapDistributePolyMesh> distribute
+        autoPtr<polyMeshDistributionMap> distribute
         (
             volScalarField& cellWeights
         );
 
         //- Distribute supplied the points to the appropriate processor
         template<class PointType>
-        autoPtr<mapDistribute> distributePoints(List<PointType>& points) const;
+        autoPtr<distributionMap> distributePoints
+        (
+            List<PointType>& points
+        ) const;
 
         //- Is the given position inside the domain of this decomposition
         bool positionOnThisProcessor(const point& pt) const;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class PointType>
-Foam::autoPtr<Foam::mapDistribute>
+Foam::autoPtr<Foam::distributionMap>
 Foam::backgroundMeshDecomposition::distributePoints
 (
     List<PointType>& points
@@ -37,7 +37,7 @@ Foam::backgroundMeshDecomposition::distributePoints
 {
     labelList toProc(processorPosition(points));
 
-    autoPtr<mapDistribute> map(buildMap(toProc));
+    autoPtr<distributionMap> map(buildMap(toProc));
 
     map().distribute(points);
 
@@ -84,7 +84,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorPosition
     // Needed for reverseDistribute
     label preDistributionToCandidateProcSize = toCandidateProc.size();
 
-    autoPtr<mapDistribute> map(buildMap(toCandidateProc));
+    autoPtr<distributionMap> map(buildMap(toCandidateProc));
 
     map().distribute(testPoints);
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -543,7 +543,7 @@ void Foam::cellShapeControlMesh::distribute
         }
     }
 
-    autoPtr<mapDistribute> mapDist =
+    autoPtr<distributionMap> mapDist =
         DistributedDelaunayMesh<CellSizeDelaunay>::distribute
         (
             decomposition,

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,8 @@ Foam::tmp<Foam::Field<Type>> Foam::smoothAlignmentSolver::filterFarPoints
 
 
 template<class Triangulation>
-Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
+Foam::autoPtr<Foam::distributionMap>
+Foam::smoothAlignmentSolver::buildReferredMap
 (
     const Triangulation& mesh,
     labelList& indices
@@ -93,9 +94,9 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
     indices.transfer(dynIndices);
 
     List<Map<label>> compactMap;
-    return autoPtr<mapDistribute>
+    return autoPtr<distributionMap>
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndexing,
             indices,
@@ -106,7 +107,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
 
 
 template<class Triangulation>
-Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildMap
+Foam::autoPtr<Foam::distributionMap> Foam::smoothAlignmentSolver::buildMap
 (
     const Triangulation& mesh,
     labelListList& pointPoints
@@ -157,9 +158,9 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildMap
     }
 
     List<Map<label>> compactMap;
-    return autoPtr<mapDistribute>
+    return autoPtr<distributionMap>
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndexing,
             pointPoints,
@@ -312,7 +313,7 @@ void Foam::smoothAlignmentSolver::smoothAlignments
     scalar minResidual = 0;
 
     labelListList pointPoints;
-    autoPtr<mapDistribute> meshDistributor = buildMap
+    autoPtr<distributionMap> meshDistributor = buildMap
     (
         mesh_,
         pointPoints
@@ -451,7 +452,7 @@ void Foam::smoothAlignmentSolver::smoothAlignments
     }
 
     labelList referredPoints;
-    autoPtr<mapDistribute> referredDistributor = buildReferredMap
+    autoPtr<distributionMap> referredDistributor = buildReferredMap
     (
         mesh_,
         referredPoints

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,14 +65,14 @@ class smoothAlignmentSolver
         );
 
         template<class Triangulation>
-        autoPtr<mapDistribute> buildMap
+        autoPtr<distributionMap> buildMap
         (
             const Triangulation& mesh,
             labelListList& pointPoints
         );
 
         template<class Triangulation>
-        autoPtr<mapDistribute> buildReferredMap
+        autoPtr<distributionMap> buildReferredMap
         (
             const Triangulation& mesh,
             labelList& indices

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,7 @@ void Foam::conformalVoronoiMesh::insertInternalPoints
 
         // Send the points that are not on this processor to the appropriate
         // place
-        Foam::autoPtr<Foam::mapDistribute> map
+        Foam::autoPtr<Foam::distributionMap> map
         (
             decomposition_().distributePoints(transferPoints)
         );
@@ -188,7 +188,7 @@ Foam::Map<Foam::label> Foam::conformalVoronoiMesh::insertPointPairs
 {
     if (Pstream::parRun() && distribute)
     {
-        autoPtr<mapDistribute> mapDist =
+        autoPtr<distributionMap> mapDist =
             decomposition_().distributePoints(vertices);
 
         // Re-index the point pairs if one or both have been distributed.
@@ -443,7 +443,7 @@ void Foam::conformalVoronoiMesh::distribute()
         }
     }
 
-    autoPtr<mapDistribute> mapDist =
+    autoPtr<distributionMap> mapDist =
         DistributedDelaunayMesh<Delaunay>::distribute(decomposition_(), points);
 
     mapDist().distribute(types);

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh)
             cwi[cI] = max(cellVertices[cI], 1e-2);
         }
 
-        autoPtr<mapDistributePolyMesh> mapDist = decomposition_().distribute
+        autoPtr<polyMeshDistributionMap> mapDist = decomposition_().distribute
         (
             cellWeights
         );

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ License
 #include "ConstCirculator.H"
 #include "backgroundMeshDecomposition.H"
 #include "autoPtr.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -550,7 +550,7 @@ int main(int argc, char *argv[])
             << distributor.countCells(decomp) << nl << endl;
 
         // Do actual sending/receiving of mesh
-        autoPtr<mapDistributePolyMesh> map = distributor.distribute(decomp);
+        autoPtr<polyMeshDistributionMap> map = distributor.distribute(decomp);
 
         // Print some statistics
         // Info<< "After distribution:" << endl;

applications/utilities/parallelProcessing/redistributePar/redistributePar.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ Description
 #include "PstreamReduceOps.H"
 #include "fvCFD.H"
 #include "fvMeshDistribute.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "IOobjectList.H"
 #include "globalIndex.H"
 #include "loadOrCreateMesh.H"
@@ -642,7 +642,7 @@ int main(int argc, char *argv[])
     //    << distributor.countCells(finalDecomp) << nl << endl;
 
     // Do actual sending/receiving of mesh
-    autoPtr<mapDistributePolyMesh> map = distributor.distribute(finalDecomp);
+    autoPtr<polyMeshDistributionMap> map = distributor.distribute(finalDecomp);
 
     //// Distribute any non-registered data accordingly
     // map().distributeFaceData(faceCc);

applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ License
 #include "IOmanip.H"
 #include "itoa.H"
 #include "globalIndex.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "stringListOps.H"
 
 #include "ensightBinaryStream.H"

applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -543,7 +543,7 @@ int main(int argc, char *argv[])
 
     List<Map<label>> compactMap(Pstream::nProcs());
 
-    mapDistribute map(globalNumbering, rayEndFace, compactMap);
+    distributionMap map(globalNumbering, rayEndFace, compactMap);
 
     labelListIOList IOsubMap
     (

applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ Note
 #include "Time.H"
 #include "polyMesh.H"
 #include "distributedTriSurfaceMesh.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "localIOdictionary.H"
 
 using namespace Foam;
@@ -257,8 +257,8 @@ int main(int argc, char *argv[])
 
     // Do redistribution
     Info<< "Redistributing surface" << nl << endl;
-    autoPtr<mapDistribute> faceMap;
+    autoPtr<distributionMap> faceMap;
-    autoPtr<mapDistribute> pointMap;
+    autoPtr<distributionMap> pointMap;
     surfMesh.distribute
     (
         meshBb[Pstream::myProcNo()],

etc/codeTemplates/dynamicCode/codedFvModelTemplate.C

@@ -187,7 +187,7 @@ void ${typeName}FvModel${SourceType}::updateMesh(const mapPolyMesh& map)
 
 void ${typeName}FvModel${SourceType}::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     set_.distribute(map);

etc/codeTemplates/dynamicCode/codedFvModelTemplate.H

@@ -118,7 +118,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();

src/OpenFOAM/Make/files

@@ -580,12 +580,14 @@ mapPolyMesh = $(polyMesh)/mapPolyMesh
 $(mapPolyMesh)/mapPolyMesh.C
 $(mapPolyMesh)/faceMapper/faceMapper.C
 $(mapPolyMesh)/cellMapper/cellMapper.C
-$(mapPolyMesh)/mapDistribute/mapDistribute.C
-$(mapPolyMesh)/mapDistribute/mapDistributeBase.C
-$(mapPolyMesh)/mapDistribute/mapDistributePolyMesh.C
-$(mapPolyMesh)/mapDistribute/IOmapDistribute.C
 $(mapPolyMesh)/mapAddedPolyMesh.C
 
+polyMeshDistributionMap = $(polyMesh)/polyMeshDistributionMap
+$(polyMeshDistributionMap)/distributionMap.C
+$(polyMeshDistributionMap)/distributionMapBase.C
+$(polyMeshDistributionMap)/polyMeshDistributionMap.C
+$(polyMeshDistributionMap)/IOdistributionMap.C
+
 PrimitivePatch = $(primitiveMesh)/PrimitivePatch
 $(PrimitivePatch)/PrimitivePatchName.C
 

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ namespace Foam
 
 class lduMesh;
 class lduMatrix;
-class mapDistribute;
+class distributionMap;
 class GAMGProcAgglomeration;
 
 /*---------------------------------------------------------------------------*\

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "GAMGAgglomeration.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "globalIndex.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/OpenFOAM/meshes/MeshObject/MeshObject.C

@@ -276,7 +276,7 @@ template<class Mesh>
 void Foam::meshObject::distribute
 (
     objectRegistry& obr,
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     HashTable<GeometricMeshObject<Mesh>*> meshObjects
@@ -287,7 +287,8 @@ void Foam::meshObject::distribute
     if (meshObject::debug)
     {
         Pout<< "meshObject::distribute(objectRegistry&, "
-               "const mapDistributePolyMesh& map) : updating " << Mesh::typeName
+               "const polyMeshDistributionMap& map) : updating "
+            << Mesh::typeName
             << " meshObjects for region " << obr.name() << endl;
     }
 

src/OpenFOAM/meshes/MeshObject/MeshObject.H

@@ -77,7 +77,7 @@ namespace Foam
 
 // Forward declarations
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                          Class MeshObject Declaration
@@ -176,7 +176,7 @@ public:
         static void updateMesh(objectRegistry&, const mapPolyMesh&);
 
         template<class Mesh>
-        static void distribute(objectRegistry&, const mapDistributePolyMesh&);
+        static void distribute(objectRegistry&, const polyMeshDistributionMap&);
 
         template<class Mesh>
         static void addPatch(objectRegistry&, const label patchi);
@@ -296,7 +296,7 @@ public:
         MoveableMeshObject<Mesh>(typeName, io)
     {}
 
-    virtual void distribute(const mapDistributePolyMesh& map) = 0;
+    virtual void distribute(const polyMeshDistributionMap& map) = 0;
 };
 
 

src/OpenFOAM/meshes/pointMesh/pointMesh.C

@@ -102,11 +102,11 @@ void Foam::pointMesh::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::pointMesh::distribute(const mapDistributePolyMesh& map)
+void Foam::pointMesh::distribute(const polyMeshDistributionMap& map)
 {
     if (debug)
     {
-        Pout<< "pointMesh::distribute(const mapDistributePolyMesh&): "
+        Pout<< "pointMesh::distribute(const polyMeshDistributionMap&): "
             << "Distribute." << endl;
         Pout<< endl;
     }

src/OpenFOAM/meshes/pointMesh/pointMesh.H

@@ -122,7 +122,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Move points
             virtual bool movePoints();

src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C

@@ -29,7 +29,7 @@ License
 #include "processorPolyPatch.H"
 #include "globalPoints.H"
 #include "polyMesh.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "labelIOList.H"
 #include "mergePoints.H"
 #include "globalIndexAndTransform.H"
@@ -556,7 +556,7 @@ void Foam::globalMeshData::calcGlobalPointSlaves() const
 
     globalPointSlavesMapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             move(globalData.map())
         )
@@ -1083,7 +1083,7 @@ void Foam::globalMeshData::calcGlobalEdgeSlaves() const
     List<Map<label>> compactMap(Pstream::nProcs());
     globalEdgeSlavesMapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             globalEdgeNumbers,
             globalEdgeSlaves,
@@ -1121,7 +1121,7 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
     // 1. Determine master point
     labelList masterPoint;
     {
-        const mapDistribute& map = globalPointSlavesMap();
+        const distributionMap& map = globalPointSlavesMap();
 
         masterPoint.setSize(map.constructSize());
         masterPoint = labelMax;
@@ -1145,7 +1145,7 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
     // to find the orientation of the master edge.
 
     {
-        const mapDistribute& map = globalEdgeSlavesMap();
+        const distributionMap& map = globalEdgeSlavesMap();
         const labelListList& slaves = globalEdgeSlaves();
         const labelListList& transformedSlaves = globalEdgeTransformedSlaves();
 
@@ -1472,7 +1472,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryFaces() const
 
     globalPointBoundaryFacesMapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndices,
             globalPointBoundaryFaces,
@@ -1700,7 +1700,7 @@ void Foam::globalMeshData::calcGlobalPointBoundaryCells() const
 
     globalPointBoundaryCellsMapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndices,
             globalPointBoundaryCells,
@@ -1749,7 +1749,7 @@ void Foam::globalMeshData::calcGlobalCoPointSlaves() const
     );
     globalCoPointSlavesMapPtr_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             move(globalData.map())
         )
@@ -2220,7 +2220,7 @@ const
 }
 
 
-const Foam::mapDistribute& Foam::globalMeshData::globalPointSlavesMap() const
+const Foam::distributionMap& Foam::globalMeshData::globalPointSlavesMap() const
 {
     if (!globalPointSlavesMapPtr_.valid())
     {
@@ -2274,7 +2274,7 @@ const Foam::PackedBoolList& Foam::globalMeshData::globalEdgeOrientation() const
 }
 
 
-const Foam::mapDistribute& Foam::globalMeshData::globalEdgeSlavesMap() const
+const Foam::distributionMap& Foam::globalMeshData::globalEdgeSlavesMap() const
 {
     if (!globalEdgeSlavesMapPtr_.valid())
     {
@@ -2317,7 +2317,7 @@ Foam::globalMeshData::globalPointTransformedBoundaryFaces() const
 }
 
 
-const Foam::mapDistribute& Foam::globalMeshData::globalPointBoundaryFacesMap()
+const Foam::distributionMap& Foam::globalMeshData::globalPointBoundaryFacesMap()
 const
 {
     if (!globalPointBoundaryFacesMapPtr_.valid())
@@ -2371,7 +2371,7 @@ Foam::globalMeshData::globalPointTransformedBoundaryCells() const
 }
 
 
-const Foam::mapDistribute& Foam::globalMeshData::globalPointBoundaryCellsMap()
+const Foam::distributionMap& Foam::globalMeshData::globalPointBoundaryCellsMap()
 const
 {
     if (!globalPointBoundaryCellsMapPtr_.valid())
@@ -2392,7 +2392,8 @@ const Foam::labelListList& Foam::globalMeshData::globalCoPointSlaves() const
 }
 
 
-const Foam::mapDistribute& Foam::globalMeshData::globalCoPointSlavesMap() const
+const Foam::distributionMap&
+Foam::globalMeshData::globalCoPointSlavesMap() const
 {
     if (!globalCoPointSlavesMapPtr_.valid())
     {
@@ -2412,7 +2413,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     const globalIndex& globalCoupledPoints = globalPointNumbering();
     // Use collocated only
     const labelListList& pointSlaves = globalCoPointSlaves();
-    const mapDistribute& pointSlavesMap = globalCoPointSlavesMap();
+    const distributionMap& pointSlavesMap = globalCoPointSlavesMap();
 
 
     // Points are either
@@ -2546,7 +2547,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
 {
     const indirectPrimitivePatch& cpp = coupledPatch();
     const labelListList& pointSlaves = globalCoPointSlaves();
-    const mapDistribute& pointSlavesMap = globalCoPointSlavesMap();
+    const distributionMap& pointSlavesMap = globalCoPointSlavesMap();
 
 
     // The patch points come in two variants:

src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H

@@ -39,7 +39,8 @@ Description
     do not allow any transformations and require a global reduction on the
     master processor.
 
-    The alternative is to have an exchange schedule (through a 'mapDistribute')
+    The alternative is to have an exchange schedule
+    (through a 'distributionMap')
     which sends all point/edge data (no distinction is made between
     those on two and those on more than two coupled patches) to the local
     'master'.  This master then does any calculation and sends
@@ -50,7 +51,7 @@ Description
 
     The exchange needs
     - a field of data
-    - a mapDistribute which does all parallel exchange and transformations
+    - a distributionMap which does all parallel exchange and transformations
       This appends remote data to the end of the field.
     - a set of indices which indicate where to get untransformed data in the
       field
@@ -69,7 +70,7 @@ Note
       would be too complicated
 
 See also
-    mapDistribute
+    distributionMap
     globalIndexAndTransform
 
 SourceFiles
@@ -93,7 +94,7 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 class polyMesh;
-class mapDistribute;
+class distributionMap;
 template<class T> class EdgeMap;
 class globalIndex;
 class globalIndexAndTransform;
@@ -165,7 +166,7 @@ class globalMeshData
 
             mutable autoPtr<labelListList> globalPointSlavesPtr_;
             mutable autoPtr<labelListList> globalPointTransformedSlavesPtr_;
-            mutable autoPtr<mapDistribute> globalPointSlavesMapPtr_;
+            mutable autoPtr<distributionMap> globalPointSlavesMapPtr_;
 
             // Coupled edge to coupled edges
 
@@ -173,7 +174,7 @@ class globalMeshData
             mutable autoPtr<labelListList> globalEdgeSlavesPtr_;
             mutable autoPtr<labelListList> globalEdgeTransformedSlavesPtr_;
             mutable autoPtr<PackedBoolList> globalEdgeOrientationPtr_;
-            mutable autoPtr<mapDistribute> globalEdgeSlavesMapPtr_;
+            mutable autoPtr<distributionMap> globalEdgeSlavesMapPtr_;
 
 
             // Coupled point to boundary faces
@@ -182,7 +183,7 @@ class globalMeshData
             mutable autoPtr<labelListList> globalPointBoundaryFacesPtr_;
             mutable autoPtr<labelListList>
                 globalPointTransformedBoundaryFacesPtr_;
-            mutable autoPtr<mapDistribute> globalPointBoundaryFacesMapPtr_;
+            mutable autoPtr<distributionMap> globalPointBoundaryFacesMapPtr_;
 
             // Coupled point to boundary cells
 
@@ -191,12 +192,12 @@ class globalMeshData
             mutable autoPtr<labelListList> globalPointBoundaryCellsPtr_;
             mutable autoPtr<labelListList>
                 globalPointTransformedBoundaryCellsPtr_;
-            mutable autoPtr<mapDistribute> globalPointBoundaryCellsMapPtr_;
+            mutable autoPtr<distributionMap> globalPointBoundaryCellsMapPtr_;
 
 
             // Other: coupled point to coupled COLLOCATED points
             mutable autoPtr<labelListList> globalCoPointSlavesPtr_;
-            mutable autoPtr<mapDistribute> globalCoPointSlavesMapPtr_;
+            mutable autoPtr<distributionMap> globalCoPointSlavesMapPtr_;
 
 
 
@@ -515,7 +516,7 @@ public:
                 List<Type>& pointData,
                 const labelListList& slaves,
                 const labelListList& transformedSlaves,
-                const mapDistribute& slavesMap,
+                const distributionMap& slavesMap,
                 const globalIndexAndTransform&,
                 const CombineOp& cop,
                 const TransformOp& top
@@ -528,7 +529,7 @@ public:
                 List<Type>& pointData,
                 const labelListList& slaves,
                 const labelListList& transformedSlaves,
-                const mapDistribute& slavesMap,
+                const distributionMap& slavesMap,
                 const CombineOp& cop
             );
 
@@ -540,7 +541,7 @@ public:
                 const globalIndex& globalPointNumbering() const;
                 const labelListList& globalPointSlaves() const;
                 const labelListList& globalPointTransformedSlaves() const;
-                const mapDistribute& globalPointSlavesMap() const;
+                const distributionMap& globalPointSlavesMap() const;
                 //- Helper to synchronise coupled patch point data
                 template<class Type, class CombineOp, class TransformOp>
                 void syncPointData
@@ -555,14 +556,14 @@ public:
                 const globalIndex& globalEdgeNumbering() const;
                 const labelListList& globalEdgeSlaves() const;
                 const labelListList& globalEdgeTransformedSlaves() const;
-                const mapDistribute& globalEdgeSlavesMap() const;
+                const distributionMap& globalEdgeSlavesMap() const;
                 //- Is my edge same orientation as master edge
                 const PackedBoolList& globalEdgeOrientation() const;
 
             // Collocated point to collocated point
 
                 const labelListList& globalCoPointSlaves() const;
-                const mapDistribute& globalCoPointSlavesMap() const;
+                const distributionMap& globalCoPointSlavesMap() const;
 
             // Coupled point to boundary faces. These are uncoupled boundary
             // faces only but include empty patches.
@@ -572,7 +573,7 @@ public:
                 const labelListList& globalPointBoundaryFaces() const;
                 const labelListList& globalPointTransformedBoundaryFaces()
                 const;
-                const mapDistribute& globalPointBoundaryFacesMap() const;
+                const distributionMap& globalPointBoundaryFacesMap() const;
 
             // Coupled point to boundary cell
 
@@ -584,7 +585,7 @@ public:
                 const labelListList& globalPointBoundaryCells() const;
                 const labelListList& globalPointTransformedBoundaryCells()
                 const;
-                const mapDistribute& globalPointBoundaryCellsMap() const;
+                const distributionMap& globalPointBoundaryCellsMap() const;
 
 
             // Other

src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 #include "globalMeshData.H"
 #include "polyMesh.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -35,7 +35,7 @@ void Foam::globalMeshData::syncData
     List<Type>& elems,
     const labelListList& slaves,
     const labelListList& transformedSlaves,
-    const mapDistribute& slavesMap,
+    const distributionMap& slavesMap,
     const globalIndexAndTransform& transforms,
     const CombineOp& cop,
     const TransformOp& top
@@ -108,7 +108,7 @@ void Foam::globalMeshData::syncData
     List<Type>& elems,
     const labelListList& slaves,
     const labelListList& transformedSlaves,
-    const mapDistribute& slavesMap,
+    const distributionMap& slavesMap,
     const CombineOp& cop
 )
 {

src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ License
 #include "processorPolyPatch.H"
 #include "cyclicPolyPatch.H"
 #include "polyMesh.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -1066,7 +1066,7 @@ void Foam::globalPoints::calculateSharedPoints
     List<Map<label>> compactMap;
     map_.reset
     (
-        new mapDistribute
+        new distributionMap
         (
             globalIndices_,
             pointPoints_,

src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ Description
 
     means point 93 on proc7 is connected to point 731 on proc4 and 114 on proc3.
     It then assigns the lowest numbered processor to be the local 'master' and
-    constructs a mapDistribute to send all data to this master.
+    constructs a distributionMap to send all data to this master.
 
     Algorithm:
         - get meshPoints of all my points on processor patches and initialise
@@ -92,7 +92,7 @@ class polyMesh;
 class polyBoundaryMesh;
 class cyclicPolyPatch;
 class polyPatch;
-class mapDistribute;
+class distributionMap;
 
 /*---------------------------------------------------------------------------*\
                         Class globalPoints Declaration
@@ -123,17 +123,17 @@ class globalPoints
         Map<label> meshToProcPoint_;
 
 
-        // Calculated mapDistribute addressing
+        // Calculated distributionMap addressing
 
-            //- Non-transformed connected points per point (in mapDistribute
+            //- Non-transformed connected points per point (in distributionMap
             //  indices)
             labelListList pointPoints_;
 
-            //- Transformed points per point (in mapDistribute indices)
+            //- Transformed points per point (in distributionMap indices)
             labelListList transformedPointPoints_;
 
             //- Corresponding map
-            autoPtr<mapDistribute> map_;
+            autoPtr<distributionMap> map_;
 
 
 
@@ -315,40 +315,40 @@ public:
                 return globalTransforms_;
             }
 
-            //- Non-transformed connected points per point (in mapDistribute
+            //- Non-transformed connected points per point (in distributionMap
             //  indices)
             const labelListList& pointPoints() const
             {
                 return pointPoints_;
             }
 
-            //- Non-transformed connected points per point (in mapDistribute
+            //- Non-transformed connected points per point (in distributionMap
             //  indices)
             labelListList& pointPoints()
             {
                 return pointPoints_;
             }
 
-            //- Transformed points per point (in mapDistribute indices)
+            //- Transformed points per point (in distributionMap indices)
             const labelListList& transformedPointPoints() const
             {
                 return transformedPointPoints_;
             }
 
-            //- Transformed points per point (in mapDistribute indices)
+            //- Transformed points per point (in distributionMap indices)
             labelListList& transformedPointPoints()
             {
                 return transformedPointPoints_;
             }
 
             //- Corresponding map
-            const mapDistribute& map() const
+            const distributionMap& map() const
             {
                 return map_();
             }
 
             //- Corresponding map
-            mapDistribute& map()
+            distributionMap& map()
             {
                 return map_();
             }

src/OpenFOAM/meshes/polyMesh/polyMesh.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ namespace Foam
 // Forward declaration of classes
 class globalMeshData;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 class polyMeshTetDecomposition;
 class treeDataCell;
 template<class Type> class indexedOctree;
@@ -610,7 +610,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh& map);
+            virtual void distribute(const polyMeshDistributionMap& map);
 
             //- Remove boundary patches
             void removeBoundary();

src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,19 +23,19 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "IOmapDistribute.H"
+#include "IOdistributionMap.H"
 
 /* * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * */
 
 namespace Foam
 {
-    defineTypeNameAndDebug(IOmapDistribute, 0);
+    defineTypeNameAndDebug(IOdistributionMap, 0);
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::IOmapDistribute::IOmapDistribute(const IOobject& io)
+Foam::IOdistributionMap::IOdistributionMap(const IOobject& io)
 :
     regIOobject(io)
 {
@@ -43,9 +43,9 @@ Foam::IOmapDistribute::IOmapDistribute(const IOobject& io)
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
         WarningInFunction
-            << "IOmapDistribute " << name()
+            << "IOdistributionMap " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOmapDistribute does not support automatic rereading."
+            " but IOdistributionMap does not support automatic rereading."
             << endl;
     }
 
@@ -64,10 +64,10 @@ Foam::IOmapDistribute::IOmapDistribute(const IOobject& io)
 }
 
 
-Foam::IOmapDistribute::IOmapDistribute
+Foam::IOdistributionMap::IOdistributionMap
 (
     const IOobject& io,
-    const mapDistribute& map
+    const distributionMap& map
 )
 :
     regIOobject(io)
@@ -76,9 +76,9 @@ Foam::IOmapDistribute::IOmapDistribute
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
         WarningInFunction
-            << "IOmapDistribute " << name()
+            << "IOdistributionMap " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOmapDistribute does not support automatic rereading."
+            " but IOdistributionMap does not support automatic rereading."
             << endl;
     }
 
@@ -96,27 +96,27 @@ Foam::IOmapDistribute::IOmapDistribute
     }
     else
     {
-        mapDistribute::operator=(map);
+        distributionMap::operator=(map);
     }
 }
 
 
-Foam::IOmapDistribute::IOmapDistribute
+Foam::IOdistributionMap::IOdistributionMap
 (
     const IOobject& io,
-    mapDistribute&& map
+    distributionMap&& map
 )
 :
     regIOobject(io),
-    mapDistribute(move(map))
+    distributionMap(move(map))
 {
     // Temporary warning
     if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
         WarningInFunction
-            << "IOmapDistribute " << name()
+            << "IOdistributionMap " << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
-            " but IOmapDistribute does not support automatic rereading."
+            " but IOdistributionMap does not support automatic rereading."
             << endl;
     }
 
@@ -137,19 +137,19 @@ Foam::IOmapDistribute::IOmapDistribute
 
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
-Foam::IOmapDistribute::~IOmapDistribute()
+Foam::IOdistributionMap::~IOdistributionMap()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::IOmapDistribute::readData(Istream& is)
+bool Foam::IOdistributionMap::readData(Istream& is)
 {
     return (is >> *this).good();
 }
 
 
-bool Foam::IOmapDistribute::writeData(Ostream& os) const
+bool Foam::IOdistributionMap::writeData(Ostream& os) const
 {
     return (os << *this).good();
 }

src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2014-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,22 +22,22 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::IOmapDistribute
+    Foam::IOdistributionMap
 
 Description
-    IOmapDistribute is derived from mapDistribute and
+    IOdistributionMap is derived from distributionMap and
-    IOobject to give the mapDistribute
+    IOobject to give the distributionMap
     automatic IO functionality via the objectRegistry.
 
 SourceFiles
-    IOmapDistribute.C
+    IOdistributionMap.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOmapDistribute_H
+#ifndef IOdistributionMap_H
-#define IOmapDistribute_H
+#define IOdistributionMap_H
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "regIOobject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,34 +46,34 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                       Class IOmapDistribute Declaration
+                       Class IOdistributionMap Declaration
 \*---------------------------------------------------------------------------*/
 
-class IOmapDistribute
+class IOdistributionMap
 :
     public regIOobject,
-    public mapDistribute
+    public distributionMap
 {
 
 public:
 
     //- Runtime type information
-    TypeName("mapDistribute");
+    TypeName("distributionMap");
 
     // Constructors
 
         //- Construct given an IOobject
-        IOmapDistribute(const IOobject&);
+        IOdistributionMap(const IOobject&);
 
-        //- Construct given an IOobject and mapDistribute
+        //- Construct given an IOobject and distributionMap
-        IOmapDistribute(const IOobject&, const mapDistribute&);
+        IOdistributionMap(const IOobject&, const distributionMap&);
 
-        //- Move constructor transferring the mapDistribute contents
+        //- Move constructor transferring the distributionMap contents
-        IOmapDistribute(const IOobject&, mapDistribute&&);
+        IOdistributionMap(const IOobject&, distributionMap&&);
 
 
     //- Destructor
-    virtual ~IOmapDistribute();
+    virtual ~IOdistributionMap();
 
 
     // Member Functions

src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMap.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "globalIndexAndTransform.H"
 #include "transformField.H"
 
@@ -31,13 +31,13 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(mapDistribute, 0);
+    defineTypeNameAndDebug(distributionMap, 0);
 }
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
@@ -45,21 +45,21 @@ void Foam::mapDistribute::transform::operator()
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     UList<label>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<label>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<label>&
@@ -68,7 +68,7 @@ void Foam::mapDistribute::transform::operator()
 
 
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
@@ -76,21 +76,21 @@ void Foam::mapDistribute::transform::operator()
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     UList<scalar>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<scalar>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<scalar>&
@@ -99,7 +99,7 @@ void Foam::mapDistribute::transform::operator()
 
 
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
@@ -107,21 +107,21 @@ void Foam::mapDistribute::transform::operator()
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     UList<bool>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<bool>&
 ) const
 {}
 template<>
-void Foam::mapDistribute::transform::operator()
+void Foam::distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<bool>&
@@ -129,9 +129,9 @@ void Foam::mapDistribute::transform::operator()
 {}
 
 
-void Foam::mapDistribute::printLayout(Ostream& os) const
+void Foam::distributionMap::printLayout(Ostream& os) const
 {
-    mapDistributeBase::printLayout(os);
+    distributionMapBase::printLayout(os);
 
     forAll(transformElements_, trafoI)
     {
@@ -147,13 +147,13 @@ void Foam::mapDistribute::printLayout(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::mapDistribute::mapDistribute()
+Foam::distributionMap::distributionMap()
 :
-    mapDistributeBase()
+    distributionMapBase()
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const label constructSize,
     labelListList&& subMap,
@@ -162,7 +162,7 @@ Foam::mapDistribute::mapDistribute
     const bool constructHasFlip
 )
 :
-    mapDistributeBase
+    distributionMapBase
     (
         constructSize,
         move(subMap),
@@ -173,7 +173,7 @@ Foam::mapDistribute::mapDistribute
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const label constructSize,
     labelListList&& subMap,
@@ -184,7 +184,7 @@ Foam::mapDistribute::mapDistribute
     const bool constructHasFlip
 )
 :
-    mapDistributeBase
+    distributionMapBase
     (
         constructSize,
         move(subMap),
@@ -197,17 +197,17 @@ Foam::mapDistribute::mapDistribute
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const labelList& sendProcs,
     const labelList& recvProcs
 )
 :
-    mapDistributeBase(sendProcs, recvProcs)
+    distributionMapBase(sendProcs, recvProcs)
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const globalIndex& globalNumbering,
     labelList& elements,
@@ -215,7 +215,7 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    mapDistributeBase
+    distributionMapBase
     (
         globalNumbering,
         elements,
@@ -225,7 +225,7 @@ Foam::mapDistribute::mapDistribute
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const globalIndex& globalNumbering,
     labelListList& cellCells,
@@ -233,7 +233,7 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    mapDistributeBase
+    distributionMapBase
     (
         globalNumbering,
         cellCells,
@@ -243,7 +243,7 @@ Foam::mapDistribute::mapDistribute
 {}
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const globalIndex& globalNumbering,
     labelList& elements,
@@ -254,7 +254,7 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    mapDistributeBase()
+    distributionMapBase()
 {
     // Construct per processor compact addressing of the global elements
     // needed. The ones from the local processor are not included since
@@ -348,7 +348,7 @@ Foam::mapDistribute::mapDistribute
 }
 
 
-Foam::mapDistribute::mapDistribute
+Foam::distributionMap::distributionMap
 (
     const globalIndex& globalNumbering,
     labelListList& cellCells,
@@ -359,7 +359,7 @@ Foam::mapDistribute::mapDistribute
     const int tag
 )
 :
-    mapDistributeBase()
+    distributionMapBase()
 {
     // Construct per processor compact addressing of the global elements
     // needed. The ones from the local processor are not included since
@@ -466,46 +466,46 @@ Foam::mapDistribute::mapDistribute
 }
 
 
-Foam::mapDistribute::mapDistribute(const mapDistribute& map)
+Foam::distributionMap::distributionMap(const distributionMap& map)
 :
-    mapDistributeBase(map),
+    distributionMapBase(map),
     transformElements_(map.transformElements_),
     transformStart_(map.transformStart_)
 {}
 
 
-Foam::mapDistribute::mapDistribute(mapDistribute&& map)
+Foam::distributionMap::distributionMap(distributionMap&& map)
 :
-    mapDistributeBase(move(map)),
+    distributionMapBase(move(map)),
     transformElements_(move(map.transformElements_)),
     transformStart_(move(map.transformStart_))
 {}
 
 
-Foam::mapDistribute::mapDistribute(Istream& is)
+Foam::distributionMap::distributionMap(Istream& is)
 {
     is  >> *this;
 }
 
 
-Foam::autoPtr<Foam::mapDistribute> Foam::mapDistribute::clone() const
+Foam::autoPtr<Foam::distributionMap> Foam::distributionMap::clone() const
 {
-    return autoPtr<mapDistribute>(new mapDistribute(*this));
+    return autoPtr<distributionMap>(new distributionMap(*this));
 }
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::label Foam::mapDistribute::whichTransform(const label index)
+Foam::label Foam::distributionMap::whichTransform(const label index)
 const
 {
     return findLower(transformStart_, index+1);
 }
 
 
-void Foam::mapDistribute::transfer(mapDistribute& rhs)
+void Foam::distributionMap::transfer(distributionMap& rhs)
 {
-    mapDistributeBase::transfer(rhs);
+    distributionMapBase::transfer(rhs);
     transformElements_.transfer(rhs.transformElements_);
     transformStart_.transfer(rhs.transformStart_);
 }
@@ -513,7 +513,7 @@ void Foam::mapDistribute::transfer(mapDistribute& rhs)
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-void Foam::mapDistribute::operator=(const mapDistribute& rhs)
+void Foam::distributionMap::operator=(const distributionMap& rhs)
 {
     // Check for assignment to self
     if (this == &rhs)
@@ -522,7 +522,7 @@ void Foam::mapDistribute::operator=(const mapDistribute& rhs)
             << "Attempted assignment to self"
             << abort(FatalError);
     }
-    mapDistributeBase::operator=(rhs);
+    distributionMapBase::operator=(rhs);
     transformElements_ = rhs.transformElements_;
     transformStart_ = rhs.transformStart_;
 }
@@ -530,11 +530,11 @@ void Foam::mapDistribute::operator=(const mapDistribute& rhs)
 
 // * * * * * * * * * * * * * * Istream Operator  * * * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, mapDistribute& map)
+Foam::Istream& Foam::operator>>(Istream& is, distributionMap& map)
 {
-    is.fatalCheck("operator>>(Istream&, mapDistribute&)");
+    is.fatalCheck("operator>>(Istream&, distributionMap&)");
 
-    is  >> static_cast<mapDistributeBase&>(map)
+    is  >> static_cast<distributionMapBase&>(map)
         >> map.transformElements_ >> map.transformStart_;
 
     return is;
@@ -543,9 +543,9 @@ Foam::Istream& Foam::operator>>(Istream& is, mapDistribute& map)
 
 // * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const mapDistribute& map)
+Foam::Ostream& Foam::operator<<(Ostream& os, const distributionMap& map)
 {
-    os  << static_cast<const mapDistributeBase&>(map) << token::NL
+    os  << static_cast<const distributionMapBase&>(map) << token::NL
         << map.transformElements_ << token::NL
         << map.transformStart_;
 

src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMap.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::mapDistribute
+    Foam::distributionMap
 
 Description
     Class containing processor-to-processor mapping information.
@@ -48,7 +48,7 @@ Note:
     So e.g 4 procs and on proc 1 the compact
     table will first have all globalIndex.localSize() elements from proc1
     followed by used-only elements of proc0, proc2, proc3.
-    The constructed mapDistribute sends the local elements from and
+    The constructed distributionMap sends the local elements from and
     receives the remote elements into their compact position.
     compactMap[proci] is the position of elements from proci in the compact
     map. compactMap[myProcNo()] is empty since trivial addressing.
@@ -125,15 +125,15 @@ Note:
 
 
 SourceFiles
-    mapDistribute.C
+    distributionMap.C
-    mapDistributeTemplates.C
+    distributionMapTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mapDistribute_H
+#ifndef distributionMap_H
-#define mapDistribute_H
+#define distributionMap_H
 
-#include "mapDistributeBase.H"
+#include "distributionMapBase.H"
 #include "transformer.H"
 #include "coupledPolyPatch.H"
 #include "EdgeMap.H"
@@ -148,19 +148,19 @@ class globalIndexAndTransform;
 
 // Forward declaration of friend functions and operators
 
-class mapDistribute;
+class distributionMap;
 
-Istream& operator>>(Istream&, mapDistribute&);
+Istream& operator>>(Istream&, distributionMap&);
-Ostream& operator<<(Ostream&, const mapDistribute&);
+Ostream& operator<<(Ostream&, const distributionMap&);
 
 
 /*---------------------------------------------------------------------------*\
-                        Class mapDistribute Declaration
+                        Class distributionMap Declaration
 \*---------------------------------------------------------------------------*/
 
-class mapDistribute
+class distributionMap
 :
-    public mapDistributeBase
+    public distributionMapBase
 {
     // Private Data
 
@@ -328,16 +328,16 @@ public:
 
 
     // Declare name of the class and its debug switch
-    ClassName("mapDistribute");
+    ClassName("distributionMap");
 
 
     // Constructors
 
         //- Construct null
-        mapDistribute();
+        distributionMap();
 
         //- Construct from components
-        mapDistribute
+        distributionMap
         (
             const label constructSize,
             labelListList&& subMap,
@@ -347,7 +347,7 @@ public:
         );
 
         //- Construct from components
-        mapDistribute
+        distributionMap
         (
             const label constructSize,
             labelListList&& subMap,
@@ -361,7 +361,7 @@ public:
         //- Construct from reverse addressing: per data item the send
         //  processor and the receive processor. (note: data is not stored
         //  sorted per processor so cannot use printLayout).
-        mapDistribute
+        distributionMap
         (
             const labelList& sendProcs,
             const labelList& recvProcs
@@ -371,7 +371,7 @@ public:
         //  numbering (or -1). Determines compact numbering (see above) and
         //  distribute map to get data into this ordering and renumbers the
         //  elements to be in compact numbering.
-        mapDistribute
+        distributionMap
         (
             const globalIndex&,
             labelList& elements,
@@ -382,7 +382,7 @@ public:
         //- Special variant that works with the info sorted into bins
         //  according to local indices. E.g. think cellCells where
         //  cellCells[localCelli] is a list of global cells
-        mapDistribute
+        distributionMap
         (
             const globalIndex&,
             labelListList& cellCells,
@@ -396,7 +396,7 @@ public:
         //  Determines compact numbering (see above) and
         //  distribute map to get data into this ordering and renumbers the
         //  elements to be in compact numbering.
-        mapDistribute
+        distributionMap
         (
             const globalIndex&,
             labelList& untransformedElements,
@@ -408,7 +408,7 @@ public:
         );
 
         //- As above but with ListLists.
-        mapDistribute
+        distributionMap
         (
             const globalIndex&,
             labelListList& cellCells,
@@ -420,20 +420,20 @@ public:
         );
 
         //- Copy constructor
-        mapDistribute(const mapDistribute&);
+        distributionMap(const distributionMap&);
 
         //- Move constructor
-        mapDistribute(mapDistribute&&);
+        distributionMap(distributionMap&&);
 
         //- Construct from Istream
-        mapDistribute(Istream&);
+        distributionMap(Istream&);
 
         //- Clone
-        autoPtr<mapDistribute> clone() const;
+        autoPtr<distributionMap> clone() const;
 
 
     //- Destructor
-    virtual ~mapDistribute()
+    virtual ~distributionMap()
     {}
 
 
@@ -461,7 +461,7 @@ public:
         // Other
 
             //- Transfer the contents of the argument and annul the argument.
-            void transfer(mapDistribute&);
+            void transfer(distributionMap&);
 
             //- Distribute data using default commsType.
             template<class T>
@@ -556,99 +556,99 @@ public:
             {
                 notImplemented
                 (
-                    "mapDistribute::updateMesh(const mapPolyMesh&)"
+                    "distributionMap::updateMesh(const mapPolyMesh&)"
                 );
             }
 
     // Member Operators
 
-        void operator=(const mapDistribute&);
+        void operator=(const distributionMap&);
 
     // IOstream Operators
 
         //- Read dictionary from Istream
-        friend Istream& operator>>(Istream&, mapDistribute&);
+        friend Istream& operator>>(Istream&, distributionMap&);
 
         //- Write dictionary to Ostream
-        friend Ostream& operator<<(Ostream&, const mapDistribute&);
+        friend Ostream& operator<<(Ostream&, const distributionMap&);
 
 };
 
 
 // Template specialisation for primitives that do not need transform
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
     List<label>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     UList<label>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<label>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<label>&
 ) const;
 
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     UList<scalar>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
     List<scalar>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<scalar>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<scalar>&
 ) const;
 
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch& cpp,
     UList<bool>& fld
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const transformer&,
     const bool,
     List<bool>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     Map<bool>&
 ) const;
 template<>
-void mapDistribute::transform::operator()
+void distributionMap::transform::operator()
 (
     const coupledPolyPatch&,
     EdgeMap<bool>&
@@ -662,7 +662,7 @@ void mapDistribute::transform::operator()
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "mapDistributeTemplates.C"
+    #include "distributionMapTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBase.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mapDistributeBase.H"
+#include "distributionMapBase.H"
 #include "commSchedule.H"
 #include "HashSet.H"
 #include "globalIndex.H"
@@ -33,13 +33,13 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(mapDistributeBase, 0);
+    defineTypeNameAndDebug(distributionMapBase, 0);
 }
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-Foam::List<Foam::labelPair> Foam::mapDistributeBase::schedule
+Foam::List<Foam::labelPair> Foam::distributionMapBase::schedule
 (
     const labelListList& subMap,
     const labelListList& constructMap,
@@ -171,7 +171,7 @@ Foam::List<Foam::labelPair> Foam::mapDistributeBase::schedule
 }
 
 
-const Foam::List<Foam::labelPair>& Foam::mapDistributeBase::schedule() const
+const Foam::List<Foam::labelPair>& Foam::distributionMapBase::schedule() const
 {
     if (schedulePtr_.empty())
     {
@@ -187,7 +187,7 @@ const Foam::List<Foam::labelPair>& Foam::mapDistributeBase::schedule() const
 }
 
 
-void Foam::mapDistributeBase::checkReceivedSize
+void Foam::distributionMapBase::checkReceivedSize
 (
     const label proci,
     const label expectedSize,
@@ -205,7 +205,7 @@ void Foam::mapDistributeBase::checkReceivedSize
 }
 
 
-void Foam::mapDistributeBase::printLayout(Ostream& os) const
+void Foam::distributionMapBase::printLayout(Ostream& os) const
 {
     // Determine offsets of remote data.
     labelList minIndex(Pstream::nProcs(), labelMax);
@@ -279,7 +279,7 @@ void Foam::mapDistributeBase::printLayout(Ostream& os) const
 }
 
 
-void Foam::mapDistributeBase::calcCompactAddressing
+void Foam::distributionMapBase::calcCompactAddressing
 (
     const globalIndex& globalNumbering,
     const labelList& elements,
@@ -328,7 +328,7 @@ void Foam::mapDistributeBase::calcCompactAddressing
 }
 
 
-void Foam::mapDistributeBase::calcCompactAddressing
+void Foam::distributionMapBase::calcCompactAddressing
 (
     const globalIndex& globalNumbering,
     const labelListList& cellCells,
@@ -387,7 +387,7 @@ void Foam::mapDistributeBase::calcCompactAddressing
 }
 
 
-void Foam::mapDistributeBase::exchangeAddressing
+void Foam::distributionMapBase::exchangeAddressing
 (
     const int tag,
     const globalIndex& globalNumbering,
@@ -465,7 +465,7 @@ void Foam::mapDistributeBase::exchangeAddressing
 }
 
 
-void Foam::mapDistributeBase::exchangeAddressing
+void Foam::distributionMapBase::exchangeAddressing
 (
     const int tag,
     const globalIndex& globalNumbering,
@@ -550,7 +550,7 @@ void Foam::mapDistributeBase::exchangeAddressing
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::mapDistributeBase::mapDistributeBase()
+Foam::distributionMapBase::distributionMapBase()
 :
     constructSize_(0),
     subHasFlip_(false),
@@ -559,7 +559,7 @@ Foam::mapDistributeBase::mapDistributeBase()
 {}
 
 
-Foam::mapDistributeBase::mapDistributeBase
+Foam::distributionMapBase::distributionMapBase
 (
     const label constructSize,
     const labelListList&& subMap,
@@ -577,7 +577,7 @@ Foam::mapDistributeBase::mapDistributeBase
 {}
 
 
-Foam::mapDistributeBase::mapDistributeBase
+Foam::distributionMapBase::distributionMapBase
 (
     const labelList& sendProcs,
     const labelList& recvProcs
@@ -651,7 +651,7 @@ Foam::mapDistributeBase::mapDistributeBase
 }
 
 
-Foam::mapDistributeBase::mapDistributeBase
+Foam::distributionMapBase::distributionMapBase
 (
     const globalIndex& globalNumbering,
     labelList& elements,
@@ -711,7 +711,7 @@ Foam::mapDistributeBase::mapDistributeBase
 }
 
 
-Foam::mapDistributeBase::mapDistributeBase
+Foam::distributionMapBase::distributionMapBase
 (
     const globalIndex& globalNumbering,
     labelListList& cellCells,
@@ -771,7 +771,7 @@ Foam::mapDistributeBase::mapDistributeBase
 }
 
 
-Foam::mapDistributeBase::mapDistributeBase(const mapDistributeBase& map)
+Foam::distributionMapBase::distributionMapBase(const distributionMapBase& map)
 :
     constructSize_(map.constructSize_),
     subMap_(map.subMap_),
@@ -782,7 +782,7 @@ Foam::mapDistributeBase::mapDistributeBase(const mapDistributeBase& map)
 {}
 
 
-Foam::mapDistributeBase::mapDistributeBase(mapDistributeBase&& map)
+Foam::distributionMapBase::distributionMapBase(distributionMapBase&& map)
 :
     constructSize_(map.constructSize_),
     subMap_(move(map.subMap_)),
@@ -793,7 +793,7 @@ Foam::mapDistributeBase::mapDistributeBase(mapDistributeBase&& map)
 {}
 
 
-Foam::mapDistributeBase::mapDistributeBase(Istream& is)
+Foam::distributionMapBase::distributionMapBase(Istream& is)
 {
     is >> *this;
 }
@@ -801,7 +801,7 @@ Foam::mapDistributeBase::mapDistributeBase(Istream& is)
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void Foam::mapDistributeBase::transfer(mapDistributeBase& rhs)
+void Foam::distributionMapBase::transfer(distributionMapBase& rhs)
 {
     constructSize_ = rhs.constructSize_;
     subMap_.transfer(rhs.subMap_);
@@ -812,7 +812,7 @@ void Foam::mapDistributeBase::transfer(mapDistributeBase& rhs)
 }
 
 
-Foam::label Foam::mapDistributeBase::renumber
+Foam::label Foam::distributionMapBase::renumber
 (
     const globalIndex& globalNumbering,
     const List<Map<label>>& compactMap,
@@ -836,14 +836,18 @@ Foam::label Foam::mapDistributeBase::renumber
 }
 
 
-void Foam::mapDistributeBase::compact(const boolList& elemIsUsed, const int tag)
+void Foam::distributionMapBase::compact
+(
+    const boolList& elemIsUsed,
+    const int tag
+)
 {
     // 1. send back to sender. Have sender delete the corresponding element
     //    from the submap and do the same to the constructMap locally
     //    (and in same order).
 
     // Send elemIsUsed field to neighbour. Use nonblocking code from
-    // mapDistributeBase but in reverse order.
+    // distributionMapBase but in reverse order.
     if (Pstream::parRun())
     {
         label startOfRequests = Pstream::nRequests();
@@ -996,7 +1000,7 @@ void Foam::mapDistributeBase::compact(const boolList& elemIsUsed, const int tag)
 }
 
 
-void Foam::mapDistributeBase::compact
+void Foam::distributionMapBase::compact
 (
     const boolList& elemIsUsed,
     const label localSize,            // max index for subMap
@@ -1010,7 +1014,7 @@ void Foam::mapDistributeBase::compact
     //    (and in same order).
 
     // Send elemIsUsed field to neighbour. Use nonblocking code from
-    // mapDistributeBase but in reverse order.
+    // distributionMapBase but in reverse order.
     if (Pstream::parRun())
     {
         label startOfRequests = Pstream::nRequests();
@@ -1220,7 +1224,7 @@ void Foam::mapDistributeBase::compact
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-void Foam::mapDistributeBase::operator=(const mapDistributeBase& rhs)
+void Foam::distributionMapBase::operator=(const distributionMapBase& rhs)
 {
     // Check for assignment to self
     if (this == &rhs)
@@ -1240,9 +1244,9 @@ void Foam::mapDistributeBase::operator=(const mapDistributeBase& rhs)
 
 // * * * * * * * * * * * * * * Istream Operator  * * * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, mapDistributeBase& map)
+Foam::Istream& Foam::operator>>(Istream& is, distributionMapBase& map)
 {
-    is.fatalCheck("operator>>(Istream&, mapDistributeBase&)");
+    is.fatalCheck("operator>>(Istream&, distributionMapBase&)");
 
     is  >> map.constructSize_ >> map.subMap_ >> map.constructMap_
         >> map.subHasFlip_ >> map.constructHasFlip_;
@@ -1253,7 +1257,7 @@ Foam::Istream& Foam::operator>>(Istream& is, mapDistributeBase& map)
 
 // * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const mapDistributeBase& map)
+Foam::Ostream& Foam::operator<<(Ostream& os, const distributionMapBase& map)
 {
     os  << map.constructSize_ << token::NL
         << map.subMap_ << token::NL

src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBase.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::mapDistributeBase
+    Foam::distributionMapBase
 
 Description
     Class containing processor-to-processor mapping information.
@@ -47,7 +47,7 @@ Note:
     So e.g 4 procs and on proc 1 the compact
     table will first have all globalIndex.localSize() elements from proc1
     followed by used-only elements of proc0, proc2, proc3.
-    The constructed mapDistributeBase sends the local elements from and
+    The constructed distributionMapBase sends the local elements from and
     receives the remote elements into their compact position.
     compactMap[proci] is the position of elements from proci in the compact
     map. compactMap[myProcNo()] is empty since trivial addressing.
@@ -62,13 +62,13 @@ Note:
 
 
 SourceFiles
-    mapDistributeBase.C
+    distributionMapBase.C
-    mapDistributeBaseTemplates.C
+    distributionMapBaseTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mapDistributeBase_H
+#ifndef distributionMapBase_H
-#define mapDistributeBase_H
+#define distributionMapBase_H
 
 #include "labelList.H"
 #include "labelPair.H"
@@ -88,17 +88,17 @@ class PstreamBuffers;
 
 // Forward declaration of friend functions and operators
 
-class mapDistributeBase;
+class distributionMapBase;
 
-Istream& operator>>(Istream&, mapDistributeBase&);
+Istream& operator>>(Istream&, distributionMapBase&);
-Ostream& operator<<(Ostream&, const mapDistributeBase&);
+Ostream& operator<<(Ostream&, const distributionMapBase&);
 
 
 /*---------------------------------------------------------------------------*\
-                      Class mapDistributeBase Declaration
+                      Class distributionMapBase Declaration
 \*---------------------------------------------------------------------------*/
 
-class mapDistributeBase
+class distributionMapBase
 {
 protected:
 
@@ -190,16 +190,16 @@ protected:
 public:
 
     // Declare name of the class and its debug switch
-    ClassName("mapDistributeBase");
+    ClassName("distributionMapBase");
 
 
     // Constructors
 
         //- Construct null
-        mapDistributeBase();
+        distributionMapBase();
 
         //- Move construct from components
-        mapDistributeBase
+        distributionMapBase
         (
             const label constructSize,
             const labelListList&& subMap,
@@ -211,7 +211,7 @@ public:
         //- Construct from reverse addressing: per data item the send
         //  processor and the receive processor. (note: data is not stored
         //  sorted per processor so cannot use printLayout).
-        mapDistributeBase
+        distributionMapBase
         (
             const labelList& sendProcs,
             const labelList& recvProcs
@@ -221,7 +221,7 @@ public:
         //  numbering (or -1). Determines compact numbering (see above) and
         //  distribute map to get data into this ordering and renumbers the
         //  elements to be in compact numbering.
-        mapDistributeBase
+        distributionMapBase
         (
             const globalIndex&,
             labelList& elements,
@@ -232,7 +232,7 @@ public:
         //- Special variant that works with the info sorted into bins
         //  according to local indices. E.g. think cellCells where
         //  cellCells[localCellI] is a list of global cells
-        mapDistributeBase
+        distributionMapBase
         (
             const globalIndex&,
             labelListList& cellCells,
@@ -241,13 +241,13 @@ public:
         );
 
         //- Construct copy
-        mapDistributeBase(const mapDistributeBase&);
+        distributionMapBase(const distributionMapBase&);
 
         //- Move constructor
-        mapDistributeBase(mapDistributeBase&&);
+        distributionMapBase(distributionMapBase&&);
 
         //- Construct from Istream
-        mapDistributeBase(Istream&);
+        distributionMapBase(Istream&);
 
 
     // Member Functions
@@ -329,7 +329,7 @@ public:
         // Other
 
             //- Transfer the contents of the argument and annul the argument.
-            void transfer(mapDistributeBase&);
+            void transfer(distributionMapBase&);
 
             //- Helper for construct from globalIndex. Renumbers element
             //  (in globalIndex numbering) into compact indices.
@@ -464,17 +464,17 @@ public:
 
     // Member Operators
 
-        void operator=(const mapDistributeBase&);
+        void operator=(const distributionMapBase&);
-        void operator=(mapDistributeBase&&);
+        void operator=(distributionMapBase&&);
 
 
     // IOstream Operators
 
         //- Read dictionary from Istream
-        friend Istream& operator>>(Istream&, mapDistributeBase&);
+        friend Istream& operator>>(Istream&, distributionMapBase&);
 
         //- Write dictionary to Ostream
-        friend Ostream& operator<<(Ostream&, const mapDistributeBase&);
+        friend Ostream& operator<<(Ostream&, const distributionMapBase&);
 };
 
 
@@ -485,7 +485,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "mapDistributeBaseTemplates.C"
+    #include "distributionMapBaseTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapBaseTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class T, class CombineOp, class negateOp>
-void Foam::mapDistributeBase::flipAndCombine
+void Foam::distributionMapBase::flipAndCombine
 (
     const UList<label>& map,
     const bool hasFlip,
@@ -76,7 +76,7 @@ void Foam::mapDistributeBase::flipAndCombine
 
 
 template<class T, class negateOp>
-T Foam::mapDistributeBase::accessAndFlip
+T Foam::distributionMapBase::accessAndFlip
 (
     const UList<T>& fld,
     const label index,
@@ -115,7 +115,7 @@ T Foam::mapDistributeBase::accessAndFlip
 
 // Distribute list.
 template<class T, class negateOp>
-void Foam::mapDistributeBase::distribute
+void Foam::distributionMapBase::distribute
 (
     const Pstream::commsTypes commsType,
     const List<labelPair>& schedule,
@@ -623,7 +623,7 @@ void Foam::mapDistributeBase::distribute
 
 // Distribute list.
 template<class T, class CombineOp, class negateOp>
-void Foam::mapDistributeBase::distribute
+void Foam::distributionMapBase::distribute
 (
     const Pstream::commsTypes commsType,
     const List<labelPair>& schedule,
@@ -1122,7 +1122,11 @@ void Foam::mapDistributeBase::distribute
 
 
 template<class T>
-void Foam::mapDistributeBase::send(PstreamBuffers& pBufs, const List<T>& field)
+void Foam::distributionMapBase::send
+(
+    PstreamBuffers& pBufs,
+    const List<T>& field
+)
 const
 {
     // Stream data into buffer
@@ -1156,7 +1160,7 @@ const
 
 
 template<class T>
-void Foam::mapDistributeBase::receive(PstreamBuffers& pBufs, List<T>& field)
+void Foam::distributionMapBase::receive(PstreamBuffers& pBufs, List<T>& field)
 const
 {
     // Consume
@@ -1196,7 +1200,7 @@ const
 
 //- Distribute data using default commsType.
 template<class T, class negateOp>
-void Foam::mapDistributeBase::distribute
+void Foam::distributionMapBase::distribute
 (
     List<T>& fld,
     const negateOp& negOp,
@@ -1256,7 +1260,7 @@ void Foam::mapDistributeBase::distribute
 
 //- Distribute data using default commsType.
 template<class T>
-void Foam::mapDistributeBase::distribute
+void Foam::distributionMapBase::distribute
 (
     List<T>& fld,
     const int tag
@@ -1268,7 +1272,7 @@ void Foam::mapDistributeBase::distribute
 
 //- Distribute data using default commsType.
 template<class T>
-void Foam::mapDistributeBase::distribute
+void Foam::distributionMapBase::distribute
 (
     DynamicList<T>& fld,
     const int tag
@@ -1286,7 +1290,7 @@ void Foam::mapDistributeBase::distribute
 
 //- Reverse distribute data using default commsType.
 template<class T>
-void Foam::mapDistributeBase::reverseDistribute
+void Foam::distributionMapBase::reverseDistribute
 (
     const label constructSize,
     List<T>& fld,
@@ -1348,7 +1352,7 @@ void Foam::mapDistributeBase::reverseDistribute
 //  Since constructSize might be larger than supplied size supply
 //  a nullValue
 template<class T>
-void Foam::mapDistributeBase::reverseDistribute
+void Foam::distributionMapBase::reverseDistribute
 (
     const label constructSize,
     const T& nullValue,

src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMapTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class T>
-void Foam::mapDistribute::applyDummyTransforms(List<T>& field) const
+void Foam::distributionMap::applyDummyTransforms(List<T>& field) const
 {
     forAll(transformElements_, trafoI)
     {
@@ -50,7 +50,7 @@ void Foam::mapDistribute::applyDummyTransforms(List<T>& field) const
 
 
 template<class T>
-void Foam::mapDistribute::applyDummyInverseTransforms(List<T>& field) const
+void Foam::distributionMap::applyDummyInverseTransforms(List<T>& field) const
 {
     forAll(transformElements_, trafoI)
     {
@@ -66,7 +66,7 @@ void Foam::mapDistribute::applyDummyInverseTransforms(List<T>& field) const
 
 
 template<class T, class TransformOp>   //, class CombineOp>
-void Foam::mapDistribute::applyTransforms
+void Foam::distributionMap::applyTransforms
 (
     const globalIndexAndTransform& globalTransforms,
     List<T>& field,
@@ -96,7 +96,7 @@ void Foam::mapDistribute::applyTransforms
 
 
 template<class T, class TransformOp>   //, class CombineOp>
-void Foam::mapDistribute::applyInverseTransforms
+void Foam::distributionMap::applyInverseTransforms
 (
     const globalIndexAndTransform& globalTransforms,
     List<T>& field,
@@ -126,7 +126,7 @@ void Foam::mapDistribute::applyInverseTransforms
 
 
 template<class T, class negateOp>
-void Foam::mapDistribute::distribute
+void Foam::distributionMap::distribute
 (
     List<T>& fld,
     const negateOp& negOp,
@@ -134,7 +134,7 @@ void Foam::mapDistribute::distribute
     const int tag
 ) const
 {
-    mapDistributeBase::distribute(fld, negOp, tag);
+    distributionMapBase::distribute(fld, negOp, tag);
 
     //- Fill in transformed slots with copies
     if (dummyTransform)
@@ -145,7 +145,7 @@ void Foam::mapDistribute::distribute
 
 
 template<class T>
-void Foam::mapDistribute::distribute
+void Foam::distributionMap::distribute
 (
     List<T>& fld,
     const bool dummyTransform,
@@ -157,7 +157,7 @@ void Foam::mapDistribute::distribute
 
 
 template<class T>
-void Foam::mapDistribute::distribute
+void Foam::distributionMap::distribute
 (
     DynamicList<T>& fld,
     const bool dummyTransform,
@@ -175,7 +175,7 @@ void Foam::mapDistribute::distribute
 
 
 template<class T>
-void Foam::mapDistribute::reverseDistribute
+void Foam::distributionMap::reverseDistribute
 (
     const label constructSize,
     List<T>& fld,
@@ -188,12 +188,12 @@ void Foam::mapDistribute::reverseDistribute
         applyDummyInverseTransforms(fld);
     }
 
-    mapDistributeBase::reverseDistribute(constructSize, fld, tag);
+    distributionMapBase::reverseDistribute(constructSize, fld, tag);
 }
 
 
 template<class T>
-void Foam::mapDistribute::reverseDistribute
+void Foam::distributionMap::reverseDistribute
 (
     const label constructSize,
     const T& nullValue,
@@ -207,12 +207,12 @@ void Foam::mapDistribute::reverseDistribute
         applyDummyInverseTransforms(fld);
     }
 
-    mapDistributeBase::reverseDistribute(constructSize, nullValue, fld, tag);
+    distributionMapBase::reverseDistribute(constructSize, nullValue, fld, tag);
 }
 
 
 template<class T, class TransformOp>
-void Foam::mapDistribute::distribute
+void Foam::distributionMap::distribute
 (
     const globalIndexAndTransform& git,
     List<T>& fld,
@@ -228,7 +228,7 @@ void Foam::mapDistribute::distribute
 
 
 template<class T, class TransformOp>
-void Foam::mapDistribute::reverseDistribute
+void Foam::distributionMap::reverseDistribute
 (
     const globalIndexAndTransform& git,
     const label constructSize,
@@ -248,7 +248,7 @@ void Foam::mapDistribute::reverseDistribute
 
 
 template<class T, class TransformOp>
-void Foam::mapDistribute::reverseDistribute
+void Foam::distributionMap::reverseDistribute
 (
     const globalIndexAndTransform& git,
     const label constructSize,

src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/lagrangianDistributionMap.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,20 +22,20 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::mapDistributeLagrangian
+    Foam::lagrangianDistributionMap
 
 Description
     Class containing mesh-to-mesh mapping information for particles
 
 SourceFiles
-    mapDistributeLagrangian.C
+    lagrangianDistributionMap.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mapDistributeLagrangian_H
+#ifndef lagrangianDistributionMap_H
-#define mapDistributeLagrangian_H
+#define lagrangianDistributionMap_H
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,15 +45,15 @@ namespace Foam
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
-                   Class mapDistributeLagrangian Declaration
+                   Class lagrangianDistributionMap Declaration
 \*---------------------------------------------------------------------------*/
 
-class mapDistributeLagrangian
+class lagrangianDistributionMap
 {
     // Private Data
 
         //- Map to distribute particles
-        const mapDistribute particleMap_;
+        const distributionMap particleMap_;
 
         //- Per element in subsetted mesh the cell label
         const labelListList constructCellLabels_;
@@ -64,7 +64,7 @@ public:
     // Constructors
 
         //- Construct from components
-        mapDistributeLagrangian
+        lagrangianDistributionMap
         (
             const label nNewParticles,
             labelListList&& subParticleMap,
@@ -82,7 +82,7 @@ public:
         // Access
 
             //- Distribution map
-            const mapDistribute& particleMap() const
+            const distributionMap& particleMap() const
             {
                 return particleMap_;
             }

src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/polyMeshDistributionMap.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,13 +23,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "polyMesh.H"
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::mapDistributePolyMesh::calcPatchSizes()
+void Foam::polyMeshDistributionMap::calcPatchSizes()
 {
     oldPatchSizes_.setSize(oldPatchStarts_.size());
 
@@ -59,7 +59,7 @@ void Foam::mapDistributePolyMesh::calcPatchSizes()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::mapDistributePolyMesh::mapDistributePolyMesh()
+Foam::polyMeshDistributionMap::polyMeshDistributionMap()
 :
     nOldPoints_(0),
     nOldFaces_(0),
@@ -74,7 +74,7 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh()
 {}
 
 
-Foam::mapDistributePolyMesh::mapDistributePolyMesh
+Foam::polyMeshDistributionMap::polyMeshDistributionMap
 (
     const polyMesh& mesh,
 
@@ -128,7 +128,7 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
 }
 
 
-Foam::mapDistributePolyMesh::mapDistributePolyMesh
+Foam::polyMeshDistributionMap::polyMeshDistributionMap
 (
     // mesh before changes
     const label nOldPoints,
@@ -138,10 +138,10 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
     labelList&& oldPatchNMeshPoints,
 
     // how to transfer pieces of mesh
-    mapDistribute&& pointMap,
+    distributionMap&& pointMap,
-    mapDistribute&& faceMap,
+    distributionMap&& faceMap,
-    mapDistribute&& cellMap,
+    distributionMap&& cellMap,
-    mapDistribute&& patchMap
+    distributionMap&& patchMap
 )
 :
     nOldPoints_(nOldPoints),
@@ -159,9 +159,9 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
 }
 
 
-Foam::mapDistributePolyMesh::mapDistributePolyMesh
+Foam::polyMeshDistributionMap::polyMeshDistributionMap
 (
-    mapDistributePolyMesh&& map
+    polyMeshDistributionMap&& map
 )
 :
     nOldPoints_(map.nOldPoints_),
@@ -177,7 +177,7 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh
 {}
 
 
-Foam::mapDistributePolyMesh::mapDistributePolyMesh(Istream& is)
+Foam::polyMeshDistributionMap::polyMeshDistributionMap(Istream& is)
 {
     is  >> *this;
 }
@@ -185,7 +185,7 @@ Foam::mapDistributePolyMesh::mapDistributePolyMesh(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::mapDistributePolyMesh::transfer(mapDistributePolyMesh& rhs)
+void Foam::polyMeshDistributionMap::transfer(polyMeshDistributionMap& rhs)
 {
     nOldPoints_ = rhs.nOldPoints_;
     nOldFaces_ = rhs.nOldFaces_;
@@ -200,7 +200,7 @@ void Foam::mapDistributePolyMesh::transfer(mapDistributePolyMesh& rhs)
 }
 
 
-void Foam::mapDistributePolyMesh::distributePointIndices(labelList& lst) const
+void Foam::polyMeshDistributionMap::distributePointIndices(labelList& lst) const
 {
     // Construct boolList from selected elements
     boolList isSelected
@@ -222,7 +222,7 @@ void Foam::mapDistributePolyMesh::distributePointIndices(labelList& lst) const
 }
 
 
-void Foam::mapDistributePolyMesh::distributeFaceIndices(labelList& lst) const
+void Foam::polyMeshDistributionMap::distributeFaceIndices(labelList& lst) const
 {
     // Construct boolList from selected elements
     boolList isSelected
@@ -244,7 +244,7 @@ void Foam::mapDistributePolyMesh::distributeFaceIndices(labelList& lst) const
 }
 
 
-void Foam::mapDistributePolyMesh::distributeCellIndices(labelList& lst) const
+void Foam::polyMeshDistributionMap::distributeCellIndices(labelList& lst) const
 {
     // Construct boolList from selected elements
     boolList isSelected
@@ -266,7 +266,7 @@ void Foam::mapDistributePolyMesh::distributeCellIndices(labelList& lst) const
 }
 
 
-void Foam::mapDistributePolyMesh::distributePatchIndices(labelList& lst) const
+void Foam::polyMeshDistributionMap::distributePatchIndices(labelList& lst) const
 {
     // Construct boolList from selected elements
     boolList isSelected
@@ -290,7 +290,10 @@ void Foam::mapDistributePolyMesh::distributePatchIndices(labelList& lst) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-void Foam::mapDistributePolyMesh::operator=(const mapDistributePolyMesh& rhs)
+void Foam::polyMeshDistributionMap::operator=
+(
+    const polyMeshDistributionMap& rhs
+)
 {
     nOldPoints_ = rhs.nOldPoints_;
     nOldFaces_ = rhs.nOldFaces_;
@@ -305,7 +308,7 @@ void Foam::mapDistributePolyMesh::operator=(const mapDistributePolyMesh& rhs)
 }
 
 
-void Foam::mapDistributePolyMesh::operator=(mapDistributePolyMesh&& rhs)
+void Foam::polyMeshDistributionMap::operator=(polyMeshDistributionMap&& rhs)
 {
     nOldPoints_ = rhs.nOldPoints_;
     nOldFaces_ = rhs.nOldFaces_;
@@ -322,9 +325,9 @@ void Foam::mapDistributePolyMesh::operator=(mapDistributePolyMesh&& rhs)
 
 // * * * * * * * * * * * * * * Istream Operator  * * * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, mapDistributePolyMesh& map)
+Foam::Istream& Foam::operator>>(Istream& is, polyMeshDistributionMap& map)
 {
-    is.fatalCheck("operator>>(Istream&, mapDistributePolyMesh&)");
+    is.fatalCheck("operator>>(Istream&, polyMeshDistributionMap&)");
 
     is  >> map.nOldPoints_
         >> map.nOldFaces_
@@ -343,7 +346,7 @@ Foam::Istream& Foam::operator>>(Istream& is, mapDistributePolyMesh& map)
 
 // * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const mapDistributePolyMesh& map)
+Foam::Ostream& Foam::operator<<(Ostream& os, const polyMeshDistributionMap& map)
 {
     os  << map.nOldPoints_
         << token::SPACE << map.nOldFaces_

src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/polyMeshDistributionMap.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::mapDistributePolyMesh
+    Foam::polyMeshDistributionMap
 
 Description
     Class containing mesh-to-mesh mapping information after a mesh distribution
@@ -34,14 +34,14 @@ Description
     mesh (constructXXXMap).
 
 SourceFiles
-    mapDistributePolyMesh.C
+    polyMeshDistributionMap.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mapDistributePolyMesh_H
+#ifndef polyMeshDistributionMap_H
-#define mapDistributePolyMesh_H
+#define polyMeshDistributionMap_H
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -54,17 +54,17 @@ class polyMesh;
 
 // Forward declaration of friend functions and operators
 
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
-Istream& operator>>(Istream&, mapDistributePolyMesh&);
+Istream& operator>>(Istream&, polyMeshDistributionMap&);
-Ostream& operator<<(Ostream&, const mapDistributePolyMesh&);
+Ostream& operator<<(Ostream&, const polyMeshDistributionMap&);
 
 
 /*---------------------------------------------------------------------------*\
-                    Class mapDistributePolyMesh Declaration
+                    Class polyMeshDistributionMap Declaration
 \*---------------------------------------------------------------------------*/
 
-class mapDistributePolyMesh
+class polyMeshDistributionMap
 {
     // Private Data
 
@@ -88,16 +88,16 @@ class mapDistributePolyMesh
 
 
         //- Point distribute map
-        mapDistribute pointMap_;
+        distributionMap pointMap_;
 
         //- Face distribute map
-        mapDistribute faceMap_;
+        distributionMap faceMap_;
 
         //- Cell distribute map
-        mapDistribute cellMap_;
+        distributionMap cellMap_;
 
         //- Patch distribute map
-        mapDistribute patchMap_;
+        distributionMap patchMap_;
 
 
     // Private Member Functions
@@ -110,12 +110,12 @@ public:
     // Constructors
 
         //- Construct null
-        mapDistributePolyMesh();
+        polyMeshDistributionMap();
 
         //- Move constructor from components.
         //  Note that mesh has to be changed already
         //  since uses mesh.nPoints etc as the new size.
-        mapDistributePolyMesh
+        polyMeshDistributionMap
         (
             const polyMesh& mesh,
 
@@ -143,7 +143,7 @@ public:
         );
 
         //- Move constructor from components
-        mapDistributePolyMesh
+        polyMeshDistributionMap
         (
             // mesh before changes
             const label nOldPoints,
@@ -153,20 +153,20 @@ public:
             labelList&& oldPatchNMeshPoints,
 
             // how to subset pieces of mesh to send across
-            mapDistribute&& pointMap,
+            distributionMap&& pointMap,
-            mapDistribute&& faceMap,
+            distributionMap&& faceMap,
-            mapDistribute&& cellMap,
+            distributionMap&& cellMap,
-            mapDistribute&& patchMap
+            distributionMap&& patchMap
         );
 
         //- Move constructor
-        mapDistributePolyMesh(mapDistributePolyMesh&&);
+        polyMeshDistributionMap(polyMeshDistributionMap&&);
 
         //- Construct from Istream
-        mapDistributePolyMesh(Istream&);
+        polyMeshDistributionMap(Istream&);
 
         //- Disallow default bitwise copy construction
-        mapDistributePolyMesh(const mapDistributePolyMesh&) = delete;
+        polyMeshDistributionMap(const polyMeshDistributionMap&) = delete;
 
 
     // Member Functions
@@ -210,25 +210,25 @@ public:
             }
 
             //- Point distribute map
-            const mapDistribute& pointMap() const
+            const distributionMap& pointMap() const
             {
                 return pointMap_;
             }
 
             //- Face distribute map
-            const mapDistribute& faceMap() const
+            const distributionMap& faceMap() const
             {
                 return faceMap_;
             }
 
             //- Cell distribute map
-            const mapDistribute& cellMap() const
+            const distributionMap& cellMap() const
             {
                 return cellMap_;
             }
 
             //- Patch distribute map
-            const mapDistribute& patchMap() const
+            const distributionMap& patchMap() const
             {
                 return patchMap_;
             }
@@ -237,7 +237,7 @@ public:
         // Other
 
             //- Transfer the contents of the argument and annul the argument.
-            void transfer(mapDistributePolyMesh&);
+            void transfer(polyMeshDistributionMap&);
 
             //- Distribute list of point data
             template<class T>
@@ -286,18 +286,18 @@ public:
 
     // Member Operators
 
-        void operator=(const mapDistributePolyMesh&);
+        void operator=(const polyMeshDistributionMap&);
 
-        void operator=(mapDistributePolyMesh&&);
+        void operator=(polyMeshDistributionMap&&);
 
 
     // IOstream Operators
 
         //- Read dictionary from Istream
-        friend Istream& operator>>(Istream&, mapDistributePolyMesh&);
+        friend Istream& operator>>(Istream&, polyMeshDistributionMap&);
 
         //- Write dictionary to Ostream
-        friend Ostream& operator<<(Ostream&, const mapDistributePolyMesh&);
+        friend Ostream& operator<<(Ostream&, const polyMeshDistributionMap&);
 };
 
 

src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
 }
 
 
-void Foam::polyMesh::distribute(const mapDistributePolyMesh& map)
+void Foam::polyMesh::distribute(const polyMeshDistributionMap& map)
 {
     meshObject::distribute<polyMesh>(*this, map);
     meshObject::distribute<pointMesh>(*this, map);

src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ SourceFiles
 #include "PackedBoolList.H"
 #include "polyMesh.H"
 #include "coupledPolyPatch.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -187,7 +187,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -207,7 +207,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -229,7 +229,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -251,7 +251,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -274,7 +274,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -294,7 +294,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -316,7 +316,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -338,7 +338,7 @@ public:
                     l,
                     cop,
                     nullValue,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -355,7 +355,13 @@ public:
                 const CombineOp& cop
             )
             {
-                syncBoundaryFaceList(mesh, l, cop, mapDistribute::transform());
+                syncBoundaryFaceList
+                (
+                    mesh,
+                    l,
+                    cop,
+                    distributionMap::transform()
+                );
             }
 
             //- Synchronise locations on boundary faces only.
@@ -372,7 +378,7 @@ public:
                     mesh,
                     l,
                     cop,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -397,7 +403,7 @@ public:
                     mesh,
                     bndValues,
                     cop,
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -421,7 +427,7 @@ public:
                     mesh,
                     bndValues,
                     cop,
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -438,7 +444,7 @@ public:
                     mesh,
                     l,
                     eqOp<T>(),
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -454,7 +460,7 @@ public:
                     mesh,
                     l,
                     eqOp<point>(),
-                    mapDistribute::transformPosition()
+                    distributionMap::transformPosition()
                 );
             }
 
@@ -477,7 +483,7 @@ public:
                     mesh,
                     bndValues,
                     eqOp<T>(),
-                    mapDistribute::transform()
+                    distributionMap::transform()
                 );
             }
 
@@ -509,7 +515,7 @@ public:
                 const CombineOp& cop
             )
             {
-                syncPointMap(mesh, l, cop, mapDistribute::transform());
+                syncPointMap(mesh, l, cop, distributionMap::transform());
             }
 
             //- Synchronise locations on selected points.
@@ -521,7 +527,13 @@ public:
                 const CombineOp& cop
             )
             {
-                syncPointMap(mesh, l, cop, mapDistribute::transformPosition());
+                syncPointMap
+                (
+                    mesh,
+                    l,
+                    cop,
+                    distributionMap::transformPosition()
+                );
             }
 
             //- Synchronise values on selected edges. Edges are represented
@@ -535,7 +547,7 @@ public:
                 const CombineOp& cop
             )
             {
-                syncEdgeMap(mesh, l, cop, mapDistribute::transform());
+                syncEdgeMap(mesh, l, cop, distributionMap::transform());
             }
 
             //- Synchronise locations on selected edges.
@@ -547,7 +559,7 @@ public:
                 const CombineOp& cop
             )
             {
-                syncEdgeMap(mesh, l, cop, mapDistribute::transformPosition());
+                syncEdgeMap(mesh, l, cop, distributionMap::transformPosition());
             }
 
         // PackedList versions

src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1130,7 +1130,7 @@ void Foam::syncTools::syncPointList
 //        gd.globalTransforms(),
 //        cop,
 //        true,   // position?
-//        mapDistribute::transform()  // not used
+//        distributionMap::transform()  // not used
 //    );
 //
 //    forAll(meshPoints, i)
@@ -1166,7 +1166,7 @@ void Foam::syncTools::syncEdgeList
     const globalMeshData& gd = mesh.globalData();
     const labelList& meshEdges = gd.coupledPatchMeshEdges();
     const globalIndexAndTransform& git = gd.globalTransforms();
-    const mapDistribute& edgeMap = gd.globalEdgeSlavesMap();
+    const distributionMap& edgeMap = gd.globalEdgeSlavesMap();
 
     List<T> cppFld(UIndirectList<T>(edgeValues, meshEdges));
 
@@ -1209,7 +1209,7 @@ void Foam::syncTools::syncEdgeList
 //    const globalMeshData& gd = mesh.globalData();
 //    const labelList& meshEdges = gd.coupledPatchMeshEdges();
 //    const globalIndexAndTransform& git = gd.globalTransforms();
-//    const mapDistribute& map = gd.globalEdgeSlavesMap();
+//    const distributionMap& map = gd.globalEdgeSlavesMap();
 //
 //    List<point> cppFld(UIndirectList<point>(edgeValues, meshEdges));
 //
@@ -1222,7 +1222,7 @@ void Foam::syncTools::syncEdgeList
 //        git,
 //        cop,
 //        true,       // position?
-//        mapDistribute::transform()  // not used
+//        distributionMap::transform()  // not used
 //    );
 //
 //    // Extract back onto mesh

src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Foam::tmp<Foam::pointField> Foam::PatchTools::pointNormals
     const globalMeshData& globalData = mesh.globalData();
     const indirectPrimitivePatch& coupledPatch = globalData.coupledPatch();
     const Map<label>& coupledPatchMP = coupledPatch.meshPointMap();
-    const mapDistribute& map = globalData.globalPointSlavesMap();
+    const distributionMap& map = globalData.globalPointSlavesMap();
     const globalIndexAndTransform& transforms =
         globalData.globalTransforms();
 
@@ -80,7 +80,7 @@ Foam::tmp<Foam::pointField> Foam::PatchTools::pointNormals
         (
             transforms,
             pointFaceNormals,
-            mapDistribute::transform()
+            distributionMap::transform()
         );
 
 
@@ -142,7 +142,7 @@ Foam::tmp<Foam::pointField> Foam::PatchTools::pointNormals
             transforms,
             coupledPointNormals.size(),
             coupledPointNormals,
-            mapDistribute::transform()
+            distributionMap::transform()
         );
     }
 
@@ -216,7 +216,7 @@ Foam::tmp<Foam::pointField> Foam::PatchTools::edgeNormals
 
 
     const globalMeshData& globalData = mesh.globalData();
-    const mapDistribute& map = globalData.globalEdgeSlavesMap();
+    const distributionMap& map = globalData.globalEdgeSlavesMap();
 
 
     // Convert patch-edge data into cpp-edge data
@@ -244,7 +244,7 @@ Foam::tmp<Foam::pointField> Foam::PatchTools::edgeNormals
         map,
         globalData.globalTransforms(),
         plusEqOp<point>(),              // add since normalised later on
-        mapDistribute::transform()
+        distributionMap::transform()
     );
     cppEdgeData /= mag(cppEdgeData)+vSmall;
 

src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -444,7 +444,7 @@ Foam::globalIndexAndTransform::globalIndexAndTransform(const polyMesh& mesh)
             const globalMeshData& gmd = mesh_.globalData();
             const indirectPrimitivePatch& cpp = gmd.coupledPatch();
             const labelList& meshPoints = cpp.meshPoints();
-            const mapDistribute& slavesMap = gmd.globalCoPointSlavesMap();
+            const distributionMap& slavesMap = gmd.globalCoPointSlavesMap();
             const labelListList& slaves = gmd.globalCoPointSlaves();
 
             List<labelPairList> elems(slavesMap.constructSize());

src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "thermophysicalTransportModel.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -224,7 +224,7 @@ baffleThickness() const
     }
     else
     {
-        const mapDistribute& mapDist = this->mappedPatchBase::map();
+        const distributionMap& mapDist = this->mappedPatchBase::map();
 
         const fvPatch& nbrPatch =
             patch().boundaryMesh()[samplePolyPatch().index()];
@@ -254,7 +254,7 @@ tmp<scalarField> thermalBaffle1DFvPatchScalarField<solidType>::qs() const
     }
     else
     {
-        const mapDistribute& mapDist = this->mappedPatchBase::map();
+        const distributionMap& mapDist = this->mappedPatchBase::map();
 
         const fvPatch& nbrPatch =
             patch().boundaryMesh()[samplePolyPatch().index()];
@@ -323,7 +323,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
     int oldTag = UPstream::msgType();
     UPstream::msgType() = oldTag+1;
 
-    const mapDistribute& mapDist = this->mappedPatchBase::map();
+    const distributionMap& mapDist = this->mappedPatchBase::map();
 
     const label patchi = patch().index();
 

src/dynamicMesh/createShellMesh/createShellMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,7 +33,7 @@ License
 #include "polyAddCell.H"
 #include "labelPair.H"
 #include "indirectPrimitivePatch.H"
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "globalMeshData.H"
 #include "PatchTools.H"
 #include "globalIndex.H"
@@ -74,7 +74,7 @@ void Foam::createShellMesh::syncEdges
     labelPairList& allEdgeData
 )
 {
-    const mapDistribute& map = globalData.globalEdgeSlavesMap();
+    const distributionMap& map = globalData.globalEdgeSlavesMap();
     const PackedBoolList& cppOrientation = globalData.globalEdgeOrientation();
 
     // Convert patch-edge data into cpp-edge data

src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C

@@ -35,7 +35,7 @@ License
 #include "removeCells.H"
 #include "polyModifyFace.H"
 #include "polyRemovePoint.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "surfaceFields.H"
 #include "pointFields.H"
 #include "syncTools.H"
@@ -976,7 +976,7 @@ void Foam::fvMeshDistribute::getCouplingData
         const globalMeshData& gmd = mesh_.globalData();
         const indirectPrimitivePatch& cpp = gmd.coupledPatch();
         const labelList& meshPoints = cpp.meshPoints();
-        const mapDistribute& slavesMap = gmd.globalCoPointSlavesMap();
+        const distributionMap& slavesMap = gmd.globalCoPointSlavesMap();
         const labelListList& slaves = gmd.globalCoPointSlaves();
 
         labelList elems(slavesMap.constructSize(), -1);
@@ -1772,7 +1772,7 @@ Foam::labelList Foam::fvMeshDistribute::countCells
 }
 
 
-Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
+Foam::autoPtr<Foam::polyMeshDistributionMap> Foam::fvMeshDistribute::distribute
 (
     const labelList& distribution
 )
@@ -1820,9 +1820,9 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     if (!Pstream::parRun())
     {
         // Collect all maps and return
-        return autoPtr<mapDistributePolyMesh>
+        return autoPtr<polyMeshDistributionMap>
         (
-            new mapDistributePolyMesh
+            new polyMeshDistributionMap
             (
                 mesh_,
 
@@ -3063,9 +3063,9 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
     }
 
     // Collect all maps and return
-    return autoPtr<mapDistributePolyMesh>
+    return autoPtr<polyMeshDistributionMap>
     (
-        new mapDistributePolyMesh
+        new polyMeshDistributionMap
         (
             mesh_,
 

src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,7 @@ namespace Foam
 
 // Forward declaration of classes
 class mapAddedPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                       Class fvMeshDistribute Declaration
@@ -366,7 +366,7 @@ public:
 
         //- Send cells to neighbours according to distribution
         //  (for every cell the new proc)
-        autoPtr<mapDistributePolyMesh> distribute(const labelList& dist);
+        autoPtr<polyMeshDistributionMap> distribute(const labelList& dist);
 
         // Debugging
 

src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -197,7 +197,7 @@ void Foam::componentDisplacementMotionSolver::updateMesh(const mapPolyMesh& mpm)
 
 void Foam::componentDisplacementMotionSolver::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {}
 

src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,7 +129,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators

src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ void Foam::componentVelocityMotionSolver::updateMesh(const mapPolyMesh& mpm)
 
 void Foam::componentVelocityMotionSolver::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {}
 

src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,7 +121,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators

src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C

@@ -159,7 +159,7 @@ void Foam::points0MotionSolver::updateMesh(const mapPolyMesh& mpm)
 
 void Foam::points0MotionSolver::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {}
 

src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2016-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators

src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ namespace Foam
 // Forward class declarations
 class polyMesh;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                         Class motionSolver Declaration
@@ -151,7 +151,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&) = 0;
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&) = 0;
+        virtual void distribute(const polyMeshDistributionMap&) = 0;
 
         //- Optionally write motion state information for restart
         virtual bool write() const;

src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ void Foam::motionSolverList::updateMesh(const mapPolyMesh& mpm)
 
 void Foam::motionSolverList::distribute
 (
-    const mapDistributePolyMesh& map
+    const polyMeshDistributionMap& map
 )
 {
     forAll(motionSolvers_, i)

src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2019-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators

src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ void Foam::velocityMotionSolver::updateMesh(const mapPolyMesh& mpm)
 }
 
 
-void Foam::velocityMotionSolver::distribute(const mapDistributePolyMesh&)
+void Foam::velocityMotionSolver::distribute(const polyMeshDistributionMap&)
 {}
 
 

src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ public:
         virtual void updateMesh(const mapPolyMesh&);
 
         //- Update corresponding to the given distribution map
-        virtual void distribute(const mapDistributePolyMesh&);
+        virtual void distribute(const polyMeshDistributionMap&);
 
 
     // Member Operators

src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C

@@ -39,7 +39,7 @@ License
 #include "OFstream.H"
 #include "Time.H"
 #include "FaceCellWave.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "refinementData.H"
 #include "refinementDistanceData.H"
 #include "degenerateMatcher.H"
@@ -4514,7 +4514,7 @@ void Foam::hexRef8::subset
 }
 
 
-void Foam::hexRef8::distribute(const mapDistributePolyMesh& map)
+void Foam::hexRef8::distribute(const polyMeshDistributionMap& map)
 {
     if (debug)
     {

src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H

@@ -56,7 +56,7 @@ class polyMesh;
 class polyPatch;
 class polyTopoChange;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                            Class hexRef8 Declaration
@@ -532,7 +532,7 @@ public:
             );
 
             //- Update local numbering for mesh redistribution
-            void distribute(const mapDistributePolyMesh&);
+            void distribute(const polyMeshDistributionMap&);
 
             //- Debug: Check coupled mesh for correctness
             void checkMesh() const;

src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 
 #include "hexRef8Data.H"
 #include "mapPolyMesh.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "polyMesh.H"
 #include "syncTools.H"
 #include "refinementHistory.H"
@@ -349,7 +349,7 @@ void Foam::hexRef8Data::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::hexRef8Data::distribute(const mapDistributePolyMesh& map)
+void Foam::hexRef8Data::distribute(const polyMeshDistributionMap& map)
 {
     if (cellLevelPtr_.valid())
     {

src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ namespace Foam
 
 // Forward declaration of classes
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 class refinementHistory;
 class fvMesh;
 
@@ -115,7 +115,7 @@ public:
         void updateMesh(const mapPolyMesh&);
 
         //- In-place distribute
-        void distribute(const mapDistributePolyMesh&);
+        void distribute(const polyMeshDistributionMap&);
 
         //- Write
         bool write() const;

src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ License
 
 #include "refinementHistory.H"
 #include "mapPolyMesh.H"
-#include "mapDistributePolyMesh.H"
+#include "polyMeshDistributionMap.H"
 #include "polyMesh.H"
 #include "syncTools.H"
 
@@ -1257,7 +1257,7 @@ void Foam::refinementHistory::countProc
 }
 
 
-void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
+void Foam::refinementHistory::distribute(const polyMeshDistributionMap& map)
 {
     if (!active())
     {

src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ namespace Foam
 
 // Forward declaration of classes
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 
 // Forward declaration of friend functions and operators
@@ -355,7 +355,7 @@ public:
         //- Update local numbering for mesh redistribution.
         //  Can only distribute clusters sent across in one go; cannot
         //  handle parts recombined in multiple passes.
-        void distribute(const mapDistributePolyMesh&);
+        void distribute(const polyMeshDistributionMap&);
 
 
         //- Compact splitCells_. Removes all freeSplitCells_ elements.

src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ class polyMesh;
 class polyTopoChange;
 class face;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                          Class removeFaces Declaration
@@ -205,7 +205,7 @@ public:
         {}
 
         //- Force recalculation of locally stored data for mesh distribution
-        void distribute(const mapDistributePolyMesh&)
+        void distribute(const polyMeshDistributionMap&)
         {}
 
 

src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -47,7 +47,7 @@ namespace Foam
 
 class fvMesh;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                            Class option Declaration
@@ -216,7 +216,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&) = 0;
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&) = 0;
+            virtual void distribute(const polyMeshDistributionMap&) = 0;
 
             //- Update for mesh motion
             virtual bool movePoints() = 0;

src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -248,7 +248,7 @@ void Foam::fvConstraints::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fvConstraints::distribute(const mapDistributePolyMesh& map)
+void Foam::fvConstraints::distribute(const polyMeshDistributionMap& map)
 {
     PtrListDictionary<fvConstraint>& constraintList(*this);
 

src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();

src/finiteVolume/cfdTools/general/fvModels/fvModel.H

@@ -48,7 +48,7 @@ namespace Foam
 
 class fvMesh;
 class mapPolyMesh;
-class mapDistributePolyMesh;
+class polyMeshDistributionMap;
 
 /*---------------------------------------------------------------------------*\
                            Class fvModel Declaration
@@ -334,7 +334,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&) = 0;
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&) = 0;
+            virtual void distribute(const polyMeshDistributionMap&) = 0;
 
             //- Update for mesh motion
             virtual bool movePoints() = 0;

src/finiteVolume/cfdTools/general/fvModels/fvModels.C

@@ -274,7 +274,7 @@ void Foam::fvModels::updateMesh(const mapPolyMesh& map)
 }
 
 
-void Foam::fvModels::distribute(const mapDistributePolyMesh& map)
+void Foam::fvModels::distribute(const polyMeshDistributionMap& map)
 {
     PtrListDictionary<fvModel>& modelList(*this);
 

src/finiteVolume/cfdTools/general/fvModels/fvModels.H

@@ -243,7 +243,7 @@ public:
             virtual void updateMesh(const mapPolyMesh&);
 
             //- Update mesh corresponding to the given distribution map
-            virtual void distribute(const mapDistributePolyMesh&);
+            virtual void distribute(const polyMeshDistributionMap&);
 
             //- Update for mesh motion
             virtual bool movePoints();

src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,7 +186,7 @@ tmp<Field<Type>> mappedPatchFieldBase<Type>::mappedField() const
     {
         case mappedPatchBase::NEARESTCELL:
         {
-            const mapDistribute& distMap = mapper_.map();
+            const distributionMap& distMap = mapper_.map();
 
             if (interpolationScheme_ != interpolationCell<Type>::typeName)
             {

src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef extendedCellToCellStencil_H
 #define extendedCellToCellStencil_H
 
-#include "mapDistribute.H"
+#include "distributionMap.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -81,7 +81,7 @@ public:
             >
         > weightedSum
         (
-            const mapDistribute& map,
+            const distributionMap& map,
             const labelListList& stencil,
             const GeometricField<Type, fvPatchField, volMesh>& fld,
             const List<List<WeightType>>& stencilWeights