From b1a866c37ccb8772c079cc1cf307583e0143798a Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 13 Jan 2020 11:21:36 +0000 Subject: [PATCH] BUG: collated: correctly handle ascii writing. See #1545. The collated container ('decomposedBlockData') is always binary but the 'payload' might be ascii so use that header information instead of the decomposeBlockData header. --- .../decomposedBlockData/decomposedBlockData.C | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C index dfc8f5796d..a9a2bb09b3 100644 --- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C +++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C @@ -658,7 +658,7 @@ Foam::autoPtr Foam::decomposedBlockData::readBlocks Pstream::scatter(ok, Pstream::msgType(), comm); - //- Set stream properties from isPtr on master + //- Set stream properties from realIsPtr on master // Scatter master header info string ver; @@ -667,12 +667,12 @@ Foam::autoPtr Foam::decomposedBlockData::readBlocks unsigned scalarByteSize; if (UPstream::master(comm)) { - ver = isPtr().version().str(); + ver = realIsPtr().version().str(); OStringStream os; - os << isPtr().format(); + os << realIsPtr().format(); format = os.str(); - labelByteSize = isPtr().labelByteSize(); - scalarByteSize = isPtr().scalarByteSize(); + labelByteSize = realIsPtr().labelByteSize(); + scalarByteSize = realIsPtr().scalarByteSize(); } Pstream::scatter(ver); //, Pstream::msgType(), comm); Pstream::scatter(format); //, Pstream::msgType(), comm);