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

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

Browse Source
This commit is contained in:
Mark Olesen
2008-12-12 14:20:56 +01:00
parent 8a5931f15a
commit c65a40d57d
39 changed files with 89 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
View File

@ -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;

3
applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
View File

@ -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;

3
applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
View File

@ -74,10 +74,7 @@ void Foam::readerDatabase::getPolyHedra()
}
}
polys.shrink();
Info<< "Found " << polys.size() << " polyhedral cells " << endl;
polys_.transfer(polys);
}

1
src/OpenFOAM/db/scalarRange/scalarRanges.C
View File

@ -51,7 +51,6 @@ Foam::scalarRanges::scalarRanges(Istream& is)
}
}
lst.shrink();
transfer(lst);
}

3
src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
View File

@ -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);

2
src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
View File

@ -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

2
src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
View File

@ -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;

2
src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
View File

@ -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]);
}

2
src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchEdgeLoops.C
View File

@ -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++;

2
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
View File

@ -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]);
}
}
}

2
src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
View File

@ -546,7 +546,7 @@ void Foam::meshRefinement::calcLocalRegions
}
}
}
localCc.shrink();
localPoints.transfer(localCc);
if (localPoints.size() != globalToLocalRegion.size())

12
src/conversion/polyDualMesh/polyDualMesh.C
View File

@ -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);
}

3
src/decompositionAgglomeration/decompositionMethods/decompositionMethod/decompositionMethod.C
View File

@ -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]);
}
}

3
src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.C
View File

@ -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]);
}
}

4
src/dynamicMesh/boundaryMesh/boundaryMesh.C
View File

@ -1504,16 +1504,12 @@ void Foam::boundaryMesh::setExtraEdges(const label edgeI)
labelList minDistance(mesh().nEdges(), -1);
// 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);
}

6
src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
View File

@ -787,9 +787,6 @@ bool Foam::topoCellLooper::cut
}
else
{
localLoop.shrink();
localLoopWeights.shrink();
loop.transfer(localLoop);
loopWeights.transfer(localLoopWeights);
@ -799,8 +796,7 @@ bool Foam::topoCellLooper::cut
else
{
// Let parent handle poly case.
return
hexCellLooper::cut
return hexCellLooper::cut
(
refDir,
cellI,

7
src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
View File

@ -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);

2
src/dynamicMesh/meshCut/wallLayerCells/wallLayerCells.C
View File

@ -222,8 +222,6 @@ Foam::wallLayerCells::wallLayerCells
}
}
refineCells.shrink();
// Transfer refineCells storage to this.
transfer(refineCells);
}

1
src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
View File

@ -489,7 +489,6 @@ void Foam::polyMeshAdder::insertVertices
if (workFace.size() != allF.size())
{
workFace.shrink();
allF.transfer(workFace);
}
}

15
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
View File

@ -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());

6
src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
View File

@ -365,8 +365,7 @@ void Foam::removeFaces::mergeFaces
}
face mergedFace;
mergedFace.transfer(faceVerts.shrink());
faceVerts.clear();
mergedFace.transfer(faceVerts);
if (reverseLoop)
{
@ -763,8 +762,7 @@ Foam::label Foam::removeFaces::compatibleRemoves
}
}
newFacesToRemove.transfer(allFacesToRemove.shrink());
allFacesToRemove.clear();
newFacesToRemove.transfer(allFacesToRemove);
return nUsedRegions;
}

8
src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
View File

@ -747,14 +747,14 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
forAll (pointsIntoMasterEdges, i)
{
pime[i].transfer(pointsIntoMasterEdges[i].shrink());
pime[i].transfer(pointsIntoMasterEdges[i]);
}
labelListList pise(pointsIntoSlaveEdges.size());
forAll (pointsIntoSlaveEdges, i)
{
pise[i].transfer(pointsIntoSlaveEdges[i].shrink());
pise[i].transfer(pointsIntoSlaveEdges[i]);
}
// Prepare the enriched faces
@ -1398,7 +1398,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
}
face newFace;
newFace.transfer(newFaceLabels.shrink());
newFace.transfer(newFaceLabels);
// 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;
newFace.transfer(newFaceLabels.shrink());
newFace.transfer(newFaceLabels);
// Pout << "Modifying slave stick-out face " << curFaceID << " old face: " << oldFace << " new face: " << newFace << endl;

4
src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
View File

