mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
- 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());
}
487 lines
14 KiB
C
487 lines
14 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
License
|
|
This file is part of OpenFOAM.
|
|
|
|
OpenFOAM is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "cellSplitter.H"
|
|
#include "polyMesh.H"
|
|
#include "polyTopoChange.H"
|
|
#include "polyAddCell.H"
|
|
#include "polyAddFace.H"
|
|
#include "polyAddPoint.H"
|
|
#include "polyModifyFace.H"
|
|
#include "mapPolyMesh.H"
|
|
#include "meshTools.H"
|
|
|
|
|
|
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
|
|
|
namespace Foam
|
|
{
|
|
defineTypeNameAndDebug(cellSplitter, 0);
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
|
|
|
void Foam::cellSplitter::getFaceInfo
|
|
(
|
|
const label facei,
|
|
label& patchID,
|
|
label& zoneID,
|
|
label& zoneFlip
|
|
) const
|
|
{
|
|
patchID = -1;
|
|
|
|
if (!mesh_.isInternalFace(facei))
|
|
{
|
|
patchID = mesh_.boundaryMesh().whichPatch(facei);
|
|
}
|
|
|
|
zoneID = mesh_.faceZones().whichZone(facei);
|
|
|
|
zoneFlip = false;
|
|
|
|
if (zoneID >= 0)
|
|
{
|
|
const faceZone& fZone = mesh_.faceZones()[zoneID];
|
|
|
|
zoneFlip = fZone.flipMap()[fZone.whichFace(facei)];
|
|
}
|
|
}
|
|
|
|
|
|
// Find the new owner of facei (since the original cell has been split into
|
|
// newCells
|
|
Foam::label Foam::cellSplitter::newOwner
|
|
(
|
|
const label facei,
|
|
const Map<labelList>& cellToCells
|
|
) const
|
|
{
|
|
label oldOwn = mesh_.faceOwner()[facei];
|
|
|
|
Map<labelList>::const_iterator fnd = cellToCells.find(oldOwn);
|
|
|
|
if (fnd == cellToCells.end())
|
|
{
|
|
// Unsplit cell
|
|
return oldOwn;
|
|
}
|
|
else
|
|
{
|
|
// Look up index of face in the cells' faces.
|
|
|
|
const labelList& newCells = fnd();
|
|
|
|
const cell& cFaces = mesh_.cells()[oldOwn];
|
|
|
|
return newCells[cFaces.find(facei)];
|
|
}
|
|
}
|
|
|
|
|
|
Foam::label Foam::cellSplitter::newNeighbour
|
|
(
|
|
const label facei,
|
|
const Map<labelList>& cellToCells
|
|
) const
|
|
{
|
|
label oldNbr = mesh_.faceNeighbour()[facei];
|
|
|
|
Map<labelList>::const_iterator fnd = cellToCells.find(oldNbr);
|
|
|
|
if (fnd == cellToCells.end())
|
|
{
|
|
// Unsplit cell
|
|
return oldNbr;
|
|
}
|
|
else
|
|
{
|
|
// Look up index of face in the cells' faces.
|
|
|
|
const labelList& newCells = fnd();
|
|
|
|
const cell& cFaces = mesh_.cells()[oldNbr];
|
|
|
|
return newCells[cFaces.find(facei)];
|
|
}
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
|
|
|
// Construct from components
|
|
Foam::cellSplitter::cellSplitter(const polyMesh& mesh)
|
|
:
|
|
mesh_(mesh),
|
|
addedPoints_()
|
|
{}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
|
|
|
Foam::cellSplitter::~cellSplitter()
|
|
{}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
|
|
|
void Foam::cellSplitter::setRefinement
|
|
(
|
|
const Map<point>& cellToMidPoint,
|
|
polyTopoChange& meshMod
|
|
)
|
|
{
|
|
addedPoints_.clear();
|
|
addedPoints_.resize(cellToMidPoint.size());
|
|
|
|
|
|
//
|
|
// Introduce cellToMidPoints.
|
|
//
|
|
|
|
forAllConstIter(Map<point>, cellToMidPoint, iter)
|
|
{
|
|
label celli = iter.key();
|
|
|
|
label anchorPoint = mesh_.cellPoints()[celli][0];
|
|
|
|
label addedPointi =
|
|
meshMod.setAction
|
|
(
|
|
polyAddPoint
|
|
(
|
|
iter(), // point
|
|
anchorPoint, // master point
|
|
-1, // zone for point
|
|
true // supports a cell
|
|
)
|
|
);
|
|
addedPoints_.insert(celli, addedPointi);
|
|
|
|
//Pout<< "Added point " << addedPointi
|
|
// << iter() << " in cell " << celli << " with centre "
|
|
// << mesh_.cellCentres()[celli] << endl;
|
|
}
|
|
|
|
|
|
//
|
|
// Add cells (first one is modified original cell)
|
|
//
|
|
|
|
Map<labelList> cellToCells(cellToMidPoint.size());
|
|
|
|
forAllConstIter(Map<point>, cellToMidPoint, iter)
|
|
{
|
|
label celli = iter.key();
|
|
|
|
const cell& cFaces = mesh_.cells()[celli];
|
|
|
|
// Cells created for this cell.
|
|
labelList newCells(cFaces.size());
|
|
|
|
// First pyramid is the original cell
|
|
newCells[0] = celli;
|
|
|
|
// Add other pyramids
|
|
for (label i = 1; i < cFaces.size(); i++)
|
|
{
|
|
label addedCelli =
|
|
meshMod.setAction
|
|
(
|
|
polyAddCell
|
|
(
|
|
-1, // master point
|
|
-1, // master edge
|
|
-1, // master face
|
|
celli, // master cell
|
|
-1 // zone
|
|
)
|
|
);
|
|
|
|
newCells[i] = addedCelli;
|
|
}
|
|
|
|
cellToCells.insert(celli, newCells);
|
|
|
|
//Pout<< "Split cell " << celli
|
|
// << " with centre " << mesh_.cellCentres()[celli] << nl
|
|
// << " faces:" << cFaces << nl
|
|
// << " into :" << newCells << endl;
|
|
}
|
|
|
|
|
|
//
|
|
// Introduce internal faces. These go from edges of the cell to the mid
|
|
// point.
|
|
//
|
|
|
|
forAllConstIter(Map<point>, cellToMidPoint, iter)
|
|
{
|
|
label celli = iter.key();
|
|
|
|
label midPointi = addedPoints_[celli];
|
|
|
|
const cell& cFaces = mesh_.cells()[celli];
|
|
|
|
const labelList& cEdges = mesh_.cellEdges()[celli];
|
|
|
|
forAll(cEdges, i)
|
|
{
|
|
label edgeI = cEdges[i];
|
|
const edge& e = mesh_.edges()[edgeI];
|
|
|
|
// Get the faces on the cell using the edge
|
|
label face0, face1;
|
|
meshTools::getEdgeFaces(mesh_, celli, edgeI, face0, face1);
|
|
|
|
// Get the cells on both sides of the face by indexing into cFaces.
|
|
// (since newly created cells are stored in cFaces order)
|
|
const labelList& newCells = cellToCells[celli];
|
|
|
|
label cell0 = newCells[cFaces.find(face0)];
|
|
label cell1 = newCells[cFaces.find(face1)];
|
|
|
|
if (cell0 < cell1)
|
|
{
|
|
// Construct face to midpoint that is pointing away from
|
|
// (pyramid split off from) celli
|
|
|
|
const face& f0 = mesh_.faces()[face0];
|
|
|
|
label index = f0.find(e[0]);
|
|
|
|
bool edgeInFaceOrder = (f0[f0.fcIndex(index)] == e[1]);
|
|
|
|
// Check if celli is the face owner
|
|
|
|
face newF(3);
|
|
if (edgeInFaceOrder == (mesh_.faceOwner()[face0] == celli))
|
|
{
|
|
// edge used in face order.
|
|
newF[0] = e[1];
|
|
newF[1] = e[0];
|
|
newF[2] = midPointi;
|
|
}
|
|
else
|
|
{
|
|
newF[0] = e[0];
|
|
newF[1] = e[1];
|
|
newF[2] = midPointi;
|
|
}
|
|
|
|
// Now newF points away from cell0
|
|
meshMod.setAction
|
|
(
|
|
polyAddFace
|
|
(
|
|
newF, // face
|
|
cell0, // owner
|
|
cell1, // neighbour
|
|
-1, // master point
|
|
-1, // master edge
|
|
face0, // master face for addition
|
|
false, // flux flip
|
|
-1, // patch for face
|
|
-1, // zone for face
|
|
false // face zone flip
|
|
)
|
|
);
|
|
}
|
|
else
|
|
{
|
|
// Construct face to midpoint that is pointing away from
|
|
// (pyramid split off from) celli
|
|
|
|
const face& f1 = mesh_.faces()[face1];
|
|
|
|
label index = f1.find(e[0]);
|
|
|
|
bool edgeInFaceOrder = (f1[f1.fcIndex(index)] == e[1]);
|
|
|
|
// Check if celli is the face owner
|
|
|
|
face newF(3);
|
|
if (edgeInFaceOrder == (mesh_.faceOwner()[face1] == celli))
|
|
{
|
|
// edge used in face order.
|
|
newF[0] = e[1];
|
|
newF[1] = e[0];
|
|
newF[2] = midPointi;
|
|
}
|
|
else
|
|
{
|
|
newF[0] = e[0];
|
|
newF[1] = e[1];
|
|
newF[2] = midPointi;
|
|
}
|
|
|
|
// Now newF points away from cell1
|
|
meshMod.setAction
|
|
(
|
|
polyAddFace
|
|
(
|
|
newF, // face
|
|
cell1, // owner
|
|
cell0, // neighbour
|
|
-1, // master point
|
|
-1, // master edge
|
|
face0, // master face for addition
|
|
false, // flux flip
|
|
-1, // patch for face
|
|
-1, // zone for face
|
|
false // face zone flip
|
|
)
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
//
|
|
// Update all existing faces for split owner or neighbour.
|
|
//
|
|
|
|
|
|
// Mark off affected face.
|
|
bitSet faceUpToDate(mesh_.nFaces(), true);
|
|
|
|
forAllConstIter(Map<point>, cellToMidPoint, iter)
|
|
{
|
|
label celli = iter.key();
|
|
|
|
const cell& cFaces = mesh_.cells()[celli];
|
|
|
|
faceUpToDate.unsetMany(cFaces);
|
|
}
|
|
|
|
forAll(faceUpToDate, facei)
|
|
{
|
|
if (!faceUpToDate.test(facei))
|
|
{
|
|
faceUpToDate.set(facei);
|
|
|
|
const face& f = mesh_.faces()[facei];
|
|
|
|
if (mesh_.isInternalFace(facei))
|
|
{
|
|
label newOwn = newOwner(facei, cellToCells);
|
|
label newNbr = newNeighbour(facei, cellToCells);
|
|
|
|
if (newOwn < newNbr)
|
|
{
|
|
meshMod.setAction
|
|
(
|
|
polyModifyFace
|
|
(
|
|
f,
|
|
facei,
|
|
newOwn, // owner
|
|
newNbr, // neighbour
|
|
false, // flux flip
|
|
-1, // patch for face
|
|
false, // remove from zone
|
|
-1, // zone for face
|
|
false // face zone flip
|
|
)
|
|
);
|
|
}
|
|
else
|
|
{
|
|
meshMod.setAction
|
|
(
|
|
polyModifyFace
|
|
(
|
|
f.reverseFace(),
|
|
facei,
|
|
newNbr, // owner
|
|
newOwn, // neighbour
|
|
false, // flux flip
|
|
-1, // patch for face
|
|
false, // remove from zone
|
|
-1, // zone for face
|
|
false // face zone flip
|
|
)
|
|
);
|
|
}
|
|
|
|
}
|
|
else
|
|
{
|
|
label newOwn = newOwner(facei, cellToCells);
|
|
|
|
label patchID, zoneID, zoneFlip;
|
|
getFaceInfo(facei, patchID, zoneID, zoneFlip);
|
|
|
|
meshMod.setAction
|
|
(
|
|
polyModifyFace
|
|
(
|
|
mesh_.faces()[facei],
|
|
facei,
|
|
newOwn, // owner
|
|
-1, // neighbour
|
|
false, // flux flip
|
|
patchID, // patch for face
|
|
false, // remove from zone
|
|
zoneID, // zone for face
|
|
zoneFlip // face zone flip
|
|
)
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
void Foam::cellSplitter::updateMesh(const mapPolyMesh& morphMap)
|
|
{
|
|
// Create copy since we're deleting entries. Only if both cell and added
|
|
// point get mapped do they get inserted.
|
|
Map<label> newAddedPoints(addedPoints_.size());
|
|
|
|
forAllConstIter(Map<label>, addedPoints_, iter)
|
|
{
|
|
label oldCelli = iter.key();
|
|
|
|
label newCelli = morphMap.reverseCellMap()[oldCelli];
|
|
|
|
label oldPointi = iter();
|
|
|
|
label newPointi = morphMap.reversePointMap()[oldPointi];
|
|
|
|
if (newCelli >= 0 && newPointi >= 0)
|
|
{
|
|
newAddedPoints.insert(newCelli, newPointi);
|
|
}
|
|
}
|
|
|
|
// Copy
|
|
addedPoints_.transfer(newAddedPoints);
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|