mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
don't need shrink before List::transfer(DynamicList&) anymore
This commit is contained in:
@ -289,9 +289,7 @@ int main(int argc, char *argv[])
|
|||||||
<< patchNames[patchI] << "\t\t"
|
<< patchNames[patchI] << "\t\t"
|
||||||
<< allPatchFaces[patchI].size() << endl;
|
<< allPatchFaces[patchI].size() << endl;
|
||||||
|
|
||||||
allPatchFaces[patchI].shrink();
|
|
||||||
patchFaces[patchI].transfer(allPatchFaces[patchI]);
|
patchFaces[patchI].transfer(allPatchFaces[patchI]);
|
||||||
allPatchFaces[patchI].clear();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Info<< endl;
|
Info<< endl;
|
||||||
|
|||||||
@ -515,7 +515,7 @@ int main(int argc, char *argv[])
|
|||||||
Info<< " " << patchNames[patchI] << " : "
|
Info<< " " << patchNames[patchI] << " : "
|
||||||
<< allPatchFaces[patchI].size() << endl;
|
<< allPatchFaces[patchI].size() << endl;
|
||||||
|
|
||||||
patchFaces[patchI].transfer(allPatchFaces[patchI].shrink());
|
patchFaces[patchI].transfer(allPatchFaces[patchI]);
|
||||||
}
|
}
|
||||||
|
|
||||||
Info<< endl;
|
Info<< endl;
|
||||||
@ -548,7 +548,6 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
meshPtr().write();
|
meshPtr().write();
|
||||||
|
|
||||||
|
|
||||||
Info<< "End\n" << endl;
|
Info<< "End\n" << endl;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@ -74,10 +74,7 @@ void Foam::readerDatabase::getPolyHedra()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
polys.shrink();
|
|
||||||
|
|
||||||
Info<< "Found " << polys.size() << " polyhedral cells " << endl;
|
Info<< "Found " << polys.size() << " polyhedral cells " << endl;
|
||||||
|
|
||||||
polys_.transfer(polys);
|
polys_.transfer(polys);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -51,7 +51,6 @@ Foam::scalarRanges::scalarRanges(Istream& is)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
lst.shrink();
|
|
||||||
transfer(lst);
|
transfer(lst);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -393,12 +393,11 @@ void Foam::globalMeshData::calcSharedEdges() const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dynSharedEdgeLabels.shrink();
|
|
||||||
sharedEdgeLabelsPtr_ = new labelList();
|
sharedEdgeLabelsPtr_ = new labelList();
|
||||||
labelList& sharedEdgeLabels = *sharedEdgeLabelsPtr_;
|
labelList& sharedEdgeLabels = *sharedEdgeLabelsPtr_;
|
||||||
sharedEdgeLabels.transfer(dynSharedEdgeLabels);
|
sharedEdgeLabels.transfer(dynSharedEdgeLabels);
|
||||||
|
|
||||||
dynSharedEdgeAddr.shrink();
|
|
||||||
sharedEdgeAddrPtr_ = new labelList();
|
sharedEdgeAddrPtr_ = new labelList();
|
||||||
labelList& sharedEdgeAddr = *sharedEdgeAddrPtr_;
|
labelList& sharedEdgeAddr = *sharedEdgeAddrPtr_;
|
||||||
sharedEdgeAddr.transfer(dynSharedEdgeAddr);
|
sharedEdgeAddr.transfer(dynSharedEdgeAddr);
|
||||||
|
|||||||
@ -467,10 +467,8 @@ void Foam::globalPoints::remove(const Map<label>& directNeighbours)
|
|||||||
Map<label> oldMeshToProcPoint(meshToProcPoint_);
|
Map<label> oldMeshToProcPoint(meshToProcPoint_);
|
||||||
meshToProcPoint_.clear();
|
meshToProcPoint_.clear();
|
||||||
|
|
||||||
procPoints_.shrink();
|
|
||||||
List<procPointList> oldProcPoints;
|
List<procPointList> oldProcPoints;
|
||||||
oldProcPoints.transfer(procPoints_);
|
oldProcPoints.transfer(procPoints_);
|
||||||
procPoints_.clear();
|
|
||||||
|
|
||||||
// Go through all equivalences
|
// Go through all equivalences
|
||||||
for
|
for
|
||||||
|
|||||||
@ -64,7 +64,7 @@ Foam::labelListList Foam::polyMesh::cellShapePointCells
|
|||||||
|
|
||||||
forAll (pc, pointI)
|
forAll (pc, pointI)
|
||||||
{
|
{
|
||||||
pointCellAddr[pointI].transfer(pc[pointI].shrink());
|
pointCellAddr[pointI].transfer(pc[pointI]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return pointCellAddr;
|
return pointCellAddr;
|
||||||
|
|||||||
@ -298,7 +298,7 @@ void PrimitivePatch<Face, FaceList, PointField, PointType>::calcAddressing()
|
|||||||
|
|
||||||
forAll (faceFaces, faceI)
|
forAll (faceFaces, faceI)
|
||||||
{
|
{
|
||||||
faceFaces[faceI].transfer(ff[faceI].shrink());
|
faceFaces[faceI].transfer(ff[faceI]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -151,8 +151,6 @@ void PrimitivePatch<Face, FaceList, PointField, PointType>::calcEdgeLoops()
|
|||||||
while (currentEdgeI != -1);
|
while (currentEdgeI != -1);
|
||||||
|
|
||||||
// Done all for current loop. Transfer to edgeLoops.
|
// Done all for current loop. Transfer to edgeLoops.
|
||||||
loop.shrink();
|
|
||||||
|
|
||||||
edgeLoops[loopI].transfer(loop);
|
edgeLoops[loopI].transfer(loop);
|
||||||
|
|
||||||
loopI++;
|
loopI++;
|
||||||
|
|||||||
@ -108,7 +108,7 @@ void Foam::primitiveMesh::calcCellEdges() const
|
|||||||
// reset the size
|
// reset the size
|
||||||
forAll (ce, cellI)
|
forAll (ce, cellI)
|
||||||
{
|
{
|
||||||
cellEdgeAddr[cellI].transfer(ce[cellI].shrink());
|
cellEdgeAddr[cellI].transfer(ce[cellI]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -546,7 +546,7 @@ void Foam::meshRefinement::calcLocalRegions
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
localCc.shrink();
|
|
||||||
localPoints.transfer(localCc);
|
localPoints.transfer(localCc);
|
||||||
|
|
||||||
if (localPoints.size() != globalToLocalRegion.size())
|
if (localPoints.size() != globalToLocalRegion.size())
|
||||||
|
|||||||
@ -412,11 +412,9 @@ void Foam::polyDualMesh::collectPatchInternalFace
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dualFace2.transfer(dualFace.shrink());
|
dualFace2.transfer(dualFace);
|
||||||
dualFace.clear();
|
|
||||||
|
|
||||||
featEdgeIndices2.transfer(featEdgeIndices.shrink());
|
featEdgeIndices2.transfer(featEdgeIndices);
|
||||||
featEdgeIndices.clear();
|
|
||||||
|
|
||||||
if (reverseFace)
|
if (reverseFace)
|
||||||
{
|
{
|
||||||
@ -1590,8 +1588,7 @@ void Foam::polyDualMesh::calcFeatures
|
|||||||
allFeaturePoints.append(allBoundary.meshPoints()[pointI]);
|
allFeaturePoints.append(allBoundary.meshPoints()[pointI]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
featurePoints.transfer(allFeaturePoints.shrink());
|
featurePoints.transfer(allFeaturePoints);
|
||||||
allFeaturePoints.clear();
|
|
||||||
|
|
||||||
if (debug)
|
if (debug)
|
||||||
{
|
{
|
||||||
@ -1633,8 +1630,7 @@ void Foam::polyDualMesh::calcFeatures
|
|||||||
allFeatureEdges.append(meshEdges[edgeI]);
|
allFeatureEdges.append(meshEdges[edgeI]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
featureEdges.transfer(allFeatureEdges.shrink());
|
featureEdges.transfer(allFeatureEdges);
|
||||||
allFeatureEdges.clear();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -165,8 +165,7 @@ void Foam::decompositionMethod::calcCellCells
|
|||||||
cellCells.setSize(dynCellCells.size());
|
cellCells.setSize(dynCellCells.size());
|
||||||
forAll(dynCellCells, coarseI)
|
forAll(dynCellCells, coarseI)
|
||||||
{
|
{
|
||||||
cellCells[coarseI].transfer(dynCellCells[coarseI].shrink());
|
cellCells[coarseI].transfer(dynCellCells[coarseI]);
|
||||||
dynCellCells[coarseI].clear();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -794,8 +794,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
|
|||||||
globalRegionRegions.setSize(dynRegionRegions.size());
|
globalRegionRegions.setSize(dynRegionRegions.size());
|
||||||
forAll(dynRegionRegions, i)
|
forAll(dynRegionRegions, i)
|
||||||
{
|
{
|
||||||
globalRegionRegions[i].transfer(dynRegionRegions[i].shrink());
|
globalRegionRegions[i].transfer(dynRegionRegions[i]);
|
||||||
dynRegionRegions[i].clear();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1503,17 +1503,13 @@ void Foam::boundaryMesh::setExtraEdges(const label edgeI)
|
|||||||
{
|
{
|
||||||
labelList minDistance(mesh().nEdges(), -1);
|
labelList minDistance(mesh().nEdges(), -1);
|
||||||
|
|
||||||
// All edge labels encountered
|
// All edge labels encountered
|
||||||
|
|
||||||
DynamicList<label> visitedEdges;
|
DynamicList<label> visitedEdges;
|
||||||
|
|
||||||
// Floodfill from edgeI starting from distance 0. Stop at distance.
|
// Floodfill from edgeI starting from distance 0. Stop at distance.
|
||||||
markEdges(8, edgeI, 0, minDistance, visitedEdges);
|
markEdges(8, edgeI, 0, minDistance, visitedEdges);
|
||||||
|
|
||||||
visitedEdges.shrink();
|
|
||||||
|
|
||||||
// Set edge labels to display
|
// Set edge labels to display
|
||||||
//? Allowed to transfer from DynamicList to List
|
|
||||||
extraEdges_.transfer(visitedEdges);
|
extraEdges_.transfer(visitedEdges);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -787,9 +787,6 @@ bool Foam::topoCellLooper::cut
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
localLoop.shrink();
|
|
||||||
localLoopWeights.shrink();
|
|
||||||
|
|
||||||
loop.transfer(localLoop);
|
loop.transfer(localLoop);
|
||||||
loopWeights.transfer(localLoopWeights);
|
loopWeights.transfer(localLoopWeights);
|
||||||
|
|
||||||
@ -799,17 +796,16 @@ bool Foam::topoCellLooper::cut
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Let parent handle poly case.
|
// Let parent handle poly case.
|
||||||
return
|
return hexCellLooper::cut
|
||||||
hexCellLooper::cut
|
(
|
||||||
(
|
refDir,
|
||||||
refDir,
|
cellI,
|
||||||
cellI,
|
vertIsCut,
|
||||||
vertIsCut,
|
edgeIsCut,
|
||||||
edgeIsCut,
|
edgeWeight,
|
||||||
edgeWeight,
|
loop,
|
||||||
loop,
|
loopWeights
|
||||||
loopWeights
|
);
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -131,11 +131,8 @@ Foam::face Foam::boundaryCutter::addEdgeCutsToFace
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
newFace.shrink();
|
|
||||||
|
|
||||||
face returnFace;
|
face returnFace;
|
||||||
returnFace.transfer(newFace);
|
returnFace.transfer(newFace);
|
||||||
newFace.clear();
|
|
||||||
|
|
||||||
if (debug)
|
if (debug)
|
||||||
{
|
{
|
||||||
@ -361,9 +358,7 @@ bool Foam::boundaryCutter::splitFace
|
|||||||
{
|
{
|
||||||
// Enough vertices to create a face from.
|
// Enough vertices to create a face from.
|
||||||
face tmpFace;
|
face tmpFace;
|
||||||
newFace.shrink();
|
|
||||||
tmpFace.transfer(newFace);
|
tmpFace.transfer(newFace);
|
||||||
newFace.clear();
|
|
||||||
|
|
||||||
// Add face tmpFace
|
// Add face tmpFace
|
||||||
addFace(faceI, tmpFace, modifiedFace, meshMod);
|
addFace(faceI, tmpFace, modifiedFace, meshMod);
|
||||||
@ -381,9 +376,7 @@ bool Foam::boundaryCutter::splitFace
|
|||||||
{
|
{
|
||||||
// Enough vertices to create a face from.
|
// Enough vertices to create a face from.
|
||||||
face tmpFace;
|
face tmpFace;
|
||||||
newFace.shrink();
|
|
||||||
tmpFace.transfer(newFace);
|
tmpFace.transfer(newFace);
|
||||||
newFace.clear();
|
|
||||||
|
|
||||||
// Add face tmpFace
|
// Add face tmpFace
|
||||||
addFace(faceI, tmpFace, modifiedFace, meshMod);
|
addFace(faceI, tmpFace, modifiedFace, meshMod);
|
||||||
|
|||||||
@ -222,8 +222,6 @@ Foam::wallLayerCells::wallLayerCells
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
refineCells.shrink();
|
|
||||||
|
|
||||||
// Transfer refineCells storage to this.
|
// Transfer refineCells storage to this.
|
||||||
transfer(refineCells);
|
transfer(refineCells);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -489,7 +489,6 @@ void Foam::polyMeshAdder::insertVertices
|
|||||||
|
|
||||||
if (workFace.size() != allF.size())
|
if (workFace.size() != allF.size())
|
||||||
{
|
{
|
||||||
workFace.shrink();
|
|
||||||
allF.transfer(workFace);
|
allF.transfer(workFace);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1079,8 +1079,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo
|
|||||||
}
|
}
|
||||||
|
|
||||||
face newFace;
|
face newFace;
|
||||||
newFace.transfer(newFaceVerts.shrink());
|
newFace.transfer(newFaceVerts);
|
||||||
newFaceVerts.clear();
|
|
||||||
|
|
||||||
label anchorCell0 = getAnchorCell
|
label anchorCell0 = getAnchorCell
|
||||||
(
|
(
|
||||||
@ -3687,8 +3686,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Convert dynamiclist to face.
|
// Convert dynamiclist to face.
|
||||||
newFace.transfer(faceVerts.shrink());
|
newFace.transfer(faceVerts);
|
||||||
faceVerts.clear();
|
|
||||||
|
|
||||||
//Pout<< "Split face:" << faceI << " verts:" << f
|
//Pout<< "Split face:" << faceI << " verts:" << f
|
||||||
// << " into quad:" << newFace << endl;
|
// << " into quad:" << newFace << endl;
|
||||||
@ -3811,8 +3809,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
|
|||||||
}
|
}
|
||||||
|
|
||||||
face newFace;
|
face newFace;
|
||||||
newFace.transfer(newFaceVerts.shrink());
|
newFace.transfer(newFaceVerts);
|
||||||
|
|
||||||
|
|
||||||
// The point with the lowest level should be an anchor
|
// The point with the lowest level should be an anchor
|
||||||
// point of the neighbouring cells.
|
// point of the neighbouring cells.
|
||||||
@ -3993,10 +3990,8 @@ Foam::labelListList Foam::hexRef8::setRefinement
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pointLevel_.transfer(newPointLevel.shrink());
|
pointLevel_.transfer(newPointLevel);
|
||||||
newPointLevel.clear();
|
cellLevel_.transfer(newCellLevel);
|
||||||
cellLevel_.transfer(newCellLevel.shrink());
|
|
||||||
newCellLevel.clear();
|
|
||||||
|
|
||||||
// Mark files as changed
|
// Mark files as changed
|
||||||
setInstance(mesh_.facesInstance());
|
setInstance(mesh_.facesInstance());
|
||||||
|
|||||||
@ -365,8 +365,7 @@ void Foam::removeFaces::mergeFaces
|
|||||||
}
|
}
|
||||||
|
|
||||||
face mergedFace;
|
face mergedFace;
|
||||||
mergedFace.transfer(faceVerts.shrink());
|
mergedFace.transfer(faceVerts);
|
||||||
faceVerts.clear();
|
|
||||||
|
|
||||||
if (reverseLoop)
|
if (reverseLoop)
|
||||||
{
|
{
|
||||||
@ -763,8 +762,7 @@ Foam::label Foam::removeFaces::compatibleRemoves
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
newFacesToRemove.transfer(allFacesToRemove.shrink());
|
newFacesToRemove.transfer(allFacesToRemove);
|
||||||
allFacesToRemove.clear();
|
|
||||||
|
|
||||||
return nUsedRegions;
|
return nUsedRegions;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -747,14 +747,14 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
|
|||||||
|
|
||||||
forAll (pointsIntoMasterEdges, i)
|
forAll (pointsIntoMasterEdges, i)
|
||||||
{
|
{
|
||||||
pime[i].transfer(pointsIntoMasterEdges[i].shrink());
|
pime[i].transfer(pointsIntoMasterEdges[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
labelListList pise(pointsIntoSlaveEdges.size());
|
labelListList pise(pointsIntoSlaveEdges.size());
|
||||||
|
|
||||||
forAll (pointsIntoSlaveEdges, i)
|
forAll (pointsIntoSlaveEdges, i)
|
||||||
{
|
{
|
||||||
pise[i].transfer(pointsIntoSlaveEdges[i].shrink());
|
pise[i].transfer(pointsIntoSlaveEdges[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare the enriched faces
|
// Prepare the enriched faces
|
||||||
@ -1398,7 +1398,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
face newFace;
|
face newFace;
|
||||||
newFace.transfer(newFaceLabels.shrink());
|
newFace.transfer(newFaceLabels);
|
||||||
|
|
||||||
// Pout << "Modifying master stick-out face " << curFaceID << " old face: " << oldFace << " new face: " << newFace << endl;
|
// Pout << "Modifying master stick-out face " << curFaceID << " old face: " << oldFace << " new face: " << newFace << endl;
|
||||||
|
|
||||||
@ -1683,7 +1683,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
face newFace;
|
face newFace;
|
||||||
newFace.transfer(newFaceLabels.shrink());
|
newFace.transfer(newFaceLabels);
|
||||||
|
|
||||||
// Pout << "Modifying slave stick-out face " << curFaceID << " old face: " << oldFace << " new face: " << newFace << endl;
|
// Pout << "Modifying slave stick-out face " << curFaceID << " old face: " << oldFace << " new face: " << newFace << endl;
|
||||||
|
|
||||||
|
|||||||
@ -227,7 +227,7 @@ void Foam::slidingInterface::decoupleInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
face newFace;
|
face newFace;
|
||||||
newFace.transfer(newFaceLabels.shrink());
|
newFace.transfer(newFaceLabels);
|
||||||
|
|
||||||
// Pout << "Modifying master stick-out face " << curFaceID << " old face: " << oldFace << " new face: " << newFace << endl;
|
// Pout << "Modifying master stick-out face " << curFaceID << " old face: " << oldFace << " new face: " << newFace << endl;
|
||||||
|
|
||||||
@ -350,7 +350,7 @@ void Foam::slidingInterface::decoupleInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
face newFace;
|
face newFace;
|
||||||
newFace.transfer(newFaceLabels.shrink());
|
newFace.transfer(newFaceLabels);
|
||||||
|
|
||||||
// Pout << "Modifying slave stick-out face " << curFaceID << " old face: " << oldFace << " new face: " << newFace << endl;
|
// Pout << "Modifying slave stick-out face " << curFaceID << " old face: " << oldFace << " new face: " << newFace << endl;
|
||||||
|
|
||||||
|
|||||||
@ -304,12 +304,12 @@ void Foam::enrichedPatch::calcCutFaces() const
|
|||||||
|
|
||||||
// Append the face
|
// Append the face
|
||||||
face cutFaceGlobal;
|
face cutFaceGlobal;
|
||||||
cutFaceGlobal.transfer(cutFaceGlobalPoints.shrink());
|
cutFaceGlobal.transfer(cutFaceGlobalPoints);
|
||||||
|
|
||||||
cf.append(cutFaceGlobal);
|
cf.append(cutFaceGlobal);
|
||||||
|
|
||||||
face cutFaceLocal;
|
face cutFaceLocal;
|
||||||
cutFaceLocal.transfer(cutFaceLocalPoints.shrink());
|
cutFaceLocal.transfer(cutFaceLocalPoints);
|
||||||
// Pout << "\ncutFaceLocal: " << cutFaceLocal.points(lp) << endl;
|
// Pout << "\ncutFaceLocal: " << cutFaceLocal.points(lp) << endl;
|
||||||
// Go through all edges of the cut faces.
|
// Go through all edges of the cut faces.
|
||||||
// If the edge corresponds to a starting face edge,
|
// If the edge corresponds to a starting face edge,
|
||||||
@ -596,20 +596,19 @@ void Foam::enrichedPatch::calcCutFaces() const
|
|||||||
|
|
||||||
// Re-pack the list into compact storage
|
// Re-pack the list into compact storage
|
||||||
cutFacesPtr_ = new faceList();
|
cutFacesPtr_ = new faceList();
|
||||||
cutFacesPtr_->transfer(cf.shrink());
|
cutFacesPtr_->transfer(cf);
|
||||||
|
|
||||||
cutFaceMasterPtr_ = new labelList();
|
cutFaceMasterPtr_ = new labelList();
|
||||||
cutFaceMasterPtr_->transfer(cfMaster.shrink());
|
cutFaceMasterPtr_->transfer(cfMaster);
|
||||||
|
|
||||||
cutFaceSlavePtr_ = new labelList();
|
cutFaceSlavePtr_ = new labelList();
|
||||||
cutFaceSlavePtr_->transfer(cfSlave.shrink());
|
cutFaceSlavePtr_->transfer(cfSlave);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void Foam::enrichedPatch::clearCutFaces()
|
void Foam::enrichedPatch::clearCutFaces()
|
||||||
{
|
{
|
||||||
deleteDemandDrivenData(cutFacesPtr_);
|
deleteDemandDrivenData(cutFacesPtr_);
|
||||||
|
|
||||||
deleteDemandDrivenData(cutFaceMasterPtr_);
|
deleteDemandDrivenData(cutFaceMasterPtr_);
|
||||||
deleteDemandDrivenData(cutFaceSlavePtr_);
|
deleteDemandDrivenData(cutFaceSlavePtr_);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -233,10 +233,10 @@ void Foam::enrichedPatch::calcEnrichedFaces
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Info << "New slave face " << faceI << ": " << newFace << endl;
|
// Info<< "New slave face " << faceI << ": " << newFace << endl;
|
||||||
|
|
||||||
// Add the new face to the list
|
// Add the new face to the list
|
||||||
enrichedFaces[nEnrichedFaces].transfer(newFace.shrink());
|
enrichedFaces[nEnrichedFaces].transfer(newFace);
|
||||||
nEnrichedFaces++;
|
nEnrichedFaces++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -384,10 +384,10 @@ void Foam::enrichedPatch::calcEnrichedFaces
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Info << "New master face: " << newFace << endl;
|
// Info<< "New master face: " << newFace << endl;
|
||||||
|
|
||||||
// Add the new face to the list
|
// Add the new face to the list
|
||||||
enrichedFaces[nEnrichedFaces].transfer(newFace.shrink());
|
enrichedFaces[nEnrichedFaces].transfer(newFace);
|
||||||
nEnrichedFaces++;
|
nEnrichedFaces++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -138,11 +138,11 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
|
|||||||
forAll (mpfToc, mpfTocI)
|
forAll (mpfToc, mpfTocI)
|
||||||
{
|
{
|
||||||
labelList l;
|
labelList l;
|
||||||
l.transfer(mpf.find(mpfToc[mpfTocI])().shrink());
|
l.transfer(mpf.find(mpfToc[mpfTocI])());
|
||||||
|
|
||||||
masterPointFaceAddr.insert(mpfToc[mpfTocI], l);
|
masterPointFaceAddr.insert(mpfToc[mpfTocI], l);
|
||||||
}
|
}
|
||||||
// Pout << "masterPointFaceAddr: " << masterPointFaceAddr << endl;
|
// Pout<< "masterPointFaceAddr: " << masterPointFaceAddr << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -110,7 +110,7 @@ void Foam::enrichedPatch::calcPointPoints() const
|
|||||||
|
|
||||||
forAll (pp, pointI)
|
forAll (pp, pointI)
|
||||||
{
|
{
|
||||||
ppAddr[pointI].transfer(pp[pointI].shrink());
|
ppAddr[pointI].transfer(pp[pointI]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -369,8 +369,6 @@ void Foam::cellFeatures::calcSuperFaces() const
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
superFace.shrink();
|
|
||||||
|
|
||||||
faces[superFaceI].transfer(superFace);
|
faces[superFaceI].transfer(superFace);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -183,9 +183,7 @@ void indexedOctree<Type>::divide
|
|||||||
result.setSize(8);
|
result.setSize(8);
|
||||||
for (direction octant = 0; octant < subIndices.size(); octant++)
|
for (direction octant = 0; octant < subIndices.size(); octant++)
|
||||||
{
|
{
|
||||||
subIndices[octant].shrink();
|
|
||||||
result[octant].transfer(subIndices[octant]);
|
result[octant].transfer(subIndices[octant]);
|
||||||
subIndices[octant].clear();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -250,8 +250,7 @@ void Foam::regionSplit::fillSeedMask
|
|||||||
// << newChangedFaces.size() << endl;
|
// << newChangedFaces.size() << endl;
|
||||||
//}
|
//}
|
||||||
|
|
||||||
changedFaces.transfer(newChangedFaces.shrink());
|
changedFaces.transfer(newChangedFaces);
|
||||||
newChangedFaces.clear();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -239,12 +239,11 @@ Foam::distributedTriSurfaceMesh::constructSegments
|
|||||||
sendMap.setSize(Pstream::nProcs());
|
sendMap.setSize(Pstream::nProcs());
|
||||||
forAll(sendMap, procI)
|
forAll(sendMap, procI)
|
||||||
{
|
{
|
||||||
dynSendMap[procI].shrink();
|
|
||||||
sendMap[procI].transfer(dynSendMap[procI]);
|
sendMap[procI].transfer(dynSendMap[procI]);
|
||||||
}
|
}
|
||||||
|
|
||||||
allSegments.transfer(dynAllSegments.shrink());
|
allSegments.transfer(dynAllSegments);
|
||||||
allSegmentMap.transfer(dynAllSegmentMap.shrink());
|
allSegmentMap.transfer(dynAllSegmentMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -704,13 +703,12 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
|
|||||||
sendMap.setSize(Pstream::nProcs());
|
sendMap.setSize(Pstream::nProcs());
|
||||||
forAll(sendMap, procI)
|
forAll(sendMap, procI)
|
||||||
{
|
{
|
||||||
dynSendMap[procI].shrink();
|
|
||||||
sendMap[procI].transfer(dynSendMap[procI]);
|
sendMap[procI].transfer(dynSendMap[procI]);
|
||||||
}
|
}
|
||||||
|
|
||||||
allCentres.transfer(dynAllCentres.shrink());
|
allCentres.transfer(dynAllCentres);
|
||||||
allRadiusSqr.transfer(dynAllRadiusSqr.shrink());
|
allRadiusSqr.transfer(dynAllRadiusSqr);
|
||||||
allSegmentMap.transfer(dynAllSegmentMap.shrink());
|
allSegmentMap.transfer(dynAllSegmentMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -482,7 +482,6 @@ void Foam::searchableBox::findLineAll
|
|||||||
pt = inter.hitPoint() + smallVec[pointI];
|
pt = inter.hitPoint() + smallVec[pointI];
|
||||||
}
|
}
|
||||||
|
|
||||||
hits.shrink();
|
|
||||||
info[pointI].transfer(hits);
|
info[pointI].transfer(hits);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@ -449,7 +449,6 @@ void Foam::triSurfaceMesh::findLineAll
|
|||||||
pt = inter.hitPoint() + smallVec[pointI];
|
pt = inter.hitPoint() + smallVec[pointI];
|
||||||
}
|
}
|
||||||
|
|
||||||
hits.shrink();
|
|
||||||
info[pointI].transfer(hits);
|
info[pointI].transfer(hits);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@ -287,18 +287,12 @@ Foam::edgeSurface::edgeSurface
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Transfer.
|
// Transfer.
|
||||||
allEdges.shrink();
|
|
||||||
edges_.transfer(allEdges);
|
edges_.transfer(allEdges);
|
||||||
|
|
||||||
allParentEdges.shrink();
|
|
||||||
parentEdges_.transfer(allParentEdges);
|
parentEdges_.transfer(allParentEdges);
|
||||||
|
|
||||||
forAll(allFaceEdges, faceI)
|
forAll(allFaceEdges, faceI)
|
||||||
{
|
{
|
||||||
DynamicList<label>& allFEdges = allFaceEdges[faceI];
|
faceEdges_[faceI].transfer(allFaceEdges[faceI]);
|
||||||
|
|
||||||
allFEdges.shrink();
|
|
||||||
faceEdges_[faceI].transfer(allFEdges);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -218,14 +218,8 @@ void Foam::edgeIntersections::intersectEdges
|
|||||||
|
|
||||||
|
|
||||||
// Done current edge. Transfer all data into *this
|
// Done current edge. Transfer all data into *this
|
||||||
currentIntersections.shrink();
|
|
||||||
currentIntersectionTypes.shrink();
|
|
||||||
|
|
||||||
operator[](edgeI).transfer(currentIntersections);
|
operator[](edgeI).transfer(currentIntersections);
|
||||||
classification_[edgeI].transfer(currentIntersectionTypes);
|
classification_[edgeI].transfer(currentIntersectionTypes);
|
||||||
|
|
||||||
currentIntersections.clear();
|
|
||||||
currentIntersectionTypes.clear();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (debug)
|
if (debug)
|
||||||
|
|||||||
@ -38,7 +38,6 @@ void Foam::surfaceIntersection::transfer
|
|||||||
List<T>& lList
|
List<T>& lList
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
dList.shrink();
|
|
||||||
lList.transfer(dList);
|
lList.transfer(dList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -197,7 +197,7 @@ void Foam::surfaceFeatures::calcFeatPoints(const List<edgeStatus>& edgeStat)
|
|||||||
featurePoints.append(pointI);
|
featurePoints.append(pointI);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
featurePoints.shrink();
|
|
||||||
featurePoints_.transfer(featurePoints);
|
featurePoints_.transfer(featurePoints);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -815,8 +815,8 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
triMap.transfer(newToOldTri.shrink());
|
triMap.transfer(newToOldTri);
|
||||||
tris.transfer(dynTris.shrink());
|
tris.transfer(dynTris);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -875,7 +875,7 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
triMap.transfer(newToOldTri.shrink());
|
triMap.transfer(newToOldTri);
|
||||||
tris.setSize(newTriI);
|
tris.setSize(newTriI);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -871,8 +871,8 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
triMap.transfer(newToOldTri.shrink());
|
triMap.transfer(newToOldTri);
|
||||||
tris.transfer(dynTris.shrink());
|
tris.transfer(dynTris);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -930,7 +930,7 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
triMap.transfer(newToOldTri.shrink());
|
triMap.transfer(newToOldTri);
|
||||||
tris.setSize(newTriI);
|
tris.setSize(newTriI);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1473,14 +1473,13 @@ Foam::isoSurfaceCell::isoSurfaceCell
|
|||||||
snappedCc = -1;
|
snappedCc = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
snappedPoints.shrink();
|
|
||||||
|
|
||||||
if (debug)
|
if (debug)
|
||||||
{
|
{
|
||||||
Pout<< "isoSurfaceCell : shifted " << snappedPoints.size()
|
Pout<< "isoSurfaceCell : shifted " << snappedPoints.size()
|
||||||
<< " cell centres to intersection." << endl;
|
<< " cell centres to intersection." << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
snappedPoints.shrink();
|
||||||
label nCellSnaps = snappedPoints.size();
|
label nCellSnaps = snappedPoints.size();
|
||||||
|
|
||||||
// Per point -1 or a point inside snappedPoints.
|
// Per point -1 or a point inside snappedPoints.
|
||||||
|
|||||||
Reference in New Issue
Block a user