The OpenFOAM repositories are back online - please see how to update to the latest version

Commit 4c98ca6f authored by Franjo's avatar Franjo

Reverted UPstream to Pstream

parent 6897c8bd
......@@ -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()
);
......
......@@ -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()
);
......
......@@ -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()
);
......
......@@ -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;
}
}
......
......@@ -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
......
......@@ -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()
);
......
......@@ -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()
);
......
......@@ -37,7 +37,7 @@ SourceFiles
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "polyMeshGenCells.H"
#include "dictionary.H"
#include "IOdictionary.H"
namespace Foam
{
......
......@@ -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;
......
......@@ -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)
);
......
......@@ -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;
}
......
......@@ -126,7 +126,11 @@ void polyMeshGenModifier::removeFaces(const boolList& removeFace)