diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C index ac4ffc8e22921cc1abb7262ed08d57d808bfb6e2..0b8c5aba87205ee49193dac8732c86b9f9d3cc4d 100644 --- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C +++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C @@ -2167,8 +2167,7 @@ bool Foam::fileOperations::masterUncollatedFileOperation::read << endl; } - bool ok = false; - if (Pstream::master(UPstream::worldComm)) + if (UPstream::master(UPstream::worldComm)) { // Do master-only reading always. const bool oldParRun = UPstream::parRun(false); @@ -2184,21 +2183,14 @@ bool Foam::fileOperations::masterUncollatedFileOperation::read UPstream::parRun(oldParRun); // Restore parallel state } - // Broadcast regIOobjects content - if (Pstream::parRun()) + // Broadcast regIOobject content, with writeData/readData handling + if (UPstream::parRun()) { - Pstream::broadcasts - ( - UPstream::worldComm, - ok, - io.headerClassName(), - io.note() - ); - if (UPstream::master(UPstream::worldComm)) { OPBstream os(UPstream::worldComm, format); + os << io.headerClassName() << io.note(); bool okWrite = io.writeData(os); ok = ok && okWrite; } @@ -2206,6 +2198,7 @@ bool Foam::fileOperations::masterUncollatedFileOperation::read { IPBstream is(UPstream::worldComm, format); + is >> io.headerClassName() >> io.note(); ok = io.readData(is); } } diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C index ea85088558196869d01eb328cda6725484ad924e..d2b6a3656f696b462d556d3df5ec125e255e1afc 100644 --- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C +++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C @@ -699,7 +699,7 @@ bool Foam::fileOperations::uncollatedFileOperation::read { bool ok = false; - if (!masterOnly || Pstream::master(UPstream::worldComm)) + if (!masterOnly || UPstream::master(UPstream::worldComm)) { if (debug) { @@ -741,19 +741,14 @@ bool Foam::fileOperations::uncollatedFileOperation::read } } - if (masterOnly && Pstream::parRun()) + if (masterOnly && UPstream::parRun()) { - Pstream::broadcasts - ( - UPstream::worldComm, - io.headerClassName(), - io.note() - ); - + // Broadcast regIOobject content, with writeData/readData handling if (UPstream::master(UPstream::worldComm)) { OPBstream os(UPstream::worldComm, format); + os << io.headerClassName() << io.note(); bool okWrite = io.writeData(os); ok = ok && okWrite; } @@ -761,6 +756,7 @@ bool Foam::fileOperations::uncollatedFileOperation::read { IPBstream is(UPstream::worldComm, format); + is >> io.headerClassName() >> io.note(); ok = io.readData(is); } }