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

ENH: Consistency updates after Foundation merge and code tidying

Browse Source
This commit is contained in:
Andrew Heather
2016-04-25 16:46:56 +01:00
parent d3157ac905
commit b9313ef2fe
242 changed files with 923 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
View File

@ -78,17 +78,13 @@ public:
// Constructors
<<<<<<< HEAD:src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
//- Construct from components
Constant
(
const word& entryName,
const Type& value,
const dimensionSet& dimensions = dimless
const Type& value
);
=======
>>>>>>> foundation:src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
//- Construct from entry name and dictionary
Constant(const word& entryName, const dictionary& dict);