ENH: Pstream: use commsType to decide whether reduce or all-to-all

src/Pstream/mpi/UIPread.C

@@ -97,7 +97,8 @@ Foam::UIPstream::UIPstream
             );
             MPI_Get_count(&status, MPI_BYTE, &messageSize_);
 
-            profilingPstream::addWaitTime();
+            // Assume these are from gathers ...
+            profilingPstream::addGatherTime();
 
             externalBuf_.setCapacity(messageSize_);
             wantedSize = messageSize_;
@@ -202,7 +203,8 @@ Foam::UIPstream::UIPstream(const int fromProcNo, PstreamBuffers& buffers)
             );
             MPI_Get_count(&status, MPI_BYTE, &messageSize_);
 
-            profilingPstream::addWaitTime();
+            // Assume these are from gathers ...
+            profilingPstream::addGatherTime();
 
             externalBuf_.setCapacity(messageSize_);
             wantedSize = messageSize_;
@@ -293,7 +295,7 @@ Foam::label Foam::UIPstream::read
             return 0;
         }
 
-        profilingPstream::addScatterTime();
+        profilingPstream::addGatherTime();
 
         // Check size of message read
 
@@ -344,7 +346,7 @@ Foam::label Foam::UIPstream::read
             return 0;
         }
 
-        profilingPstream::addScatterTime();
+        profilingPstream::addWaitTime();
 
         if (debug)
         {

src/Pstream/mpi/UOPwrite.C

@@ -85,7 +85,8 @@ bool Foam::UOPstream::write
             PstreamGlobals::MPICommunicators_[communicator] //MPI_COMM_WORLD
         );
 
-        profilingPstream::addGatherTime();
+        // Assume these are from scatters ...
+        profilingPstream::addScatterTime();
 
         if (debug)
         {
@@ -107,7 +108,8 @@ bool Foam::UOPstream::write
             PstreamGlobals::MPICommunicators_[communicator] //MPI_COMM_WORLD
         );
 
-        profilingPstream::addWaitTime();
+        // Assume these are from scatters ...
+        profilingPstream::addScatterTime();
 
         if (debug)
         {