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

6
src/dynamicMesh/createShellMesh/createShellMesh.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
@ -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

14
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
View File

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

6
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.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 @@ 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

4
src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.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
@ -197,7 +197,7 @@ void Foam::componentDisplacementMotionSolver::updateMesh(const mapPolyMesh& mpm)
void Foam::componentDisplacementMotionSolver::distribute
(
const mapDistributePolyMesh& map
const polyMeshDistributionMap& map
)
{}

4
src/dynamicMesh/motionSolvers/componentDisplacement/componentDisplacementMotionSolver.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-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

4
src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.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
@ -113,7 +113,7 @@ void Foam::componentVelocityMotionSolver::updateMesh(const mapPolyMesh& mpm)
void Foam::componentVelocityMotionSolver::distribute
(
const mapDistributePolyMesh& map
const polyMeshDistributionMap& map
)
{}

4
src/dynamicMesh/motionSolvers/componentVelocity/componentVelocityMotionSolver.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-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

2
src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
View File

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

4
src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.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) 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

6
src/dynamicMesh/motionSolvers/motionSolver/motionSolver.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
@ -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;

4
src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.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) 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)

4
src/dynamicMesh/motionSolvers/motionSolverList/motionSolverList.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) 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

4
src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.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
@ -79,7 +79,7 @@ void Foam::velocityMotionSolver::updateMesh(const mapPolyMesh& mpm)
}
void Foam::velocityMotionSolver::distribute(const mapDistributePolyMesh&)
void Foam::velocityMotionSolver::distribute(const polyMeshDistributionMap&)
{}

4
src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.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-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

4
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
View File

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

4
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
View File

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

6
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.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) 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())
{

6
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.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) 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;

6
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.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
@ -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())
{

6
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.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
@ -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.

6
src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.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
@ -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&)
{}