STYLE: use PstreamBuffers default construct

- PstreamBuffers are nonBlocking by default, so no need to re-specify
2024-04-26 10:17:43 +02:00 · 2024-04-26 10:17:43 +02:00 · 7b38b148fa
commit 7b38b148fa
parent 7f355ba343
34 changed files with 48 additions and 68 deletions
--- a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
+++ b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C
@ -66,7 +66,7 @@ int main(int argc, char *argv[])
            Pstream::myProcNo()
        );

-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        if (!Pstream::master())
        {
@ -150,7 +150,7 @@ int main(int argc, char *argv[])

    // Do a non-blocking send inbetween
    {
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        for (const int proci : Pstream::allProcs())
        {
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@ -618,7 +618,7 @@ void Foam::conformalVoronoiMesh::reorderProcessorPatches
    labelList rotation(faces.size(), Zero);
    labelList faceMap(faces.size(), label(-1));

-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    // Send ordering
    forAll(sortMesh.boundaryMesh(), patchi)
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.C
@ -184,7 +184,7 @@ Foam::parLagrangianDistributor::distributeLagrangianPositions
    labelListList sendMap;

    // Transfer buffers
-    PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    {
        // List of lists of particles to be transferred for all of the
--- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
@ -545,7 +545,7 @@ bool Foam::decomposedBlockData::readBlocks
    }
    else
    {
-        PstreamBuffers pBufs(comm, UPstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(comm);

        if (UPstream::master(comm))
        {
@ -667,7 +667,7 @@ Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlocks
    }
    else
    {
-        PstreamBuffers pBufs(comm, UPstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(comm);

        if (UPstream::master(comm))
        {
--- a/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/masterOFstream.C
@ -115,7 +115,7 @@ void Foam::masterOFstream::commit()
        }

        // Different files
-        PstreamBuffers pBufs(comm_, UPstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(comm_);

        if (!UPstream::master(comm_))
        {
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@ -38,7 +38,7 @@ Description

    Example usage:
    \code
-        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        for (const int proci : UPstream::allProcs())
        {
@ -68,7 +68,7 @@ Description
    one-to-all and all-to-one communication patterns.
    For example,
    \code
-        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        if (UPstream::master())
        {
@ -96,7 +96,7 @@ Description

    For example,
    \code
-        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        pBufs.initRegisterSend();

--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@ -452,7 +452,7 @@ Foam::fileOperations::masterUncollatedFileOperation::read
 {
    autoPtr<ISstream> isPtr;

-    PstreamBuffers pBufs(comm, UPstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs(comm);

    if (UPstream::master(comm))
    {
@ -1834,7 +1834,7 @@ bool Foam::fileOperations::masterUncollatedFileOperation::readHeader
        }

        // Is a more efficient scatter possible?
-        PstreamBuffers pBufs(comm_, UPstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(comm_);

        if (Pstream::master(comm_))
        {
@ -2396,7 +2396,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewIFstream
        filePaths[Pstream::myProcNo(comm_)] = filePath;
        Pstream::gatherList(filePaths, Pstream::msgType(), comm_);

-        PstreamBuffers pBufs(comm_, Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs(comm_);

        if (Pstream::master(comm_))
        {
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@ -311,12 +311,7 @@ void Foam::GAMGSolver::gatherMatrices
    const auto& boundaryMap = agglomeration_.boundaryMap(destLevel);

    // Use PstreamBuffers
-    PstreamBuffers pBufs
-    (
-        UPstream::commsTypes::nonBlocking,
-        UPstream::msgType(),
-        comm
-    );
+    PstreamBuffers pBufs(comm);

    // Send to master
    if (!UPstream::master(comm))
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
@ -1344,12 +1344,7 @@ void Foam::lduPrimitiveMesh::gather
    (void)mesh.lduAddr().patchSchedule();

    // Use PstreamBuffers
-    PstreamBuffers pBufs
-    (
-        Pstream::commsTypes::nonBlocking,
-        UPstream::msgType(),
-        comm
-    );
+    PstreamBuffers pBufs(comm);

    // Send to master
    if (!Pstream::master(comm))
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
@ -681,7 +681,7 @@ void Foam::mapDistributeBase::distribute

        if (!is_contiguous<T>::value)
        {
-            PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking, tag, comm);
+            PstreamBuffers pBufs(comm, tag);

            // Stream data into buffer
            for (const int proci : UPstream::allProcs(comm))
@ -1121,7 +1121,7 @@ void Foam::mapDistributeBase::distribute

        if (!is_contiguous<T>::value)
        {
-            PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking, tag, comm);
+            PstreamBuffers pBufs(comm, tag);

            // Stream data into buffer
            for (const int proci : UPstream::allProcs(comm))
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@ -132,7 +132,7 @@ void Foam::syncTools::syncPointMap
        // Presize according to number of processor patches
        // (global topology information may not yet be available...)
        DynamicList<label> neighbProcs(patches.nProcessorPatches());
-        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        // Reduce communication by only sending non-zero data,
        // but with multiply-connected processor/processor
@ -396,7 +396,7 @@ void Foam::syncTools::syncEdgeMap
        // Presize according to number of processor patches
        // (global topology information may not yet be available...)
        DynamicList<label> neighbProcs(patches.nProcessorPatches());
-        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        // Reduce communication by only sending non-zero data,
        // but with multiply-connected processor/processor
@ -1142,7 +1142,7 @@ void Foam::syncTools::syncBoundaryFaceList
        else
        {
            DynamicList<label> neighbProcs;
-            PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+            PstreamBuffers pBufs;

            // Send
            for (const polyPatch& pp : patches)
--- a/src/OpenFOAM/parallel/globalIndex/globalIndexTemplates.C
+++ b/src/OpenFOAM/parallel/globalIndex/globalIndexTemplates.C
@ -1092,7 +1092,7 @@ void Foam::globalIndex::get
        );

        // Send local indices to individual processors as local index
-        PstreamBuffers sendBufs(UPstream::commsTypes::nonBlocking, tag, comm);
+        PstreamBuffers sendBufs(comm, tag);

        for (const auto proci : validBins)
        {
@ -1109,7 +1109,7 @@ void Foam::globalIndex::get
        sendBufs.finishedSends();


-        PstreamBuffers returnBufs(UPstream::commsTypes::nonBlocking, tag, comm);
+        PstreamBuffers returnBufs(comm, tag);

        for (const int proci : sendBufs.allProcs())
        {
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@ -2153,7 +2153,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
    UPstream::allToAll(nSendCells, nRecvCells);

    // Allocate buffers
-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;


    // What to send to neighbouring domains
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
@ -1272,7 +1272,7 @@ void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
    // Create subsetted refinement tree consisting of all parents that
    // move in their whole to other processor.

-    PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    for (const int proci : Pstream::allProcs())
    {
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@ -537,7 +537,7 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::calcOverlappingProcEddies
    }


-    PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    forAll(sendMap, proci)
    {
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@ -174,7 +174,7 @@ void Foam::fvMeshSubset::doCoupledPatches

    if (syncPar && UPstream::parRun())
    {
-        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        // Send face usage across processor patches
        if (!nCellsUsingFace.empty())
--- a/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMD.C
+++ b/src/functionObjects/field/DMD/DMDModels/derived/STDMD/STDMD.C
@ -227,7 +227,7 @@ reducedKoopmanOperator()
        // the final outcome of TSQR decomposition up to sign

        // Don't clear storage on persistent buffer
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;
        pBufs.allowClearRecv(false);

        const label myProcNo = Pstream::myProcNo();
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@ -111,7 +111,7 @@ void Foam::functionObjects::externalCoupled::readColumns
    // Get sizes for all processors
    const globalIndex globalFaces(globalIndex::gatherOnly{}, nRows);

-    PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    if (UPstream::master())
    {
@ -182,7 +182,7 @@ void Foam::functionObjects::externalCoupled::readLines
    // Get sizes for all processors
    const globalIndex globalFaces(globalIndex::gatherOnly{}, nRows);

-    PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    if (UPstream::master())
    {
--- a/src/functionObjects/randomProcesses/energySpectrum/energySpectrum.C
+++ b/src/functionObjects/randomProcesses/energySpectrum/energySpectrum.C
@ -215,7 +215,7 @@ bool Foam::functionObjects::energySpectrum::write()

    if (Pstream::parRun())
    {
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        {
            UOPstream toMaster(Pstream::masterNo(), pBufs);
--- a/src/functionObjects/utilities/syncObjects/syncObjects.C
+++ b/src/functionObjects/utilities/syncObjects/syncObjects.C
@ -87,11 +87,7 @@ void Foam::functionObjects::syncObjects::sync()
    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    // Note provision of explicit all-world communicator
-    PstreamBuffers pBufs
-    (
-        UPstream::commGlobal(),
-        UPstream::commsTypes::nonBlocking
-    );
+    PstreamBuffers pBufs(UPstream::commGlobal());


    for (const int proci : pBufs.allProcs())
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@ -182,7 +182,7 @@ void Foam::Cloud<ParticleType>::move

    // Allocate transfer buffers,
    // automatic clearStorage when UIPstream closes is disabled.
-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;
    pBufs.allowClearRecv(false);

    // Cache of opened UOPstream wrappers
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.H
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.H
@ -39,7 +39,7 @@ Description
    Simultaneous communication and computation is possible using:

    \verbatim
-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;
    label startOfRequests = Pstream::nRequests();
    il_.sendReferredData(cellOccupancy_, pBufs);
    // Do other things
@ -231,8 +231,7 @@ public:

    // Member Functions

-        //- Prepare and send referred particles and wall data,
-        //  nonBlocking communication
+        //- Prepare and send referred particles and wall data (nonBlocking)
        void sendReferredData
        (
            const List<DynamicList<ParticleType*>>& cellOccupancy,
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@ -58,7 +58,7 @@ void Foam::PairCollision<CloudType>::preInteraction()
 template<class CloudType>
 void Foam::PairCollision<CloudType>::parcelInteraction()
 {
-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    label startOfRequests = Pstream::nRequests();

--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/RecycleInteraction/RecycleInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/RecycleInteraction/RecycleInteraction.C
@ -208,7 +208,7 @@ void Foam::RecycleInteraction<CloudType>::postEvolve()
        // See comments in Cloud::move() about transfer particles handling

        // Allocate transfer buffers
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        // Cache of opened UOPstream wrappers
        PtrList<UOPstream> UOPstreamPtrs(Pstream::nProcs());
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@ -131,7 +131,7 @@ void Foam::moleculeCloud::buildCellOccupancy()

 void Foam::moleculeCloud::calculatePairForce()
 {
-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    // Start sending referred data
    label startOfRequests = Pstream::nRequests();
@ -356,7 +356,7 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()

    buildCellOccupancy();

-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    // Start sending referred data
    label startOfRequests = Pstream::nRequests();
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMIParallelOps.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/advancingFrontAMI/advancingFrontAMIParallelOps.C
@ -78,12 +78,7 @@ void Foam::advancingFrontAMI::distributePatches
    points.setSize(Pstream::nProcs(comm_));
    faceIDs.setSize(Pstream::nProcs(comm_));

-    PstreamBuffers pBufs
-    (
-        Pstream::commsTypes::nonBlocking,
-        UPstream::msgType(),
-        comm_
-    );
+    PstreamBuffers pBufs(comm_);

    for (const int domain : Pstream::allProcs(comm_))
    {
--- a/src/meshTools/polyTopoChange/polyTopoChange.C
+++ b/src/meshTools/polyTopoChange/polyTopoChange.C
@ -2026,7 +2026,7 @@ void Foam::polyTopoChange::reorderCoupledFaces
    // Rotation on new faces.
    labelList rotation(faces_.size(), Zero);

-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    // Send ordering
    forAll(patchMap, patchi)
--- a/src/meshTools/processorLOD/box/box.C
+++ b/src/meshTools/processorLOD/box/box.C
@ -102,7 +102,7 @@ void Foam::processorLODs::box::setRefineFlags
    labelList& nElems
 ) const
 {
-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    // Identify src boxes that can be refined and send to all remote procs
    for (const int proci : Pstream::allProcs())
@ -315,7 +315,7 @@ bool Foam::processorLODs::box::doRefineBoxes
    List<DynamicList<treeBoundBox>>& fixedBoxes
 )
 {
-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    // Send refine info back for list of evolving src boxes
    forAll(refineFlags, proci)
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
@ -1970,7 +1970,7 @@ bool Foam::cellCellStencils::inverseDistance::update()

    const globalIndex globalCells(mesh_.nCells());

-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    // Mark holes (in allCellTypes)
    for (label srcI = 0; srcI < meshParts.size()-1; srcI++)
--- a/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
@ -765,7 +765,7 @@ bool Foam::cellCellStencils::trackingInverseDistance::update()

    const globalIndex globalCells(mesh_.nCells());

-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    DebugInfo<< FUNCTION_NAME << " : Allocated donor-cell structures" << endl;

--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@ -4784,7 +4784,7 @@ void Foam::distributedTriSurfaceMesh::distribute
    // Send all
    // ~~~~~~~~

-    PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    forAll(faceSendMap, proci)
    {
--- a/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
+++ b/src/parallel/reconstruct/faReconstruct/faMeshReconstructor.C
@ -110,7 +110,7 @@ void Foam::faMeshReconstructor::calcAddressing
            }
        }

-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        if (Pstream::master())
        {
--- a/src/sampling/meshToMesh/meshToMeshParallelOps.C
+++ b/src/sampling/meshToMesh/meshToMeshParallelOps.C
@ -274,7 +274,7 @@ void Foam::meshToMesh::distributeCells
    procLocalFaceIDs.setSize(Pstream::nProcs());;


-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    PstreamBuffers pBufs;

    for (const int domain : Pstream::allProcs())
    {
--- a/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
+++ b/src/transportModels/geometricVoF/advectionSchemes/isoAdvection/isoAdvection.C
@ -497,7 +497,7 @@ Foam::DynamicList<Foam::label>  Foam::isoAdvection::syncProcPatches
    if (Pstream::parRun())
    {
        DynamicList<label> neighProcs;
-        PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
+        PstreamBuffers pBufs;

        // Send
        for (const label patchi : procPatchLabels_)