exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Parallel bugfix in polyhedralRefinement

Browse source 
While ensuring point consistent refinement/unrefinement, we need to loop over
all points in order to correctly take into account point consistency across
processor boundaries.
This commit is contained in:
Vuko Vukcevic 2018-02-05 22:50:21 +01:00
parent 0c5506f9c2
commit 819568c8d1
1 changed files with 9 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/dynamicMesh/dynamicMesh/polyMeshModifiers/polyhedralRefinement/polyhedralRefinement.C
View file

@ -2894,27 +2894,6 @@ Foam::label Foam::polyhedralRefinement::pointConsistentRefinement
// Count number of cells that will be added // Count number of cells that will be added
label nAddCells = 0; label nAddCells = 0;
// Collect all points from cells to refine. Assume that 10% of mesh points
// are going to be affected to prevent excessive resizing
labelHashSet pointsToConsider(mesh_.nPoints()/10);
// Get cell points
const labelListList& meshCellPoints = mesh_.cellPoints();
// Collect all points
forAll (meshCellPoints, cellI)
{
if (cellsToRefine[cellI])
{
// Get current cell points and insert them into hash set
const labelList& curPoints = meshCellPoints[cellI];
forAll (curPoints, pointI)
{
pointsToConsider.insert(curPoints[pointI]);
}
}
}
// Maximum surrounding cell refinement level for each point // Maximum surrounding cell refinement level for each point
labelList maxRefLevel(mesh_.nPoints(), 0); labelList maxRefLevel(mesh_.nPoints(), 0);
@ -2922,11 +2901,8 @@ Foam::label Foam::polyhedralRefinement::pointConsistentRefinement
const labelListList& meshPointCells = mesh_.pointCells(); const labelListList& meshPointCells = mesh_.pointCells();
// Loop through all points and collect maximum point level for each point // Loop through all points and collect maximum point level for each point
forAllConstIter (labelHashSet, pointsToConsider, iter) forAll (maxRefLevel, pointI)
{ {
// Get point index
const label& pointI = iter.key();
// Get the cells for this point // Get the cells for this point
const labelList& curCells = meshPointCells[pointI]; const labelList& curCells = meshPointCells[pointI];
@ -2958,13 +2934,10 @@ Foam::label Foam::polyhedralRefinement::pointConsistentRefinement
true // Apply separation for parallel cyclics true // Apply separation for parallel cyclics
); );
// Now that the levels are synced, go through considered points and add // Now that the levels are synced, go through all points and add cells to
// cells to refine // refine
forAllConstIter (labelHashSet, pointsToConsider, iter) forAll (maxRefLevel, pointI)
{ {
// Get point index
const label& pointI = iter.key();
// Get the cells for this point // Get the cells for this point
const labelList& curCells = meshPointCells[pointI]; const labelList& curCells = meshPointCells[pointI];
@ -3160,41 +3133,16 @@ Foam::label Foam::polyhedralRefinement::pointConsistentUnrefinement
// Count number of cells removed from unrefinement // Count number of cells removed from unrefinement
label nRemCells = 0; label nRemCells = 0;
// Get necessary mesh data
const label nPoints = mesh_.nPoints();
const labelListList& meshCellPoints = mesh_.cellPoints();
// Collect all points to consider from cells to unrefine. Assume that 10% of
// mesh points are going to be affected to prevent excessive resizing
labelHashSet pointsToConsider(nPoints/10);
// Collect all points
forAll (meshCellPoints, cellI)
{
if (cellsToUnrefine[cellI])
{
// Get current cell points and insert them into hash set
const labelList& curPoints = meshCellPoints[cellI];
forAll (curPoints, pointI)
{
pointsToConsider.insert(curPoints[pointI]);
}
}
}
// Minimum cell refinement level for each point. Note: initialise with // Minimum cell refinement level for each point. Note: initialise with
// labelMax // labelMax
labelList minRefLevel(nPoints, labelMax); labelList minRefLevel(mesh_.nPoints(), labelMax);
// Get point cells // Get point cells
const labelListList& meshPointCells = mesh_.pointCells(); const labelListList& meshPointCells = mesh_.pointCells();
// Loop through all points and collect minimum point level for each point // Loop through all points and collect minimum point level for each point
forAllConstIter (labelHashSet, pointsToConsider, iter) forAll (minRefLevel, pointI)
{ {
// Get point index
const label& pointI = iter.key();
// Get the cell for this point // Get the cell for this point
const labelList& curCells = meshPointCells[pointI]; const labelList& curCells = meshPointCells[pointI];
@ -3226,13 +3174,10 @@ Foam::label Foam::polyhedralRefinement::pointConsistentUnrefinement
true // Apply separation for parallel cyclics true // Apply separation for parallel cyclics
); );
// Now that the levels are synced, go through considered points and protect // Now that the levels are synced, go through all points and protect some
// some cells from unrefinement // cells from unrefinement
forAllConstIter (labelHashSet, pointsToConsider, iter) forAll (minRefLevel, pointI)
{ {
// Get point index
const label& pointI = iter.key();
// Get the cells for this point // Get the cells for this point
const labelList& curCells = meshPointCells[pointI]; const labelList& curCells = meshPointCells[pointI];