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

thermophysicalFunction: Initial work to convert into Function1 and Function2

Browse Source
This commit is contained in:
Henry Weller
2020-12-03 19:22:50 +00:00
parent b07fbddf4f
commit a806e1bc6b
188 changed files with 1084 additions and 1145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1Templates.C
View File

@ -30,14 +30,14 @@ License
template <class PrimitiveType>
Foam::objectFunction1::objectFunction1
(
const word& entryName,
const word& name,
const dictionary& dict,
const type<PrimitiveType>&
)
:
autoPtr<Function1<PrimitiveType>>
(
Function1<PrimitiveType>::New(entryName, dict).ptr()
Function1<PrimitiveType>::New(name, dict).ptr()
)
{}
@ -47,7 +47,7 @@ Foam::objectFunction1::objectFunction1
template <template <class> class ObjectType>
Foam::autoPtr<Foam::objectFunction1> Foam::objectFunction1::New
(
const word& entryName,
const word& name,
const dictionary& dict,
const word& objectName,
const objectRegistry& db
@ -56,15 +56,15 @@ Foam::autoPtr<Foam::objectFunction1> Foam::objectFunction1::New
autoPtr<objectFunction1> ptr
(
db.foundObject<ObjectType<scalar>>(objectName)
? new objectFunction1(entryName, dict, type<scalar>())
? new objectFunction1(name, dict, type<scalar>())
: db.foundObject<ObjectType<vector>>(objectName)
? new objectFunction1(entryName, dict, type<vector>())
? new objectFunction1(name, dict, type<vector>())
: db.foundObject<ObjectType<symmTensor>>(objectName)
? new objectFunction1(entryName, dict, type<symmTensor>())
? new objectFunction1(name, dict, type<symmTensor>())
: db.foundObject<ObjectType<sphericalTensor>>(objectName)
? new objectFunction1(entryName, dict, type<sphericalTensor>())
? new objectFunction1(name, dict, type<sphericalTensor>())
: db.foundObject<ObjectType<tensor>>(objectName)
? new objectFunction1(entryName, dict, type<tensor>())
? new objectFunction1(name, dict, type<tensor>())
: nullptr
);