Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
415d000d
Commit
415d000d
authored
Sep 07, 2017
by
Andrew Heather
Browse files
INT: Compatibility updates for Function1 related code
parent
3b6eb380
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
View file @
415d000d
...
...
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation |
Copyright (C) 2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -127,6 +127,12 @@ public:
//- Copy constructor
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
virtual
~
CSV
();
...
...
src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
View file @
415d000d
...
...
@@ -72,6 +72,17 @@ Type Foam::Function1<Type>::value(const scalar x) const
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
>
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
>
Foam
::
tmp
<
Foam
::
Field
<
typename
Function1Type
::
returnType
>>
Foam
::
FieldFunction1
<
Function1Type
>::
value
...
...
src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
View file @
415d000d
...
...
@@ -142,7 +142,7 @@ public:
virtual
Type
value
(
const
scalar
x
)
const
;
//- 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
virtual
Type
integrate
(
const
scalar
x1
,
const
scalar
x2
)
const
;
...
...
@@ -152,7 +152,7 @@ public:
(
const
scalarField
&
x1
,
const
scalarField
&
x2
)
const
=
0
;
)
const
;
// I/O
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment