diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H index 0d0be885242e94654c41fef1b5e7c571188aba8c..0af9263b4e917f516cacbfa9c864246d07ce6740 100644 --- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H +++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H @@ -164,19 +164,19 @@ public: // Access //- Return the object registry - const objectRegistry& thisDb() const + const objectRegistry& thisDb() const noexcept { return *this; } - //- Return time - const Time& time() const + //- Return time registry + const Time& time() const noexcept { return time_; } //- Return the parent objectRegistry - const objectRegistry& parent() const + const objectRegistry& parent() const noexcept { return parent_; } diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C index dcb7ed0cdc99f4deb0d24573df29189f1d4477fa..a35fccdc5590836b7233c8a7adb476192ccb7558 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobject.C +++ b/src/OpenFOAM/db/regIOobject/regIOobject.C @@ -44,13 +44,13 @@ bool Foam::regIOobject::masterOnlyReading = false; // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::regIOobject::regIOobject(const IOobject& io, const bool isTime) +Foam::regIOobject::regIOobject(const IOobject& io, const bool isTimeObject) : IOobject(io), registered_(false), ownedByRegistry_(false), watchIndices_(), - eventNo_(isTime ? 0 : db().getEvent()), // No event for top-level Time + eventNo_(isTimeObject ? 0 : db().getEvent()), // No event for top-level Time metaDataPtr_(nullptr), isPtr_(nullptr) { diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H index 8ace12cc3becbb92b5a697cfc184d0dead44c76f..94fef1cabf8c244215d9beee90de8f3ab49c8585 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobject.H +++ b/src/OpenFOAM/db/regIOobject/regIOobject.H @@ -84,10 +84,6 @@ protected: const word& typeName ); - //- Construct and return an IFstream for the object. - // The results is NULL if the stream construction failed - Istream* objectStream(); - //- To flag master-only reading of objects static bool masterOnlyReading; @@ -117,8 +113,8 @@ private: // Private Member Functions - //- Return Istream - Istream& readStream(const bool valid = true); + //- Construct object stream, read header if not already constructed + void readStream(const bool valid); //- No copy assignment void operator=(const regIOobject&) = delete; @@ -141,7 +137,7 @@ public: //- Construct from IOobject. The optional flag adds special handling //- if the object is the top-level regIOobject (eg, Time). - regIOobject(const IOobject& io, const bool isTime = false); + regIOobject(const IOobject& io, const bool isTimeObject = false); //- Copy construct regIOobject(const regIOobject& rio); diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C index 46d6760191e46dc2900db0fee597b17953e1b68d..1db1ab6d131705dc8aaa240c07aac5e8fa8bebac 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C +++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C @@ -86,17 +86,8 @@ bool Foam::regIOobject::readHeaderOk // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::Istream& Foam::regIOobject::readStream(const bool valid) +void Foam::regIOobject::readStream(const bool valid) { - if (IFstream::debug) - { - Pout<< "regIOobject::readStream() : " - << "reading object " << name() - << " (global " << global() << ")" - << " from file " << objectPath() - << endl; - } - if (readOpt() == NO_READ) { FatalErrorInFunction @@ -131,8 +122,6 @@ Foam::Istream& Foam::regIOobject::readStream(const bool valid) isPtr_ = fileHandler().readStream(*this, objPath, type(), valid); } - - return *isPtr_; }