Commit c65a40d5 authored by Mark Olesen's avatar Mark Olesen
Browse files

don't need shrink before List::transfer(DynamicList&) anymore

parent 8a5931f1
......@@ -289,9 +289,7 @@ int main(int argc, char *argv[])
<< patchNames[patchI] << "\t\t"
<< allPatchFaces[patchI].size() << endl;
allPatchFaces[patchI].shrink();
patchFaces[patchI].transfer(allPatchFaces[patchI]);
allPatchFaces[patchI].clear();
}
Info<< endl;
......
......@@ -461,7 +461,7 @@ int main(int argc, char *argv[])
}
}
// Trim
boundaryFaces.setSize(faceI);
boundaryPatch.setSize(faceI);
......@@ -515,7 +515,7 @@ int main(int argc, char *argv[])
Info<< " " << patchNames[patchI] << " : "
<< allPatchFaces[patchI].size() << endl;
patchFaces[patchI].transfer(allPatchFaces[patchI].shrink());
patchFaces[patchI].transfer(allPatchFaces[patchI]);
}
Info<< endl;
......@@ -548,7 +548,6 @@ int main(int argc, char *argv[])
meshPtr().write();
Info<< "End\n" << endl;
return 0;
......
......@@ -74,10 +74,7 @@ void Foam::readerDatabase::getPolyHedra()
}
}
polys.shrink();
Info<< "Found " << polys.size() << " polyhedral cells " << endl;
polys_.transfer(polys);
}
......
......@@ -51,7 +51,6 @@ Foam::scalarRanges::scalarRanges(Istream& is)
}
}
lst.shrink();
transfer(lst);
}
......
......@@ -393,12 +393,11 @@ void Foam::globalMeshData::calcSharedEdges() const
}
}
}
dynSharedEdgeLabels.shrink();
sharedEdgeLabelsPtr_ = new labelList();
labelList& sharedEdgeLabels = *sharedEdgeLabelsPtr_;
sharedEdgeLabels.transfer(dynSharedEdgeLabels);
dynSharedEdgeAddr.shrink();
sharedEdgeAddrPtr_ = new labelList();
labelList& sharedEdgeAddr = *sharedEdgeAddrPtr_;
sharedEdgeAddr.transfer(dynSharedEdgeAddr);
......
......@@ -467,10 +467,8 @@ void Foam::globalPoints::remove(const Map<label>& directNeighbours)
Map<label> oldMeshToProcPoint(meshToProcPoint_);
meshToProcPoint_.clear();
procPoints_.shrink();
List<procPointList> oldProcPoints;
oldProcPoints.transfer(procPoints_);
procPoints_.clear();
// Go through all equivalences
for
......@@ -535,7 +533,7 @@ void Foam::globalPoints::remove(const Map<label>& directNeighbours)
{
// This happens for 'wedge' like cyclics where the two halves
// come together in the same point so share the same meshPoint.
// So this meshPoint will have info of size one only.
// So this meshPoint will have info of size one only.
if
(
pointInfo[0][0] != Pstream::myProcNo()
......@@ -968,7 +966,7 @@ Foam::globalPoints::globalPoints(const polyMesh& mesh)
// Pout<< " pointI:" << meshPointI << ' '
// << mesh.points()[meshPointI]
// << " connected to proc " << pointInfo[i][0]
// << " point:" << pointInfo[i][1]
// << " point:" << pointInfo[i][1]
// << endl;
// }
//}
......
......@@ -64,7 +64,7 @@ Foam::labelListList Foam::polyMesh::cellShapePointCells
forAll (pc, pointI)
{
pointCellAddr[pointI].transfer(pc[pointI].shrink());
pointCellAddr[pointI].transfer(pc[pointI]);
}
return pointCellAddr;
......
......@@ -298,7 +298,7 @@ void PrimitivePatch<Face, FaceList, PointField, PointType>::calcAddressing()
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);
// Done all for current loop. Transfer to edgeLoops.
loop.shrink();
edgeLoops[loopI].transfer(loop);
loopI++;
......
......@@ -108,7 +108,7 @@ void Foam::primitiveMesh::calcCellEdges() const
// reset the size
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);
if (localPoints.size() != globalToLocalRegion.size())
......
......@@ -412,11 +412,9 @@ void Foam::polyDualMesh::collectPatchInternalFace
}
}
dualFace2.transfer(dualFace.shrink());
dualFace.clear();
dualFace2.transfer(dualFace);
featEdgeIndices2.transfer(featEdgeIndices.shrink());
featEdgeIndices.clear();
featEdgeIndices2.transfer(featEdgeIndices);
if (reverseFace)
{
......@@ -1590,8 +1588,7 @@ void Foam::polyDualMesh::calcFeatures
allFeaturePoints.append(allBoundary.meshPoints()[pointI]);
}
}
featurePoints.transfer(allFeaturePoints.shrink());
allFeaturePoints.clear();
featurePoints.transfer(allFeaturePoints);
if (debug)
{
......@@ -1633,8 +1630,7 @@ void Foam::polyDualMesh::calcFeatures
allFeatureEdges.append(meshEdges[edgeI]);
}
}
featureEdges.transfer(allFeatureEdges.shrink());
allFeatureEdges.clear();
featureEdges.transfer(allFeatureEdges);
}
......
......@@ -165,8 +165,7 @@ void Foam::decompositionMethod::calcCellCells
cellCells.setSize(dynCellCells.size());
forAll(dynCellCells, coarseI)
{
cellCells[coarseI].transfer(dynCellCells[coarseI].shrink());
dynCellCells[coarseI].clear();
cellCells[coarseI].transfer(dynCellCells[coarseI]);
}
}
......
......@@ -794,8 +794,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
globalRegionRegions.setSize(dynRegionRegions.size());
forAll(dynRegionRegions, i)
{
globalRegionRegions[i].transfer(dynRegionRegions[i].shrink());
dynRegionRegions[i].clear();
globalRegionRegions[i].transfer(dynRegionRegions[i]);
}
}
......@@ -859,7 +858,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
// Check for user supplied weights and decomp options
if (decompositionDict_.found("metisCoeffs"))
{
const dictionary& metisCoeffs =
const dictionary& metisCoeffs =
decompositionDict_.subDict("metisCoeffs");
word weightsFile;
......
......@@ -1503,17 +1503,13 @@ void Foam::boundaryMesh::setExtraEdges(const label edgeI)
{
labelList minDistance(mesh().nEdges(), -1);
// All edge labels encountered
// All edge labels encountered
DynamicList<label> visitedEdges;
// Floodfill from edgeI starting from distance 0. Stop at distance.
markEdges(8, edgeI, 0, minDistance, visitedEdges);
visitedEdges.shrink();
// Set edge labels to display
//? Allowed to transfer from DynamicList to List
extraEdges_.transfer(visitedEdges);
}
......
......@@ -787,9 +787,6 @@ bool Foam::topoCellLooper::cut
}
else
{
localLoop.shrink();
localLoopWeights.shrink();
loop.transfer(localLoop);
loopWeights.transfer(localLoopWeights);
......@@ -799,17 +796,16 @@ bool Foam::topoCellLooper::cut
else
{
// Let parent handle poly case.
return
hexCellLooper::cut
(
refDir,
cellI,
vertIsCut,
edgeIsCut,
edgeWeight,
loop,
loopWeights
);
return hexCellLooper::cut
(
refDir,
cellI,
vertIsCut,
edgeIsCut,
edgeWeight,
loop,
loopWeights
);
}
}
}
......
......@@ -131,11 +131,8 @@ Foam::face Foam::boundaryCutter::addEdgeCutsToFace
}
}
newFace.shrink();
face returnFace;
returnFace.transfer(newFace);
newFace.clear();
if (debug)
{
......@@ -361,9 +358,7 @@ bool Foam::boundaryCutter::splitFace
{
// Enough vertices to create a face from.
face tmpFace;
newFace.shrink();
tmpFace.transfer(newFace);
newFace.clear();
// Add face tmpFace
addFace(faceI, tmpFace, modifiedFace, meshMod);
......@@ -381,9 +376,7 @@ bool Foam::boundaryCutter::splitFace
{
// Enough vertices to create a face from.
face tmpFace;
newFace.shrink();
tmpFace.transfer(newFace);
newFace.clear();
// Add face tmpFace
addFace(faceI, tmpFace, modifiedFace, meshMod);
......
......@@ -222,8 +222,6 @@ Foam::wallLayerCells::wallLayerCells
}
}
refineCells.shrink();
// Transfer refineCells storage to this.
transfer(refineCells);
}
......
......@@ -489,7 +489,6 @@ void Foam::polyMeshAdder::insertVertices
if (workFace.size() != allF.size())
{
workFace.shrink();
allF.transfer(workFace);
}
}
......
......@@ -1079,8 +1079,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo
}
face newFace;
newFace.transfer(newFaceVerts.shrink());
newFaceVerts.clear();
newFace.transfer(newFaceVerts);
label anchorCell0 = getAnchorCell
(
......@@ -3687,8 +3686,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
);
// Convert dynamiclist to face.
newFace.transfer(faceVerts.shrink());
faceVerts.clear();
newFace.transfer(faceVerts);
//Pout<< "Split face:" << faceI << " verts:" << f
// << " into quad:" << newFace << endl;
......@@ -3811,8 +3809,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
}
face newFace;
newFace.transfer(newFaceVerts.shrink());
newFace.transfer(newFaceVerts);
// The point with the lowest level should be an anchor
// point of the neighbouring cells.
......@@ -3993,10 +3990,8 @@ Foam::labelListList Foam::hexRef8::setRefinement
}
}
pointLevel_.transfer(newPointLevel.shrink());
newPointLevel.clear();
cellLevel_.transfer(newCellLevel.shrink());
newCellLevel.clear();
pointLevel_.transfer(newPointLevel);
cellLevel_.transfer(newCellLevel);
// Mark files as changed
setInstance(mesh_.facesInstance());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment