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

BUG: decompositionMethod: cellCells for cyclics or agglomeration

Browse Source
This commit is contained in:
mattijs
2011-02-09 13:01:23 +00:00
parent 8e01dd8cf1
commit b1d82f1b67
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -398,15 +398,16 @@ void Foam::decompositionMethod::calcCellCells
// Create global cell numbers // Create global cell numbers
// ~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~
globalIndex globalCells(mesh.nCells()); label nAgglom = max(agglom)+1;
globalIndex globalAgglom(nAgglom);
const labelList& faceOwner = mesh.faceOwner(); const labelList& faceOwner = mesh.faceOwner();
const labelList& faceNeighbour = mesh.faceNeighbour(); const labelList& faceNeighbour = mesh.faceNeighbour();
const polyBoundaryMesh& patches = mesh.boundaryMesh(); const polyBoundaryMesh& patches = mesh.boundaryMesh();
// Get renumbered owner on other side of coupled faces // Get agglomerate owner on other side of coupled faces
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
labelList globalNeighbour(mesh.nFaces()-mesh.nInternalFaces()); labelList globalNeighbour(mesh.nFaces()-mesh.nInternalFaces());
@ -421,10 +422,13 @@ void Foam::decompositionMethod::calcCellCells
forAll(pp, i) forAll(pp, i)
{ {
globalNeighbour[bFaceI++] = globalCells.toGlobal globalNeighbour[bFaceI] = globalAgglom.toGlobal
( (
faceOwner[faceI++] agglom[faceOwner[faceI]]
); );
bFaceI++;
faceI++;
} }
} }
} }
@ -448,8 +452,13 @@ void Foam::decompositionMethod::calcCellCells
nFacesPerCell[nei]++; nFacesPerCell[nei]++;
} }
// Handle coupled faces // Handle coupled faces. In case of agglomeration you might end up
HashSet<edge, Hash<edge> > cellPair(mesh.nFaces()-mesh.nInternalFaces()); // with multiple connections ('faces') between the same two agglomerations.
// This is illegal so mark.
HashSet<labelPair, Hash<labelPair> > cellPair
(
mesh.nFaces()-mesh.nInternalFaces()
);
forAll(patches, patchI) forAll(patches, patchI)
{ {
@ -464,7 +473,7 @@ void Foam::decompositionMethod::calcCellCells
{ {
label own = agglom[faceOwner[faceI]]; label own = agglom[faceOwner[faceI]];
label globalNei = globalNeighbour[bFaceI]; label globalNei = globalNeighbour[bFaceI];
if (cellPair.insert(edge(own, globalNei))) if (cellPair.insert(labelPair(own, globalNei)))
{ {
nFacesPerCell[own]++; nFacesPerCell[own]++;
} }
@ -491,8 +500,8 @@ void Foam::decompositionMethod::calcCellCells
label own = agglom[faceOwner[faceI]]; label own = agglom[faceOwner[faceI]];
label nei = agglom[faceNeighbour[faceI]]; label nei = agglom[faceNeighbour[faceI]];
m[offsets[own] + nFacesPerCell[own]++] = globalCells.toGlobal(nei); m[offsets[own] + nFacesPerCell[own]++] = globalAgglom.toGlobal(nei);
m[offsets[nei] + nFacesPerCell[nei]++] = globalCells.toGlobal(own); m[offsets[nei] + nFacesPerCell[nei]++] = globalAgglom.toGlobal(own);
} }
// For boundary faces is offsetted coupled neighbour // For boundary faces is offsetted coupled neighbour
@ -510,7 +519,7 @@ void Foam::decompositionMethod::calcCellCells
{ {
label own = agglom[faceOwner[faceI]]; label own = agglom[faceOwner[faceI]];
label globalNei = globalNeighbour[bFaceI]; label globalNei = globalNeighbour[bFaceI];
if (cellPair.insert(edge(own, globalNei))) if (cellPair.insert(labelPair(own, globalNei)))
{ {
m[offsets[own] + nFacesPerCell[own]++] = globalNei; m[offsets[own] + nFacesPerCell[own]++] = globalNei;
} }