zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: Resolved merge conflict when merging develop branch

Browse Source
This commit is contained in:
Andrew Heather
2017-05-24 12:30:09 +01:00
parent b5ed93a40a 31d0f2c51c
commit 9a864bdd85
2762 changed files with 124329 additions and 53036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -315,7 +315,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;
@ -458,10 +458,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();
};