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: InteractionLists. Using indexedOctree of all wall faces to

Browse Source 
determine directWallFaces_.  More elegant method, and will reduce the
number of unnecessary wall faces found, speeding up runs.  Not a lot
of additional cost.
This commit is contained in:
graham
2010-04-09 17:53:14 +01:00
parent 61d8d5eda6
commit b4f2fc226e
2 changed files with 34 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/lagrangian/basic/InteractionLists/InteractionLists.C
View File

@ -662,7 +662,7 @@ Foam::InteractionLists<ParticleType>::InteractionLists
rilInverse_[cellI].transfer(rilInverseTemp[cellI]);
}
// Direct interaction list
// Direct interaction list and direct wall faces
Info<< " Building direct interaction lists" << endl;
@ -675,8 +675,31 @@ Foam::InteractionLists<ParticleType>::InteractionLists
100.0
);
DynamicList<label> localWallFaces;
forAll(mesh.boundaryMesh(), patchI)
{
const polyPatch& patch = mesh.boundaryMesh()[patchI];
if (isA<wallPolyPatch>(patch))
{
localWallFaces.append(identity(patch.size()) + patch.start());
}
}
indexedOctree<treeDataFace> wallFacesTree
(
treeDataFace(true, mesh, localWallFaces),
procBbRndExt,
8, // maxLevel,
10, // leafSize,
100.0
);
dil_.setSize(mesh_.nCells());
directWallFaces_.setSize(mesh.nCells());
forAll(cellBbs, cellI)
{
const treeBoundBox& cellBb = cellBbs[cellI];
@ -687,7 +710,7 @@ Foam::InteractionLists<ParticleType>::InteractionLists
cellBb.max() + interactionVec
);
// Find all elements intersecting box.
// Find all cells intersecting extendedBb
labelList interactingElems
(
allCellsTree.findBox(extendedBb)
@ -715,95 +738,20 @@ Foam::InteractionLists<ParticleType>::InteractionLists
}
dil_[cellI].transfer(cellDIL);
}
// Direct wall faces
// Find all wall faces intersecting extendedBb
interactingElems = wallFacesTree.findBox(extendedBb);
// DynamicLists for data gathering
DynamicList<label> thisCellOnlyWallFaces;
DynamicList<label> otherCellOnlyWallFaces;
List<DynamicList<label> > wallFacesTemp(mesh_.nCells());
directWallFaces_[cellI].setSize(interactingElems.size(), -1);
const labelList& patchID = mesh_.boundaryMesh().patchID();
label nInternalFaces = mesh_.nInternalFaces();
forAll(wallFacesTemp, thisCellI)
{
// Find all of the wall faces for the current cell
const labelList& thisCellFaces = mesh_.cells()[thisCellI];
DynamicList<label>& thisCellWallFaces = wallFacesTemp[thisCellI];
thisCellOnlyWallFaces.clear();
forAll(thisCellFaces, tCFI)
forAll(interactingElems, i)
{
label faceI = thisCellFaces[tCFI];
label elemI = interactingElems[i];
if (!mesh_.isInternalFace(faceI))
{
label patchI = patchID[faceI - nInternalFaces];
label f = wallFacesTree.shapes().faceLabels()[elemI];
const polyPatch& patch = mesh_.boundaryMesh()[patchI];
if (isA<wallPolyPatch>(patch))
{
thisCellOnlyWallFaces.append(faceI);
}
}
directWallFaces_[cellI][i] = f;
}
// Add all the found wall faces to this cell's list, and
// retain the wall faces for this cell only to add to other
// cells.
thisCellWallFaces.append(thisCellOnlyWallFaces);
// Loop over all of the cells in the dil for this cell, adding
// the wallFaces for this cell to the other cell's wallFace
// list, and all of the wallFaces for the other cell to this
// cell's list
const labelList& cellDil = dil_[thisCellI];
forAll(cellDil, i)
{
label otherCellI = cellDil[i];
const labelList& otherCellFaces = mesh_.cells()[otherCellI];
DynamicList<label>& otherCellWallFaces = wallFacesTemp[otherCellI];
otherCellOnlyWallFaces.clear();
forAll(otherCellFaces, oCFI)
{
label faceI = otherCellFaces[oCFI];
if (!mesh_.isInternalFace(faceI))
{
label patchI = patchID[faceI - nInternalFaces];
const polyPatch& patch = mesh_.boundaryMesh()[patchI];
if (isA<wallPolyPatch>(patch))
{
otherCellOnlyWallFaces.append(faceI);
}
}
}
thisCellWallFaces.append(otherCellOnlyWallFaces);
otherCellWallFaces.append(thisCellOnlyWallFaces);
}
}
directWallFaces_.setSize(mesh_.nCells());
forAll(directWallFaces_, i)
{
directWallFaces_[i].transfer(wallFacesTemp[i]);
}
}

5
src/lagrangian/basic/InteractionLists/InteractionLists.H
View File

@ -63,6 +63,7 @@ SourceFiles
#include "globalIndexAndTransform.H"
#include "indexedOctree.H"
#include "treeDataCell.H"
#include "treeDataFace.H"
#include "mapDistribute.H"
#include "Random.H"
@ -104,9 +105,7 @@ class InteractionLists
labelListList dil_;
//- Wall faces on this processor that are in interaction range
// of each each cell, data subordinate to dil, i.e. if a cell
// B is on cell A's dil, then all of cell B's wall faces are
// considered posible interactions for cell A.
// of each each cell
labelListList directWallFaces_;
//- Referred interaction list - which real cells are to be