update/remove some tests from applications/test

This commit is contained in:
Mark Olesen
2008-12-18 10:00:03 +01:00
parent a43b7a916e
commit 94a6462058
12 changed files with 10 additions and 343 deletions

View File

@ -59,23 +59,24 @@ Gather<T0>::Gather(const T0& localData, const bool redistribute)
// Receive data
for
(
int slave=Pstream::firstSlave(), procIndex = 1;
slave<=Pstream::lastSlave();
int slave = Pstream::firstSlave(), procIndex = 1;
slave <= Pstream::lastSlave();
slave++, procIndex++
)
{
IPstream fromSlave(slave);
IPstream fromSlave(Pstream::scheduled, slave);
fromSlave >> this->operator[](procIndex);
}
// Send data
for
(
int slave=Pstream::firstSlave(), procIndex = 1;
slave<=Pstream::lastSlave();
int slave = Pstream::firstSlave(), procIndex = 1;
slave <= Pstream::lastSlave();
slave++, procIndex++
)
{
OPstream toSlave(slave);
OPstream toSlave(Pstream::scheduled, slave);
if (redistribute)
{
@ -92,12 +93,13 @@ Gather<T0>::Gather(const T0& localData, const bool redistribute)
{
// Slave: send my local data to master
{
OPstream toMaster(Pstream::masterNo());
OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
toMaster << localData;
}
// Receive data from master
{
IPstream fromMaster(Pstream::masterNo());
IPstream fromMaster(Pstream::scheduled, Pstream::masterNo());
if (redistribute)
{
fromMaster >> *this;