zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: improved parallel transfer of strings

Browse Source 
- support send/receive with embedded '\0' characters
This commit is contained in:
Mark Olesen
2017-11-04 15:51:52 +01:00
parent f42ed2fc9f
commit 507486194e
4 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
applications/test/parallel/Test-parallel.C
View File

@ -120,6 +120,24 @@ void testMapDistribute()
}
// Print to Perr
template<class T>
Ostream& perrInfo(const T& data)
{
Perr<< data;
return Perr;
}
// Print to Perr
template<>
Ostream& perrInfo(const string& data)
{
Perr<< data << " (size: " << data.size() << ")";
return Perr;
}
template<class T>
void testTransfer(const T& input)
{
@ -127,7 +145,8 @@ void testTransfer(const T& input)
if (Pstream::master())
{
Perr<<"test transfer (" << (typeid(T).name()) << "): " << data << nl << endl;
Perr<<"test transfer (" << (typeid(T).name()) << "): ";
perrInfo(data) << nl << endl;
}
if (Pstream::myProcNo() != Pstream::masterNo())
@ -141,7 +160,7 @@ void testTransfer(const T& input)
Perr<< "slave receiving from master " << Pstream::masterNo() << endl;
IPstream fromMaster(Pstream::commsTypes::blocking, Pstream::masterNo());
fromMaster >> data;
Perr<< data << endl;
perrInfo(data) << endl;
}
else
{
@ -155,7 +174,7 @@ void testTransfer(const T& input)
Perr<< "master receiving from slave " << slave << endl;
IPstream fromSlave(Pstream::commsTypes::blocking, slave);
fromSlave >> data;
Perr<< data << endl;
perrInfo(data) << endl;
}
for
@ -258,6 +277,15 @@ int main(int argc, char *argv[])
testTransfer(scalar(3.14159));
testTransfer(string("test string"));
testTransfer(string(" x "));
{
// Slightly roundabout way to construct with a nul in string
string str1("embedded. nul character in string");
str1[8] = '\0';
Info<< "len: " << str1.size() << endl;
testTransfer(str1);
}
testTransfer(word("3.141 59")); // bad word, but transfer doesn't care
testTokenized(label(1234));