Function1::Table: simplified and rationalised

TableBase, TableFile and Table now combined into a single simpler Table class
which handle both the reading of embedded and file data using the generalised
TableReader.  The new EmbeddedTableReader handles the embedded data reading
providing the functionality of the original Table class within the same
structure that can read the data from separate files.

The input format defaults to 'embedded' unless the 'file' entry is present and
the Table class is added to the run-time selection table under the name 'table'
and 'tableFile' which provides complete backward comparability.  However it is
advisable to migrate cases to use the new 'table' entry and all tutorial cases
have been updated.
This commit is contained in:
Henry Weller
2020-11-16 23:48:47 +00:00
parent 37ebdfe36e
commit 4e183e33d4
43 changed files with 377 additions and 821 deletions

View File

@ -30,7 +30,7 @@ Description
Control settings are read from the $FOAM_CASE/system/noiseDict dictionary,
or user-specified dictionary using the -dict option. Pressure data is
read using a TableFile Function1:
read using a Table Function1:
Usage
\verbatim
@ -72,7 +72,7 @@ Usage
- one-third-octave-band pressure spectrum
See also
TableFile.H
Table.H
noiseFFT.H
\*---------------------------------------------------------------------------*/
@ -81,7 +81,7 @@ See also
#include "noiseFFT.H"
#include "argList.H"
#include "Time.H"
#include "TableFile.H"
#include "Table.H"
#include "IOdictionary.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -134,7 +134,7 @@ int main(int argc, char *argv[])
#include "createFields.H"
Info<< "Reading data file" << endl;
Function1s::TableFile<scalar> pData
Function1s::Table<scalar> pData
(
"pressure",
dict.subDict("pressureData")