From 645ba8e612e7f5f7d9b51c8497f844262dacaa4d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 6 Apr 2010 16:30:35 +0100
Subject: [PATCH] ENH: Split exchange into two step process (send+receive) so
we can intersperse calculations.
---
.../mapPolyMesh/mapDistribute/mapDistribute.H | 8 ++
.../mapDistribute/mapDistributeTemplates.C | 78 +++++++++++++++++--
2 files changed, 78 insertions(+), 8 deletions(-)
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
index ab7193a6829..0d47c7db9d4 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H
@@ -70,6 +70,7 @@ namespace Foam
class mapPolyMesh;
class globalIndex;
+class PstreamBuffers;
/*---------------------------------------------------------------------------*\
Class mapDistribute Declaration
@@ -318,6 +319,13 @@ public:
}
}
+ //- Do all sends using PstreamBuffers
+ template<class T>
+ void send(PstreamBuffers&, const List<T>&) const;
+ //- Do all receives using PstreamBuffers
+ template<class T>
+ void receive(PstreamBuffers&, List<T>&) const;
+
//- Correct for topo change.
void updateMesh(const mapPolyMesh&)
{
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index e219bc95abd..8797519d4df 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -185,7 +185,7 @@ void Foam::mapDistribute::distribute
{
if (!contiguous<T>())
{
- PstreamBuffers pBuffs(Pstream::nonBlocking);
+ PstreamBuffers pBufs(Pstream::nonBlocking);
// Stream data into buffer
for (label domain = 0; domain < Pstream::nProcs(); domain++)
@@ -195,13 +195,13 @@ void Foam::mapDistribute::distribute
if (domain != Pstream::myProcNo() && map.size())
{
// Put data into send buffer
- UOPstream toDomain(domain, pBuffs);
+ UOPstream toDomain(domain, pBufs);
toDomain << UIndirectList<T>(field, map);
}
}
// Start receiving
- pBuffs.finishedSends();
+ pBufs.finishedSends();
{
// Set up 'send' to myself
@@ -231,7 +231,7 @@ void Foam::mapDistribute::distribute
if (domain != Pstream::myProcNo() && map.size())
{
- UIPstream str(domain, pBuffs);
+ UIPstream str(domain, pBufs);
List<T> recvField(str);
if (recvField.size() != map.size())
@@ -551,7 +551,7 @@ void Foam::mapDistribute::distribute
{
if (!contiguous<T>())
{
- PstreamBuffers pBuffs(Pstream::nonBlocking);
+ PstreamBuffers pBufs(Pstream::nonBlocking);
// Stream data into buffer
for (label domain = 0; domain < Pstream::nProcs(); domain++)
@@ -561,13 +561,13 @@ void Foam::mapDistribute::distribute
if (domain != Pstream::myProcNo() && map.size())
{
// Put data into send buffer
- UOPstream toDomain(domain, pBuffs);
+ UOPstream toDomain(domain, pBufs);
toDomain << UIndirectList<T>(field, map);
}
}
// Start receiving
- pBuffs.finishedSends();
+ pBufs.finishedSends();
{
// Set up 'send' to myself
@@ -597,7 +597,7 @@ void Foam::mapDistribute::distribute
if (domain != Pstream::myProcNo() && map.size())
{
- UIPstream str(domain, pBuffs);
+ UIPstream str(domain, pBufs);
List<T> recvField(str);
if (recvField.size() != map.size())
@@ -757,4 +757,66 @@ void Foam::mapDistribute::distribute
}
+template<class T>
+void Foam::mapDistribute::send(PstreamBuffers& pBufs, const List<T>& field)
+const
+{
+ // Stream data into buffer
+ for (label domain = 0; domain < Pstream::nProcs(); domain++)
+ {
+ const labelList& map = subMap_[domain];
+
+ if (map.size())
+ {
+ // Put data into send buffer
+ UOPstream toDomain(domain, pBufs);
+ toDomain << UIndirectList<T>(field, map);
+ }
+ }
+
+ // Start sending and receiving but do not block.
+ pBufs.finishedSends(false);
+}
+
+
+template<class T>
+void Foam::mapDistribute::receive(PstreamBuffers& pBufs, List<T>& field) const
+{
+ // Consume
+ field.setSize(constructSize_);
+
+ for (label domain = 0; domain < Pstream::nProcs(); domain++)
+ {
+ const labelList& map = constructMap_[domain];
+
+ if (map.size())
+ {
+ UIPstream str(domain, pBufs);
+ List<T> recvField(str);
+
+ if (recvField.size() != map.size())
+ {
+ FatalErrorIn
+ (
+ "template<class T>\n"
+ "void mapDistribute::receive\n"
+ "(\n"
+ " PstreamBuffers&,\n"
+ " List<T>&\n"
+ ")\n"
+ ) << "Expected from processor " << domain
+ << " " << map.size() << " but received "
+ << recvField.size() << " elements."
+ << abort(FatalError);
+ }
+
+ forAll(map, i)
+ {
+ field[map[i]] = recvField[i];
+ }
+ }
+ }
+}
+
+
// ************************************************************************* //
--
GitLab