diff --git a/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C b/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C index 9708b64bce8a2369f57ce89659df9f056ab57571..b47696ba3e38bdc8e823b6bd45c10c53c19c3a58 100644 --- a/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C +++ b/meshLibrary/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C @@ -374,7 +374,7 @@ void extrudeLayer::createNewVertices() OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), globalLabels.byteSize() ); @@ -390,7 +390,7 @@ void extrudeLayer::createNewVertices() labelList receivedData; IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C b/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C index b855808025391e8cc05566466b6b101fb35fc246..4805c5411cddb17e57ed4fcaad5c5e3e3213ab77 100644 --- a/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C +++ b/meshLibrary/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C @@ -1049,7 +1049,7 @@ void refineBoundaryLayers::generateNewFaces() OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), sendData.byteSize() ); @@ -1065,7 +1065,7 @@ void refineBoundaryLayers::generateNewFaces() IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C b/meshLibrary/utilities/decomposeCells/decomposeCellsDecomposition.C index 8ba5fc0786fec5eb2c2d0232dc47d7a2fc94fbce..cb7fda6e744d3b8f190170d3b0eef53179f94b9a 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), decFace.byteSize() ); @@ -132,7 +132,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell) IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.C index 6e0546597bc2b8bfb9c93137ccc6aa37a389043e..94630cf5571d97d8852b4d03800084b6b284e236 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<T> receivedData; - IPstream fromOtherProc(UPstream::commsTypes::blocking, above[aboveI]); + IPstream fromOtherProc(Pstream::commsTypes::blocking, above[aboveI]); fromOtherProc >> receivedData; gop(receivedData); @@ -94,7 +94,13 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) sop(dts); //- send the data - OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize()); + OPstream toOtherProc + ( + Pstream::commsTypes::blocking, + neiProc, + dts.byteSize() + ); + toOtherProc << dts; } @@ -104,7 +110,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) { //- receive the data List<T> receivedData; - IPstream fromOtherProc(UPstream::commsTypes::blocking, below[belowI]); + IPstream fromOtherProc(Pstream::commsTypes::blocking, below[belowI]); fromOtherProc >> receivedData; gop(receivedData); @@ -119,7 +125,13 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) sop(dts); //- send the data - OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize()); + OPstream toOtherProc + ( + Pstream::commsTypes::blocking, + neiProc, + dts.byteSize() + ); + toOtherProc << dts; } } @@ -143,14 +155,24 @@ void exchangeMap labelHashSet receiveData; for(iter=m.begin();iter!=m.end();++iter) { - OPstream toOtherProc(UPstream::commsTypes::blocking, iter->first, sizeof(label)); + OPstream toOtherProc + ( + Pstream::commsTypes::blocking, + iter->first, + sizeof(label) + ); toOtherProc << iter->second.size(); } for(iter=m.begin();iter!=m.end();++iter) { - IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first, sizeof(label)); + IPstream fromOtherProc + ( + Pstream::commsTypes::blocking, + iter->first, + sizeof(label) + ); label s; fromOtherProc >> s; @@ -159,7 +181,7 @@ void exchangeMap receiveData.insert(iter->first); } - if( commsType == UPstream::commsTypes::blocking ) + if( commsType == Pstream::commsTypes::blocking ) { //- start with blocking type of send and received operation @@ -173,7 +195,7 @@ void exchangeMap OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, iter->first, dts.byteSize() ); @@ -186,11 +208,16 @@ void exchangeMap if( !receiveData.found(iter->first) ) continue; - IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first); + IPstream fromOtherProc + ( + Pstream::commsTypes::blocking, + iter->first + ); + data.appendFromStream(fromOtherProc); } } - else if( commsType == UPstream::commsTypes::scheduled ) + else if( commsType == Pstream::commsTypes::scheduled ) { //- start with scheduled data transfer //- this type of transfer is intended for long messages because @@ -204,13 +231,13 @@ void exchangeMap if( !receiveData.found(iter->first) ) continue; - //List<T> receive; - IPstream fromOtherProc(UPstream::commsTypes::scheduled, iter->first); - //fromOtherProc >> receive; - data.appendFromStream(fromOtherProc); + IPstream fromOtherProc + ( + Pstream::commsTypes::scheduled, + iter->first + ); - //forAll(receive, i) - // data.append(receive[i]); + data.appendFromStream(fromOtherProc); } //- send data to processors with greater ids @@ -226,7 +253,7 @@ void exchangeMap OPstream toOtherProc ( - UPstream::commsTypes::scheduled, + Pstream::commsTypes::scheduled, iter->first, dts.byteSize() ); @@ -243,13 +270,13 @@ void exchangeMap if( !receiveData.found(riter->first) ) continue; - IPstream fromOtherProc(UPstream::commsTypes::scheduled, riter->first); - //List<T> receive; - //fromOtherProc >> receive; - data.appendFromStream(fromOtherProc); + IPstream fromOtherProc + ( + Pstream::commsTypes::scheduled, + riter->first + ); - //forAll(receive, i) - // data.append(receive[i]); + data.appendFromStream(fromOtherProc); } //- send data to processors with lower ids @@ -265,7 +292,7 @@ void exchangeMap OPstream toOtherProc ( - UPstream::commsTypes::scheduled, + Pstream::commsTypes::scheduled, riter->first, dts.byteSize() ); @@ -317,7 +344,7 @@ void exchangeMap OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, iter->first, dataToSend.byteSize() ); @@ -330,7 +357,12 @@ void exchangeMap mOut.insert(std::make_pair(iter->first, List<T>())); List<T>& dataToReceive = mOut[iter->first]; - IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first); + IPstream fromOtherProc + ( + Pstream::commsTypes::blocking, + iter->first + ); + fromOtherProc >> dataToReceive; } } diff --git a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H index 4748c73e0c0dc2e6189c423428883fa5f4e89557..e7fc6ff37eeab0a05d49b009e5137a58d1c8a255 100644 --- a/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H +++ b/meshLibrary/utilities/helperFunctions/helperFunctionsPar.H @@ -43,7 +43,7 @@ SourceFiles namespace Foam { - + namespace help { @@ -65,7 +65,7 @@ void exchangeMap ( const std::map<label, ListType>&, LongList<T>&, - const UPstream::commsTypes commsType = UPstream::commsTypes::blocking + const Pstream::commsTypes commsType = Pstream::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 b36560e620fe3655fa587117aa72c2a9bde9d9e0..a209a7241332517f3c985bd9c98240ec84e6dcfb 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, pBnd[patchI].neiProcNo(), sendData.byteSize() ); @@ -605,7 +605,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr) IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, pBnd[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C b/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C index 3c58b071f9ec64255e96b518bef5c89406878a93..bbedc041d9faecaac886a53a5b36913e83df79ab 100644 --- a/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C +++ b/meshLibrary/utilities/meshes/partTetMesh/partTetMeshAddressing.C @@ -88,7 +88,7 @@ void partTetMesh::createPointsAndTets OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -103,7 +103,7 @@ void partTetMesh::createPointsAndTets IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGen.H b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGen.H index 7263a6da58e054d5f4962fea671bd53642897a80..7a420ae49093ef88a5688fe2c6c0aefeccf8099f 100644 --- a/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGen.H +++ b/meshLibrary/utilities/meshes/polyMeshGen/polyMeshGen.H @@ -37,7 +37,7 @@ SourceFiles // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #include "polyMeshGenCells.H" -#include "dictionary.H" +#include "IOdictionary.H" namespace Foam { diff --git a/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C b/meshLibrary/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C index eec105dab5d6d26ca30af334a5504c5d2ca78c90..863796bc26fbc2db7115841879872406c1355b48 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -142,7 +142,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -236,7 +236,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -247,7 +247,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -344,7 +344,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -358,7 +358,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -529,7 +529,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -540,7 +540,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -642,7 +642,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -653,7 +653,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; diff --git a/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C b/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C index 8a43cfa6f16bc904862e19a1d4288219b80a6ee1..3d6c106f9f84eb2f7a9d20f67576c45f5631cfe0 100644 --- a/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C +++ b/meshLibrary/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C @@ -1566,7 +1566,7 @@ bool checkCellPartTetrahedra OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBnd[patchI].neiProcNo(), sendData.byteSize() ); @@ -1580,7 +1580,7 @@ bool checkCellPartTetrahedra IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBnd[patchI].neiProcNo() ); @@ -1667,7 +1667,7 @@ void checkFaceDotProduct OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), cCentres.byteSize() ); @@ -1680,7 +1680,7 @@ void checkFaceDotProduct vectorField otherCentres; IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -2076,7 +2076,7 @@ bool checkFacePyramids OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), markedFaces.byteSize() ); @@ -2089,7 +2089,7 @@ bool checkFacePyramids labelList receivedData; IPstream fromOtheProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); fromOtheProc >> receivedData; @@ -2179,7 +2179,7 @@ void checkFaceSkewness OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), cCentres.byteSize() ); @@ -2194,7 +2194,7 @@ void checkFaceSkewness vectorField otherCentres; IPstream fromOtheProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -2421,7 +2421,7 @@ void checkFaceUniformity OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dst.byteSize() ); @@ -2436,7 +2436,7 @@ void checkFaceUniformity scalarField otherDst; IPstream fromOtheProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -2885,7 +2885,7 @@ bool checkFaceFlatness { OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), sizeof(label) ); @@ -2898,7 +2898,7 @@ bool checkFaceFlatness { IPstream fromOtheProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), sizeof(label) ); @@ -2914,7 +2914,7 @@ bool checkFaceFlatness OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), markedFaces[patchI].byteSize() ); @@ -2930,7 +2930,7 @@ bool checkFaceFlatness labelList receivedData; IPstream fromOtheProc ( - UPstream::commsTypes::blocking, + Pstream::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 29659092e68a48ebcb60c37dcd400b760628fa16..5b0251552b97e0ae51ad1f333d6130f47c41943f 100644 --- a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C +++ b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C @@ -44,9 +44,9 @@ void polyMeshGenModifier::addBufferCells() { if( !Pstream::parRun() ) return; - + Info << "Adding buffer layers" << endl; - + const labelList& owner = mesh_.owner(); pointFieldPMG& points = mesh_.points(); faceListPMG& faces = facesAccess(); @@ -55,12 +55,12 @@ void polyMeshGenModifier::addBufferCells() const polyMeshGenAddressing& addressing = mesh_.addressingData(); const labelLongList& globalPointLabel = addressing.globalPointLabel(); const Map<label>& globalToLocal = addressing.globalToLocalPointAddressing(); - + //- receive vertices forAll(procBoundaries, patchI) { labelHashSet pointsToSend; - + label faceI = procBoundaries[patchI].patchStart(); const label end = faceI + procBoundaries[patchI].patchSize(); for(;faceI<end;++faceI) @@ -69,12 +69,12 @@ void polyMeshGenModifier::addBufferCells() forAll(c, fI) { const face& f = faces[c[fI]]; - + forAll(f, pI) pointsToSend.insert(f[pI]); } } - + faceI = 0; List<labelledPoint> ptsToSend(pointsToSend.size()); forAllConstIter(labelHashSet, pointsToSend, it) @@ -84,35 +84,35 @@ void polyMeshGenModifier::addBufferCells() globalPointLabel[it.key()], points[it.key()] ); - + OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); - + toOtherProc << ptsToSend; } - + Map<label> globalToLocalReceived; forAll(procBoundaries, patchI) { List<labelledPoint> receivedPoints; IPstream fromOtherProc ( - UIPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); - + fromOtherProc >> receivedPoints; - + forAll(receivedPoints, i) { if( globalToLocal.found(receivedPoints[i].pointLabel()) ) continue; if( globalToLocalReceived.found(receivedPoints[i].pointLabel()) ) continue; - + globalToLocalReceived.insert ( receivedPoints[i].pointLabel(), @@ -121,62 +121,62 @@ void polyMeshGenModifier::addBufferCells() points.append(receivedPoints[i].coordinates()); } } - + //- send cells to other processors forAll(procBoundaries, patchI) { labelHashSet cellsToSend; - + label faceI = procBoundaries[patchI].patchStart(); const label end = faceI + procBoundaries[patchI].patchSize(); for(;faceI<end;++faceI) cellsToSend.insert(owner[faceI]); - + labelLongList flattenedCells; forAllConstIter(labelHashSet, cellsToSend, it) { const cell& c = cells[it.key()]; - + //- the number of faces in the cell flattenedCells.append(c.size()); - + //- add faces forAll(c, fI) { const face& f = faces[c[fI]]; - + //- the number of vertices in the face flattenedCells.append(f.size()); forAll(f, pI) flattenedCells.append(globalPointLabel[f[pI]]); } } - + OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); - + toOtherProc << flattenedCells; } - + forAll(procBoundaries, patchI) { word subsetName = "processor_"; subsetName += help::scalarToText(procBoundaries[patchI].neiProcNo()); const label subsetID = mesh_.addCellSubset(subsetName); - + labelList receivedCells; - + IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); - + fromOtherProc >> receivedCells; - + label counter(0); while( counter < receivedCells.size() ) { @@ -187,7 +187,7 @@ void polyMeshGenModifier::addBufferCells() forAll(c[fI], pI) { const label gpI = receivedCells[counter++]; - + if( globalToLocal.found(gpI) ) { c[fI][pI] = globalToLocal[gpI]; @@ -198,14 +198,14 @@ void polyMeshGenModifier::addBufferCells() } } } - + mesh_.addCellToSubset(subsetID, cells.size()); addCell(c); } } mesh_.clearOut(); - + Info << "Finished adding buffer layers" << endl; } diff --git a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C index 91a12b1182254af6da52fd5eae84f60bb32e3c71..b2f5137cb59e7aa85b950e41b8f53e8ce3945cac 100644 --- a/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C +++ b/meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C @@ -126,7 +126,11 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace) OPstream toOtherProc ( - UPstream::commsTypes::blocking, + # ifdef ExtendSpecific + Pstream::blocking, + # else + Pstream::commsTypes::blocking, + # endif procBoundaries[patchI].neiProcNo(), removeProcFace.byteSize() ); @@ -142,7 +146,11 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace) boolList removeOtherProcFace; IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + # ifdef ExtendSpecific + Pstream::blocking, + # else + Pstream::commsTypes::blocking, + # endif procBoundaries[patchI].neiProcNo() ); fromOtherProc >> removeOtherProcFace; diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C index e96451bb32aead5028c517f0b4dcab2ee8c244a5..4c7638e0018b17ff9f97712277b383b1f68ef434 100644 --- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C +++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C @@ -171,7 +171,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const { //- receive the data labelList receivedLabels; - IPstream fromOtherProc(UPstream::commsTypes::blocking, above[aboveI]); + IPstream fromOtherProc(Pstream::commsTypes::blocking, above[aboveI]); fromOtherProc >> receivedLabels; label counter(0); @@ -245,7 +245,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const } //- send the data - OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize()); + OPstream toOtherProc(Pstream::commsTypes::blocking, neiProc, dts.byteSize()); toOtherProc << dts; } @@ -255,7 +255,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const { //- receive the data labelList receivedLabels; - IPstream fromOtherProc(UPstream::commsTypes::blocking, below[belowI]); + IPstream fromOtherProc(Pstream::commsTypes::blocking, below[belowI]); fromOtherProc >> receivedLabels; label counter(0); @@ -329,7 +329,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const } //- send the data - OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize()); + OPstream toOtherProc(Pstream::commsTypes::blocking, neiProc, dts.byteSize()); toOtherProc << dts; } } @@ -437,7 +437,7 @@ void meshOctreeAddressing::calcGlobalLeafLabels() const //- exchange the data with other processors LongList<meshOctreeCubeBasic> rLeaves; - help::exchangeMap(exchangeData, rLeaves, UPstream::commsTypes::scheduled); + help::exchangeMap(exchangeData, rLeaves, Pstream::commsTypes::scheduled); //- update the local data forAll(rLeaves, i) @@ -479,9 +479,9 @@ void meshOctreeAddressing::calcGlobalLeafLabels() const //- exchange the data rLeaves.clear(); - help::exchangeMap(exchangeData, rLeaves, UPstream::commsTypes::scheduled); + help::exchangeMap(exchangeData, rLeaves, Pstream::commsTypes::scheduled); labelLongList rLabels; - help::exchangeMap(exchangeLabels, rLabels, UPstream::commsTypes::scheduled); + help::exchangeMap(exchangeLabels, rLabels, Pstream::commsTypes::scheduled); if( rLeaves.size() != rLabels.size() ) FatalErrorIn("void meshOctreeAddressing::calcGlobalLeafLabels() const") @@ -526,7 +526,7 @@ void meshOctreeAddressing::calcGlobalLeafLabels() const //- exchange the data rLabels.clear(); - help::exchangeMap(exchangeLabels, rLabels, UPstream::commsTypes::scheduled); + help::exchangeMap(exchangeLabels, rLabels, Pstream::commsTypes::scheduled); //- update the local data label counter(0); diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C index b83b2b28792e11e1c8b76140c904f4a311bd2248..5dd112a96e5dce8fba79c16ad81631917b1b29ea 100644 --- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C +++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C @@ -214,7 +214,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType) List<meshOctreeCubeBasic> mc; - IPstream fromOtherProc(UPstream::commsTypes::blocking, iter.key()); + IPstream fromOtherProc(Pstream::commsTypes::blocking, iter.key()); fromOtherProc >> mc; @@ -254,7 +254,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType) OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procI, sendCoordinates.byteSize() ); @@ -270,7 +270,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType) List<meshOctreeCubeBasic> mc; - IPstream fromOtherProc(UPstream::commsTypes::blocking, iter.key()); + IPstream fromOtherProc(Pstream::commsTypes::blocking, iter.key()); fromOtherProc >> mc; @@ -309,7 +309,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType) OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procI, sendCoordinates.byteSize() ); diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C index 0cd4205106a1996533cf6f3e1040f8b60254d059..c98427b0286ade7dab3bfb98788c8c97e7900a74 100644 --- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C +++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C @@ -261,7 +261,7 @@ void meshOctreeModifier::addLayerFromNeighbouringProcessors() //- exchange data with other processors LongList<meshOctreeCubeBasic> receivedCoordinates; - help::exchangeMap(toProcs, receivedCoordinates, UPstream::commsTypes::blocking); + help::exchangeMap(toProcs, receivedCoordinates, Pstream::commsTypes::blocking); # ifdef OCTREE_DEBUG Pout << "Received " << receivedCoordinates.size() diff --git a/meshLibrary/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C b/meshLibrary/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C index d0ecdc62ae53ab677511a35d09c9d950a70e570d..bb7c398785bb1e22696727837ff1692c96d72011 100644 --- a/meshLibrary/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C +++ b/meshLibrary/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C @@ -116,7 +116,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors { OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, neiProcs_[neiProcI], sizeof(label) ); @@ -129,7 +129,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, neiProcs_[neiProcI], sizeof(label) ); @@ -147,7 +147,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); dataToReceive.appendFromStream(fromOtherProc); } @@ -159,7 +159,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- send data to other processor - OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]); + OPstream toOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); toOtherProc << toProcs[neiProcI]; } @@ -172,7 +172,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); dataToReceive.appendFromStream(fromOtherProc); } @@ -184,7 +184,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- send data to other processor - OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]); + OPstream toOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); toOtherProc << toProcs[neiProcI]; } } @@ -268,7 +268,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors { OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, neiProcs_[neiProcI], sizeof(label) ); @@ -281,7 +281,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, neiProcs_[neiProcI], sizeof(label) ); @@ -299,7 +299,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); dataToReceive.appendFromStream(fromOtherProc); } @@ -312,7 +312,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- send data to other processor - OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]); + OPstream toOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); toOtherProc << toProcs[neiProcI]; } @@ -325,7 +325,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); dataToReceive.appendFromStream(fromOtherProc); } @@ -338,7 +338,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- send data to other processor - OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]); + OPstream toOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); toOtherProc << toProcs[neiProcI]; } @@ -353,7 +353,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); receivedRanges.appendFromStream(fromOtherProc); } @@ -368,7 +368,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors //- send data to other processor OPstream toOtherProc ( - UPstream::commsTypes::scheduled, + Pstream::commsTypes::scheduled, neiProcs_[neiProcI], attributesToProcs[neiProcI].byteSize() ); @@ -385,7 +385,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors continue; //- receive data from other processor - IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]); + IPstream fromOtherProc(Pstream::commsTypes::scheduled, neiProcs_[neiProcI]); receivedRanges.appendFromStream(fromOtherProc); } @@ -400,7 +400,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors //- send data to other processor OPstream toOtherProc ( - UPstream::commsTypes::scheduled, + Pstream::commsTypes::scheduled, neiProcs_[neiProcI], attributesToProcs[neiProcI].byteSize() ); diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H index b188a0978d9259f1ec3b9a0570f6bcb439fd9ce8..4857d282f0ffec0d712bb1661aa7b95cd60d6c5f 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -80,7 +80,7 @@ inline void meshOptimizer::lockCells(const labelListType& l) IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -146,7 +146,7 @@ inline void meshOptimizer::lockFaces(const labelListType& lf) OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -160,7 +160,7 @@ inline void meshOptimizer::lockFaces(const labelListType& lf) IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); @@ -235,7 +235,7 @@ inline void meshOptimizer::lockPoints(const labelListType& lp) OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dataToSend.byteSize() ); @@ -249,7 +249,7 @@ inline void meshOptimizer::lockPoints(const labelListType& lp) IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C b/meshLibrary/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C index 5cc4de2526d416985c9da8cceb2ed72713652087..665ec08d344de23d0bb258c3454022185ddd1992 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, pBnd[patchI].neiProcNo(), sendData.byteSize() ); @@ -314,7 +314,7 @@ void meshOptimizer::laplaceSmoother::updateMeshGeometry IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, pBnd[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C b/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C index 54c1c9496fa4374b19266e3d31a3938cec3307e2..bda59b55746f81e76a6bf6f628329c1075b8873d 100644 --- a/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C +++ b/meshLibrary/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C @@ -121,7 +121,7 @@ public: OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), groupOwner.byteSize() ); @@ -138,7 +138,7 @@ public: IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C b/meshLibrary/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C index e7784441e87c946c6351d1616f173faf41c9f24f..ac140bb475badbeb72a5d3e2605f0f8358c37c5e 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), globalLabels.byteSize() ); @@ -248,7 +248,7 @@ bool checkIrregularSurfaceConnections::checkAndFixCellGroupsAtBndVertices labelList receivedData; IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C b/meshLibrary/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C index 3553705a18f49600e159ffae34164261ca6b0fe0..88f7f9b87ecf516031782169d5997bdf21e5a8bd 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), patchCellType.byteSize() ); @@ -217,7 +217,7 @@ void checkNonMappableCellConnections::findCells(labelHashSet& badCells) { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); diff --git a/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C b/meshLibrary/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C index ddd48a8cd556f9e8c66fa3ad393811a1dabdbda3..3e417e6aa680f661216f0edec259775e7223adb0 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, neiProcs[procI], dataToSend.byteSize() ); @@ -270,7 +270,7 @@ void topologicalCleaner::checkInvalidConnectionsForVerticesFaces forAll(neiProcs, procI) { labelList receivedData; - IPstream fromOtherProc(UPstream::commsTypes::blocking, neiProcs[procI]); + IPstream fromOtherProc(Pstream::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 b730968d58f976dd38e830b2ffe2f378b41ee5b5..adfac53e144a75ca6431c3ceb7a7a9aaf826ca11 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), decProcFace.byteSize() ); @@ -193,7 +193,7 @@ void topologicalCleaner::checkNonMappableFaces() boolList decOtherProc; IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> decOtherProc; diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C index ab62c4c480b4c8335e6446f8376fd59327ba734e..30387578ff2b81c8a3e565b0e320eb33e4de02d0 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -206,7 +206,7 @@ void meshSurfaceEngine::calculateBoundaryNodes() const labelList receiveData; IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> receiveData; @@ -1032,7 +1032,7 @@ void meshSurfaceEngine::calculateEdgesAndAddressing() const OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -1046,7 +1046,7 @@ void meshSurfaceEngine::calculateEdgesAndAddressing() const labelList receivedEdges; IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> receivedEdges; diff --git a/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C b/meshLibrary/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C index 8d86e6f972c462ddd298002abe5e00f1dfbd0779..a1c05fad70003cd0547a5a715135ad69c06b23db 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -146,7 +146,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -250,7 +250,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -261,7 +261,7 @@ void meshSurfaceEngine::calcGlobalBoundaryPointLabels() const { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -450,7 +450,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -461,7 +461,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; @@ -586,7 +586,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const OPstream toOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), dts.byteSize() ); @@ -597,7 +597,7 @@ void meshSurfaceEngine::calcGlobalBoundaryEdgeLabels() const { IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); labelList receivedData; diff --git a/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C b/meshLibrary/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C index 5e0898349ca5146b2edb71b6825190093ecdcd83..df4b1d1af4785d44cb9cd26cf731a14fcc173219 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 ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo(), bndVertsToSend.byteSize() ); @@ -130,7 +130,7 @@ void surfaceMorpherCells::findBoundaryVertices() labelList receivedBndNodes; IPstream fromOtherProc ( - UPstream::commsTypes::blocking, + Pstream::commsTypes::blocking, procBoundaries[patchI].neiProcNo() ); fromOtherProc >> receivedBndNodes;