From c65a40d57df0be4eff723e0d0cdf9b1c6c84bbc2 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 12 Dec 2008 14:20:56 +0100 Subject: [PATCH] don't need shrink before List::transfer(DynamicList&) anymore --- .../netgenNeutralToFoam/netgenNeutralToFoam.C | 2 -- .../conversion/tetgenToFoam/tetgenToFoam.C | 5 ++-- .../fieldview9Reader/readerDatabase.C | 3 --- src/OpenFOAM/db/scalarRange/scalarRanges.C | 1 - .../polyMesh/globalMeshData/globalMeshData.C | 3 +-- .../polyMesh/globalMeshData/globalPoints.C | 6 ++--- .../meshes/polyMesh/polyMeshFromShapeMesh.C | 2 +- .../PrimitivePatch/PrimitivePatchAddressing.C | 2 +- .../PrimitivePatch/PrimitivePatchEdgeLoops.C | 2 -- .../primitiveMesh/primitiveMeshCellEdges.C | 2 +- .../meshRefinement/meshRefinement.C | 2 +- src/conversion/polyDualMesh/polyDualMesh.C | 12 ++++------ .../decompositionMethod/decompositionMethod.C | 3 +-- .../parMetisDecomp/parMetisDecomp.C | 5 ++-- src/dynamicMesh/boundaryMesh/boundaryMesh.C | 6 +---- .../meshCut/cellLooper/topoCellLooper.C | 24 ++++++++----------- .../boundaryCutter/boundaryCutter.C | 7 ------ .../meshCut/wallLayerCells/wallLayerCells.C | 2 -- src/dynamicMesh/polyMeshAdder/polyMeshAdder.C | 1 - .../polyTopoChange/polyTopoChange/hexRef8.C | 15 ++++-------- .../polyTopoChange/removeFaces.C | 22 ++++++++--------- .../slidingInterface/coupleSlidingInterface.C | 16 ++++++------- .../decoupleSlidingInterface.C | 4 ++-- .../enrichedPatch/enrichedPatchCutFaces.C | 15 ++++++------ .../enrichedPatch/enrichedPatchFaces.C | 10 ++++---- .../enrichedPatch/enrichedPatchMasterPoints.C | 4 ++-- .../enrichedPatch/enrichedPatchPointPoints.C | 2 +- src/meshTools/cellFeatures/cellFeatures.C | 2 -- src/meshTools/indexedOctree/indexedOctree.C | 2 -- src/meshTools/regionSplit/regionSplit.C | 3 +-- .../distributedTriSurfaceMesh.C | 12 ++++------ .../searchableSurface/searchableBox.C | 1 - .../searchableSurface/triSurfaceMesh.C | 1 - .../intersectedSurface/edgeSurface.C | 8 +------ .../surfaceIntersection/edgeIntersections.C | 8 +------ .../surfaceIntersectionTemplates.C | 1 - .../surfaceFeatures/surfaceFeatures.C | 2 +- .../sampledSurface/isoSurface/isoSurface.C | 6 ++--- .../isoSurface/isoSurfaceCell.C | 21 ++++++++-------- 39 files changed, 89 insertions(+), 156 deletions(-) diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C index f290e7fa42..f9337bad0e 100644 --- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C +++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C @@ -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; diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C index e99bca0af1..cf9d5e8237 100644 --- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C +++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C @@ -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; diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C index d7db62e441..898f3572e0 100644 --- a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C +++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C @@ -74,10 +74,7 @@ void Foam::readerDatabase::getPolyHedra() } } - polys.shrink(); - Info<< "Found " << polys.size() << " polyhedral cells " << endl; - polys_.transfer(polys); } diff --git a/src/OpenFOAM/db/scalarRange/scalarRanges.C b/src/OpenFOAM/db/scalarRange/scalarRanges.C index d2bf1c8302..f0cf5d5a84 100644 --- a/src/OpenFOAM/db/scalarRange/scalarRanges.C +++ b/src/OpenFOAM/db/scalarRange/scalarRanges.C @@ -51,7 +51,6 @@ Foam::scalarRanges::scalarRanges(Istream& is) } } - lst.shrink(); transfer(lst); } diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C index 8fdee370a0..0650dcc879 100644 --- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C +++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C @@ -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); diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C index 6cf680ca70..93382ec2a4 100644 --- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C +++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C @@ -467,10 +467,8 @@ void Foam::globalPoints::remove(const Map