exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Barrier messaging

Browse source
This commit is contained in:
Hrvoje Jasak 2016-10-25 11:15:33 +01:00
parent efb22e56fd
commit 1460d20087
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/foam/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
View file

@ -77,8 +77,7 @@ Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
{ {
IPstream fromSlave IPstream fromSlave
( (
Pstream::defaultComms(), Pstream::scheduled,
// Pstream::scheduled,
slave, slave,
0, 0,
tag tag
@ -106,8 +105,7 @@ Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
{ {
OPstream toSlave OPstream toSlave
( (
Pstream::defaultComms(), Pstream::scheduled,
// Pstream::scheduled,
slave, slave,
0, 0,
tag tag
@ -121,8 +119,7 @@ Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
{ {
OPstream toMaster OPstream toMaster
( (
Pstream::defaultComms(), Pstream::scheduled,
// Pstream::scheduled,
Pstream::masterNo(), Pstream::masterNo(),
0, 0,
tag tag
@ -133,8 +130,7 @@ Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
{ {
IPstream fromMaster IPstream fromMaster
( (
Pstream::defaultComms(), Pstream::scheduled,
// Pstream::scheduled,
Pstream::masterNo(), Pstream::masterNo(),
0, 0,
tag tag
@ -420,7 +416,8 @@ void Foam::mapDistribute::compact(const boolList& elemIsUsed, const int tag)
// Wait for all to finish // Wait for all to finish
// Pstream::waitRequests(startOfRequests); Pout<< "BARRIER in compact" << endl;
Pstream::waitRequests(startOfRequests);
// Compact out all submap entries that are referring to unused elements // Compact out all submap entries that are referring to unused elements

9
src/foam/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
View file

@ -237,6 +237,7 @@ void Foam::mapDistribute::distribute
} }
// Block ourselves, waiting only for the current comms // Block ourselves, waiting only for the current comms
Pout<< "TEMPLATE BARRIER in distribute, non-blocking non-contiguous" << endl;
Pstream::waitRequests(nOutstanding); Pstream::waitRequests(nOutstanding);
// Consume // Consume
@ -258,7 +259,7 @@ void Foam::mapDistribute::distribute
} }
} }
} }
else else // contiguous data
{ {
// Set up sends to neighbours // Set up sends to neighbours
@ -343,7 +344,7 @@ void Foam::mapDistribute::distribute
// Wait for all to finish // Wait for all to finish
Pout<< "TEMPLATE BARRIER in distribute, non-blocking, contiguous" << endl;
Pstream::waitRequests(nOutstanding); Pstream::waitRequests(nOutstanding);
@ -584,6 +585,7 @@ void Foam::mapDistribute::distribute
} }
// Block ourselves, waiting only for the current comms // Block ourselves, waiting only for the current comms
Pout<< "TEMPLATE BARRIER in distribute, non-blocking non-contiguous 2" << endl;
Pstream::waitRequests(nOutstanding); Pstream::waitRequests(nOutstanding);
// Consume // Consume
@ -605,7 +607,7 @@ void Foam::mapDistribute::distribute
} }
} }
} }
else else // Contiguous data
{ {
// Set up sends to neighbours // Set up sends to neighbours
@ -689,6 +691,7 @@ void Foam::mapDistribute::distribute
// Wait for all to finish // Wait for all to finish
Pout<< "TEMPLATE BARRIER in distribute, non-blocking contiguous 2" << endl;
Pstream::waitRequests(nOutstanding); Pstream::waitRequests(nOutstanding);