MRG: Integrated Foundation code to commit 47bd8e1

This commit is contained in:
Andrew Heather
2017-03-23 10:12:38 +00:00
148 changed files with 9543 additions and 926 deletions

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) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -125,7 +125,7 @@ bool Foam::functionObjects::abort::read(const dictionary& dict)
action_ = nextWrite;
}
if (dict.readIfPresent("fileName", abortFile_))
if (dict.readIfPresent("file", abortFile_))
{
abortFile_.expand();
}