drop ununsed nUsedFaces parameter from polyMesh::resetPrimitives(xfer<..)

- use xfer form for calls to resetPrimitives
This commit is contained in:
Mark Olesen
2008-10-24 12:25:27 +02:00
parent ba6979747c
commit ac00f974e6
7 changed files with 38 additions and 48 deletions

View File

@ -316,11 +316,10 @@ autoPtr<mapPolyMesh> reorderMesh
mesh.resetPrimitives mesh.resetPrimitives
( (
mesh.nFaces(), xfer<pointField>::null(),
mesh.points(), xferMove(newFaces),
newFaces, xferMove(newOwner),
newOwner, xferMove(newNeighbour),
newNeighbour,
patchSizes, patchSizes,
patchStarts patchStarts
); );

View File

@ -1059,7 +1059,6 @@ void Foam::polyMesh::resetPrimitives
void Foam::polyMesh::resetPrimitives void Foam::polyMesh::resetPrimitives
( (
const label nUsedFaces,
const xfer<pointField>& points, const xfer<pointField>& points,
const xfer<faceList>& faces, const xfer<faceList>& faces,
const xfer<labelList>& owner, const xfer<labelList>& owner,
@ -1124,7 +1123,6 @@ void Foam::polyMesh::resetPrimitives
( (
"polyMesh::polyMesh::resetPrimitives\n" "polyMesh::polyMesh::resetPrimitives\n"
"(\n" "(\n"
" const label nUsedFaces,\n"
" const xfer<pointField>&,\n" " const xfer<pointField>&,\n"
" const xfer<faceList>&,\n" " const xfer<faceList>&,\n"
" const xfer<labelList>& owner,\n" " const xfer<labelList>& owner,\n"
@ -1163,7 +1161,6 @@ void Foam::polyMesh::resetPrimitives
( (
"polyMesh::polyMesh::resetPrimitives\n" "polyMesh::polyMesh::resetPrimitives\n"
"(\n" "(\n"
" const label nUsedFaces,\n"
" const xfer<pointField>&,\n" " const xfer<pointField>&,\n"
" const xfer<faceList>&,\n" " const xfer<faceList>&,\n"
" const xfer<labelList>& owner,\n" " const xfer<labelList>& owner,\n"

View File

@ -477,7 +477,6 @@ public:
// patch ends at nActiveFaces) and change patches with addPatches. // patch ends at nActiveFaces) and change patches with addPatches.
void resetPrimitives void resetPrimitives
( (
const label nUsedFaces,
const xfer<pointField>& points, const xfer<pointField>& points,
const xfer<faceList>& faces, const xfer<faceList>& faces,
const xfer<labelList>& owner, const xfer<labelList>& owner,

View File

@ -1349,11 +1349,10 @@ void Foam::polyDualMesh::calcDual
// Assign to mesh. // Assign to mesh.
resetPrimitives resetPrimitives
( (
dualFaces.size(), xferMove(dualPoints),
dualPoints, xferMove(dualFaces),
dualFaces, xferMove(dualOwner),
dualOwner, xferMove(dualNeighbour),
dualNeighbour,
patchSizes, patchSizes,
patchStarts patchStarts
); );

View File

@ -1702,11 +1702,10 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
mesh0.resetMotion(); // delete any oldPoints. mesh0.resetMotion(); // delete any oldPoints.
mesh0.resetPrimitives mesh0.resetPrimitives
( (
allFaces.size(), xferMove(allPoints),
allPoints, xferMove(allFaces),
allFaces, xferMove(allOwner),
allOwner, xferMove(allNeighbour),
allNeighbour,
patchSizes, // size patchSizes, // size
patchStarts, // patchstarts patchStarts, // patchstarts
validBoundary // boundary valid? validBoundary // boundary valid?

View File

@ -2987,13 +2987,12 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
mesh.resetPrimitives mesh.resetPrimitives
( (
nActiveFaces_, xferMove(renumberedMeshPoints),
xferMove<pointField>(renumberedMeshPoints), xferMoveTo<faceList>(faces_),
xferMove<faceList>(faces_), xferMoveTo<labelList>(faceOwner_),
xferMove<labelList>(faceOwner_), xferMoveTo<labelList>(faceNeighbour_),
xferMove<labelList>(faceNeighbour_), patchSizes,
xferMove<labelList>(patchSizes), patchStarts,
xferMove<labelList>(patchStarts),
syncParallel syncParallel
); );
@ -3004,13 +3003,12 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
// Set new points. // Set new points.
mesh.resetPrimitives mesh.resetPrimitives
( (
nActiveFaces_, xferMove(newPoints),
xferMove<pointField>(newPoints), xferMoveTo<faceList>(faces_),
xferMove<faceList>(faces_), xferMoveTo<labelList>(faceOwner_),
xferMove<labelList>(faceOwner_), xferMoveTo<labelList>(faceNeighbour_),
xferMove<labelList>(faceNeighbour_), patchSizes,
xferMove<labelList>(patchSizes), patchStarts,
xferMove<labelList>(patchStarts),
syncParallel syncParallel
); );
// Invalidate new points to go into map. // Invalidate new points to go into map.

View File

@ -756,11 +756,10 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
// (patches guaranteed to be in increasing order) // (patches guaranteed to be in increasing order)
mesh.resetPrimitives mesh.resetPrimitives
( (
patchStarts[bMesh.size()-1] + patchSizes[bMesh.size()-1], xfer<pointField>::null(),
mesh.points(), xferMove(newFaces),
newFaces, xfer<labelList>::null(),
mesh.faceOwner(), xfer<labelList>::null(),
mesh.faceNeighbour(),
patchSizes, patchSizes,
patchStarts, patchStarts,
true // boundary forms valid boundary mesh. true // boundary forms valid boundary mesh.