ENH: Refactored stateFunctionObject

- created new functionObjects::properties class derived from IOdictionary
  - replaces raw state IOdictionary owned by functionObjectList
  - state dictionary access/manipulators moved from stateFunctionObject
- stateFunctionObject now acts as a light wrapper around
  functionObjecties::properties
- updated dependent code
This commit is contained in:
Andrew Heather
2021-09-21 20:51:41 +01:00
committed by Mark Olesen
parent b19e767b8f
commit aeef96251f
9 changed files with 787 additions and 251 deletions

View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -50,12 +50,14 @@ SourceFiles
#define functionObjects_stateFunctionObject_H
#include "timeFunctionObject.H"
#include "functionObjectProperties.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// Forward Declarations
class IOdictionary;
namespace functionObjects
@ -80,10 +82,10 @@ protected:
// Protected Member Functions
//- Return a const reference to the state dictionary
const IOdictionary& stateDict() const;
const functionObjects::properties& stateDict() const;
//- Return non-const access to the state dictionary
IOdictionary& stateDict();
functionObjects::properties& stateDict();
//- No copy construct
@ -237,10 +239,10 @@ public:
) const;
//- Retrieve the result entries
List<word> objectResultEntries() const;
wordList objectResultEntries() const;
//- Return result entries for named object
List<word> objectResultEntries(const word& objectName) const;
wordList objectResultEntries(const word& objectName) const;
//- Write the results entries for all objects to stream
void writeResultEntries(Ostream& os) const;