zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polyMeshDistributionMap: renamed mapDistributePolyMesh -> polyMeshDistributionMap

Browse Source 
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.
This commit is contained in:
Henry Weller
2022-03-31 18:01:44 +01:00
parent 97eee844ad
commit 2e6eb5f2ce
267 changed files with 1103 additions and 1048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
View File

@ -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,

6
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/extrude2DMesh/extrude2DMesh.H
View File

@ -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

10
applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
View File

@ -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));

18
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
View File

@ -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;
}

10
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
View File

@ -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
static autoPtr<mapDistribute> buildMap(const List<label>& toProc);
//- Build a distributionMap for the supplied destination processor data
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

24
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
View File

@ -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);

15
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
View File

@ -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
static autoPtr<mapDistribute> buildMap(const List<label>& toProc);
//- Build a distributionMap for the supplied destination processor data
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;

8
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
View File

@ -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);

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
View File

@ -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,

19
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
View File

@ -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

6
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H
View File

@ -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

8
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
View File

@ -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);

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
View File

@ -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
);

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C
View File

@ -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 * * * * * * * * * * * * * //

4
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
View File

@ -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;