zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: mapDistribute: allow -1 as global element

Browse Source
This commit is contained in:
mattijs
2010-12-30 08:38:18 +00:00
parent 041f7c4eea
commit 4eb5e673e1
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
View File

@ -307,7 +307,7 @@ Foam::mapDistribute::mapDistribute
{ {
label globalIndex = elements[i]; label globalIndex = elements[i];
if (!globalNumbering.isLocal(globalIndex)) if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
{ {
label procI = globalNumbering.whichProcID(globalIndex); label procI = globalNumbering.whichProcID(globalIndex);
nNonLocal[procI]++; nNonLocal[procI]++;
@ -329,7 +329,7 @@ Foam::mapDistribute::mapDistribute
{ {
label globalIndex = elements[i]; label globalIndex = elements[i];
if (!globalNumbering.isLocal(globalIndex)) if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
{ {
label procI = globalNumbering.whichProcID(globalIndex); label procI = globalNumbering.whichProcID(globalIndex);
label index = globalNumbering.toLocal(procI, globalIndex); label index = globalNumbering.toLocal(procI, globalIndex);
@ -452,7 +452,7 @@ Foam::mapDistribute::mapDistribute
{ {
label globalIndex = cCells[i]; label globalIndex = cCells[i];
if (!globalNumbering.isLocal(globalIndex)) if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
{ {
label procI = globalNumbering.whichProcID(globalIndex); label procI = globalNumbering.whichProcID(globalIndex);
nNonLocal[procI]++; nNonLocal[procI]++;
@ -482,7 +482,7 @@ Foam::mapDistribute::mapDistribute
{ {
label globalIndex = cCells[i]; label globalIndex = cCells[i];
if (!globalNumbering.isLocal(globalIndex)) if (globalIndex != -1 && !globalNumbering.isLocal(globalIndex))
{ {
label procI = globalNumbering.whichProcID(globalIndex); label procI = globalNumbering.whichProcID(globalIndex);
label index = globalNumbering.toLocal(procI, globalIndex); label index = globalNumbering.toLocal(procI, globalIndex);
@ -603,6 +603,10 @@ Foam::label Foam::mapDistribute::renumber
const label globalI const label globalI
) )
{ {
if (globalI == -1)
{
return globalI;
}
if (globalNumbering.isLocal(globalI)) if (globalNumbering.isLocal(globalI))
{ {
return globalNumbering.toLocal(globalI); return globalNumbering.toLocal(globalI);

4
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
View File

@ -123,7 +123,7 @@ public:
); );
//- Construct from list of (possibly) remote elements in globalIndex //- Construct from list of (possibly) remote elements in globalIndex
// numbering. Determines compact numbering (see above) and // numbering (or -1). Determines compact numbering (see above) and
// distribute map to get data into this ordering and renumbers the // distribute map to get data into this ordering and renumbers the
// elements to be in compact numbering. // elements to be in compact numbering.
mapDistribute mapDistribute
@ -133,7 +133,7 @@ public:
List<Map<label> >& compactMap List<Map<label> >& compactMap
); );
//- Special variant that works with the into sorted into bins //- Special variant that works with the info sorted into bins
// according to local indices. E.g. think cellCells where // according to local indices. E.g. think cellCells where
// cellCells[localCellI] is a list of global cells // cellCells[localCellI] is a list of global cells
mapDistribute mapDistribute