From 45e503847fbc4b9d4978258cee49a261e9fff4bc Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 19 Dec 2013 15:36:50 +0000
Subject: [PATCH] ENH: Cloud: optimisation; clearing, not destroying transfer
buffers
---
src/lagrangian/basic/Cloud/Cloud.C | 48 +++++++++++++++++++-----------
1 file changed, 30 insertions(+), 18 deletions(-)
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index c0e43c16868..3773de6606c 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -219,22 +219,33 @@ void Foam::Cloud<ParticleType>::move(TrackData& td, const scalar trackTime)
// Reset nTrackingRescues
nTrackingRescues_ = 0;
+
+ // List of lists of particles to be transfered for all of the
+ // neighbour processors
+ List<IDLList<ParticleType> > particleTransferLists
+ (
+ neighbourProcs.size()
+ );
+
+ // List of destination processorPatches indices for all of the
+ // neighbour processors
+ List<DynamicList<label> > patchIndexTransferLists
+ (
+ neighbourProcs.size()
+ );
+
+ // Allocate transfer buffers
+ PstreamBuffers pBufs(Pstream::nonBlocking);
+
+
// While there are particles to transfer
while (true)
{
- // List of lists of particles to be transfered for all of the
- // neighbour processors
- List<IDLList<ParticleType> > particleTransferLists
- (
- neighbourProcs.size()
- );
-
- // List of destination processorPatches indices for all of the
- // neighbour processors
- List<DynamicList<label> > patchIndexTransferLists
- (
- neighbourProcs.size()
- );
+ particleTransferLists = IDLList<ParticleType>();
+ forAll(patchIndexTransferLists, i)
+ {
+ patchIndexTransferLists[i].clear();
+ }
// Loop over all particles
forAllIter(typename Cloud<ParticleType>, *this, pIter)
@@ -288,8 +299,9 @@ void Foam::Cloud<ParticleType>::move(TrackData& td, const scalar trackTime)
break;
}
- // Allocate transfer buffers
- PstreamBuffers pBufs(Pstream::nonBlocking);
+
+ // Clear transfer buffers
+ pBufs.clear();
// Stream into send buffers
forAll(particleTransferLists, i)
@@ -308,12 +320,12 @@ void Foam::Cloud<ParticleType>::move(TrackData& td, const scalar trackTime)
}
}
- // Set up transfers when in non-blocking mode. Returns sizes (in bytes)
- // to be sent/received.
- labelListList allNTrans(Pstream::nProcs());
+ // Start sending. Sets number of bytes transferred
+ labelListList allNTrans(Pstream::nProcs());
pBufs.finishedSends(allNTrans);
+
bool transfered = false;
forAll(allNTrans, i)
--
GitLab