mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
ENH: new bitSet class and improved PackedList class (closes #751)
- The bitSet class replaces the old PackedBoolList class.
The redesign provides better block-wise access and reduced method
calls. This helps both in cases where the bitSet may be relatively
sparse, and in cases where advantage of contiguous operations can be
made. This makes it easier to work with a bitSet as top-level object.
In addition to the previously available count() method to determine
if a bitSet is being used, now have simpler queries:
- all() - true if all bits in the addressable range are empty
- any() - true if any bits are set at all.
- none() - true if no bits are set.
These are faster than count() and allow early termination.
The new test() method tests the value of a single bit position and
returns a bool without any ambiguity caused by the return type
(like the get() method), nor the const/non-const access (like
operator[] has). The name corresponds to what std::bitset uses.
The new find_first(), find_last(), find_next() methods provide a faster
means of searching for bits that are set.
This can be especially useful when using a bitSet to control an
conditional:
OLD (with macro):
forAll(selected, celli)
{
if (selected[celli])
{
sumVol += mesh_.cellVolumes()[celli];
}
}
NEW (with const_iterator):
for (const label celli : selected)
{
sumVol += mesh_.cellVolumes()[celli];
}
or manually
for
(
label celli = selected.find_first();
celli != -1;
celli = selected.find_next()
)
{
sumVol += mesh_.cellVolumes()[celli];
}
- When marking up contiguous parts of a bitset, an interval can be
represented more efficiently as a labelRange of start/size.
For example,
OLD:
if (isA<processorPolyPatch>(pp))
{
forAll(pp, i)
{
ignoreFaces.set(i);
}
}
NEW:
if (isA<processorPolyPatch>(pp))
{
ignoreFaces.set(pp.range());
}
This commit is contained in:
@ -69,7 +69,7 @@ bool Foam::snappySnapDriver::isFeaturePoint
|
||||
(
|
||||
const scalar featureCos,
|
||||
const indirectPrimitivePatch& pp,
|
||||
const PackedBoolList& isFeatureEdge,
|
||||
const bitSet& isFeatureEdge,
|
||||
const label pointi
|
||||
) const
|
||||
{
|
||||
@ -128,7 +128,7 @@ bool Foam::snappySnapDriver::isFeaturePoint
|
||||
|
||||
void Foam::snappySnapDriver::smoothAndConstrain
|
||||
(
|
||||
const PackedBoolList& isPatchMasterEdge,
|
||||
const bitSet& isPatchMasterEdge,
|
||||
const indirectPrimitivePatch& pp,
|
||||
const labelList& meshEdges,
|
||||
const List<pointConstraint>& constraints,
|
||||
@ -271,7 +271,7 @@ void Foam::snappySnapDriver::calcNearestFace
|
||||
<< exit(FatalError);
|
||||
}
|
||||
const faceZone& fZone = mesh.faceZones()[zonei];
|
||||
PackedBoolList isZonedFace(mesh.nFaces(), fZone);
|
||||
bitSet isZonedFace(mesh.nFaces(), fZone);
|
||||
|
||||
DynamicList<label> ppFaces(fZone.size());
|
||||
DynamicList<label> meshFaces(fZone.size());
|
||||
@ -456,7 +456,7 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
|
||||
{
|
||||
const fvMesh& mesh = meshRefiner_.mesh();
|
||||
|
||||
const PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh));
|
||||
const bitSet isMasterFace(syncTools::getMasterFaces(mesh));
|
||||
|
||||
|
||||
// For now just get all surrounding face data. Expensive - should just
|
||||
@ -558,7 +558,7 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
|
||||
|
||||
|
||||
// Mark all points on 'boundary' edges
|
||||
PackedBoolList isBoundaryPoint(pp.nPoints());
|
||||
bitSet isBoundaryPoint(pp.nPoints());
|
||||
|
||||
const labelListList& edgeFaces = pp.edgeFaces();
|
||||
const edgeList& edges = pp.edges();
|
||||
@ -861,7 +861,7 @@ Foam::pointIndexHit Foam::snappySnapDriver::findMultiPatchPoint
|
||||
void Foam::snappySnapDriver::writeStats
|
||||
(
|
||||
const indirectPrimitivePatch& pp,
|
||||
const PackedBoolList& isPatchMasterPoint,
|
||||
const bitSet& isPatchMasterPoint,
|
||||
const List<pointConstraint>& patchConstraints
|
||||
) const
|
||||
{
|
||||
@ -1430,7 +1430,7 @@ void Foam::snappySnapDriver::releasePointsNextToMultiPatch
|
||||
|
||||
|
||||
// 1. Mark points on multiple patches
|
||||
PackedBoolList isMultiPatchPoint(pp.size());
|
||||
bitSet isMultiPatchPoint(pp.size());
|
||||
|
||||
forAll(pointFacePatchID, pointi)
|
||||
{
|
||||
@ -2855,7 +2855,7 @@ void Foam::snappySnapDriver::determineBaffleFeatures
|
||||
|
||||
|
||||
// Is edge on baffle
|
||||
PackedBoolList isBaffleEdge(pp.nEdges());
|
||||
bitSet isBaffleEdge(pp.nEdges());
|
||||
label nBaffleEdges = 0;
|
||||
// Is point on
|
||||
// 0 : baffle-edge (0)
|
||||
@ -3395,7 +3395,7 @@ void Foam::snappySnapDriver::featureAttractionUsingFeatureEdges
|
||||
const refinementFeatures& features = meshRefiner_.features();
|
||||
const fvMesh& mesh = meshRefiner_.mesh();
|
||||
|
||||
const PackedBoolList isPatchMasterPoint
|
||||
const bitSet isPatchMasterPoint
|
||||
(
|
||||
meshRefinement::getMasterPoints
|
||||
(
|
||||
@ -3833,8 +3833,8 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
|
||||
const fvMesh& mesh = meshRefiner_.mesh();
|
||||
|
||||
|
||||
//const PackedBoolList isMasterPoint(syncTools::getMasterPoints(mesh));
|
||||
const PackedBoolList isPatchMasterPoint
|
||||
//const bitSet isMasterPoint(syncTools::getMasterPoints(mesh));
|
||||
const bitSet isPatchMasterPoint
|
||||
(
|
||||
meshRefinement::getMasterPoints
|
||||
(
|
||||
@ -4116,12 +4116,12 @@ Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
|
||||
|
||||
if (featureAttract < 1-0.001)
|
||||
{
|
||||
//const PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
|
||||
//const bitSet isMasterEdge(syncTools::getMasterEdges(mesh));
|
||||
const labelList meshEdges
|
||||
(
|
||||
pp.meshEdges(mesh.edges(), mesh.pointEdges())
|
||||
);
|
||||
const PackedBoolList isPatchMasterEdge
|
||||
const bitSet isPatchMasterEdge
|
||||
(
|
||||
meshRefinement::getMasterEdges
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user