zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

functionObjects: Renamed dictionary entry 'functionObjectLibs' -> 'libs'

Browse Source 
This changes simplifies the specification of functionObjects in
controlDict and is consistent with the 'libs' option in controlDict to
load special solver libraries.

Support for the old 'functionObjectLibs' name is supported for backward compatibility.
This commit is contained in:
Henry Weller
2016-05-16 22:09:01 +01:00
parent 4ba3463052
commit 18725ed3ac
128 changed files with 191 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
View File

@ -61,12 +61,24 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
Info<< "Selecting function " << functionType << endl;
}
const_cast<Time&>(t).libs().open
(
dict,
"functionObjectLibs",
dictionaryConstructorTablePtr_
);
if (dict.found("functionObjectLibs"))
{
const_cast<Time&>(t).libs().open
(
dict,
"functionObjectLibs",
dictionaryConstructorTablePtr_
);
}
else
{
const_cast<Time&>(t).libs().open
(
dict,
"libs",
dictionaryConstructorTablePtr_
);
}
if (!dictionaryConstructorTablePtr_)
{

4
src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
View File

@ -46,7 +46,7 @@ Description
myFunctionObject // Name of functionObject entry
{
type functionObjectType;
functionObjectLibs ("libMyFunctionObjectlib.so");
libs ("libMyFunctionObjectlib.so");
region defaultRegion;
enabled yes;
timeStart 0;
@ -62,7 +62,7 @@ Description
\table
Property | Description | Required | Default value
type | Type of function object | yes |
functionObjectLibs | Libraries containing implementation | yes |
libs | Libraries containing implementation | yes |
region | Name of region for multi-region cases | no |
enabled | On/off switch | no | yes
timeStart| Start time | no |