diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C index fbf6af5ad6..af38397fb3 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.C @@ -166,7 +166,7 @@ void Foam::fv::VoFClouds::updateMesh(const polyTopoChangeMap&) {} -void Foam::fv::VoFClouds::distribute(const polyMeshDistributionMap& map) +void Foam::fv::VoFClouds::distribute(const polyDistributionMap& map) { clouds_.distribute(map); } diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H index 2d1a7d6c39..7ae1ceac67 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFClouds/VoFClouds.H @@ -152,7 +152,7 @@ public: virtual void updateMesh(const polyTopoChangeMap&); //- Update mesh corresponding to the given distribution map - virtual void distribute(const polyMeshDistributionMap&); + virtual void distribute(const polyDistributionMap&); //- Update for mesh motion virtual bool movePoints(); diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C index 38366f1728..75410a533e 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C @@ -233,7 +233,7 @@ void Foam::fv::VoFSolidificationMeltingSource::updateMesh void Foam::fv::VoFSolidificationMeltingSource::distribute ( - const polyMeshDistributionMap& map + const polyDistributionMap& map ) { set_.distribute(map); diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H index 2a3008962f..a280696ceb 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H @@ -194,7 +194,7 @@ public: virtual void updateMesh(const polyTopoChangeMap&); //- Update mesh corresponding to the given distribution map - virtual void distribute(const polyMeshDistributionMap&); + virtual void distribute(const polyDistributionMap&); //- Update for mesh motion virtual bool movePoints(); diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C index 20145a7b85..3924f0aa8f 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.C @@ -159,7 +159,7 @@ void Foam::fv::VoFSurfaceFilm::updateMesh(const polyTopoChangeMap&) } -void Foam::fv::VoFSurfaceFilm::distribute(const polyMeshDistributionMap&) +void Foam::fv::VoFSurfaceFilm::distribute(const polyDistributionMap&) { NotImplemented; } diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H index 66ee07af4a..ec19170f63 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/VoFSurfaceFilm.H @@ -139,7 +139,7 @@ public: virtual void updateMesh(const polyTopoChangeMap&); //- Update mesh corresponding to the given distribution map - virtual void distribute(const polyMeshDistributionMap&); + virtual void distribute(const polyDistributionMap&); //- Update for mesh motion virtual bool movePoints(); diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C index bf726c1432..4e04df9008 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C @@ -211,7 +211,7 @@ void Foam::fv::VoFTurbulenceDamping::updateMesh(const polyTopoChangeMap&) {} -void Foam::fv::VoFTurbulenceDamping::distribute(const polyMeshDistributionMap&) +void Foam::fv::VoFTurbulenceDamping::distribute(const polyDistributionMap&) {} diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H index a1c2663e23..3e54d6baf5 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H @@ -178,7 +178,7 @@ public: virtual void updateMesh(const polyTopoChangeMap&); //- Update mesh corresponding to the given distribution map - virtual void distribute(const polyMeshDistributionMap&); + virtual void distribute(const polyDistributionMap&); //- Update for mesh motion virtual bool movePoints(); diff --git a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C index 800ca2de63..7fb3bec588 100644 --- a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C +++ b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.C @@ -206,7 +206,7 @@ void Foam::fv::VoFTurbulenceDamping::updateMesh(const polyTopoChangeMap&) {} -void Foam::fv::VoFTurbulenceDamping::distribute(const polyMeshDistributionMap&) +void Foam::fv::VoFTurbulenceDamping::distribute(const polyDistributionMap&) {} diff --git a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H index d89836c3b5..603bd43635 100644 --- a/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H +++ b/applications/solvers/multiphase/interFoam/VoFTurbulenceDamping/VoFTurbulenceDamping.H @@ -177,7 +177,7 @@ public: virtual void updateMesh(const polyTopoChangeMap&); //- Update mesh corresponding to the given distribution map - virtual void distribute(const polyMeshDistributionMap&); + virtual void distribute(const polyDistributionMap&); //- Update for mesh motion virtual bool movePoints(); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C index 06f67a23ed..5f389e06b4 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C @@ -310,7 +310,7 @@ void Foam::fv::interfaceTurbulenceDamping::updateMesh(const polyTopoChangeMap&) void Foam::fv::interfaceTurbulenceDamping::distribute ( - const polyMeshDistributionMap& + const polyDistributionMap& ) {} diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H index 24971381f7..618a89de0c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H @@ -198,7 +198,7 @@ public: virtual void updateMesh(const polyTopoChangeMap&); //- Update mesh corresponding to the given distribution map - virtual void distribute(const polyMeshDistributionMap&); + virtual void distribute(const polyDistributionMap&); //- Update for mesh motion virtual bool movePoints(); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C index 66a4a13311..001d6b08c1 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C @@ -244,7 +244,7 @@ void Foam::fv::phaseTurbulenceStabilisation::updateMesh void Foam::fv::phaseTurbulenceStabilisation::distribute ( - const polyMeshDistributionMap& + const polyDistributionMap& ) {} diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H index 4ab4da2b95..7f5b42aaa9 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H @@ -168,7 +168,7 @@ public: virtual void updateMesh(const polyTopoChangeMap&); //- Update mesh corresponding to the given distribution map - virtual void distribute(const polyMeshDistributionMap&); + virtual void distribute(const polyDistributionMap&); //- Update for mesh motion virtual bool movePoints(); diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C index 1b6d516c14..a7fcf709a5 100644 --- a/applications/test/fieldMapping/Test-fieldMapping.C +++ b/applications/test/fieldMapping/Test-fieldMapping.C @@ -197,20 +197,20 @@ int main(int argc, char *argv[]) // Change mesh and inflate Info<< "Actually changing mesh" << nl << endl; - autoPtr morphMap = meshMod.changeMesh(mesh, inflate); + autoPtr map = meshMod.changeMesh(mesh, inflate); Info<< "Mapping fields" << nl << endl; - mesh.updateMesh(morphMap); + mesh.updateMesh(map); // Move mesh (since morphing does not do this) - if (morphMap().hasMotionPoints()) + if (map().hasMotionPoints()) { Info<< "Moving mesh" << nl << endl; - mesh.movePoints(morphMap().preMotionPoints()); + mesh.movePoints(map().preMotionPoints()); } // Update numbering of cells/vertices. - faceRemover.updateMesh(morphMap); + faceRemover.updateMesh(map); Info<< "Writing fields" << nl << endl; diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C index fe2b626d52..4e8d11efef 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C @@ -513,18 +513,18 @@ void subsetMesh const Time& runTime = mesh.time(); - autoPtr morphMap = meshMod.changeMesh(mesh, false); + autoPtr map = meshMod.changeMesh(mesh, false); - if (morphMap().hasMotionPoints()) + if (map().hasMotionPoints()) { - mesh.movePoints(morphMap().preMotionPoints()); + mesh.movePoints(map().preMotionPoints()); } // Update topology on cellRemover - cellRemover.updateMesh(morphMap()); + cellRemover.updateMesh(map()); // Update refLevel for removed cells. - const labelList& cellMap = morphMap().cellMap(); + const labelList& cellMap = map().cellMap(); labelList newRefLevel(cellMap.size()); @@ -547,7 +547,7 @@ void subsetMesh } // Update cutCells for removed cells. - cutCells.updateMesh(morphMap()); + cutCells.updateMesh(map()); } diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C index b55b31ffa8..f70d27f45a 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C +++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C @@ -461,7 +461,7 @@ void Foam::cellSplitter::setRefinement } -void Foam::cellSplitter::updateMesh(const polyTopoChangeMap& morphMap) +void Foam::cellSplitter::updateMesh(const polyTopoChangeMap& map) { // Create copy since we're deleting entries. Only if both cell and added // point get mapped do they get inserted. @@ -471,11 +471,11 @@ void Foam::cellSplitter::updateMesh(const polyTopoChangeMap& morphMap) { label oldCelli = iter.key(); - label newCelli = morphMap.reverseCellMap()[oldCelli]; + label newCelli = map.reverseCellMap()[oldCelli]; label oldPointi = iter(); - label newPointi = morphMap.reversePointMap()[oldPointi]; + label newPointi = map.reversePointMap()[oldPointi]; if (newCelli >= 0 && newPointi >= 0) { diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C index 8fed041965..2d6ba45b5b 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C +++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C @@ -530,14 +530,14 @@ int main(int argc, char *argv[]) cutter.setRefinement(cellToPyrCentre, meshMod); // Do changes - autoPtr morphMap = meshMod.changeMesh(mesh, false); + autoPtr map = meshMod.changeMesh(mesh, false); - if (morphMap().hasMotionPoints()) + if (map().hasMotionPoints()) { - mesh.movePoints(morphMap().preMotionPoints()); + mesh.movePoints(map().preMotionPoints()); } - cutter.updateMesh(morphMap()); + cutter.updateMesh(map()); if (!overwrite) { @@ -602,15 +602,15 @@ int main(int argc, char *argv[]) cutter.setRefinement(allPointInfo, meshMod); // Do changes - autoPtr morphMap = meshMod.changeMesh(mesh, false); + autoPtr map = meshMod.changeMesh(mesh, false); - if (morphMap().hasMotionPoints()) + if (map().hasMotionPoints()) { - mesh.movePoints(morphMap().preMotionPoints()); + mesh.movePoints(map().preMotionPoints()); } // Not implemented yet: - // cutter.updateMesh(morphMap()); + // cutter.updateMesh(map()); if (!overwrite) @@ -647,14 +647,14 @@ int main(int argc, char *argv[]) ); // Do changes - autoPtr morphMap = meshMod.changeMesh(mesh, false); + autoPtr map = meshMod.changeMesh(mesh, false); - if (morphMap().hasMotionPoints()) + if (map().hasMotionPoints()) { - mesh.movePoints(morphMap().preMotionPoints()); + mesh.movePoints(map().preMotionPoints()); } - cutter.updateMesh(morphMap()); + cutter.updateMesh(map()); if (!overwrite) { diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C index 2fd678dac9..14f9cb35be 100644 --- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C +++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C @@ -240,15 +240,15 @@ int main(int argc, char *argv[]) runTime++; } - autoPtr morphMap = meshMod.changeMesh(mesh, false); + autoPtr map = meshMod.changeMesh(mesh, false); - if (morphMap().hasMotionPoints()) + if (map().hasMotionPoints()) { - mesh.movePoints(morphMap().preMotionPoints()); + mesh.movePoints(map().preMotionPoints()); } // Update stored labels on meshCutter. - cutter.updateMesh(morphMap()); + cutter.updateMesh(map()); Info<< "Finished refining" << endl; diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C index 0190a21180..4e05e714ca 100644 --- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C +++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C @@ -136,18 +136,18 @@ int main(int argc, char *argv[]) meshMod ); - autoPtr morphMap = meshMod.changeMesh(mesh, false); + autoPtr map = meshMod.changeMesh(mesh, false); - mesh.updateMesh(morphMap); + mesh.updateMesh(map); // Move mesh (since morphing does not do this) - if (morphMap().hasMotionPoints()) + if (map().hasMotionPoints()) { - mesh.movePoints(morphMap().preMotionPoints()); + mesh.movePoints(map().preMotionPoints()); } // Update numbering of cells/vertices. - faceRemover.updateMesh(morphMap); + faceRemover.updateMesh(map); if (!overwrite) { diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C index fee069840c..f49b285b45 100644 --- a/applications/utilities/mesh/advanced/splitCells/splitCells.C +++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C @@ -685,18 +685,18 @@ int main(int argc, char *argv[]) runTime++; } - autoPtr morphMap = meshMod.changeMesh(mesh, false); + autoPtr map = meshMod.changeMesh(mesh, false); - if (morphMap().hasMotionPoints()) + if (map().hasMotionPoints()) { - mesh.movePoints(morphMap().preMotionPoints()); + mesh.movePoints(map().preMotionPoints()); } // Update stored labels on meshCutter - cutter.updateMesh(morphMap()); + cutter.updateMesh(map()); // Update cellSet - cellsToCut.updateMesh(morphMap()); + cellsToCut.updateMesh(map()); Info<< "Remaining:" << cellsToCut.size() << endl; diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C index f6412e6172..c6ec0c19fb 100644 --- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C +++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh.C @@ -251,9 +251,9 @@ int main(int argc, char *argv[]) extruder.setRefinement(meshMod()); // Create a mesh from topo changes. - autoPtr morphMap = meshMod().changeMesh(mesh(), false); + autoPtr map = meshMod().changeMesh(mesh(), false); - mesh().updateMesh(morphMap); + mesh().updateMesh(map); { edgeCollapser collapser(mesh()); @@ -301,10 +301,10 @@ int main(int argc, char *argv[]) collapser.setRefinement(allPointInfo, meshModCollapse); // Create a mesh from topo changes. - autoPtr morphMap + autoPtr map = meshModCollapse.changeMesh(mesh(), false); - mesh().updateMesh(morphMap); + mesh().updateMesh(map); } if (!overwrite) diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H index 882d805966..c5049bbcaa 100644 --- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H +++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H @@ -52,7 +52,7 @@ namespace Foam class polyMesh; class polyTopoChange; class polyTopoChangeMap; -class polyMeshDistributionMap; +class polyDistributionMap; class polyBoundaryMesh; /*---------------------------------------------------------------------------*\ @@ -123,7 +123,7 @@ public: {} //- Force recalculation of locally stored data for mesh distribution - void distribute(const polyMeshDistributionMap&) + void distribute(const polyDistributionMap&) {} label frontPatchi() const diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C index 6615a63b66..b253d60933 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C @@ -409,7 +409,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement() fvMeshDistribute distributor(mesh_); - autoPtr mapDist = distributor.distribute + autoPtr mapDist = distributor.distribute ( newDecomp ); @@ -841,7 +841,7 @@ Foam::backgroundMeshDecomposition::~backgroundMeshDecomposition() // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -Foam::autoPtr +Foam::autoPtr Foam::backgroundMeshDecomposition::distribute ( volScalarField& cellWeights @@ -988,7 +988,7 @@ Foam::backgroundMeshDecomposition::distribute fvMeshDistribute distributor(mesh_); - autoPtr mapDist = + autoPtr mapDist = distributor.distribute(newDecomp); meshCutter_.distribute(mapDist); diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H index c6a6cdd19b..cd92891292 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H @@ -62,7 +62,7 @@ SourceFiles #include "decompositionMethod.H" #include "fvMeshDistribute.H" #include "removeCells.H" -#include "polyMeshDistributionMap.H" +#include "polyDistributionMap.H" #include "globalIndex.H" #include "treeBoundBox.H" #include "primitivePatch.H" @@ -210,7 +210,7 @@ public: //- Redistribute the background mesh based on a supplied weight field, // returning a map to use to redistribute vertices. - autoPtr distribute + autoPtr distribute ( volScalarField& cellWeights ); diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C index d5a627a00f..48f973e814 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C @@ -127,7 +127,7 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh) cwi[cI] = max(cellVertices[cI], 1e-2); } - autoPtr mapDist = decomposition_().distribute + autoPtr mapDist = decomposition_().distribute ( cellWeights ); diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C index 8962deb4cc..9b85dc5667 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C @@ -550,7 +550,7 @@ int main(int argc, char *argv[]) << distributor.countCells(decomp) << nl << endl; // Do actual sending/receiving of mesh - autoPtr map = distributor.distribute(decomp); + autoPtr map = distributor.distribute(decomp); // Print some statistics // Info<< "After distribution:" << endl; diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C index 6f0900d5ec..62c38c9f28 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C @@ -201,10 +201,10 @@ int main(int argc, char *argv[]) extruder.setRefinement(meshMod); - autoPtr morphMap = + autoPtr map = meshMod.changeMesh(pMesh, false); - pMesh.updateMesh(morphMap); + pMesh.updateMesh(map); } } diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C index c5d15d4666..48d609d799 100644 --- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C +++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C @@ -448,9 +448,9 @@ int main(int argc, char *argv[]) } // Execute all polyMeshModifiers - autoPtr morphMap = stitcher.changeMesh(true); + autoPtr map = stitcher.changeMesh(true); - mesh.movePoints(morphMap->preMotionPoints()); + mesh.movePoints(map->preMotionPoints()); // Write mesh if (overwrite) diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index f9912eaaa8..d734adbdcb 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -51,7 +51,7 @@ Description #include "PstreamReduceOps.H" #include "fvCFD.H" #include "fvMeshDistribute.H" -#include "polyMeshDistributionMap.H" +#include "polyDistributionMap.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 map = distributor.distribute(finalDecomp); + autoPtr map = distributor.distribute(finalDecomp); //// Distribute any non-registered data accordingly // map().distributeFaceData(faceCc); diff --git a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C index 85e06f5486..963191de4f 100644 --- a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C +++ b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.C @@ -187,7 +187,7 @@ void ${typeName}FvModel${SourceType}::updateMesh(const polyTopoChangeMap& map) void ${typeName}FvModel${SourceType}::distribute ( - const polyMeshDistributionMap& map + const polyDistributionMap& map ) { set_.distribute(map); diff --git a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H index 68afe695fa..4a6fc154a6 100644 --- a/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H +++ b/etc/codeTemplates/dynamicCode/codedFvModelTemplate.H @@ -118,7 +118,7 @@ public: virtual void updateMesh(const polyTopoChangeMap&); //- Update mesh corresponding to the given distribution map - virtual void distribute(const polyMeshDistributionMap&); + virtual void distribute(const polyDistributionMap&); //- Update for mesh motion virtual bool movePoints(); diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index fcfa980b7c..9bf955af91 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -582,11 +582,11 @@ $(polyTopoChangeMap)/faceMapper/faceMapper.C $(polyTopoChangeMap)/cellMapper/cellMapper.C $(polyTopoChangeMap)/mapAddedPolyMesh.C -polyMeshDistributionMap = $(polyMesh)/polyMeshDistributionMap -$(polyMeshDistributionMap)/distributionMap.C -$(polyMeshDistributionMap)/distributionMapBase.C -$(polyMeshDistributionMap)/polyMeshDistributionMap.C -$(polyMeshDistributionMap)/IOdistributionMap.C +polyDistributionMap = $(polyMesh)/polyDistributionMap +$(polyDistributionMap)/distributionMap.C +$(polyDistributionMap)/distributionMapBase.C +$(polyDistributionMap)/polyDistributionMap.C +$(polyDistributionMap)/IOdistributionMap.C PrimitivePatch = $(primitiveMesh)/PrimitivePatch $(PrimitivePatch)/PrimitivePatchName.C diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.C b/src/OpenFOAM/meshes/MeshObject/MeshObject.C index 6b6b2b837d..b761c3ed3f 100644 --- a/src/OpenFOAM/meshes/MeshObject/MeshObject.C +++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.C @@ -276,7 +276,7 @@ template void Foam::meshObject::distribute ( objectRegistry& obr, - const polyMeshDistributionMap& map + const polyDistributionMap& map ) { HashTable*> meshObjects @@ -287,7 +287,7 @@ void Foam::meshObject::distribute if (meshObject::debug) { Pout<< "meshObject::distribute(objectRegistry&, " - "const polyMeshDistributionMap& map) : updating " + "const polyDistributionMap& map) : updating " << Mesh::typeName << " meshObjects for region " << obr.name() << endl; } diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.H b/src/OpenFOAM/meshes/MeshObject/MeshObject.H index 0f98da3842..e231cc7657 100644 --- a/src/OpenFOAM/meshes/MeshObject/MeshObject.H +++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.H @@ -77,7 +77,7 @@ namespace Foam // Forward declarations class polyTopoChangeMap; -class polyMeshDistributionMap; +class polyDistributionMap; /*---------------------------------------------------------------------------*\ Class MeshObject Declaration @@ -176,7 +176,7 @@ public: static void updateMesh(objectRegistry&, const polyTopoChangeMap&); template - static void distribute(objectRegistry&, const polyMeshDistributionMap&); + static void distribute(objectRegistry&, const polyDistributionMap&); template static void addPatch(objectRegistry&, const label patchi); @@ -296,7 +296,7 @@ public: MoveableMeshObject(typeName, io) {} - virtual void distribute(const polyMeshDistributionMap& map) = 0; + virtual void distribute(const polyDistributionMap& map) = 0; }; diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.C b/src/OpenFOAM/meshes/pointMesh/pointMesh.C index d177874994..0de250b65f 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointMesh.C +++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.C @@ -102,11 +102,11 @@ void Foam::pointMesh::updateMesh(const polyTopoChangeMap& map) } -void Foam::pointMesh::distribute(const polyMeshDistributionMap& map) +void Foam::pointMesh::distribute(const polyDistributionMap& map) { if (debug) { - Pout<< "pointMesh::distribute(const polyMeshDistributionMap&): " + Pout<< "pointMesh::distribute(const polyDistributionMap&): " << "Distribute." << endl; Pout<< endl; } diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.H b/src/OpenFOAM/meshes/pointMesh/pointMesh.H index 7f6d6f282c..002cfb8236 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointMesh.H +++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.H @@ -122,7 +122,7 @@ public: virtual void updateMesh(const polyTopoChangeMap&); //- Update mesh corresponding to the given distribution map - virtual void distribute(const polyMeshDistributionMap&); + virtual void distribute(const polyDistributionMap&); //- Move points virtual bool movePoints(); diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H index aa4211315c..058cdef8f8 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H @@ -64,7 +64,7 @@ namespace Foam // Forward declaration of classes class globalMeshData; class polyTopoChangeMap; -class polyMeshDistributionMap; +class polyDistributionMap; class polyMeshTetDecomposition; class treeDataCell; template class indexedOctree; @@ -610,7 +610,7 @@ public: virtual void updateMesh(const polyTopoChangeMap&); //- Update mesh corresponding to the given distribution map - virtual void distribute(const polyMeshDistributionMap& map); + virtual void distribute(const polyDistributionMap& map); //- Remove boundary patches void removeBoundary(); diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.C b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.C deleted file mode 100644 index 9efc758d7c..0000000000 --- a/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.C +++ /dev/null @@ -1,158 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "IOdistributionMap.H" - -/* * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * */ - -namespace Foam -{ - defineTypeNameAndDebug(IOdistributionMap, 0); -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::IOdistributionMap::IOdistributionMap(const IOobject& io) -: - regIOobject(io) -{ - // Temporary warning - if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED) - { - WarningInFunction - << "IOdistributionMap " << name() - << " constructed with IOobject::MUST_READ_IF_MODIFIED" - " but IOdistributionMap does not support automatic rereading." - << endl; - } - - if - ( - ( - io.readOpt() == IOobject::MUST_READ - || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED - ) - || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk()) - ) - { - readStream(typeName) >> *this; - close(); - } -} - - -Foam::IOdistributionMap::IOdistributionMap -( - const IOobject& io, - const distributionMap& map -) -: - regIOobject(io) -{ - // Temporary warning - if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED) - { - WarningInFunction - << "IOdistributionMap " << name() - << " constructed with IOobject::MUST_READ_IF_MODIFIED" - " but IOdistributionMap does not support automatic rereading." - << endl; - } - - if - ( - ( - io.readOpt() == IOobject::MUST_READ - || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED - ) - || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk()) - ) - { - readStream(typeName) >> *this; - close(); - } - else - { - distributionMap::operator=(map); - } -} - - -Foam::IOdistributionMap::IOdistributionMap -( - const IOobject& io, - distributionMap&& map -) -: - regIOobject(io), - distributionMap(move(map)) -{ - // Temporary warning - if (io.readOpt() == IOobject::MUST_READ_IF_MODIFIED) - { - WarningInFunction - << "IOdistributionMap " << name() - << " constructed with IOobject::MUST_READ_IF_MODIFIED" - " but IOdistributionMap does not support automatic rereading." - << endl; - } - - if - ( - ( - io.readOpt() == IOobject::MUST_READ - || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED - ) - || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk()) - ) - { - readStream(typeName) >> *this; - close(); - } -} - - -// * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * // - -Foam::IOdistributionMap::~IOdistributionMap() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -bool Foam::IOdistributionMap::readData(Istream& is) -{ - return (is >> *this).good(); -} - - -bool Foam::IOdistributionMap::writeData(Ostream& os) const -{ - return (os << *this).good(); -} - - -// ************************************************************************* // diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.H b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.H deleted file mode 100644 index e78a31307e..0000000000 --- a/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/IOdistributionMap.H +++ /dev/null @@ -1,98 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::IOdistributionMap - -Description - IOdistributionMap is derived from distributionMap and - IOobject to give the distributionMap - automatic IO functionality via the objectRegistry. - -SourceFiles - IOdistributionMap.C - -\*---------------------------------------------------------------------------*/ - -#ifndef IOdistributionMap_H -#define IOdistributionMap_H - -#include "distributionMap.H" -#include "regIOobject.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class IOdistributionMap Declaration -\*---------------------------------------------------------------------------*/ - -class IOdistributionMap -: - public regIOobject, - public distributionMap -{ - -public: - - //- Runtime type information - TypeName("distributionMap"); - - // Constructors - - //- Construct given an IOobject - IOdistributionMap(const IOobject&); - - //- Construct given an IOobject and distributionMap - IOdistributionMap(const IOobject&, const distributionMap&); - - //- Move constructor transferring the distributionMap contents - IOdistributionMap(const IOobject&, distributionMap&&); - - - //- Destructor - virtual ~IOdistributionMap(); - - - // Member Functions - - //- ReadData function required for regIOobject read operation - virtual bool readData(Istream&); - - //- WriteData function required for regIOobject write operation - virtual bool writeData(Ostream&) const; - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMap.C b/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMap.C deleted file mode 100644 index 21626cbaeb..0000000000 --- a/src/OpenFOAM/meshes/polyMesh/polyMeshDistributionMap/distributionMap.C +++ /dev/null @@ -1,556 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "distributionMap.H" -#include "globalIndexAndTransform.H" -#include "transformField.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(distributionMap, 0); -} - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -template<> -void Foam::distributionMap::transform::operator() -( - const transformer&, - const bool, - List