Merge remote-tracking branch 'origin/develop' into integration-foundation

This commit is contained in:
Andrew Heather
2017-05-18 12:43:15 +01:00
29 changed files with 38 additions and 18 deletions

View File

@ -324,7 +324,7 @@ protected:
// Protected Member Functions
//- The volume mesh or surface registry being used
const objectRegistry& obr() const override;
const objectRegistry& obr() const;
//- Return the local list of face IDs
inline const labelList& faceId() const;
@ -471,10 +471,10 @@ public:
inline fileName outputDir() const;
//- Read from dictionary
virtual bool read(const dictionary& dict) override;
virtual bool read(const dictionary& dict);
//- Calculate and write
virtual bool write() override;
virtual bool write();
};