@ -227,7 +227,7 @@ void Foam::slidingInterface::decoupleInterface
}
face newFace;
newFace.transfer(newFaceLabels.shrink());
newFace.transfer(newFaceLabels);
// Pout << "Modifying master stick-out face " << curFaceID << " old face: " << oldFace << " new face: " << newFace << endl;
@ -350,7 +350,7 @@ void Foam::slidingInterface::decoupleInterface
}
face newFace;
newFace.transfer(newFaceLabels.shrink());
newFace.transfer(newFaceLabels);
// Pout << "Modifying slave stick-out face " << curFaceID << " old face: " << oldFace << " new face: " << newFace << endl;

11
src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
View File

@ -304,12 +304,12 @@ void Foam::enrichedPatch::calcCutFaces() const
// Append the face
face cutFaceGlobal;
cutFaceGlobal.transfer(cutFaceGlobalPoints.shrink());
cutFaceGlobal.transfer(cutFaceGlobalPoints);
cf.append(cutFaceGlobal);
face cutFaceLocal;
cutFaceLocal.transfer(cutFaceLocalPoints.shrink());
cutFaceLocal.transfer(cutFaceLocalPoints);
// Pout << "\ncutFaceLocal: " << cutFaceLocal.points(lp) << endl;
// Go through all edges of the cut faces.
// 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
cutFacesPtr_ = new faceList();
cutFacesPtr_->transfer(cf.shrink());
cutFacesPtr_->transfer(cf);
cutFaceMasterPtr_ = new labelList();
cutFaceMasterPtr_->transfer(cfMaster.shrink());
cutFaceMasterPtr_->transfer(cfMaster);
cutFaceSlavePtr_ = new labelList();
cutFaceSlavePtr_->transfer(cfSlave.shrink());
cutFaceSlavePtr_->transfer(cfSlave);
}
void Foam::enrichedPatch::clearCutFaces()
{
deleteDemandDrivenData(cutFacesPtr_);
deleteDemandDrivenData(cutFaceMasterPtr_);
deleteDemandDrivenData(cutFaceSlavePtr_);
}

8
src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
View File

@ -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
enrichedFaces[nEnrichedFaces].transfer(newFace.shrink());
enrichedFaces[nEnrichedFaces].transfer(newFace);
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
enrichedFaces[nEnrichedFaces].transfer(newFace.shrink());
enrichedFaces[nEnrichedFaces].transfer(newFace);
nEnrichedFaces++;
}

4
src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
View File

@ -138,11 +138,11 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
forAll (mpfToc, mpfTocI)
{
labelList l;
l.transfer(mpf.find(mpfToc[mpfTocI])().shrink());
l.transfer(mpf.find(mpfToc[mpfTocI])());
masterPointFaceAddr.insert(mpfToc[mpfTocI], l);
}
// Pout << "masterPointFaceAddr: " << masterPointFaceAddr << endl;
// Pout<< "masterPointFaceAddr: " << masterPointFaceAddr << endl;
}

2
src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
View File

@ -110,7 +110,7 @@ void Foam::enrichedPatch::calcPointPoints() const
forAll (pp, pointI)
{
ppAddr[pointI].transfer(pp[pointI].shrink());
ppAddr[pointI].transfer(pp[pointI]);
}
}

2
src/meshTools/cellFeatures/cellFeatures.C
View File

@ -369,8 +369,6 @@ void Foam::cellFeatures::calcSuperFaces() const
}
else
{
superFace.shrink();
faces[superFaceI].transfer(superFace);
}
}

2
src/meshTools/indexedOctree/indexedOctree.C
View File

@ -183,9 +183,7 @@ void indexedOctree<Type>::divide
result.setSize(8);
for (direction octant = 0; octant < subIndices.size(); octant++)
{
subIndices[octant].shrink();
result[octant].transfer(subIndices[octant]);
subIndices[octant].clear();
}
}

3
src/meshTools/regionSplit/regionSplit.C
View File

@ -250,8 +250,7 @@ void Foam::regionSplit::fillSeedMask
// << newChangedFaces.size() << endl;
//}
changedFaces.transfer(newChangedFaces.shrink());
newChangedFaces.clear();
changedFaces.transfer(newChangedFaces);
}
}

12
src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
View File

