songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfer use

Browse Source
This commit is contained in:
mattijs 2008-10-22 09:39:52 +01:00
parent 135c6d0536
commit 042d8d0781
1 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
View File

@ -2988,12 +2988,12 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
mesh.resetPrimitives mesh.resetPrimitives
( (
nActiveFaces_, nActiveFaces_,
renumberedMeshPoints, xferMove<pointField>(renumberedMeshPoints),
faces_, xferMove<faceList>(faces_),
faceOwner_, xferMove<labelList>(faceOwner_),
faceNeighbour_, xferMove<labelList>(faceNeighbour_),
patchSizes, xferMove<labelList>(patchSizes),
patchStarts, xferMove<labelList>(patchStarts),
syncParallel syncParallel
); );
@ -3005,12 +3005,12 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
mesh.resetPrimitives mesh.resetPrimitives
( (
nActiveFaces_, nActiveFaces_,
newPoints, xferMove<pointField>(newPoints),
faces_, xferMove<faceList>(faces_),
faceOwner_, xferMove<labelList>(faceOwner_),
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.
@ -3019,6 +3019,22 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
mesh.changing(true); mesh.changing(true);
} }
// Clear out primitives
{
retiredPoints_.clear();
retiredPoints_.resize(0);
faces_.clear();
faces_.setSize(0);
region_.clear();
region_.setSize(0);
faceOwner_.clear();
faceOwner_.setSize(0);
faceNeighbour_.clear();
faceNeighbour_.setSize(0);
}
if (debug) if (debug)
{ {
// Some stats on changes // Some stats on changes
@ -3055,21 +3071,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::changeMesh
writeMeshStats(mesh, Pout); writeMeshStats(mesh, Pout);
} }
// Clear out primitives
{
retiredPoints_.clear();
retiredPoints_.resize(0);
faces_.clear();
faces_.setSize(0);
region_.clear();
region_.setSize(0);
faceOwner_.clear();
faceOwner_.setSize(0);
faceNeighbour_.clear();
faceNeighbour_.setSize(0);
}
// Zones // Zones
// ~~~~~ // ~~~~~
@ -3250,14 +3251,30 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::makeMesh
new fvMesh new fvMesh
( (
io, io,
newPoints, xferMove<pointField>(newPoints),
faces_, xferMove<faceList>(faces_),
faceOwner_, xferMove<labelList>(faceOwner_),
faceNeighbour_ xferMove<labelList>(faceNeighbour_)
) )
); );
fvMesh& newMesh = newMeshPtr(); fvMesh& newMesh = newMeshPtr();
// Clear out primitives
{
newPoints.clear();
retiredPoints_.clear();
retiredPoints_.resize(0);
faces_.clear();
faces_.setSize(0);
region_.clear();
region_.setSize(0);
faceOwner_.clear();
faceOwner_.setSize(0);
faceNeighbour_.clear();
faceNeighbour_.setSize(0);
}
if (debug) if (debug)
{ {
// Some stats on changes // Some stats on changes
@ -3289,22 +3306,6 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::polyTopoChange::makeMesh
} }
// Clear out primitives
{
newPoints.clear();
retiredPoints_.clear();
retiredPoints_.resize(0);
faces_.clear();
faces_.setSize(0);
region_.clear();
region_.setSize(0);
faceOwner_.clear();
faceOwner_.setSize(0);
faceNeighbour_.clear();
faceNeighbour_.setSize(0);
}
{ {
const polyBoundaryMesh& oldPatches = mesh.boundaryMesh(); const polyBoundaryMesh& oldPatches = mesh.boundaryMesh();