diff --git a/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H b/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H index 765ff9b7ce..91a816aa8d 100644 --- a/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H +++ b/src/OpenFOAM/db/runTimeSelection/construction/addToRunTimeSelectionTable.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,43 +98,6 @@ namespace Foam (#baseType, baseType::typeName_(), thisType::typeName, STR(LIB_NAME)) -//- Add to hash-table of functions with 'lookup' as the key -#define addRemovableNamedToRunTimeSelectionTable\ -(baseType,thisType,argNames,lookup) \ - \ - /* Add the thisType constructor function to the table, find by lookup */ \ - baseType::addRemovable##argNames##ConstructorToTable \ - addRemovable_##lookup##_##thisType##argNames##ConstructorTo \ - ##baseType##Table_(#lookup); \ - \ - bool addRemovable_##lookup##_##thisType##argNames##To##baseType##ToC_ = \ - addToRunTimeSelectionTableToC \ - (#baseType, baseType::typeName_(), #lookup, STR(LIB_NAME)) - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -//- Add to hash-table of functions with typename as the key. -// Use when baseType doesn't need a template argument (eg, is a typedef) -#define addTemplateToRunTimeSelectionTable\ -(baseType,thisType,Targ,argNames) \ - \ - /* Add the thisType constructor function to the table */ \ - baseType::add##argNames##ConstructorToTable> \ - add##thisType##Targ##argNames##ConstructorTo##baseType##Table_ - - -//- Add to hash-table of functions with 'lookup' as the key. -// Use when baseType doesn't need a template argument (eg, is a typedef) -#define addNamedTemplateToRunTimeSelectionTable\ -(baseType,thisType,Targ,argNames,lookup) \ - \ - /* Add the thisType constructor function to the table, find by lookup */ \ - baseType::add##argNames##ConstructorToTable> \ - add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType \ - ##Table_(#lookup) - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // //- Add to hash-table of functions with typename as the key. @@ -144,7 +107,16 @@ namespace Foam \ /* Add the thisType constructor function to the table */ \ baseType::add##argNames##ConstructorToTable> \ - add##thisType##Targ##argNames##ConstructorTo##baseType##Targ##Table_ + add##thisType##Targ##argNames##ConstructorTo##baseType##Targ##Table_; \ + \ + bool add##thisType##Targ##argNames##To##baseType##Targ##ToC_ = \ + addToRunTimeSelectionTableToC \ + ( \ + #baseType, \ + baseType::typeName_(), \ + thisType::typeName, \ + STR(LIB_NAME) \ + ) //- Add to hash-table of functions with 'lookup' as the key. @@ -155,7 +127,11 @@ namespace Foam /* Add the thisType constructor function to the table, find by lookup */ \ baseType::add##argNames##ConstructorToTable> \ add_##lookup##_##thisType##Targ##argNames##ConstructorTo##baseType## \ - Targ##Table_(#lookup) + Targ##Table_(#lookup); \ + \ + bool add_##lookup##_##thisType##Targ##argNames##To##baseType##Targ##ToC_ = \ + addToRunTimeSelectionTableToC \ + (#baseType, baseType::typeName_(), #lookup, STR(LIB_NAME)) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H index ca7ecb1376..206f089af1 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H +++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,6 +43,7 @@ SourceFiles #include "tmp.H" #include "typeInfo.H" #include "Field.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -216,33 +217,43 @@ public: #define makeFunction1(Type) \ \ defineNamedTemplateTypeNameAndDebug(Function1, 0); \ - \ defineTemplateRunTimeSelectionTable(Function1, dictionary); #define makeFunction1Type(SS, Type) \ \ - defineNamedTemplateTypeNameAndDebug(Function1s::SS, 0); \ - \ - Function1::adddictionaryConstructorToTable> \ - addFunction1##SS##Type##ConstructorToTable_; + defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Function1 Type##Function1; \ + typedef SS Type##SS##Function1; \ + addToRunTimeSelectionTable \ + ( \ + Type##Function1, \ + Type##SS##Function1, \ + dictionary \ + ) #define makeNamedFunction1Type(SS, Type, Name) \ \ - Function1::adddictionaryConstructorToTable> \ - addFunction1##Name##Type##ConstructorToTable_(#Name); + typedef Function1 Type##Function1; \ + typedef SS Type##SS##Function1; \ + addNamedToRunTimeSelectionTable \ + ( \ + Type##Function1, \ + Type##SS##Function1, \ + dictionary, \ + Name \ + ) #define makeScalarFunction1(SS) \ \ defineTypeNameAndDebug(SS, 0); \ - \ - Function1::adddictionaryConstructorToTable \ - addFunction1##SS##ConstructorToTable_; + typedef Function1 scalarFunction1; \ + addToRunTimeSelectionTable(scalarFunction1, SS, dictionary) -#define makeFunction1s(Type) \ +#define makeFunction1s(Type, nullArg) \ \ template<> \ const char* const Foam::Tuple2::typeName \ @@ -251,20 +262,24 @@ public: ); \ \ makeFunction1(Type); \ - makeFunction1Type(None, Type); \ - makeFunction1Type(Constant, Type); \ - makeFunction1Type(Uniform, Type); \ - makeFunction1Type(ZeroConstant, Type); \ - makeFunction1Type(OneConstant, Type); \ - makeFunction1Type(Polynomial, Type); \ - makeFunction1Type(Sine, Type); \ - makeFunction1Type(Square, Type); \ - makeFunction1Type(Table, Type); \ - makeFunction1Type(UniformTable, Type); \ - makeFunction1Type(NonUniformTable, Type); \ - makeNamedFunction1Type(Table, Type, tableFile); \ - makeFunction1Type(Scale, Type); \ - makeFunction1Type(Coded, Type); + \ + namespace Function1s \ + { \ + makeFunction1Type(None, Type); \ + makeFunction1Type(Constant, Type); \ + makeFunction1Type(Uniform, Type); \ + makeFunction1Type(ZeroConstant, Type); \ + makeFunction1Type(OneConstant, Type); \ + makeFunction1Type(Polynomial, Type); \ + makeFunction1Type(Sine, Type); \ + makeFunction1Type(Square, Type); \ + makeFunction1Type(Table, Type); \ + makeFunction1Type(UniformTable, Type); \ + makeFunction1Type(NonUniformTable, Type); \ + makeNamedFunction1Type(Table, Type, tableFile); \ + makeFunction1Type(Scale, Type); \ + makeFunction1Type(Coded, Type); \ + } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.H index d335684b65..1703d17c1c 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.H +++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableReader/TableReader/TableReader.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,6 +36,7 @@ SourceFiles #define TableReader_H #include "dictionary.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -122,14 +123,17 @@ public: \ defineNamedTemplateTypeNameAndDebug(TableReaders::SS, 0); \ \ - TableReader::adddictionaryConstructorToTable> \ - add##SS##Type##ConstructorToTable_; + addTemplatedToRunTimeSelectionTable(TableReader, SS, Type, dictionary) #define makeTableReaders(Type) \ defineTableReader(Type); \ - makeTableReader(Embedded, Type); \ - makeTableReader(Foam, Type); \ - makeTableReader(Csv, Type) + \ + namespace TableReaders \ + { \ + makeTableReader(Embedded, Type); \ + makeTableReader(Foam, Type); \ + makeTableReader(Csv, Type); \ + } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C index c6d0b58ade..61b676a9cf 100644 --- a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C +++ b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,14 +45,14 @@ License namespace Foam { makeFunction1(label); - makeFunction1Type(None, label); - makeFunction1Type(Constant, label); - makeFunction1s(scalar); - makeFunction1s(vector); - makeFunction1s(sphericalTensor); - makeFunction1s(symmTensor); - makeFunction1s(tensor); + namespace Function1s + { + makeFunction1Type(None, label); + makeFunction1Type(Constant, label); + } + + FOR_ALL_FIELD_TYPES(makeFunction1s); } diff --git a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H index 862db3d9cf..c440df5d13 100644 --- a/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H +++ b/src/OpenFOAM/primitives/functions/Function2/Function2/Function2.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,6 +43,7 @@ SourceFiles #include "tmp.H" #include "typeInfo.H" #include "Field.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -204,24 +205,27 @@ public: #define makeFunction2(Type) \ \ defineNamedTemplateTypeNameAndDebug(Function2, 0); \ - \ defineTemplateRunTimeSelectionTable(Function2, dictionary); #define makeFunction2Type(SS, Type) \ \ - defineNamedTemplateTypeNameAndDebug(Function2s::SS, 0); \ - \ - Function2::adddictionaryConstructorToTable> \ - addFunction2##SS##Type##ConstructorToTable_; + defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Function2 Type##Function2; \ + typedef SS Type##SS##Function2; \ + addToRunTimeSelectionTable \ + ( \ + Type##Function2, \ + Type##SS##Function2, \ + dictionary \ + ) #define makeScalarFunction2(SS) \ \ defineTypeNameAndDebug(SS, 0); \ - \ - Function2::adddictionaryConstructorToTable \ - addFunction2##SS##ConstructorToTable_; + typedef Function2 scalarFunction2; \ + addToRunTimeSelectionTable(scalarFunction2, SS, dictionary) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function2/makeFunction2s.C b/src/OpenFOAM/primitives/functions/Function2/makeFunction2s.C index 8016cabc86..a24ea79947 100644 --- a/src/OpenFOAM/primitives/functions/Function2/makeFunction2s.C +++ b/src/OpenFOAM/primitives/functions/Function2/makeFunction2s.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,27 +35,32 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define makeFunction2s(Type) \ +#define makeFunction2s(Type, nullArg) \ + \ makeFunction2(Type); \ - makeFunction2Type(None, Type); \ - makeFunction2Type(Constant, Type); \ - makeFunction2Type(ZeroConstant, Type); \ - makeFunction2Type(OneConstant, Type); \ - makeFunction2Type(Scale, Type); \ - makeFunction2Type(UniformTable, Type); \ - makeFunction2Type(Coded, Type); + \ + namespace Function2s \ + { \ + makeFunction2Type(None, Type); \ + makeFunction2Type(Constant, Type); \ + makeFunction2Type(ZeroConstant, Type); \ + makeFunction2Type(OneConstant, Type); \ + makeFunction2Type(Scale, Type); \ + makeFunction2Type(UniformTable, Type); \ + makeFunction2Type(Coded, Type); \ + } namespace Foam { makeFunction2(label); - makeFunction2Type(None, label); - makeFunction2Type(Constant, label); - makeFunction2s(scalar); - makeFunction2s(vector); - makeFunction2s(sphericalTensor); - makeFunction2s(symmTensor); - makeFunction2s(tensor); + namespace Function2s + { + makeFunction2Type(None, label); + makeFunction2Type(Constant, label); + } + + FOR_ALL_FIELD_TYPES(makeFunction2s); } diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C index 41f2678925..017bb2c750 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -102,11 +102,14 @@ const trvType trvType::vsType::rootMin namespace Foam { - makeFunction1s(trvType); + makeFunction1s(trvType, nullArg); defineTableReader(trvType); - makeTableReader(Embedded, trvType); - makeTableReader(Foam, trvType); + namespace TableReaders + { + makeTableReader(Embedded, trvType); + makeTableReader(Foam, trvType); + } } diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H index 45bcfe4a2a..3324ef3b24 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H +++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,8 +37,8 @@ Description #include "pointFields.H" #include "typeInfo.H" #include "autoPtr.H" -#include "runTimeSelectionTables.H" #include "tetIndices.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -68,7 +68,7 @@ protected: public: //- Runtime type information - virtual const word& type() const = 0; + TypeName("interpolation"); // Declare run-time constructor selection table @@ -219,9 +219,13 @@ public: defineNamedTemplateTypeNameAndDebug(InterpolationType, 0); #define makeInterpolation(Type, InterpolationType) \ - interpolation:: \ - adddictionaryConstructorToTable> \ - add##InterpolationType##Type##ConstructorToTable_; + addTemplatedToRunTimeSelectionTable \ + ( \ + interpolation, \ + InterpolationType, \ + Type, \ + dictionary \ + ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolations.C b/src/finiteVolume/interpolation/interpolation/interpolation/interpolations.C index e96f158a0c..6c7aa2d3ff 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolations.C +++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolations.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,6 +33,8 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Define the constructor function hash tables +FOR_ALL_FIELD_TYPES(defineInterpolation, interpolation); + defineTemplateRunTimeSelectionTable(interpolation, dictionary); defineTemplateRunTimeSelectionTable(interpolation, dictionary); defineTemplateRunTimeSelectionTable(interpolation, dictionary); diff --git a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C index 8d373bf0c6..f6604f88c4 100644 --- a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C +++ b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C @@ -98,11 +98,14 @@ const avType avType::vsType::rootMin namespace Foam { - makeFunction1s(avType); + makeFunction1s(avType, nullArg); defineTableReader(avType); - makeTableReader(Embedded, avType); - makeTableReader(Foam, avType); + namespace TableReaders + { + makeTableReader(Embedded, avType); + makeTableReader(Foam, avType); + } } diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C b/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C index 030ba4d383..a7fd953190 100644 --- a/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C +++ b/src/thermophysicalModels/specie/thermophysicalFunctions/APIdiffCoef/APIdiffCoef.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ namespace Foam { namespace Function2s { - makeScalarFunction2(APIdiffCoef) + makeScalarFunction2(APIdiffCoef); } } diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.C index 0827736b5e..ce8c85c2d0 100644 --- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.C +++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS0/NSRDS0.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ namespace Foam { namespace Function1s { - makeScalarFunction1(NSRDS0) + makeScalarFunction1(NSRDS0); } } diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.C index 2fed945e80..5070cd70b7 100644 --- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.C +++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS1/NSRDS1.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ namespace Foam { namespace Function1s { - makeScalarFunction1(NSRDS1) + makeScalarFunction1(NSRDS1); } } diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.C index f1320321a5..7dcdb23b7a 100644 --- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.C +++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS14/NSRDS14.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ namespace Foam { namespace Function1s { - makeScalarFunction1(NSRDS14) + makeScalarFunction1(NSRDS14); } } diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.C index 08c762a05d..4ab857f18a 100644 --- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.C +++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS2/NSRDS2.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ namespace Foam { namespace Function1s { - makeScalarFunction1(NSRDS2) + makeScalarFunction1(NSRDS2); } } diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.C index b18c9a1d71..8d979ef030 100644 --- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.C +++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS3/NSRDS3.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ namespace Foam { namespace Function1s { - makeScalarFunction1(NSRDS3) + makeScalarFunction1(NSRDS3); } } diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.C index 82743e22e0..411d3ebd38 100644 --- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.C +++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS4/NSRDS4.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ namespace Foam { namespace Function1s { - makeScalarFunction1(NSRDS4) + makeScalarFunction1(NSRDS4); } } diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.C index 0b746010d9..47211a7219 100644 --- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.C +++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS5/NSRDS5.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ namespace Foam { namespace Function1s { - makeScalarFunction1(NSRDS5) + makeScalarFunction1(NSRDS5); } } diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.C index a4de14f055..a34dd01a1f 100644 --- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.C +++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS6/NSRDS6.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ namespace Foam { namespace Function1s { - makeScalarFunction1(NSRDS6) + makeScalarFunction1(NSRDS6); } } diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.C b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.C index 350a1b3bea..b08eb91ecf 100644 --- a/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.C +++ b/src/thermophysicalModels/specie/thermophysicalFunctions/NSRDS/NSRDS7/NSRDS7.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ namespace Foam { namespace Function1s { - makeScalarFunction1(NSRDS7) + makeScalarFunction1(NSRDS7); } } diff --git a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C index cecb875b6d..083b7eea06 100644 --- a/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C +++ b/src/thermophysicalModels/specie/thermophysicalFunctions/integratedNonUniformTable1/integratedNonUniformTable1.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ namespace Foam { namespace Function1s { - makeScalarFunction1(integratedNonUniformTable) + makeScalarFunction1(integratedNonUniformTable); } }