CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added check for zero-size boxes in SetSharedPart and SetNeighborPart

Browse Source
This commit is contained in:
Rob Falgout 2016-03-19 20:15:05 -07:00
parent 34a69027c8
commit 0552c5543e
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/sstruct_mv/HYPRE_sstruct_grid.c
View File

@ -403,7 +403,6 @@ HYPRE_SStructGridSetNeighborPart( HYPRE_SStructGrid grid,
neighbor = &neighbors[part][nneighbors[part]];
nbor_offset = nbor_offsets[part][nneighbors[part]];
nneighbors[part]++;
box = hypre_SStructNeighborBox(neighbor);
hypre_CopyToCleanIndex(ilower, ndim, cilower);
@ -412,6 +411,12 @@ HYPRE_SStructGridSetNeighborPart( HYPRE_SStructGrid grid,
hypre_BoxSetExtents(box, cilower, ciupper);
hypre_SetIndex(nbor_offset, 0);
/* If the neighbor box is empty, return */
if ( !(hypre_BoxVolume(box) > 0) )
{
return hypre_error_flag;
}
hypre_SStructNeighborPart(neighbor) = nbor_part;
coord = hypre_SStructNeighborCoord(neighbor);
@ -444,6 +449,8 @@ HYPRE_SStructGridSetNeighborPart( HYPRE_SStructGrid grid,
hypre_IndexD(ilower_mapped, d) = 0;
}
nneighbors[part]++;
return hypre_error_flag;
}
@ -489,7 +496,6 @@ HYPRE_SStructGridSetSharedPart( HYPRE_SStructGrid grid,
neighbor = &neighbors[part][nneighbors[part]];
nbor_offset = nbor_offsets[part][nneighbors[part]];
nneighbors[part]++;
box = hypre_SStructNeighborBox(neighbor);
hypre_CopyToCleanIndex(ilower, ndim, cilower);
@ -498,6 +504,12 @@ HYPRE_SStructGridSetSharedPart( HYPRE_SStructGrid grid,
hypre_BoxSetExtents(box, cilower, ciupper);
hypre_CopyToCleanIndex(offset, ndim, nbor_offset);
/* If the neighbor box is empty, return */
if ( !(hypre_BoxVolume(box) > 0) )
{
return hypre_error_flag;
}
hypre_SStructNeighborPart(neighbor) = shared_part;
coord = hypre_SStructNeighborCoord(neighbor);
@ -522,7 +534,9 @@ HYPRE_SStructGridSetSharedPart( HYPRE_SStructGrid grid,
{
hypre_IndexD(ilower_mapped, dd) = hypre_IndexD(shared_iupper, dd);
}
/* map the offset to the neighbor part and adjust ilower_mapped */
/* Map the offset to the neighbor part and adjust ilower_mapped so that
* NeighborILower is a direct mapping of NeighborBoxIMin. This allows us
* to eliminate shared_offset. */
offset_mapped[dd] = offset[d]*dir[d];
if (offset_mapped[dd] != shared_offset[dd])
{
@ -536,6 +550,8 @@ HYPRE_SStructGridSetSharedPart( HYPRE_SStructGrid grid,
hypre_IndexD(ilower_mapped, d) = 0;
}
nneighbors[part]++;
return hypre_error_flag;
}
@ -712,10 +728,11 @@ HYPRE_SStructGridAssemble( HYPRE_SStructGrid grid )
/* Create var-centered vneighbor box from cell-centered neighbor box */
hypre_CopyBox(hypre_SStructNeighborBox(neighbor), box);
hypre_SStructCellBoxToVarBox(box, nbor_offset, varoffset, &valid);
/* It is possible to have empty vneighbor boxes. For example, if
* only faces are shared (see SetSharedPart), then the vneighbor
* boxes for cell variables will be empty. */
if ( !(valid && hypre_BoxVolume(box)) )
/* Sometimes we can't construct vneighbor boxes (valid = false).
* For example, if only faces are shared (see SetSharedPart), then
* there should be no vneighbor boxes for cell variables. Note that
* we ensure nonempty neighbor boxes when they are set up. */
if (!valid)
{
continue;
}