From 935be5df353a4c8ee8ade73adcb5d1872f21c80a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 14 Dec 2010 10:20:47 +0000
Subject: [PATCH] ENH: IOdictionary : transfer note() in masterOnly mode.
---
src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C | 6 ++----
src/OpenFOAM/db/regIOobject/regIOobjectRead.C | 5 ++---
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
index 7192eb7f61a..a1d6903956d 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
@@ -68,9 +68,8 @@ void Foam::IOdictionary::readFile(const bool masterOnly)
// Master reads headerclassname from file. Make sure this gets
// transfered as well as contents.
- word masterClassName = headerClassName();
- Pstream::scatter(comms, masterClassName);
-
+ Pstream::scatter(comms, const_cast<word&>(headerClassName()));
+ Pstream::scatter(comms, note());
// Get my communication order
const Pstream::commsStruct& myComm = comms[Pstream::myProcNo()];
@@ -94,7 +93,6 @@ void Foam::IOdictionary::readFile(const bool masterOnly)
IOstream::ASCII
);
IOdictionary::readData(fromAbove);
- const_cast<word&>(headerClassName()) = masterClassName;
}
// Send to my downstairs neighbours
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
index 5802fec85fd..3ba675fe2c7 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C
@@ -203,8 +203,8 @@ bool Foam::regIOobject::read()
// Master reads headerclassname from file. Make sure this gets
// transfered as well as contents.
- word masterClassName = headerClassName();
- Pstream::scatter(comms, masterClassName);
+ Pstream::scatter(comms, const_cast<word&>(headerClassName()));
+ Pstream::scatter(comms, note());
// Get my communication order
@@ -231,7 +231,6 @@ bool Foam::regIOobject::read()
IOstream::ASCII
);
ok = readData(fromAbove);
- const_cast<word&>(headerClassName()) = masterClassName;
}
// Send to my downstairs neighbours
--
GitLab