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

Commit 2b17f246 authored by Tomislav Maric's avatar Tomislav Maric

utilities: UPstream::commsTypes fully qualified names

parent 9a70121a
......@@ -171,7 +171,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const
{
//- receive the data
labelList receivedLabels;
IPstream fromOtherProc(Pstream::blocking, above[aboveI]);
IPstream fromOtherProc(UPstream::commsTypes::blocking, above[aboveI]);
fromOtherProc >> receivedLabels;
label counter(0);
......@@ -245,7 +245,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const
}
//- send the data
OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize());
OPstream toOtherProc(UPstream::commsTypes::blocking, neiProc, dts.byteSize());
toOtherProc << dts;
}
......@@ -255,7 +255,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const
{
//- receive the data
labelList receivedLabels;
IPstream fromOtherProc(Pstream::blocking, below[belowI]);
IPstream fromOtherProc(UPstream::commsTypes::blocking, below[belowI]);
fromOtherProc >> receivedLabels;
label counter(0);
......@@ -329,7 +329,7 @@ void meshOctreeAddressing::calcGlobalPointLabels() const
}
//- send the data
OPstream toOtherProc(Pstream::blocking, neiProc, dts.byteSize());
OPstream toOtherProc(UPstream::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, Pstream::scheduled);
help::exchangeMap(exchangeData, rLeaves, UPstream::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, Pstream::scheduled);
help::exchangeMap(exchangeData, rLeaves, UPstream::commsTypes::scheduled);
labelLongList rLabels;
help::exchangeMap(exchangeLabels, rLabels, Pstream::scheduled);
help::exchangeMap(exchangeLabels, rLabels, UPstream::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, Pstream::scheduled);
help::exchangeMap(exchangeLabels, rLabels, UPstream::commsTypes::scheduled);
//- update the local data
label counter(0);
......
......@@ -214,7 +214,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
List<meshOctreeCubeBasic> mc;
IPstream fromOtherProc(Pstream::blocking, iter.key());
IPstream fromOtherProc(UPstream::commsTypes::blocking, iter.key());
fromOtherProc >> mc;
......@@ -254,7 +254,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
OPstream toOtherProc
(
Pstream::blocking,
UPstream::commsTypes::blocking,
procI,
sendCoordinates.byteSize()
);
......@@ -270,7 +270,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
List<meshOctreeCubeBasic> mc;
IPstream fromOtherProc(Pstream::blocking, iter.key());
IPstream fromOtherProc(UPstream::commsTypes::blocking, iter.key());
fromOtherProc >> mc;
......@@ -309,7 +309,7 @@ void meshOctreeModifier::loadDistribution(const direction usedType)
OPstream toOtherProc
(
Pstream::blocking,
UPstream::commsTypes::blocking,
procI,
sendCoordinates.byteSize()
);
......
......@@ -254,7 +254,7 @@ void meshOctreeModifier::addLayerFromNeighbouringProcessors()
//- exchange data with other processors
LongList<meshOctreeCubeBasic> receivedCoordinates;
help::exchangeMap(toProcs, receivedCoordinates, Pstream::blocking);
help::exchangeMap(toProcs, receivedCoordinates, UPstream::commsTypes::blocking);
# ifdef OCTREE_DEBUG
Pout << "Received " << receivedCoordinates.size()
......
......@@ -116,7 +116,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
{
OPstream toOtherProc
(
Pstream::blocking,
UPstream::commsTypes::blocking,
neiProcs_[neiProcI],
sizeof(label)
);
......@@ -129,7 +129,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
{
IPstream fromOtherProc
(
Pstream::blocking,
UPstream::commsTypes::blocking,
neiProcs_[neiProcI],
sizeof(label)
);
......@@ -147,7 +147,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
continue;
//- receive data from other processor
IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
dataToReceive.appendFromStream(fromOtherProc);
}
......@@ -159,7 +159,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
continue;
//- send data to other processor
OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
toOtherProc << toProcs[neiProcI];
}
......@@ -172,7 +172,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
continue;
//- receive data from other processor
IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
dataToReceive.appendFromStream(fromOtherProc);
}
......@@ -184,7 +184,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
continue;
//- send data to other processor
OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
toOtherProc << toProcs[neiProcI];
}
}
......@@ -268,7 +268,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
{
OPstream toOtherProc
(
Pstream::blocking,
UPstream::commsTypes::blocking,
neiProcs_[neiProcI],
sizeof(label)
);
......@@ -281,7 +281,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
{
IPstream fromOtherProc
(
Pstream::blocking,
UPstream::commsTypes::blocking,
neiProcs_[neiProcI],
sizeof(label)
);
......@@ -299,7 +299,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
continue;
//- receive data from other processor
IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
dataToReceive.appendFromStream(fromOtherProc);
}
......@@ -312,7 +312,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
continue;
//- send data to other processor
OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
toOtherProc << toProcs[neiProcI];
}
......@@ -325,7 +325,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
continue;
//- receive data from other processor
IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
dataToReceive.appendFromStream(fromOtherProc);
}
......@@ -338,7 +338,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
continue;
//- send data to other processor
OPstream toOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
OPstream toOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
toOtherProc << toProcs[neiProcI];
}
......@@ -353,7 +353,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
continue;
//- receive data from other processor
IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
receivedRanges.appendFromStream(fromOtherProc);
}
......@@ -368,7 +368,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
//- send data to other processor
OPstream toOtherProc
(
Pstream::scheduled,
UPstream::commsTypes::scheduled,
neiProcs_[neiProcI],
attributesToProcs[neiProcI].byteSize()
);
......@@ -385,7 +385,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
continue;
//- receive data from other processor
IPstream fromOtherProc(Pstream::scheduled, neiProcs_[neiProcI]);
IPstream fromOtherProc(UPstream::commsTypes::scheduled, neiProcs_[neiProcI]);
receivedRanges.appendFromStream(fromOtherProc);
}
......@@ -400,7 +400,7 @@ void meshOctree::exchangeRequestsWithNeighbourProcessors
//- send data to other processor
OPstream toOtherProc
(
Pstream::scheduled,
UPstream::commsTypes::scheduled,
neiProcs_[neiProcI],
attributesToProcs[neiProcI].byteSize()
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment