From 37ebdfe36ee0934fea5c673fe29dc2fcd5ebef59 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 16 Nov 2020 21:01:41 +0000
Subject: [PATCH] Function1::TableReader: Added EmbeddedTableReader so that
 TableFile can read embedded table data

---
 .../utilities/postProcessing/noise/noise.C    |   5 +-
 .../functions/Function1/Function1/Function1.H |  10 +-
 .../functions/Function1/Table/Table.C         |  12 +-
 .../functions/Function1/Table/Table.H         |   6 +-
 .../functions/Function1/Table/TableBase.C     |  25 ++--
 .../functions/Function1/Table/TableBase.H     |   7 +-
 .../functions/Function1/TableFile/TableFile.C |  35 ++---
 .../functions/Function1/TableFile/TableFile.H |  18 +--
 .../TableReader/Csv/CsvTableReader.C          |  34 ++---
 .../TableReader/Csv/CsvTableReader.H          |  26 ++--
 .../Embedded/EmbeddedTableReader.C            |  81 ++++++++++++
 .../Embedded/EmbeddedTableReader.H            | 122 ++++++++++++++++++
 .../TableReader/Foam/FoamTableReader.C        |  26 ++--
 .../TableReader/Foam/FoamTableReader.H        |  17 ++-
 .../TableFileReader/TableFileReader.C         |  95 ++++++++++++++
 .../TableFileReader/TableFileReader.H         | 105 +++++++++++++++
 .../TableReader/TableReader/TableReader.C     |  74 +----------
 .../TableReader/TableReader/TableReader.H     |  48 +++----
 .../TableReader/TableReader/TableReaderNew.C  |  78 +++++++++++
 .../TableFile/TableReader/makeTableReaders.C  |   4 +-
 .../sixDoFMotion/sixDoFMotion.C               |   2 +
 .../sixDoFAccelerationSource.C                |   2 +
 .../tabulatedAxialAngularSpring.C             |   4 +-
 23 files changed, 617 insertions(+), 219 deletions(-)
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Embedded/EmbeddedTableReader.C
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Embedded/EmbeddedTableReader.H
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableFileReader/TableFileReader.C
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableFileReader/TableFileReader.H
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReaderNew.C

diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C
index dd66fe750a..5bf07c0903 100644
--- a/applications/utilities/postProcessing/noise/noise.C
+++ b/applications/utilities/postProcessing/noise/noise.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -162,7 +162,8 @@ int main(int argc, char *argv[])
 
     nfft -= pRef;
 
-    fileName baseFileName(pData.fName().lessExt());
+    fileName pDateFileName(dict.subDict("pressureData").lookup("file"));
+    fileName baseFileName(pDateFileName.lessExt());
 
     graph Pf(nfft.RMSmeanPf(N, min(nfft.size()/N, nw)));
     Info<< "    Creating graph for " << Pf.title() << endl;
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index e4ae4c401c..1a5d25634d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -228,7 +228,15 @@ public:
     defineNamedTemplateTypeNameAndDebug(Function1s::SS<Type>, 0);              \
                                                                                \
     Function1<Type>::adddictionaryConstructorToTable<Function1s::SS<Type>>     \
-        addFunction1##SS##Type##ConstructorToTable_;
+    addFunction1##SS##Type##ConstructorToTable_;
+
+
+#define makeNamedFunction1Type(SS, Type, Name)                                 \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(Function1s::SS<Type>, 0);              \
+                                                                               \
+    Function1<Type>::adddictionaryConstructorToTable<Function1s::SS<Type>>     \
+    addFunction1##SS##Type##ConstructorToTable_(#Name);
 
 
 #define makeScalarFunction1(SS)                                                \
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
index 2931c8ae5b..73c511296e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,11 +94,13 @@ Foam::Function1s::Table<Type>::~Table()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1s::Table<Type>::writeEntries(Ostream& os) const
+void Foam::Function1s::Table<Type>::writeEntries
+(
+    Ostream& os,
+    const List<Tuple2<scalar, Type>>& table
+) const
 {
-    TableBase<Type, Table<Type>>::writeEntries(os);
-
-    os  << indent << "values" << this->table_
+    os  << indent << "values" << table
         << token::END_STATEMENT << endl;
 }
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
index c914d83410..b6313be29b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
@@ -97,7 +97,11 @@ public:
     // Member Functions
 
         //- Write entries only in dictionary format
