exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Porting: Mac OSX scoping of Pstream

Browse source
This commit is contained in:
Hrvoje Jasak 2019-04-25 11:04:41 +01:00
parent 6a466c4378
commit f538892f93
25 changed files with 125 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesh/cfMesh/utilities/boundaryLayers/extrudeLayer/extrudeLayer.C
View file

@ -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()
);

4
src/mesh/cfMesh/utilities/boundaryLayers/refineBoundaryLayers/refineBoundaryLayersFaces.C
View file

@ -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()
);

4
src/mesh/cfMesh/utilities/decomposeCells/decomposeCellsDecomposition.C
View file

@ -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()
);

34
src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.C
View file

@ -82,7 +82,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
{
//- receive the data
List<T> 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<T> 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<class T, class ListType>"
"void exchangeMap"
"(const std::map<label, ListType>& m, LongList<T>& 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
);

2
src/mesh/cfMesh/utilities/helperFunctions/helperFunctionsPar.H
View file

@ -68,7 +68,7 @@ void exchangeMap
(
const std::map<label, ListType>&,
LongList<T>&,
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

4
src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMesh.C
View file

@ -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()
);

4
src/mesh/cfMesh/utilities/meshes/partTetMesh/partTetMeshAddressing.C
View file

@ -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()
);

20
src/mesh/cfMesh/utilities/meshes/polyMeshGenAddressing/polyMeshGenAddressingParallelAddressing.C
View file

@ -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;

40
src/mesh/cfMesh/utilities/meshes/polyMeshGenChecks/polyMeshGenChecksGeometry.C
View file

@ -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)
);

8
src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierAddBufferCells.C
View file

@ -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<labelledPoint> 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()
);

4
src/mesh/cfMesh/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRemoveFaces.C
View file

@ -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;

16
src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeAddressing/meshOctreeAddressingParallelAddressing.C
View file

@ -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<meshOctreeCubeBasic> 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);

8
src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierLoadDistribution.C
View file

@ -217,7 +217,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
List<meshOctreeCubeBasic> 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<meshOctreeCubeBasic> 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()
);

2
src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeModifier/meshOctreeModifierParallelRefinement.C
View file

@ -264,7 +264,7 @@ void meshOctreeModifier::addLayerFromNeighbouringProcessors()
//- exchange data with other processors
LongList<meshOctreeCubeBasic> receivedCoordinates;
help::exchangeMap(toProcs, receivedCoordinates, Pstream::commsTypes::blocking);
help::exchangeMap(toProcs, receivedCoordinates, Pstream::blocking);
# ifdef OCTREE_DEBUG
Pout << "Received " << receivedCoordinates.size()

32
src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeParallelCommunication.C
View file

@ -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()
);

12
src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerI.H
View file

@ -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()
);

4
src/mesh/cfMesh/utilities/smoothers/geometry/meshOptimizer/meshOptimizerOptimizePoint.C
View file

@ -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()
);

4
src/mesh/cfMesh/utilities/smoothers/topology/checkCellConnectionsOverFaces/checkCellConnectionsOverFaces.C
View file

@ -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()
);

4
src/mesh/cfMesh/utilities/smoothers/topology/checkIrregularSurfaceConnections/checkIrregularSurfaceConnectionsFunctions.C
View file

@ -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()
);

4
src/mesh/cfMesh/utilities/smoothers/topology/checkNonMappableCellConnections/checkNonMappableCellConnections.C
View file

@ -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()
);

4
src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologicalCleanerInvalidVertices.C
View file

@ -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);

4
src/mesh/cfMesh/utilities/smoothers/topology/topologicalCleaner/topologyCleanerNonMappableCells.C
View file

@ -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;

8
src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineCalculateBoundaryNodesAndFaces.C
View file

@ -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;

16
src/mesh/cfMesh/utilities/surfaceTools/meshSurfaceEngine/meshSurfaceEngineParallelAddressing.C
View file

@ -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;

4
src/mesh/cfMesh/utilities/surfaceTools/surfaceMorpherCells/surfaceMorpherCellsMorphInternalFaces.C
View file

@ -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;