From f538892f93527bec18b31accbd62b84a1cdcc92c Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Thu, 25 Apr 2019 11:04:41 +0100 Subject: [PATCH] Porting: Mac OSX scoping of Pstream --- .../extrudeLayer/extrudeLayer.C | 4 +- .../refineBoundaryLayersFaces.C | 4 +- .../decomposeCellsDecomposition.C | 4 +- .../helperFunctions/helperFunctionsPar.C | 34 ++++++++-------- .../helperFunctions/helperFunctionsPar.H | 2 +- .../meshes/partTetMesh/partTetMesh.C | 4 +- .../partTetMesh/partTetMeshAddressing.C | 4 +- .../polyMeshGenAddressingParallelAddressing.C | 20 +++++----- .../polyMeshGenChecksGeometry.C | 40 +++++++++---------- .../polyMeshGenModifierAddBufferCells.C | 8 ++-- .../polyMeshGenModifierRemoveFaces.C | 4 +- .../meshOctreeAddressingParallelAddressing.C | 16 ++++---- .../meshOctreeModifierLoadDistribution.C | 8 ++-- .../meshOctreeModifierParallelRefinement.C | 2 +- .../meshOctreeParallelCommunication.C | 32 +++++++-------- .../geometry/meshOptimizer/meshOptimizerI.H | 12 +++--- .../meshOptimizerOptimizePoint.C | 4 +- .../checkCellConnectionsOverFaces.C | 4 +- ...heckIrregularSurfaceConnectionsFunctions.C | 4 +- .../checkNonMappableCellConnections.C | 4 +- .../topologicalCleanerInvalidVertices.C | 4 +- .../topologyCleanerNonMappableCells.C | 4 +- ...faceEngineCalculateBoundaryNodesAndFaces.C | 8 ++-- .../meshSurfaceEngineParallelAddressing.C | 16 ++++---- .../surfaceMorpherCellsMorphInternalFaces.C | 4 +- 25 files changed, 125 insertions(+), 125 deletions(-) diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C index 05e736d4b..2c74c8f27 100644 --- a/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C +++ b/src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C @@ -377,7 +377,7 @@ void extrudeLayer::createNewVertices() OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), globalLabels.byteSize() ); @@ -393,7 +393,7 @@ void extrudeLayer::createNewVertices() labelList receivedData; IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C index eb2c09abe..7e5923bbe 100644 --- a/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C +++ b/src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C @@ -1052,7 +1052,7 @@ void refineBoundaryLayers::generateNewFaces() OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), sendData.byteSize() ); @@ -1068,7 +1068,7 @@ void refineBoundaryLayers::generateNewFaces() IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsDecomposition.C b/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsDecomposition.C index 90332591e..34427fbf7 100644 --- a/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsDecomposition.C +++ b/src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsDecomposition.C @@ -120,7 +120,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell) OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), decFace.byteSize() ); @@ -135,7 +135,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell) IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.C b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.C index c5e99c7f1..81a33327a 100644 --- a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.C +++ b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.C @@ -82,7 +82,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) { //- receive the data List receivedData; - IPstream fromOtherProc(Pstream::commsTypes::blocking, above[aboveI]); + IPstream fromOtherProc(Pstream::blocking, above[aboveI]); fromOtherProc >> receivedData; gop(receivedData); @@ -99,7 +99,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) //- send the data OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, neiProc, dts.byteSize() ); @@ -113,7 +113,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) { //- receive the data List receivedData; - IPstream fromOtherProc(Pstream::commsTypes::blocking, below[belowI]); + IPstream fromOtherProc(Pstream::blocking, below[belowI]); fromOtherProc >> receivedData; gop(receivedData); @@ -130,7 +130,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) //- send the data OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, neiProc, dts.byteSize() ); @@ -160,7 +160,7 @@ void exchangeMap { OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, iter->first, sizeof(label) ); @@ -172,7 +172,7 @@ void exchangeMap { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, iter->first, sizeof(label) ); @@ -184,7 +184,7 @@ void exchangeMap receiveData.insert(iter->first); } - if( commsType == Pstream::commsTypes::blocking ) + if( commsType == Pstream::blocking ) { //- start with blocking type of send and received operation @@ -198,7 +198,7 @@ void exchangeMap OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, iter->first, dts.byteSize() ); @@ -213,14 +213,14 @@ void exchangeMap IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, iter->first ); data.appendFromStream(fromOtherProc); } } - else if( commsType == Pstream::commsTypes::scheduled ) + else if( commsType == Pstream::scheduled ) { //- start with scheduled data transfer //- this type of transfer is intended for long messages because @@ -236,7 +236,7 @@ void exchangeMap IPstream fromOtherProc ( - Pstream::commsTypes::scheduled, + Pstream::scheduled, iter->first ); @@ -256,7 +256,7 @@ void exchangeMap OPstream toOtherProc ( - Pstream::commsTypes::scheduled, + Pstream::scheduled, iter->first, dts.byteSize() ); @@ -275,7 +275,7 @@ void exchangeMap IPstream fromOtherProc ( - Pstream::commsTypes::scheduled, + Pstream::scheduled, riter->first ); @@ -295,7 +295,7 @@ void exchangeMap OPstream toOtherProc ( - Pstream::commsTypes::scheduled, + Pstream::scheduled, riter->first, dts.byteSize() ); @@ -310,7 +310,7 @@ void exchangeMap "template" "void exchangeMap" "(const std::map& m, LongList& data," - " const Pstream::commsTypes commsType)" + " const Pstream commsType)" ) << "Unknown communication type" << exit(FatalError); } @@ -347,7 +347,7 @@ void exchangeMap OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, iter->first, dataToSend.byteSize() ); @@ -362,7 +362,7 @@ void exchangeMap IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, iter->first ); diff --git a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.H b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.H index 995446c36..da63fb225 100644 --- a/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.H +++ b/src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.H @@ -68,7 +68,7 @@ void exchangeMap ( const std::map&, LongList&, - const Pstream::commsTypes commsType = Pstream::commsTypes::blocking + const Pstream commsType = Pstream::blocking ); //- sends the data stored in a map to other processors and receives the data diff --git a/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMesh.C b/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMesh.C index 590178019..c80be496e 100644 --- a/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMesh.C +++ b/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMesh.C @@ -594,7 +594,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr) OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, pBnd[patchI].neiProcNo(), sendData.byteSize() ); @@ -608,7 +608,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr) IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, pBnd[patchI].neiProcNo() ); diff --git a/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshAddressing.C b/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshAddressing.C index 9216d6124..8c60fbc8c 100644 --- a/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshAddressing.C +++ b/src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshAddressing.C @@ -91,7 +91,7 @@ void partTetMesh::createPointsAndTets OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -106,7 +106,7 @@ void partTetMesh::createPointsAndTets IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C index 475d9322e..c48e909da 100644 --- a/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C +++ b/src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C @@ -134,7 +134,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -145,7 +145,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -239,7 +239,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -250,7 +250,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -347,7 +347,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -361,7 +361,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); @@ -532,7 +532,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -543,7 +543,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -645,7 +645,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -656,7 +656,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; diff --git a/src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C index 0994b16ef..a3c1e0b39 100644 --- a/src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C +++ b/src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C @@ -621,7 +621,7 @@ bool checkTetQuality OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), markedFaces.byteSize() ); @@ -634,7 +634,7 @@ bool checkTetQuality labelList receivedData; IPstream fromOtheProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); fromOtheProc >> receivedData; @@ -824,7 +824,7 @@ bool checkMinTwist OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), cCentres.byteSize() ); @@ -840,7 +840,7 @@ bool checkMinTwist IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); @@ -1140,7 +1140,7 @@ void checkMinVolRatio OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), vol.byteSize() ); @@ -1156,7 +1156,7 @@ void checkMinVolRatio IPstream fromOtheProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); @@ -1569,7 +1569,7 @@ bool checkCellPartTetrahedra OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBnd[patchI].neiProcNo(), sendData.byteSize() ); @@ -1583,7 +1583,7 @@ bool checkCellPartTetrahedra IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBnd[patchI].neiProcNo() ); @@ -1670,7 +1670,7 @@ void checkFaceDotProduct OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), cCentres.byteSize() ); @@ -1683,7 +1683,7 @@ void checkFaceDotProduct vectorField otherCentres; IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); @@ -2079,7 +2079,7 @@ bool checkFacePyramids OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), markedFaces.byteSize() ); @@ -2092,7 +2092,7 @@ bool checkFacePyramids labelList receivedData; IPstream fromOtheProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); fromOtheProc >> receivedData; @@ -2182,7 +2182,7 @@ void checkFaceSkewness OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), cCentres.byteSize() ); @@ -2197,7 +2197,7 @@ void checkFaceSkewness vectorField otherCentres; IPstream fromOtheProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); @@ -2424,7 +2424,7 @@ void checkFaceUniformity OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dst.byteSize() ); @@ -2439,7 +2439,7 @@ void checkFaceUniformity scalarField otherDst; IPstream fromOtheProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); @@ -2888,7 +2888,7 @@ bool checkFaceFlatness { OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), sizeof(label) ); @@ -2901,7 +2901,7 @@ bool checkFaceFlatness { IPstream fromOtheProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), sizeof(label) ); @@ -2917,7 +2917,7 @@ bool checkFaceFlatness OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), markedFaces[patchI].byteSize() ); @@ -2933,7 +2933,7 @@ bool checkFaceFlatness labelList receivedData; IPstream fromOtheProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), nMarkedOnOtherProcs[patchI]*sizeof(label) ); diff --git a/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C index 6c6068397..c31ae7d0a 100644 --- a/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C +++ b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C @@ -90,7 +90,7 @@ void polyMeshGenModifier::addBufferCells() OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); @@ -103,7 +103,7 @@ void polyMeshGenModifier::addBufferCells() List receivedPoints; IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); @@ -157,7 +157,7 @@ void polyMeshGenModifier::addBufferCells() OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); @@ -174,7 +174,7 @@ void polyMeshGenModifier::addBufferCells() IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C index 4d98aaab6..a322c751d 100644 --- a/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C +++ b/src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C @@ -129,7 +129,7 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace) OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), removeProcFace.byteSize() ); @@ -145,7 +145,7 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace) boolList removeOtherProcFace; IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> removeOtherProcFace; diff --git a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C index ff64f453c..b3acfb04d 100644 --- a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C +++ b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C @@ -174,7 +174,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const { //- receive the data labelList receivedLabels; - IPstream fromOtherProc(Pstream::commsTypes::blocking, above[aboveI]); + IPstream fromOtherProc(Pstream::blocking, above[aboveI]); fromOtherProc >> receivedLabels; label counter(0); @@ -248,7 +248,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const } //- send the data - OPstream toOtherProc(Pstream::commsTypes::blocking, neiProc, dts.byteSize()); + OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize()); toOtherProc << dts; } @@ -258,7 +258,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const { //- receive the data labelList receivedLabels; - IPstream fromOtherProc(Pstream::commsTypes::blocking, below[belowI]); + IPstream fromOtherProc(Pstream::blocking, below[belowI]); fromOtherProc >> receivedLabels; label counter(0); @@ -332,7 +332,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const } //- send the data - OPstream toOtherProc(Pstream::commsTypes::blocking, neiProc, dts.byteSize()); + OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize()); toOtherProc << dts; } } @@ -440,7 +440,7 @@ void meshOctreeAddressing::calcGlobalLeafLabels() const //- exchange the data with other processors LongList rLeaves; - help::exchangeMap(exchangeData, rLeaves, Pstream::commsTypes::scheduled); + help::exchangeMap(exchangeData, rLeaves, Pstream::scheduled); //- update the local data forAll(rLeaves, i) @@ -482,9 +482,9 @@ void meshOctreeAddressing::calcGlobalLeafLabels() const //- exchange the data rLeaves.clear(); - help::exchangeMap(exchangeData, rLeaves, Pstream::commsTypes::scheduled); + help::exchangeMap(exchangeData, rLeaves, Pstream::scheduled); labelLongList rLabels; - help::exchangeMap(exchangeLabels, rLabels, Pstream::commsTypes::scheduled); + help::exchangeMap(exchangeLabels, rLabels, Pstream::scheduled); if( rLeaves.size() != rLabels.size() ) FatalErrorIn("void meshOctreeAddressing::calcGlobalLeafLabels() const") @@ -529,7 +529,7 @@ void meshOctreeAddressing::calcGlobalLeafLabels() const //- exchange the data rLabels.clear(); - help::exchangeMap(exchangeLabels, rLabels, Pstream::commsTypes::scheduled); + help::exchangeMap(exchangeLabels, rLabels, Pstream::scheduled); //- update the local data label counter(0); diff --git a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C index 8d55077d3..49392ae7e 100644 --- a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C +++ b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C @@ -217,7 +217,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType) List mc; - IPstream fromOtherProc(Pstream::commsTypes::blocking, iter.key()); + IPstream fromOtherProc(Pstream::blocking, iter.key()); fromOtherProc >> mc; @@ -257,7 +257,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType) OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procI, sendCoordinates.byteSize() ); @@ -273,7 +273,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType) List mc; - IPstream fromOtherProc(Pstream::commsTypes::blocking, iter.key()); + IPstream fromOtherProc(Pstream::blocking, iter.key()); fromOtherProc >> mc; @@ -312,7 +312,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType) OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procI, sendCoordinates.byteSize() ); diff --git a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C index 4e3a9d684..7a79b5819 100644 --- a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C +++ b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C @@ -264,7 +264,7 @@ void meshOctreeModifier::addLayerFromNeighbouringProcessors() //- exchange data with other processors LongList receivedCoordinates; - help::exchangeMap(toProcs, receivedCoordinates, Pstream::commsTypes::blocking); + help::exchangeMap(toProcs, receivedCoordinates, Pstream::blocking); # ifdef OCTREE_DEBUG Pout << "Received " << receivedCoordinates.size() diff --git a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C index 6af722685..9468ffc05 100644 --- a/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C +++ b/src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C @@ -119,7 +119,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors { OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, neiProcs_[neiProcI], sizeof(label) ); @@ -132,7 +132,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, neiProcs_[neiProcI], sizeof(label) ); @@ -150,7 +150,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]); dataToReceive.appendFromStream(fromOtherProc); } @@ -162,7 +162,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- send data to other processor - OPstream toOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); + OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]); toOtherProc << toProcs[neiProcI]; } @@ -175,7 +175,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]); dataToReceive.appendFromStream(fromOtherProc); } @@ -187,7 +187,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- send data to other processor - OPstream toOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); + OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]); toOtherProc << toProcs[neiProcI]; } } @@ -271,7 +271,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors { OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, neiProcs_[neiProcI], sizeof(label) ); @@ -284,7 +284,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, neiProcs_[neiProcI], sizeof(label) ); @@ -302,7 +302,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]); dataToReceive.appendFromStream(fromOtherProc); } @@ -315,7 +315,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- send data to other processor - OPstream toOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); + OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]); toOtherProc << toProcs[neiProcI]; } @@ -328,7 +328,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]); dataToReceive.appendFromStream(fromOtherProc); } @@ -341,7 +341,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- send data to other processor - OPstream toOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); + OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]); toOtherProc << toProcs[neiProcI]; } @@ -356,7 +356,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]); receivedRanges.appendFromStream(fromOtherProc); } @@ -371,7 +371,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors //- send data to other processor OPstream toOtherProc ( - Pstream::commsTypes::scheduled, + Pstream::scheduled, neiProcs_[neiProcI], attributesToProcs[neiProcI].byteSize() ); @@ -388,7 +388,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]); receivedRanges.appendFromStream(fromOtherProc); } @@ -403,7 +403,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors //- send data to other processor OPstream toOtherProc ( - Pstream::commsTypes::scheduled, + Pstream::scheduled, neiProcs_[neiProcI], attributesToProcs[neiProcI].byteSize() ); diff --git a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H index edf9f06b0..f8b2c6c31 100644 --- a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H +++ b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H @@ -69,7 +69,7 @@ inline void meshOptimizer::lockCells(const labelListType& l) OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -83,7 +83,7 @@ inline void meshOptimizer::lockCells(const labelListType& l) IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); @@ -149,7 +149,7 @@ inline void meshOptimizer::lockFaces(const labelListType& lf) OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -163,7 +163,7 @@ inline void meshOptimizer::lockFaces(const labelListType& lf) IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); @@ -238,7 +238,7 @@ inline void meshOptimizer::lockPoints(const labelListType& lp) OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -252,7 +252,7 @@ inline void meshOptimizer::lockPoints(const labelListType& lp) IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C index 85f449a74..06e277cc6 100644 --- a/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C +++ b/src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C @@ -303,7 +303,7 @@ void meshOptimizer::laplaceSmoother::updateMeshGeometry OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, pBnd[patchI].neiProcNo(), sendData.byteSize() ); @@ -317,7 +317,7 @@ void meshOptimizer::laplaceSmoother::updateMeshGeometry IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, pBnd[patchI].neiProcNo() ); diff --git a/src/mesh/cfMesh/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C b/src/mesh/cfMesh/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C index de032df85..92c53e795 100644 --- a/src/mesh/cfMesh/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C +++ b/src/mesh/cfMesh/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C @@ -124,7 +124,7 @@ public: OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), groupOwner.byteSize() ); @@ -141,7 +141,7 @@ public: IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/src/mesh/cfMesh/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C b/src/mesh/cfMesh/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C index 005d51a16..396492f2c 100644 --- a/src/mesh/cfMesh/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C +++ b/src/mesh/cfMesh/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C @@ -235,7 +235,7 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), globalLabels.byteSize() ); @@ -251,7 +251,7 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices labelList receivedData; IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/src/mesh/cfMesh/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C b/src/mesh/cfMesh/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C index bc862b9dc..324325c05 100644 --- a/src/mesh/cfMesh/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C +++ b/src/mesh/cfMesh/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C @@ -207,7 +207,7 @@ void checkNonMappableCellConnections::findCells(labelHashSet& badCells) OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), patchCellType.byteSize() ); @@ -220,7 +220,7 @@ void checkNonMappableCellConnections::findCells(labelHashSet& badCells) { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C b/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C index c2ca22dc2..848514d02 100644 --- a/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C +++ b/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C @@ -263,7 +263,7 @@ void topologicalCleaner::checkInvalidConnectionsForVerticesFaces OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, neiProcs[procI], dataToSend.byteSize() ); @@ -273,7 +273,7 @@ void topologicalCleaner::checkInvalidConnectionsForVerticesFaces forAll(neiProcs, procI) { labelList receivedData; - IPstream fromOtherProc(Pstream::commsTypes::blocking, neiProcs[procI]); + IPstream fromOtherProc(Pstream::blocking, neiProcs[procI]); fromOtherProc >> receivedData; label counter(0); diff --git a/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C b/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C index 25abb638f..c6cdde30c 100644 --- a/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C +++ b/src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C @@ -184,7 +184,7 @@ void topologicalCleaner::checkNonMappableFaces() //- send information about decomposed faces to other processor OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), decProcFace.byteSize() ); @@ -196,7 +196,7 @@ void topologicalCleaner::checkNonMappableFaces() boolList decOtherProc; IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> decOtherProc; diff --git a/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C index 6fd8c8d44..01c7a832d 100644 --- a/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C +++ b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C @@ -195,7 +195,7 @@ void meshSurfaceEngine::calculateBoundaryNodes() const OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -209,7 +209,7 @@ void meshSurfaceEngine::calculateBoundaryNodes() const labelList receiveData; IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> receiveData; @@ -1035,7 +1035,7 @@ void meshSurfaceEngine::calculateEdgesAndAddressing() const OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -1049,7 +1049,7 @@ void meshSurfaceEngine::calculateEdgesAndAddressing() const labelList receivedEdges; IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> receivedEdges; diff --git a/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C index b161a5c47..eed139b0a 100644 --- a/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C +++ b/src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C @@ -138,7 +138,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -149,7 +149,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -253,7 +253,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -264,7 +264,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -453,7 +453,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -464,7 +464,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -589,7 +589,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -600,7 +600,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const { IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; diff --git a/src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C b/src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C index cae57d389..4e895e821 100644 --- a/src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C +++ b/src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C @@ -119,7 +119,7 @@ void surfaceMorpherCells::findBoundaryVertices() //- send the list of other processor OPstream toOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo(), bndVertsToSend.byteSize() ); @@ -133,7 +133,7 @@ void surfaceMorpherCells::findBoundaryVertices() labelList receivedBndNodes; IPstream fromOtherProc ( - Pstream::commsTypes::blocking, + Pstream::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> receivedBndNodes;