-        virtual void writeEntries(Ostream& os) const;
+        virtual void writeEntries
+        (
+            Ostream& os,
+            const List<Tuple2<scalar, Type>>& table
+        ) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 8b3725573b..cce68a7d2a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "TableBase.H"
-#include "Time.H"
 #include "linearInterpolationWeights.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
@@ -300,11 +299,17 @@ Foam::Function1s::TableBase<Type, Function1Type>::y() const
 
 
 template<class Type, class Function1Type>
-void Foam::Function1s::TableBase<Type, Function1Type>::writeEntries
+void Foam::Function1s::TableBase<Type, Function1Type>::writeData
 (
     Ostream& os
 ) const
 {
+    Function1<Type>::writeData(os);
+    os  << token::END_STATEMENT << nl;
+
+    os  << indent << word(this->name() + "Coeffs") << nl;
+    os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
+
     writeEntryIfDifferent
     (
         os,
@@ -320,21 +325,9 @@ void Foam::Function1s::TableBase<Type, Function1Type>::writeEntries
         linearInterpolationWeights::typeName,
         interpolationScheme_
     );
-}
 
+    writeEntries(os, table_);
 
-template<class Type, class Function1Type>
-void Foam::Function1s::TableBase<Type, Function1Type>::writeData
-(
-    Ostream& os
-) const
-{
-    Function1<Type>::writeData(os);
-    os  << token::END_STATEMENT << nl;
-
-    os  << indent << word(this->name() + "Coeffs") << nl;
-    os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
-    writeEntries(os);
     os  << decrIndent << indent << token::END_BLOCK << endl;
 }
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index 5e0503e9d8..e5e6a7dd5b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
@@ -37,7 +37,6 @@ SourceFiles
 
 #include "tableBase.H"
 #include "Function1.H"
-#include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -141,7 +140,11 @@ public:
         virtual tmp<Field<Type>> y() const;
 
         //- Write entries only in dictionary format
-        virtual void writeEntries(Ostream& os) const;
+        virtual void writeEntries
+        (
+            Ostream& os,
+            const List<Tuple2<scalar, Type>>& table
+        ) const = 0;
 
         //- Write all table data in dictionary format
         virtual void writeData(Ostream& os) const;
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
index df8966dc05..5eaf485f8d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,27 +30,13 @@ License
 template<class Type>
 Foam::Function1s::TableFile<Type>::TableFile
 (
-    const word& entryName,
+    const word& name,
     const dictionary& dict
 )
 :
-    TableBase<Type, TableFile<Type>>(entryName, dict),
-    fName_(dict.lookup("file")),
-    reader_
-    (
-        TableReader<Type>::New
-        (
-            dict.lookupOrDefault<word>
-            (
-                "format",
-                TableReaders::Foam<Type>::typeName
-            ),
-            dict
-        )
-    )
+    TableBase<Type, TableFile<Type>>(name, dict),
+    reader_(TableReader<Type>::New(name, dict, this->table_))
 {
-    reader_()(fName_, this->table_);
-
     TableBase<Type, TableFile<Type>>::check();
 }
 
@@ -59,7 +45,6 @@ template<class Type>
 Foam::Function1s::TableFile<Type>::TableFile(const TableFile<Type>& tbl)
 :
     TableBase<Type, TableFile<Type>>(tbl),
-    fName_(tbl.fName_),
     reader_(tbl.reader_, false)
 {}
 
