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

Formatting and removal of debug statements

Browse source
This commit is contained in:
Hrvoje Jasak 2016-11-28 12:08:33 +00:00
parent 5859008288
commit 71e45fa381
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,6 +188,7 @@ const Foam::List<Foam::labelPair>& Foam::mapDistribute::schedule() const
)
);
}
return schedulePtr_();
}
@ -414,12 +415,9 @@ void Foam::mapDistribute::compact(const boolList& elemIsUsed, const int tag)
}
}
// Wait for all to finish
Pout<< "BARRIER in compact" << endl;
Pstream::waitRequests(startOfRequests);
// Compact out all submap entries that are referring to unused elements
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
@ -479,6 +477,7 @@ void Foam::mapDistribute::compact(const boolList& elemIsUsed, const int tag)
constructSize_ = maxConstructIndex + 1;
// Clear the schedule (note:not necessary if nothing changed)
Pout<< "CLEAR SCHEDULE POINTER" << endl;
schedulePtr_.clear();
}

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

@ -237,7 +237,6 @@ void Foam::mapDistribute::distribute
}
// Block ourselves, waiting only for the current comms
Pout<< "TEMPLATE BARRIER in distribute, non-blocking non-contiguous" << endl;
Pstream::waitRequests(nOutstanding);
// Consume
@ -344,12 +343,9 @@ void Foam::mapDistribute::distribute
// Wait for all to finish
Pout<< "TEMPLATE BARRIER in distribute, non-blocking, contiguous" << endl;
Pstream::waitRequests(nOutstanding);
// Collect neighbour fields
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
const labelList& map = constructMap[domain];
@ -585,7 +581,6 @@ void Foam::mapDistribute::distribute
}
// Block ourselves, waiting only for the current comms
Pout<< "TEMPLATE BARRIER in distribute, non-blocking non-contiguous 2" << endl;
Pstream::waitRequests(nOutstanding);
// Consume
@ -689,14 +684,10 @@ void Foam::mapDistribute::distribute
}
}
// Wait for all to finish
Pout<< "TEMPLATE BARRIER in distribute, non-blocking contiguous 2" << endl;
Pstream::waitRequests(nOutstanding);
// Collect neighbour fields
for (label domain = 0; domain < Pstream::nProcs(); domain++)
{
const labelList& map = constructMap[domain];