Commit 4c98ca6f authored by Franjo's avatar Franjo

Reverted UPstream to Pstream

parent 6897c8bd
...@@ -374,7 +374,7 @@ void extrudeLayer::createNewVertices() ...@@ -374,7 +374,7 @@ void extrudeLayer::createNewVertices()
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
globalLabels.byteSize() globalLabels.byteSize()
); );
...@@ -390,7 +390,7 @@ void extrudeLayer::createNewVertices() ...@@ -390,7 +390,7 @@ void extrudeLayer::createNewVertices()
labelList receivedData; labelList receivedData;
IPstream fromOtherProc IPstream fromOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
......
...@@ -1049,7 +1049,7 @@ void refineBoundaryLayers::generateNewFaces() ...@@ -1049,7 +1049,7 @@ void refineBoundaryLayers::generateNewFaces()
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
sendData.byteSize() sendData.byteSize()
); );
...@@ -1065,7 +1065,7 @@ void refineBoundaryLayers::generateNewFaces() ...@@ -1065,7 +1065,7 @@ void refineBoundaryLayers::generateNewFaces()
IPstream fromOtherProc IPstream fromOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
......
...@@ -117,7 +117,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell) ...@@ -117,7 +117,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell)
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
decFace.byteSize() decFace.byteSize()
); );
...@@ -132,7 +132,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell) ...@@ -132,7 +132,7 @@ void decomposeCells::checkFaceConnections(const boolList& decomposeCell)
IPstream fromOtherProc IPstream fromOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
......
...@@ -79,7 +79,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) ...@@ -79,7 +79,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
{ {
//- receive the data //- receive the data
List<T> receivedData; List<T> receivedData;
IPstream fromOtherProc(UPstream::commsTypes::blocking, above[aboveI]); IPstream fromOtherProc(Pstream::commsTypes::blocking, above[aboveI]);
fromOtherProc >> receivedData; fromOtherProc >> receivedData;
gop(receivedData); gop(receivedData);
...@@ -94,7 +94,13 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) ...@@ -94,7 +94,13 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
sop(dts); sop(dts);
//- send the data //- send the data
OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize()); OPstream toOtherProc
(
Pstream::commsTypes::blocking,
neiProc,
dts.byteSize()
);
toOtherProc << dts; toOtherProc << dts;
} }
...@@ -104,7 +110,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) ...@@ -104,7 +110,7 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
{ {
//- receive the data //- receive the data
List<T> receivedData; List<T> receivedData;
IPstream fromOtherProc(UPstream::commsTypes::blocking, below[belowI]); IPstream fromOtherProc(Pstream::commsTypes::blocking, below[belowI]);
fromOtherProc >> receivedData; fromOtherProc >> receivedData;
gop(receivedData); gop(receivedData);
...@@ -119,7 +125,13 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop) ...@@ -119,7 +125,13 @@ void whisperReduce(const ListType& neis, const scatterOp& sop, gatherOp& gop)
sop(dts); sop(dts);
//- send the data //- send the data
OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize()); OPstream toOtherProc
(
Pstream::commsTypes::blocking,
neiProc,
dts.byteSize()
);
toOtherProc << dts; toOtherProc << dts;
} }
} }
...@@ -143,14 +155,24 @@ void exchangeMap ...@@ -143,14 +155,24 @@ void exchangeMap
labelHashSet receiveData; labelHashSet receiveData;
for(iter=m.begin();iter!=m.end();++iter) 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(); toOtherProc << iter->second.size();
} }
for(iter=m.begin();iter!=m.end();++iter) 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; label s;
fromOtherProc >> s; fromOtherProc >> s;
...@@ -159,7 +181,7 @@ void exchangeMap ...@@ -159,7 +181,7 @@ void exchangeMap
receiveData.insert(iter->first); receiveData.insert(iter->first);
} }
if( commsType == UPstream::commsTypes::blocking ) if( commsType == Pstream::commsTypes::blocking )
{ {
//- start with blocking type of send and received operation //- start with blocking type of send and received operation
...@@ -173,7 +195,7 @@ void exchangeMap ...@@ -173,7 +195,7 @@ void exchangeMap
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
iter->first, iter->first,
dts.byteSize() dts.byteSize()
); );
...@@ -186,11 +208,16 @@ void exchangeMap ...@@ -186,11 +208,16 @@ void exchangeMap
if( !receiveData.found(iter->first) ) if( !receiveData.found(iter->first) )
continue; continue;
IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first); IPstream fromOtherProc
(
Pstream::commsTypes::blocking,
iter->first
);
data.appendFromStream(fromOtherProc); data.appendFromStream(fromOtherProc);
} }
} }
else if( commsType == UPstream::commsTypes::scheduled ) else if( commsType == Pstream::commsTypes::scheduled )
{ {
//- start with scheduled data transfer //- start with scheduled data transfer
//- this type of transfer is intended for long messages because //- this type of transfer is intended for long messages because
...@@ -204,13 +231,13 @@ void exchangeMap ...@@ -204,13 +231,13 @@ void exchangeMap
if( !receiveData.found(iter->first) ) if( !receiveData.found(iter->first) )
continue; continue;
//List<T> receive; IPstream fromOtherProc
IPstream fromOtherProc(UPstream::commsTypes::scheduled, iter->first); (
//fromOtherProc >> receive; Pstream::commsTypes::scheduled,
data.appendFromStream(fromOtherProc); iter->first
);
//forAll(receive, i) data.appendFromStream(fromOtherProc);
// data.append(receive[i]);
} }
//- send data to processors with greater ids //- send data to processors with greater ids
...@@ -226,7 +253,7 @@ void exchangeMap ...@@ -226,7 +253,7 @@ void exchangeMap
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::scheduled, Pstream::commsTypes::scheduled,
iter->first, iter->first,
dts.byteSize() dts.byteSize()
); );
...@@ -243,13 +270,13 @@ void exchangeMap ...@@ -243,13 +270,13 @@ void exchangeMap
if( !receiveData.found(riter->first) ) if( !receiveData.found(riter->first) )
continue; continue;
IPstream fromOtherProc(UPstream::commsTypes::scheduled, riter->first); IPstream fromOtherProc
//List<T> receive; (
//fromOtherProc >> receive; Pstream::commsTypes::scheduled,
data.appendFromStream(fromOtherProc); riter->first
);
//forAll(receive, i) data.appendFromStream(fromOtherProc);
// data.append(receive[i]);
} }
//- send data to processors with lower ids //- send data to processors with lower ids
...@@ -265,7 +292,7 @@ void exchangeMap ...@@ -265,7 +292,7 @@ void exchangeMap
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::scheduled, Pstream::commsTypes::scheduled,
riter->first, riter->first,
dts.byteSize() dts.byteSize()
); );
...@@ -317,7 +344,7 @@ void exchangeMap ...@@ -317,7 +344,7 @@ void exchangeMap
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
iter->first, iter->first,
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -330,7 +357,12 @@ void exchangeMap ...@@ -330,7 +357,12 @@ void exchangeMap
mOut.insert(std::make_pair(iter->first, List<T>())); mOut.insert(std::make_pair(iter->first, List<T>()));
List<T>& dataToReceive = mOut[iter->first]; List<T>& dataToReceive = mOut[iter->first];
IPstream fromOtherProc(UPstream::commsTypes::blocking, iter->first); IPstream fromOtherProc
(
Pstream::commsTypes::blocking,
iter->first
);
fromOtherProc >> dataToReceive; fromOtherProc >> dataToReceive;
} }
} }
......
...@@ -43,7 +43,7 @@ SourceFiles ...@@ -43,7 +43,7 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace help namespace help
{ {
...@@ -65,7 +65,7 @@ void exchangeMap ...@@ -65,7 +65,7 @@ void exchangeMap
( (
const std::map<label, ListType>&, const std::map<label, ListType>&,
LongList<T>&, 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 //- sends the data stored in a map to other processors and receives the data
......
...@@ -591,7 +591,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr) ...@@ -591,7 +591,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr)
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
pBnd[patchI].neiProcNo(), pBnd[patchI].neiProcNo(),
sendData.byteSize() sendData.byteSize()
); );
...@@ -605,7 +605,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr) ...@@ -605,7 +605,7 @@ void partTetMesh::updateOrigMesh(boolList* changedFacePtr)
IPstream fromOtherProc IPstream fromOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
pBnd[patchI].neiProcNo() pBnd[patchI].neiProcNo()
); );
......
...@@ -88,7 +88,7 @@ void partTetMesh::createPointsAndTets ...@@ -88,7 +88,7 @@ void partTetMesh::createPointsAndTets
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -103,7 +103,7 @@ void partTetMesh::createPointsAndTets ...@@ -103,7 +103,7 @@ void partTetMesh::createPointsAndTets
IPstream fromOtherProc IPstream fromOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
......
...@@ -37,7 +37,7 @@ SourceFiles ...@@ -37,7 +37,7 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "polyMeshGenCells.H" #include "polyMeshGenCells.H"
#include "dictionary.H" #include "IOdictionary.H"
namespace Foam namespace Foam
{ {
......
...@@ -131,7 +131,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const ...@@ -131,7 +131,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -142,7 +142,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const ...@@ -142,7 +142,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
{ {
IPstream fromOtherProc IPstream fromOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
labelList receivedData; labelList receivedData;
...@@ -236,7 +236,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const ...@@ -236,7 +236,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -247,7 +247,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const ...@@ -247,7 +247,7 @@ void polyMeshGenAddressing::calcGlobalPointLabels() const
{ {
IPstream fromOtherProc IPstream fromOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
labelList receivedData; labelList receivedData;
...@@ -344,7 +344,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const ...@@ -344,7 +344,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -358,7 +358,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const ...@@ -358,7 +358,7 @@ void polyMeshGenAddressing::calcGlobalFaceLabels() const
{ {
IPstream fromOtherProc IPstream fromOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
...@@ -529,7 +529,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const ...@@ -529,7 +529,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -540,7 +540,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const ...@@ -540,7 +540,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
{ {
IPstream fromOtherProc IPstream fromOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
labelList receivedData; labelList receivedData;
...@@ -642,7 +642,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const ...@@ -642,7 +642,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo(), procBoundaries[patchI].neiProcNo(),
dataToSend.byteSize() dataToSend.byteSize()
); );
...@@ -653,7 +653,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const ...@@ -653,7 +653,7 @@ void polyMeshGenAddressing::calcGlobalEdgeLabels() const
{ {
IPstream fromOtherProc IPstream fromOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBoundaries[patchI].neiProcNo() procBoundaries[patchI].neiProcNo()
); );
labelList receivedData; labelList receivedData;
......
...@@ -1566,7 +1566,7 @@ bool checkCellPartTetrahedra ...@@ -1566,7 +1566,7 @@ bool checkCellPartTetrahedra
OPstream toOtherProc OPstream toOtherProc
( (
UPstream::commsTypes::blocking, Pstream::commsTypes::blocking,
procBnd[patchI].neiProcNo(), procBnd[patchI].neiProcNo(),
sendData.byteSize() sendData.byteSize()
); );
...@@ -1580,7 +1580,7 @@ bool checkCellPartTetrahedra ...@@ -1580,7 +1580,7 @@ bool checkCellPartTetrahedra