@@ -74,13 +59,13 @@ Foam::Function1s::TableFile<Type>::~TableFile()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1s::TableFile<Type>::writeEntries(Ostream& os) const
+void Foam::Function1s::TableFile<Type>::writeEntries
+(
+    Ostream& os,
+    const List<Tuple2<scalar, Type>>& table
+) const
 {
-    TableBase<Type, TableFile<Type>>::writeEntries(os);
-
-    writeEntry(os, "file", fName_);
-    writeEntry(os, "format", reader_->type());
-    reader_->write(os);
+    reader_->write(os, table);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
index d6ecc6b904..5ce90321bb 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
@@ -75,9 +75,6 @@ class TableFile
 {
     // Private Data
 
-        //- File name for table
-        const fileName fName_;
-
         //- Table reader
         const autoPtr<TableReader<Type>> reader_;
 
@@ -101,19 +98,14 @@ public:
     virtual ~TableFile();
 
 
-    // Access
-
-        //- Return the file name
-        inline const fileName& fName() const
-        {
-            return fName_;
-        }
-
-
     // I/O
 
         //- Write entries only in dictionary format
-        virtual void writeEntries(Ostream& os) const;
+        virtual void writeEntries
+        (
+            Ostream& os,
+            const List<Tuple2<scalar, Type>>& table
+        ) const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.C
index 56bf01aa09..b51188cba6 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -198,23 +198,17 @@ void Foam::TableReaders::Csv<Type>::read
 }
 
 
-template<class Type>
-void Foam::TableReaders::Csv<Type>::read
-(
-    ISstream&,
-    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& data
-) const
-{
-    NotImplemented;
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::TableReaders::Csv<Type>::Csv(const dictionary& dict)
+Foam::TableReaders::Csv<Type>::Csv
+(
+    const word& name,
+    const dictionary& dict,
+    List<Tuple2<scalar, Type>>& table
+)
 :
-    TableReader<Type>(dict),
+    TableFileReader<Type>(dict),
     nHeaderLine_(dict.lookup<label>("nHeaderLine")),
     refColumn_(dict.lookup<label>("refColumn")),
     componentColumns_(dict.lookup("componentColumns")),
@@ -228,6 +222,8 @@ Foam::TableReaders::Csv<Type>::Csv(const dictionary& dict)
             << pTraits<Type>::nComponents << endl
             << exit(FatalError);
     }
+
+    TableFileReader<Type>::read(dict, table);
 }
 
 
@@ -238,10 +234,16 @@ Foam::TableReaders::Csv<Type>::~Csv()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
 template<class Type>
