From 2bad528b51a84c1aed83cdbd5317deb5b21286cc Mon Sep 17 00:00:00 2001 From: Tomislav Maric Date: Thu, 25 May 2017 15:54:32 +0200 Subject: [PATCH] utilities: fully qualified names for UPstream::commsTypes Using UPstream::commsTypes::blocking everywhere.This should work on other versions besides -dev. --- .../extrudeLayer/extrudeLayer.C | 4 +-- .../refineBoundaryLayersFaces.C | 4 +-- .../decomposeCellsDecomposition.C | 4 +-- .../helperFunctions/helperFunctionsPar.C | 32 +++++++++---------- .../helperFunctions/helperFunctionsPar.H | 2 +- .../meshes/partTetMesh/partTetMesh.C | 4 +-- .../partTetMesh/partTetMeshAddressing.C | 4 +-- .../polyMeshGenAddressingParallelAddressing.C | 20 ++++++------ .../polyMeshGenChecksGeometry.C | 28 ++++++++-------- .../polyMeshGenModifierAddBufferCells.C | 8 ++--- .../polyMeshGenModifierRemoveFaces.C | 4 +-- .../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 +-- 21 files changed, 89 insertions(+), 89 deletions(-) diff --git a/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C b/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C index 86692a6..9708b64 100644 --- a/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C +++ b/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C @@ -374,7 +374,7 @@ void extrudeLayer::createNewVertices() OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), globalLabels.byteSize() ); @@ -390,7 +390,7 @@ void extrudeLayer::createNewVertices() labelList receivedData; IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C b/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C index 40cf3a8..b855808 100644 --- a/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C +++ b/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C @@ -1049,7 +1049,7 @@ void refineBoundaryLayers::generateNewFaces() OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), sendData.byteSize() ); @@ -1065,7 +1065,7 @@ void refineBoundaryLayers::generateNewFaces() IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C b/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C index df4ed32..8ba5fc0 100644 --- a/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C +++ b/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C @@ -117,7 +117,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell) OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), decFace.byteSize() ); @@ -132,7 +132,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell) IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C index 5ba9664..6e05465 100644 --- a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C +++ b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C @@ -79,7 +79,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) { //- receive the data List receivedData; - IPstream fromOtherProc(Pstream::blocking, above[aboveI]); + IPstream fromOtherProc(UPstream::commsTypes::blocking, above[aboveI]); fromOtherProc >> receivedData; gop(receivedData); @@ -94,7 +94,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) sop(dts); //- send the data - OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize()); + OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize()); toOtherProc << dts; } @@ -104,7 +104,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) { //- receive the data List receivedData; - IPstream fromOtherProc(Pstream::blocking, below[belowI]); + IPstream fromOtherProc(UPstream::commsTypes::blocking, below[belowI]); fromOtherProc >> receivedData; gop(receivedData); @@ -119,7 +119,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) sop(dts); //- send the data - OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize()); + OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize()); toOtherProc << dts; } } @@ -143,14 +143,14 @@ void exchangeMap labelHashSet receiveData; for(iter=m.begin();iter!=m.end();++iter) { - OPstream toOtherProc(Pstream::blocking, iter->first, sizeof(label)); + OPstream toOtherProc(UPstream::commsTypes::blocking, iter->first, sizeof(label)); toOtherProc << iter->second.size(); } for(iter=m.begin();iter!=m.end();++iter) { - IPstream fromOtherProc(Pstream::blocking, iter->first, sizeof(label)); + IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first, sizeof(label)); label s; fromOtherProc >> s; @@ -159,7 +159,7 @@ void exchangeMap receiveData.insert(iter->first); } - if( commsType == Pstream::blocking ) + if( commsType == UPstream::commsTypes::blocking ) { //- start with blocking type of send and received operation @@ -173,7 +173,7 @@ void exchangeMap OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, iter->first, dts.byteSize() ); @@ -186,11 +186,11 @@ void exchangeMap if( !receiveData.found(iter->first) ) continue; - IPstream fromOtherProc(Pstream::blocking, iter->first); + IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first); data.appendFromStream(fromOtherProc); } } - else if( commsType == Pstream::scheduled ) + else if( commsType == UPstream::commsTypes::scheduled ) { //- start with scheduled data transfer //- this type of transfer is intended for long messages because @@ -205,7 +205,7 @@ void exchangeMap continue; //List receive; - IPstream fromOtherProc(Pstream::scheduled, iter->first); + IPstream fromOtherProc(UPstream::commsTypes::scheduled, iter->first); //fromOtherProc >> receive; data.appendFromStream(fromOtherProc); @@ -226,7 +226,7 @@ void exchangeMap OPstream toOtherProc ( - Pstream::scheduled, + UPstream::commsTypes::scheduled, iter->first, dts.byteSize() ); @@ -243,7 +243,7 @@ void exchangeMap if( !receiveData.found(riter->first) ) continue; - IPstream fromOtherProc(Pstream::scheduled, riter->first); + IPstream fromOtherProc(UPstream::commsTypes::scheduled, riter->first); //List receive; //fromOtherProc >> receive; data.appendFromStream(fromOtherProc); @@ -265,7 +265,7 @@ void exchangeMap OPstream toOtherProc ( - Pstream::scheduled, + UPstream::commsTypes::scheduled, riter->first, dts.byteSize() ); @@ -317,7 +317,7 @@ void exchangeMap OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, iter->first, dataToSend.byteSize() ); @@ -330,7 +330,7 @@ void exchangeMap mOut.insert(std::make_pair(iter->first, List())); List& dataToReceive = mOut[iter->first]; - IPstream fromOtherProc(Pstream::blocking, iter->first); + IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first); fromOtherProc >> dataToReceive; } } diff --git a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H index e2b8911..4748c73 100644 --- a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H +++ b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H @@ -65,7 +65,7 @@ void exchangeMap ( const std::map&, LongList&, - const Pstream::commsTypes commsType = Pstream::blocking + const UPstream::commsTypes commsType = UPstream::commsTypes::blocking ); //- sends the data stored in a map to other processors and receives the data diff --git a/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C b/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C index c82d95f..b36560e 100644 --- a/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C +++ b/meshLibrary/utilities/meshes/partTetMesh/partTetMesh.C @@ -591,7 +591,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr) OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, pBnd[patchI].neiProcNo(), sendData.byteSize() ); @@ -605,7 +605,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr) IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, pBnd[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C b/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C index 97c5e5a..3c58b07 100644 --- a/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C +++ b/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C @@ -88,7 +88,7 @@ void partTetMesh::createPointsAndTets OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -103,7 +103,7 @@ void partTetMesh::createPointsAndTets IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C b/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C index 4618d55..eec105d 100644 --- a/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C +++ b/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C @@ -131,7 +131,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -142,7 +142,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const { IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -236,7 +236,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -247,7 +247,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const { IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -344,7 +344,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -358,7 +358,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const { IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -529,7 +529,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -540,7 +540,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const { IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -642,7 +642,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -653,7 +653,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const { IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; diff --git a/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C b/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C index c44d09e..61be0c1 100644 --- a/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C +++ b/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C @@ -577,7 +577,7 @@ bool checkCellPartTetrahedra OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBnd[patchI].neiProcNo(), sendData.byteSize() ); @@ -591,7 +591,7 @@ bool checkCellPartTetrahedra IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBnd[patchI].neiProcNo() ); @@ -678,7 +678,7 @@ void checkFaceDotProduct OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), cCentres.byteSize() ); @@ -691,7 +691,7 @@ void checkFaceDotProduct vectorField otherCentres; IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -1087,7 +1087,7 @@ bool checkFacePyramids OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), markedFaces.byteSize() ); @@ -1100,7 +1100,7 @@ bool checkFacePyramids labelList receivedData; IPstream fromOtheProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); fromOtheProc >> receivedData; @@ -1190,7 +1190,7 @@ void checkFaceSkewness OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), cCentres.byteSize() ); @@ -1205,7 +1205,7 @@ void checkFaceSkewness vectorField otherCentres; IPstream fromOtheProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -1433,7 +1433,7 @@ void checkFaceUniformity OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dst.byteSize() ); @@ -1448,7 +1448,7 @@ void checkFaceUniformity scalarField otherDst; IPstream fromOtheProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -1895,7 +1895,7 @@ bool checkFaceFlatness { OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), sizeof(label) ); @@ -1908,7 +1908,7 @@ bool checkFaceFlatness { IPstream fromOtheProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), sizeof(label) ); @@ -1924,7 +1924,7 @@ bool checkFaceFlatness OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), markedFaces[patchI].byteSize() ); @@ -1940,7 +1940,7 @@ bool checkFaceFlatness labelList receivedData; IPstream fromOtheProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), nMarkedOnOtherProcs[patchI]*sizeof(label) ); diff --git a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C index 13f28d5..2965909 100644 --- a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C +++ b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C @@ -87,7 +87,7 @@ void polyMeshGenModifier::addBufferCells() OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -100,7 +100,7 @@ void polyMeshGenModifier::addBufferCells() List receivedPoints; IPstream fromOtherProc ( - IPstream::blocking, + UIPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -154,7 +154,7 @@ void polyMeshGenModifier::addBufferCells() OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -171,7 +171,7 @@ void polyMeshGenModifier::addBufferCells() IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C index 89a5487..91a12b1 100644 --- a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C +++ b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C @@ -126,7 +126,7 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace) OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), removeProcFace.byteSize() ); @@ -142,7 +142,7 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace) boolList removeOtherProcFace; IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> removeOtherProcFace; diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H index d3da635..b188a09 100644 --- a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H +++ b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H @@ -66,7 +66,7 @@ inline void meshOptimizer::lockCells(const labelListType& l) OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -80,7 +80,7 @@ inline void meshOptimizer::lockCells(const labelListType& l) IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -146,7 +146,7 @@ inline void meshOptimizer::lockFaces(const labelListType& lf) OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -160,7 +160,7 @@ inline void meshOptimizer::lockFaces(const labelListType& lf) IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -235,7 +235,7 @@ inline void meshOptimizer::lockPoints(const labelListType& lp) OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -249,7 +249,7 @@ inline void meshOptimizer::lockPoints(const labelListType& lp) IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C index cc57152..5cc4de2 100644 --- a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C +++ b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C @@ -300,7 +300,7 @@ void meshOptimizer::laplaceSmoother::updateMeshGeometry OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, pBnd[patchI].neiProcNo(), sendData.byteSize() ); @@ -314,7 +314,7 @@ void meshOptimizer::laplaceSmoother::updateMeshGeometry IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, pBnd[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C b/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C index fbb5c00..54c1c94 100644 --- a/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C +++ b/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C @@ -121,7 +121,7 @@ public: OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), groupOwner.byteSize() ); @@ -138,7 +138,7 @@ public: IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C b/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C index 56df4fa..e778444 100644 --- a/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C +++ b/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C @@ -232,7 +232,7 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), globalLabels.byteSize() ); @@ -248,7 +248,7 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices labelList receivedData; IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C b/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C index ec8224f..3553705 100644 --- a/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C +++ b/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C @@ -204,7 +204,7 @@ void checkNonMappableCellConnections::findCells(labelHashSet& badCells) OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), patchCellType.byteSize() ); @@ -217,7 +217,7 @@ void checkNonMappableCellConnections::findCells(labelHashSet& badCells) { IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C b/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C index ad368fe..ddd48a8 100644 --- a/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C +++ b/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C @@ -260,7 +260,7 @@ void topologicalCleaner::checkInvalidConnectionsForVerticesFaces OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, neiProcs[procI], dataToSend.byteSize() ); @@ -270,7 +270,7 @@ void topologicalCleaner::checkInvalidConnectionsForVerticesFaces forAll(neiProcs, procI) { labelList receivedData; - IPstream fromOtherProc(Pstream::blocking, neiProcs[procI]); + IPstream fromOtherProc(UPstream::commsTypes::blocking, neiProcs[procI]); fromOtherProc >> receivedData; label counter(0); diff --git a/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C b/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C index 3b28054..b730968 100644 --- a/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C +++ b/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C @@ -181,7 +181,7 @@ void topologicalCleaner::checkNonMappableFaces() //- send information about decomposed faces to other processor OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), decProcFace.byteSize() ); @@ -193,7 +193,7 @@ void topologicalCleaner::checkNonMappableFaces() boolList decOtherProc; IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> decOtherProc; diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C index e6e3f5a..ab62c4c 100644 --- a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C +++ b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C @@ -192,7 +192,7 @@ void meshSurfaceEngine::calculateBoundaryNodes() const OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -206,7 +206,7 @@ void meshSurfaceEngine::calculateBoundaryNodes() const labelList receiveData; IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> receiveData; @@ -1032,7 +1032,7 @@ void meshSurfaceEngine::calculateEdgesAndAddressing() const OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -1046,7 +1046,7 @@ void meshSurfaceEngine::calculateEdgesAndAddressing() const labelList receivedEdges; IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> receivedEdges; diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C index b0c778f..8d86e6f 100644 --- a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C +++ b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C @@ -135,7 +135,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -146,7 +146,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const { IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -250,7 +250,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -261,7 +261,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const { IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -450,7 +450,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -461,7 +461,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const { IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -586,7 +586,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -597,7 +597,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const { IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; diff --git a/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C b/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C index b5d3f99..5e08983 100644 --- a/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C +++ b/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C @@ -116,7 +116,7 @@ void surfaceMorpherCells::findBoundaryVertices() //- send the list of other processor OPstream toOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), bndVertsToSend.byteSize() ); @@ -130,7 +130,7 @@ void surfaceMorpherCells::findBoundaryVertices() labelList receivedBndNodes; IPstream fromOtherProc ( - Pstream::blocking, + UPstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> receivedBndNodes; -- GitLab