@ -239,12 +239,11 @@ Foam::distributedTriSurfaceMesh::constructSegments
sendMap.setSize(Pstream::nProcs());
forAll(sendMap, procI)
{
dynSendMap[procI].shrink();
sendMap[procI].transfer(dynSendMap[procI]);
}
allSegments.transfer(dynAllSegments.shrink());
allSegmentMap.transfer(dynAllSegmentMap.shrink());
allSegments.transfer(dynAllSegments);
allSegmentMap.transfer(dynAllSegmentMap);
}
@ -704,13 +703,12 @@ Foam::distributedTriSurfaceMesh::calcLocalQueries
sendMap.setSize(Pstream::nProcs());
forAll(sendMap, procI)
{
dynSendMap[procI].shrink();
sendMap[procI].transfer(dynSendMap[procI]);
}
allCentres.transfer(dynAllCentres.shrink());
allRadiusSqr.transfer(dynAllRadiusSqr.shrink());
allSegmentMap.transfer(dynAllSegmentMap.shrink());
allCentres.transfer(dynAllCentres);
allRadiusSqr.transfer(dynAllRadiusSqr);
allSegmentMap.transfer(dynAllSegmentMap);
}

1
src/meshTools/searchableSurface/searchableBox.C
View File

@ -482,7 +482,6 @@ void Foam::searchableBox::findLineAll
pt = inter.hitPoint() + smallVec[pointI];
}
hits.shrink();
info[pointI].transfer(hits);
}
else

1
src/meshTools/searchableSurface/triSurfaceMesh.C
View File

@ -449,7 +449,6 @@ void Foam::triSurfaceMesh::findLineAll
pt = inter.hitPoint() + smallVec[pointI];
}
hits.shrink();
info[pointI].transfer(hits);
}
else

8
src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
View File

@ -287,18 +287,12 @@ Foam::edgeSurface::edgeSurface
}
// Transfer.
allEdges.shrink();
edges_.transfer(allEdges);
allParentEdges.shrink();
parentEdges_.transfer(allParentEdges);
forAll(allFaceEdges, faceI)
{
DynamicList<label>& allFEdges = allFaceEdges[faceI];
allFEdges.shrink();
faceEdges_[faceI].transfer(allFEdges);
faceEdges_[faceI].transfer(allFaceEdges[faceI]);
}

6
src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
View File

@ -218,14 +218,8 @@ void Foam::edgeIntersections::intersectEdges
// Done current edge. Transfer all data into *this
currentIntersections.shrink();
currentIntersectionTypes.shrink();
operator[](edgeI).transfer(currentIntersections);
classification_[edgeI].transfer(currentIntersectionTypes);
currentIntersections.clear();
currentIntersectionTypes.clear();
}
if (debug)

1
src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
View File

@ -38,7 +38,6 @@ void Foam::surfaceIntersection::transfer
List<T>& lList
)
{
dList.shrink();
lList.transfer(dList);
}

2
src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
View File

@ -197,7 +197,7 @@ void Foam::surfaceFeatures::calcFeatPoints(const List<edgeStatus>& edgeStat)
featurePoints.append(pointI);
}
}
featurePoints.shrink();
featurePoints_.transfer(featurePoints);
}

6
src/sampling/sampledSurface/isoSurface/isoSurface.C
View File

@ -815,8 +815,8 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
}
}
triMap.transfer(newToOldTri.shrink());
tris.transfer(dynTris.shrink());
triMap.transfer(newToOldTri);
tris.transfer(dynTris);
}
@ -875,7 +875,7 @@ Foam::triSurface Foam::isoSurface::stitchTriPoints
}
}
triMap.transfer(newToOldTri.shrink());
triMap.transfer(newToOldTri);
tris.setSize(newTriI);
}
}

9
src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
View File

@ -871,8 +871,8 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
}
}
triMap.transfer(newToOldTri.shrink());
tris.transfer(dynTris.shrink());
triMap.transfer(newToOldTri);
tris.transfer(dynTris);
}
@ -930,7 +930,7 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
}
}
triMap.transfer(newToOldTri.shrink());
triMap.transfer(newToOldTri);
tris.setSize(newTriI);
}
}
@ -1473,14 +1473,13 @@ Foam::isoSurfaceCell::isoSurfaceCell
snappedCc = -1;
}
snappedPoints.shrink();
if (debug)
{
Pout<< "isoSurfaceCell : shifted " << snappedPoints.size()
<< " cell centres to intersection." << endl;
}
snappedPoints.shrink();
label nCellSnaps = snappedPoints.size();
// Per point -1 or a point inside snappedPoints.