-void Foam::TableReaders::Csv<Type>::write(Ostream& os) const
+void Foam::TableReaders::Csv<Type>::write
+(
+    Ostream& os,
+    const List<Tuple2<scalar, Type>>& table
+) const
 {
-    TableReader<Type>::write(os);
+    TableFileReader<Type>::write(os);
 
     writeEntry(os, "nHeaderLine", nHeaderLine_);
     writeEntry(os, "refColumn", refColumn_);
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.H
index a6c0dea031..bb1eba8cfc 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.H
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Csv/CsvTableReader.H
@@ -48,7 +48,7 @@ SourceFiles
 #ifndef CsvTableReader_H
 #define CsvTableReader_H
 
-#include "TableReader.H"
+#include "TableFileReader.H"
 #include "labelList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,7 +65,7 @@ namespace TableReaders
 template<class Type>
 class Csv
 :
-    public TableReader<Type>
+    public TableFileReader<Type>
 {
     // Private Data
 
@@ -93,13 +93,6 @@ class Csv
         //- Read a 1D table
         virtual void read(ISstream&, List<Tuple2<scalar, Type>>&) const;
 
-        //- Read a 2D table
-        virtual void read
-        (
-            ISstream&,
-            List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>&
-        ) const;
-
 
 public:
 
@@ -110,7 +103,12 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        Csv(const dictionary& dict);
+        Csv
+        (
+            const word& name,
+            const dictionary &dict,
+            List<Tuple2<scalar, Type>>& table
+        );
 
         //- Construct and return a copy
         virtual autoPtr<TableReader<Type>> clone() const
@@ -125,8 +123,12 @@ public:
 
     // Member Functions
 
-        //- Write the remaining parameters
-        virtual void write(Ostream& os) const;
+        //- Write the CSV parameters
+        virtual void write
+        (
+            Ostream& os,
+            const List<Tuple2<scalar, Type>>& table
+        ) const;
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Embedded/EmbeddedTableReader.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Embedded/EmbeddedTableReader.C
new file mode 100644
index 0000000000..e567041abb
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Embedded/EmbeddedTableReader.C
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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 "EmbeddedTableReader.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::TableReaders::Embedded<Type>::Embedded
+(
+    const word& name,
+    const dictionary& dict,
+    List<Tuple2<scalar, Type>>& table
+)
+:
+    TableReader<Type>(dict)
+{
+    if (!dict.found(name))
+    {
+        dict.lookup("values") >> table;
+    }
+    else
+    {
+        Istream& is(dict.lookup(name));
+        word entryType(is);
+        if (is.eof())
+        {
+            dict.lookup("values") >> table;
+        }
+        else
+        {
+            is  >> table;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::TableReaders::Embedded<Type>::~Embedded()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::TableReaders::Embedded<Type>::write
+(
+    Ostream& os,
+    const List<Tuple2<scalar, Type>>& table
+) const
+{
+    os  << indent << "values" << table
+        << token::END_STATEMENT << endl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Embedded/EmbeddedTableReader.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Embedded/EmbeddedTableReader.H
new file mode 100644
index 0000000000..e5606bc6ae
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Embedded/EmbeddedTableReader.H
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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/>.
+
+Class
+    Foam::TableReaders::Embedded
+
+Description
+    Reads an interpolation table from the \c values entry in OpenFOAM-format.
+
+    This is a list of Tuple2's where the first (x) column is scalar, and the
+    second (y) column is the type to be interpolated.
+
+    Usage:
+    \verbatim
+        values
+        (
+            (0.0 (1 2 3))
+            (1.0 (4 5 6))
+        );
+    \endverbatim
+
+SourceFiles
+    Embedded.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef EmbeddedTableReader_H
+#define EmbeddedTableReader_H
+
+#include "TableReader.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace TableReaders
+{
+
+/*---------------------------------------------------------------------------*\
+                            Class Foam Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class Embedded
+:
+    public TableReader<Type>
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("embedded");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        Embedded
+        (
+            const word& name,
+            const dictionary &dict,
+            List<Tuple2<scalar, Type>>& table
+        );
+
+        //- Construct and return a copy
+        virtual autoPtr<TableReader<Type>> clone() const
+        {
+            return autoPtr<TableReader<Type>>(new Embedded<Type>(*this));
+        }
+
+
+    //- Destructor
+    virtual ~Embedded();
+
+
+    // Member Functions
+
+        //- Write the table values
+        virtual void write
+        (
+            Ostream& os,
+            const List<Tuple2<scalar, Type>>& table
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace TableReaders
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "EmbeddedTableReader.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Foam/FoamTableReader.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Foam/FoamTableReader.C
index aaad3d07fe..525416d1ed 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Foam/FoamTableReader.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Foam/FoamTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,24 +38,20 @@ void Foam::TableReaders::Foam<Type>::read
 }
 
 
-template<class Type>
-void Foam::TableReaders::Foam<Type>::read
-(
-    ISstream& is,
-    List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>& data
-) const
-{
-    is  >> data;
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::TableReaders::Foam<Type>::Foam(const dictionary& dict)
+Foam::TableReaders::Foam<Type>::Foam
+(
+    const word& name,
+    const dictionary& dict,
+    List<Tuple2<scalar, Type>>& table
+)
 :
-    TableReader<Type>(dict)
-{}
+    TableFileReader<Type>(dict)
+{
+    TableFileReader<Type>::read(dict, table);
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Foam/FoamTableReader.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Foam/FoamTableReader.H
index 969aa3e06e..dd334ef2bb 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Foam/FoamTableReader.H
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/Foam/FoamTableReader.H
@@ -45,7 +45,7 @@ SourceFiles
 #ifndef FoamTableReader_H
 #define FoamTableReader_H
 
-#include "TableReader.H"
+#include "TableFileReader.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -61,19 +61,13 @@ namespace TableReaders
 template<class Type>
 class Foam
 :
-    public TableReader<Type>
+    public TableFileReader<Type>
 {
     // Private Member Functions
 
         //- Read a 1D table
         virtual void read(ISstream&, List<Tuple2<scalar, Type>> &) const;
 
-        //- Read a 2D table
-        virtual void read
-        (
-            ISstream&,
-            List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>&
-        ) const;
 
 public:
 
@@ -84,7 +78,12 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        Foam(const dictionary &dict);
+        Foam
+        (
+            const word& name,
+            const dictionary &dict,
+            List<Tuple2<scalar, Type>>& table
+        );
 
         //- Construct and return a copy
         virtual autoPtr<TableReader<Type>> clone() const
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableFileReader/TableFileReader.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableFileReader/TableFileReader.C
new file mode 100644
index 0000000000..d6014c4db6
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableFileReader/TableFileReader.C
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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 "TableFileReader.H"
+#include "fileOperation.H"
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+template<class Type>
+void Foam::TableFileReader<Type>::read
+(
+    const dictionary& dict,
+    List<Tuple2<scalar, Type>>& table
+) const
+{
+    // Expand the file
+    fileName fNameExpanded(fName_);
+    fNameExpanded.expand();
+
+    // Open a stream and check it
+    autoPtr<ISstream> isPtr(fileHandler().NewIFstream(fNameExpanded));
+    ISstream& is = isPtr();
+    if (!is.good())
+    {
+        FatalIOErrorInFunction(is)
+            << "Cannot open file" << fName_ << nl
+            << exit(FatalIOError);
+    }
+
+    // Read data from the stream
+    read(is, table);
+
+    // Check something was read
+    if (table.empty())
+    {
+        FatalIOErrorInFunction(is)
+            << "Table read from " << fName_ << " is empty" << nl
+            << exit(FatalIOError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::TableFileReader<Type>::TableFileReader
+(
+    const dictionary& dict
+)
+:
+    TableReader<Type>(dict),
+    fName_(dict.lookup("file"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::TableFileReader<Type>::~TableFileReader()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::TableFileReader<Type>::write(Ostream& os) const
+{
+    writeEntry(os, "format", this->type());
+    writeEntry(os, "file", fName_);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableFileReader/TableFileReader.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableFileReader/TableFileReader.H
new file mode 100644
index 0000000000..9fa7674b9c
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableFileReader/TableFileReader.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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/>.
+
+Class
+    Foam::TableFileReader
+
+Description
+    Base class to read table data for tables
+
+SourceFiles
+    TableFileReader.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef TableFileReader_H
+#define TableFileReader_H
+
+#include "TableReader.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class TableFileReader Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class TableFileReader
+:
+    public TableReader<Type>
+{
+    // Private Data
+
+        //- File name for table
+        const fileName fName_;
+
+
+    // Private Member Functions
+
+        //- Read a 1D table
+        virtual void read(ISstream&, List<Tuple2<scalar, Type>>&) const = 0;
+
+
+protected:
+
+        //- Read a 1D table
+        void read(const dictionary& dict, List<Tuple2<scalar, Type>>&) const;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from dictionary
+        TableFileReader(const dictionary& dict);
+
+
+    //- Destructor
+    virtual ~TableFileReader();
+
+
+    // Member Functions
+
+        //- Write additional information
+        virtual void write(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "TableFileReader.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReader.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReader.C
index 4087e254dd..7171d57fec 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReader.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,38 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "TableReader.H"
-#include "fileOperation.H"
-
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
-template<class Type>
-Foam::autoPtr<Foam::TableReader<Type>> Foam::TableReader<Type>::New
-(
-    const word& readerType,
-    const dictionary& dict
-)
-{
-    typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(readerType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorInFunction
-            << "Unknown reader type " << readerType
-            << nl << nl
-            << "Valid reader types : " << nl
-            << dictionaryConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<TableReader<Type>>(cstrIter()(dict));
-}
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::TableReader<Type>::TableReader(const dictionary&)
+Foam::TableReader<Type>::TableReader(const dictionary& dict)
 {}
 
 
@@ -69,45 +42,12 @@ Foam::TableReader<Type>::~TableReader()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::TableReader<Type>::write(Ostream& os) const
+void Foam::TableReader<Type>::write
+(
+    Ostream& os,
+    const List<Tuple2<scalar, Type>>& table
+) const
 {}
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class Type>
-template<class TableType>
-void Foam::TableReader<Type>::operator()
-(
-    const fileName& fName,
-    TableType& data
-) const
-{
-    // Expand the file
-    fileName fNameExpanded(fName);
-    fNameExpanded.expand();
-
-    // Open a stream and check it
-    autoPtr<ISstream> isPtr(fileHandler().NewIFstream(fNameExpanded));
-    ISstream& is = isPtr();
-    if (!is.good())
-    {
-        FatalIOErrorInFunction(is)
-            << "Cannot open file" << fName << nl
-            << exit(FatalIOError);
-    }
-
-    // Read data from the stream
-    read(is, data);
-
-    // Check something was read
-    if (data.empty())
-    {
-        FatalIOErrorInFunction(is)
-            << "Table read from " << fName << " is empty" << nl
-            << exit(FatalIOError);
-    }
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReader.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReader.H
index 4952efd8da..d335684b65 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReader.H
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReader.H
@@ -36,9 +36,6 @@ SourceFiles
 #define TableReader_H
 
 #include "dictionary.H"
-#include "fieldTypes.H"
-#include "runTimeSelectionTables.H"
-#include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,30 +49,13 @@ namespace Foam
 template<class Type>
 class TableReader
 {
-private:
-
-    // Private Member Functions
-
-        //- Read a 1D table
-        virtual void read
-        (
-            ISstream&,
-            List<Tuple2<scalar, Type>>&
-        ) const = 0;
-
-        //- Read a 2D table
-        virtual void read
-        (
-            ISstream&,
-            List<Tuple2<scalar, List<Tuple2<scalar, Type>>>>&
-        ) const = 0;
-
 
 public:
 
     //- Runtime type information
     TypeName("TableReader");
 
+
     // Declare run-time constructor selection table
 
         declareRunTimeSelectionTable
@@ -83,8 +63,12 @@ public:
             autoPtr,
             TableReader,
             dictionary,
-            (const dictionary& dict),
-            (dict)
+            (
+                const word& name,
+                const dictionary& dict,
+                List<Tuple2<scalar, Type>>& table
+            ),
+            (name, dict, table)
         );
 
 
@@ -100,8 +84,9 @@ public:
     // Selector
     static autoPtr<TableReader<Type>> New
     (
-        const word& readerType,
-        const dictionary& dict
+        const word& name,
+        const dictionary& dict,
+        List<Tuple2<scalar, Type>>& table
     );
 
 
@@ -111,12 +96,12 @@ public:
 
     // Member Functions
 
-        //- Read a table
-        template<class TableType>
-        void operator()(const fileName&, TableType&) const;
-
         //- Write additional information
-        virtual void write(Ostream& os) const;
+        virtual void write
+        (
+            Ostream& os,
+            const List<Tuple2<scalar, Type>>& table
+        ) const;
 };
 
 
@@ -142,6 +127,7 @@ public:
 
 #define makeTableReaders(Type)                                                 \
     defineTableReader(Type);                                                   \
+    makeTableReader(Embedded, Type);                                           \
     makeTableReader(Foam, Type);                                               \
     makeTableReader(Csv, Type)
 
@@ -150,7 +136,7 @@ public:
 
 #ifdef NoRepository
     #include "TableReader.C"
-    #include "FoamTableReader.H"
+    #include "TableReaderNew.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReaderNew.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReaderNew.C
new file mode 100644
index 0000000000..9a59094feb
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/TableReader/TableReaderNew.C
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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 "EmbeddedTableReader.H"
+#include "FoamTableReader.H"
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+template<class Type>
+Foam::autoPtr<Foam::TableReader<Type>> Foam::TableReader<Type>::New
+(
+    const word& name,
+    const dictionary& dict,
+    List<Tuple2<scalar, Type>>& table
+)
+{
+    if (dict.found("format"))
+    {
+        const word readerType(dict.lookup("format"));
+
+        typename dictionaryConstructorTable::iterator cstrIter =
+            dictionaryConstructorTablePtr_->find(readerType);
+
+        if (cstrIter == dictionaryConstructorTablePtr_->end())
+        {
+            FatalErrorInFunction
+                << "Unknown reader type " << readerType
+                << nl << nl
+                << "Valid reader types : " << nl
+                << dictionaryConstructorTablePtr_->sortedToc()
+                << exit(FatalError);
+        }
+
+        return autoPtr<TableReader<Type>>(cstrIter()(name, dict, table));
+    }
+    else
+    {
+        if (dict.found("file"))
+        {
+            return autoPtr<TableReader<Type>>
+            (
+                new TableReaders::Foam<Type>(name, dict, table)
+            );
+        }
+        else
+        {
+            return autoPtr<TableReader<Type>>
+            (
+                new TableReaders::Embedded<Type>(name, dict, table)
+            );
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/makeTableReaders.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/makeTableReaders.C
index f99dc71d4c..b6ee5611b4 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/makeTableReaders.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableReader/makeTableReaders.C
@@ -23,10 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "TableReader.H"
+#include "EmbeddedTableReader.H"
 #include "FoamTableReader.H"
 #include "CsvTableReader.H"
-#include "fieldTypes.H"
-#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C
index 7ad8fe3023..20a4941cd9 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/sixDoFMotion/sixDoFMotion.C
@@ -57,6 +57,7 @@ namespace solidBodyMotionFunctions
 #include "Square.H"
 #include "Table.H"
 #include "TableFile.H"
+#include "EmbeddedTableReader.H"
 #include "FoamTableReader.H"
 #include "Scale.H"
 #include "CodedFunction1.H"
@@ -102,6 +103,7 @@ namespace Foam
     makeFunction1s(trvType);
 
     defineTableReader(trvType);
+    makeTableReader(Embedded, trvType);
     makeTableReader(Foam, trvType);
 }
 
diff --git a/src/fvOptions/sources/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C b/src/fvOptions/sources/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C
index 8a80175243..11491fdead 100644
--- a/src/fvOptions/sources/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C
+++ b/src/fvOptions/sources/derived/sixDoFAccelerationSource/sixDoFAccelerationSource.C
@@ -56,6 +56,7 @@ namespace fv
 #include "Square.H"
 #include "Table.H"
 #include "TableFile.H"
+#include "EmbeddedTableReader.H"
 #include "FoamTableReader.H"
 #include "Scale.H"
 #include "CodedFunction1.H"
@@ -98,6 +99,7 @@ namespace Foam
     makeFunction1s(avType);
 
     defineTableReader(avType);
+    makeTableReader(Embedded, avType);
     makeTableReader(Foam, avType);
 }
 
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
index ad2a47c237..2393b867c7 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -212,7 +212,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::write
 
     writeEntry(os, "axis", axis_);
 
-    moment_->writeEntries(os);
+    moment_->writeData(os);
 
     writeKeyword(os, "angleFormat");