diff --git a/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C b/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C deleted file mode 100644 index bf6432e2c174517f11776f3f4a27284c696f1347..0000000000000000000000000000000000000000 --- a/src/OpenFOAM/primitives/functions/Function1/makeDataEntries.C +++ /dev/null @@ -1,65 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- - | Copyright (C) 2011-2016 OpenFOAM Foundation -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. - -\*---------------------------------------------------------------------------*/ - -#include "Constant.H" -#include "PolynomialEntry.H" -#include "Sine.H" -#include "Square.H" -#include "CSV.H" -#include "Table.H" -#include "TableFile.H" - -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#define makeFunction1s(Type) \ - makeFunction1(Type); \ - makeFunction1Type(Constant, Type); \ - makeFunction1Type(Polynomial, Type); \ - makeFunction1Type(Sine, Type); \ - makeFunction1Type(Square, Type); \ - makeFunction1Type(CSV, Type); \ - makeFunction1Type(Table, Type); \ - makeFunction1Type(TableFile, Type); - -namespace Foam -{ - makeFunction1(label); - //makeFunction1Type(Constant, label); - // Polynomial functions and interpolation do evaluate to label - // Instead evaluate a scalar and convert to label as appropriate - - makeFunction1s(scalar); - makeFunction1s(vector); - makeFunction1s(sphericalTensor); - makeFunction1s(symmTensor); - makeFunction1s(tensor); -} - - -// ************************************************************************* // diff --git a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C index edc4e5efce9c3384709268fdcd6b9e6072e9001b..806649c661667b322ebec2dd1d353f530e7cc991 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 | - \\ / A nd | + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2017 OpenFOAM Foundation