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

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source 
Conflicts:
	src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
	src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
	src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
	src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
This commit is contained in:
mattijs
2012-02-03 12:44:17 +00:00
parent 100ba9c0c4 2f4e81919e
commit 99a7669440
53 changed files with 1161 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -122,17 +122,28 @@ public:
// Member Functions
//- Return TableFile value
virtual Type value(const scalar x) const
{
return TableBase<Type>::value(x);
}
// Manipulation
//- Integrate between two (scalar) values
virtual Type integrate(const scalar x1, const scalar x2) const
{
return TableBase<Type>::integrate(x1, x2);
}
//- Convert time
virtual void convertTimeBase(const Time& t)
{
TableBase<Type>::convertTimeBase(t);
}
// Evaluation
//- Return TableFile value
virtual Type value(const scalar x) const
{
return TableBase<Type>::value(x);
}
//- Integrate between two (scalar) values
virtual Type integrate(const scalar x1, const scalar x2) const
{
return TableBase<Type>::integrate(x1, x2);
}
// I/O