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

BUGFIX: next wall distance may cause seg fault

Browse source
This commit is contained in:
Henrik Rusche 2017-08-02 18:56:05 +02:00
parent 08a7e2e03b
commit 7fe57ece38
2 changed files with 92 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/finiteVolume/fvMesh/wallDist/nearWallDist.C
View file

@ -33,31 +33,16 @@ License
void Foam::nearWallDist::doAll()
{
cellDistFuncs wallUtils(mesh_);
// AJ: make sure to pick up all patches that are specified as a wall
const polyBoundaryMesh& bMesh = wallUtils.mesh().boundaryMesh();
labelHashSet wallPatchIDs(bMesh.size());
forAll(bMesh, patchI)
{
if (bMesh[patchI].isWall())
{
wallPatchIDs.insert(patchI);
}
}
// Get patch ids of walls
// labelHashSet wallPatchIDs(wallUtils.getPatchIDs<wallPolyPatch>());
// Size neighbours array for maximum possible
labelList neighbours(wallUtils.maxPatchSize(wallPatchIDs));
// Correct all cells with face on wall
const volVectorField& cellCentres = mesh_.C();
// HR 12.02.18: Use hashSet to determine nbs
// This should removes a possible error due to wrong sizing since
// getPointNeighbours may still run over AND should be faster
// since the linear search (again getPointNeighbours) is removed.
labelHashSet nbs(20);
// Correct all cells with face on wall
forAll(mesh_.boundary(), patchI)
{
fvPatchScalarField& ypatch = operator[](patchI);
@ -67,29 +52,45 @@ void Foam::nearWallDist::doAll()
if (patch.isWall())
{
const polyPatch& pPatch = patch.patch();
const unallocLabelList& faceCells = patch.faceCells();
const pointField& points = pPatch.points();
const unallocLabelList& faceCells = pPatch.faceCells();
// Check cells with face on wall
forAll(patch, patchFaceI)
{
label nNeighbours = wallUtils.getPointNeighbours
const face& f = pPatch.localFaces()[patchFaceI];
scalar minDist = GREAT;
// Loop over points
forAll(f, fI)
{
const labelList& pointNbs = pPatch.pointFaces()[f[fI]];
// Loop over faces sharing current point
// This will include the face itself
forAll(pointNbs, pointNbsI)
{
const label nbr = pointNbs[pointNbsI];
if (nbs.insert(nbr))
{
const pointHit curHit = pPatch[nbr].nearestPoint
(
pPatch,
patchFaceI,
neighbours
cellCentres[faceCells[nbr]],
points
);
label minFaceI = -1;
if (curHit.distance() < minDist)
{
minDist = curHit.distance();
}
}
}
}
ypatch[patchFaceI] = wallUtils.smallestDist
(
cellCentres[faceCells[patchFaceI]],
pPatch,
nNeighbours,
neighbours,
minFaceI
);
ypatch[patchFaceI] = minDist;
nbs.clear();
}
}
else

74
src/meshTools/cellDist/cellDistFuncs.C
View file

@ -181,6 +181,12 @@ Foam::label Foam::cellDistFuncs::getPointNeighbours
label faceI = pointNbs[nbI];
// Check for faceI in edge-neighbours part of neighbours
// HR 12.02.18: Should start the search from the begining
// of the list. Otherwise we may append a face that is
// also an edge neighbour -> Inefficient + sizing may not
// be adequate on processors with very small wall patches.
// Therefore replaced and not used anymore!
if (findIndex(nEdgeNbs, neighbours, faceI) == -1)
{
neighbours[nNeighbours++] = faceI;
@ -297,11 +303,11 @@ void Foam::cellDistFuncs::correctBoundaryFaceCells
Map<label>& nearestFace
) const
{
// Size neighbours array for maximum possible (= size of largest patch)
label maxPointNeighbours = maxPatchSize(patchIDs);
labelList neighbours(maxPointNeighbours);
// HR 12.02.18: Use hashSet to determine nbs
// This should removes a possible error due to wrong sizing since
// getPointNeighbours may still run over AND should be faster
// since the linear search (again getPointNeighbours) is removed.
labelHashSet nbs(20);
// Correct all cells with face on wall
const vectorField& cellCentres = mesh().cellCentres();
@ -311,37 +317,57 @@ void Foam::cellDistFuncs::correctBoundaryFaceCells
{
if (patchIDs.found(patchI))
{
const polyPatch& patch = mesh().boundaryMesh()[patchI];
const polyPatch& pPatch = mesh().boundaryMesh()[patchI];
const pointField& points = pPatch.points();
const unallocLabelList& faceCells = pPatch.faceCells();
// Check cells with face on wall
forAll(patch, patchFaceI)
forAll(pPatch, patchFaceI)
{
label nNeighbours = getPointNeighbours
(
patch,
patchFaceI,
neighbours
);
label cellI = faceOwner[patch.start() + patchFaceI];
const face& f = pPatch.localFaces()[patchFaceI];
scalar minDist = GREAT;
label minFaceI = -1;
wallDistCorrected[cellI] = smallestDist
// Loop over points
forAll(f, fI)
{
const labelList& pointNbs = pPatch.pointFaces()[f[fI]];
// Loop over faces sharing current point
// This will include the face itself
forAll(pointNbs, pointNbsI)
{
const label nbr = pointNbs[pointNbsI];
if (nbs.insert(nbr))
{
const pointHit curHit = pPatch[nbr].nearestPoint
(
cellCentres[cellI],
patch,
nNeighbours,
neighbours,
minFaceI
cellCentres[faceCells[nbr]],
points
);
// Store wallCell and its nearest neighbour
nearestFace.insert(cellI, minFaceI);
if (curHit.distance() < minDist)
{
minDist = curHit.distance();
minFaceI = nbr;
}
}
}
}
wallDistCorrected[patchFaceI] = minDist;
// Store wallCell and its nearest neighbour
nearestFace.insert
(
faceOwner[pPatch.start() + patchFaceI],
pPatch.start() + minFaceI
);
nbs.clear();
}
}
}
}