diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C index 2f4d2aea4..965cafff5 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C @@ -50,7 +50,7 @@ Foam::functionObject::functionObject(const word& name) Foam::autoPtr Foam::functionObject::New ( const word& name, - const Time& t, + const Time& runTime, const dictionary& dict ) { @@ -63,7 +63,7 @@ Foam::autoPtr Foam::functionObject::New if (dict.found("functionObjectLibs")) { - const_cast(t).libs().open + const_cast(runTime).libs().open ( dict, "functionObjectLibs", @@ -72,7 +72,7 @@ Foam::autoPtr Foam::functionObject::New } else { - const_cast(t).libs().open + const_cast(runTime).libs().open ( dict, "libs", @@ -102,7 +102,7 @@ Foam::autoPtr Foam::functionObject::New << exit(FatalError); } - return autoPtr(cstrIter()(name, t, dict)); + return autoPtr(cstrIter()(name, runTime, dict)); } diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H index d11ff9104..7958dc37d 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H @@ -160,8 +160,8 @@ public: autoPtr, functionObject, dictionary, - (const word& name, const Time& t, const dictionary& dict), - (name, t, dict) + (const word& name, const Time& runTime, const dictionary& dict), + (name, runTime, dict) ); diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C index b24b0a38c..7d151fa42 100644 --- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C +++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C @@ -284,12 +284,19 @@ bool Foam::functionObjectList::read() << exit(FatalIOError); } - const dictionary& functionDicts = entryPtr->dict(); + const dictionary& functionsDict = entryPtr->dict(); - newPtrs.setSize(functionDicts.size()); - newDigs.setSize(functionDicts.size()); + const_cast(time_).libs().open + ( + functionsDict, + "libs", + functionObject::dictionaryConstructorTablePtr_ + ); - forAllConstIter(dictionary, functionDicts, iter) + newPtrs.setSize(functionsDict.size()); + newDigs.setSize(functionsDict.size()); + + forAllConstIter(dictionary, functionsDict, iter) { const word& key = iter().keyword();