zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

INT: Compatibility updates for Function1 related code

Browse Source
This commit is contained in:
Andrew Heather
2017-09-07 10:47:54 +01:00
parent 3b6eb380d0
commit 415d000db6
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -127,6 +127,12 @@ public:
//- Copy constructor //- Copy constructor
CSV(const CSV<Type>& tbl); CSV(const CSV<Type>& tbl);
//- Construct and return a clone
virtual tmp<Function1<Type>> clone() const
{
return tmp<Function1<Type>>(new CSV<Type>(*this));
}
//- Destructor //- Destructor
virtual ~CSV(); virtual ~CSV();

24
src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
View File

@ -72,6 +72,17 @@ Type Foam::Function1<Type>::value(const scalar x) const
return Zero; return Zero;
} }
template<class Type>
Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::value
(
const scalarField& x
) const
{
NotImplemented;
return tmp<Foam::Field<Type>>(nullptr);
}
template<class Type> template<class Type>
Type Foam::Function1<Type>::integrate(const scalar x1, const scalar x2) const Type Foam::Function1<Type>::integrate(const scalar x1, const scalar x2) const
@ -82,6 +93,19 @@ Type Foam::Function1<Type>::integrate(const scalar x1, const scalar x2) const
} }
template<class Type>
Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::integrate
(
const scalarField& x1,
const scalarField& x2
) const
{
NotImplemented;
return tmp<Foam::Field<Type>>(nullptr);
}
template<class Function1Type> template<class Function1Type>
Foam::tmp<Foam::Field<typename Function1Type::returnType>> Foam::tmp<Foam::Field<typename Function1Type::returnType>>
Foam::FieldFunction1<Function1Type>::value Foam::FieldFunction1<Function1Type>::value

4
src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
View File

@ -142,7 +142,7 @@ public:
virtual Type value(const scalar x) const; virtual Type value(const scalar x) const;
//- Return value as a function of (scalar) independent variable //- Return value as a function of (scalar) independent variable
virtual tmp<Field<Type>> value(const scalarField& x) const = 0; virtual tmp<Field<Type>> value(const scalarField& x) const;
//- Integrate between two (scalar) values //- Integrate between two (scalar) values
virtual Type integrate(const scalar x1, const scalar x2) const; virtual Type integrate(const scalar x1, const scalar x2) const;
@ -152,7 +152,7 @@ public:
( (
const scalarField& x1, const scalarField& x1,
const scalarField& x2 const scalarField& x2
) const = 0; ) const;
// I/O // I/O