diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C index c7e85f0a6e..5cbd9f9770 100644 --- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C +++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C @@ -316,11 +316,10 @@ autoPtr reorderMesh mesh.resetPrimitives ( - mesh.nFaces(), - mesh.points(), - newFaces, - newOwner, - newNeighbour, + xfer::null(), + xferMove(newFaces), + xferMove(newOwner), + xferMove(newNeighbour), patchSizes, patchStarts ); diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C index fbb5b9b3d7..6e57ae869d 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C @@ -1059,7 +1059,6 @@ void Foam::polyMesh::resetPrimitives void Foam::polyMesh::resetPrimitives ( - const label nUsedFaces, const xfer& points, const xfer& faces, const xfer& owner, @@ -1124,7 +1123,6 @@ void Foam::polyMesh::resetPrimitives ( "polyMesh::polyMesh::resetPrimitives\n" "(\n" - " const label nUsedFaces,\n" " const xfer&,\n" " const xfer&,\n" " const xfer& owner,\n" @@ -1163,7 +1161,6 @@ void Foam::polyMesh::resetPrimitives ( "polyMesh::polyMesh::resetPrimitives\n" "(\n" - " const label nUsedFaces,\n" " const xfer&,\n" " const xfer&,\n" " const xfer& owner,\n" diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H index d794705216..8be9e9465d 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H @@ -477,7 +477,6 @@ public: // patch ends at nActiveFaces) and change patches with addPatches. void resetPrimitives ( - const label nUsedFaces, const xfer& points, const xfer& faces, const xfer& owner, diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C index 6a776e3b83..93a0088c84 100644 --- a/src/conversion/polyDualMesh/polyDualMesh.C +++ b/src/conversion/polyDualMesh/polyDualMesh.C @@ -1349,11 +1349,10 @@ void Foam::polyDualMesh::calcDual // Assign to mesh. resetPrimitives ( - dualFaces.size(), - dualPoints, - dualFaces, - dualOwner, - dualNeighbour, + xferMove(dualPoints), + xferMove(dualFaces), + xferMove(dualOwner), + xferMove(dualNeighbour), patchSizes, patchStarts ); diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C index b04bc9101e..36227bd267 100644 --- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C +++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C @@ -959,7 +959,7 @@ void Foam::polyMeshAdder::mergeFaceZones ) { zoneNames.setSize(fz0.size() + fz1.size()); - + append(fz0.names(), zoneNames); from1ToAll.setSize(fz1.size()); @@ -1041,7 +1041,7 @@ void Foam::polyMeshAdder::mergeCellZones ) { zoneNames.setSize(cz0.size() + cz1.size()); - + append(cz0.names(), zoneNames); from1ToAll.setSize(cz1.size()); @@ -1168,7 +1168,7 @@ void Foam::polyMeshAdder::addZones mesh.pointZones() ); } - + List fZones(fzFaces.size()); forAll(fZones, i) { @@ -1557,7 +1557,7 @@ Foam::autoPtr Foam::polyMeshAdder::add // Inplace extend mesh0 patches (note that patches0.size() now also // has changed) - polyBoundaryMesh& allPatches = + polyBoundaryMesh& allPatches = const_cast(mesh0.boundaryMesh()); allPatches.setSize(allPatchNames.size()); @@ -1702,11 +1702,10 @@ Foam::autoPtr Foam::polyMeshAdder::add mesh0.resetMotion(); // delete any oldPoints. mesh0.resetPrimitives ( - allFaces.size(), - allPoints, - allFaces, - allOwner, - allNeighbour, + xferMove(allPoints), + xferMove(allFaces), + xferMove(allOwner), + xferMove(allNeighbour), patchSizes, // size patchStarts, // patchstarts validBoundary // boundary valid? @@ -1792,7 +1791,7 @@ Foam::Map Foam::polyMeshAdder::findSharedPoints } } - + // Assign single master for every shared with multiple geometric points // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C index 38ce05f6c7..de5124ea07 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C +++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C @@ -852,7 +852,7 @@ void Foam::polyTopoChange::compact << " at position " << faceI << endl << "Probably face has not been adapted for" << " removed points." << abort(FatalError); - } + } localPointMap[pointI] = newPointI++; } } @@ -904,7 +904,7 @@ void Foam::polyTopoChange::compact << " at position " << faceI << endl << "Probably face has not been adapted for" << " removed points." << abort(FatalError); - } + } localPointMap[pointI] = newPointI++; } } @@ -2987,13 +2987,12 @@ Foam::autoPtr Foam::polyTopoChange::changeMesh mesh.resetPrimitives ( - nActiveFaces_, - xferMove(renumberedMeshPoints), - xferMove(faces_), - xferMove(faceOwner_), - xferMove(faceNeighbour_), - xferMove(patchSizes), - xferMove(patchStarts), + xferMove(renumberedMeshPoints), + xferMoveTo(faces_), + xferMoveTo(faceOwner_), + xferMoveTo(faceNeighbour_), + patchSizes, + patchStarts, syncParallel ); @@ -3004,13 +3003,12 @@ Foam::autoPtr Foam::polyTopoChange::changeMesh // Set new points. mesh.resetPrimitives ( - nActiveFaces_, - xferMove(newPoints), - xferMove(faces_), - xferMove(faceOwner_), - xferMove(faceNeighbour_), - xferMove(patchSizes), - xferMove(patchStarts), + xferMove(newPoints), + xferMoveTo(faces_), + xferMoveTo(faceOwner_), + xferMoveTo(faceNeighbour_), + patchSizes, + patchStarts, syncParallel ); // Invalidate new points to go into map. diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C index 405bbb67e3..c4861bbfaf 100644 --- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C +++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C @@ -237,7 +237,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) // Go through the points and start from the point used twice // check all the edges to find the edges starting from this point - // add the + // add the labelListList edgesToInsert(singleEdges.size()); label nEdgesToInsert = 0; @@ -438,7 +438,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) // Warning: the ordering must be parametric, because in // the case of multiple point insertion onto the same edge // it is possible to get non-cyclic loops - // + // const labelList& unorderedEdge = edgesToInsert[edgeToInsertI]; @@ -678,7 +678,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) << oldFaces[currentFaceIndex] << nl << "newFace: " << newFace << endl; # endif - + // Check for duplicate points in the new face forAll (newFace, checkI) { @@ -756,11 +756,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) // (patches guaranteed to be in increasing order) mesh.resetPrimitives ( - patchStarts[bMesh.size()-1] + patchSizes[bMesh.size()-1], - mesh.points(), - newFaces, - mesh.faceOwner(), - mesh.faceNeighbour(), + xfer::null(), + xferMove(newFaces), + xfer::null(), + xfer::null(), patchSizes, patchStarts, true // boundary forms valid boundary mesh.