From 5763b7e4041a1f4da6e49b027e55280afce40ba1 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 21 Nov 2011 17:12:59 +0000
Subject: [PATCH] ENH: Added CSV table DataEntry

---
 .../primitives/functions/DataEntry/CSV/CSV.C  | 285 ++++++++++++++++++
 .../primitives/functions/DataEntry/CSV/CSV.H  | 174 +++++++++++
 .../functions/DataEntry/CSV/CSVIO.C           |  85 ++++++
 .../functions/DataEntry/Constant/Constant.C   |   5 +-
 .../functions/DataEntry/Constant/Constant.H   |   2 +-
 .../functions/DataEntry/DataEntry/DataEntry.H |   4 +-
 .../DataEntry/DataEntry/DataEntryNew.C        |   3 +-
 .../functions/DataEntry/Table/Table.C         |   9 +-
 .../functions/DataEntry/Table/Table.H         |   2 +-
 .../functions/DataEntry/makeDataEntries.C     |  24 +-
 .../DataEntry/polynomial/polynomial.C         |   9 +-
 .../DataEntry/polynomial/polynomial.H         |   2 +-
 12 files changed, 591 insertions(+), 13 deletions(-)
 create mode 100644 src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
 create mode 100644 src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
 create mode 100644 src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C

diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
new file mode 100644
index 0000000000..438c10f60b
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
@@ -0,0 +1,285 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 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 "CSV.H"
+#include "DynamicList.H"
+#include "IFstream.H"
+//#include "IStringStream.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+namespace Foam
+{
+    // doesn't recognize specialization otherwise
+    template<>
+    scalar CSV<scalar>::readValue(const List<string>& splitted)
+    {
+        if (componentColumns_[0] >= splitted.size())
+        {
+            FatalErrorIn("CSV<scalar>::readValue(const List<string>&)")
+                << "No column " << componentColumns_[0] << " in "
+                << splitted << endl
+                << exit(FatalError);
+        }
+
+        return readScalar(IStringStream(splitted[componentColumns_[0]])());
+    }
+
+
+    template<class Type>
+    Type CSV<Type>::readValue(const List<string>& splitted)
+    {
+        Type result;
+
+        for (label i = 0; i < pTraits<Type>::nComponents; i++)
+        {
+            if (componentColumns_[i] >= splitted.size())
+            {
+                FatalErrorIn("CSV<Type>::readValue(const List<string>&)")
+                    << "No column " << componentColumns_[i] << " in "
+                    << splitted << endl
+                    << exit(FatalError);
+            }
+
+            result[i] =
+                readScalar(IStringStream(splitted[componentColumns_[i]])());
+        }
+
+        return result;
+    }
+}
+
+
+template<class Type>
+void Foam::CSV<Type>::read()
+{
+    IFstream is(fName_.expand());
+
+    DynamicList<Tuple2<scalar, Type> > values;
+
+    // skip header
+    if (headerLine_)
+    {
+        string line;
+        is.getLine(line);
+    }
+
+    // read data
+    while (is.good())
+    {
+        string line;
+        is.getLine(line);
+
+        DynamicList<string> splitted;
+
+        std::size_t pos = 0;
+        while (pos != std::string::npos)
+        {
+            std::size_t nPos = line.find(separator_, pos);
+
+            if (nPos == std::string::npos)
+            {
+                splitted.append(line.substr(pos));
+                pos = nPos;
+            }
+            else
+            {
+                splitted.append(line.substr(pos, nPos - pos));
+                pos = nPos + 1;
+            }
+        }
+
+        if (splitted.size() <= 1)
+        {
+            break;
+        }
+
+        scalar x = readScalar(IStringStream(splitted[refColumn_])());
+        Type value = readValue(splitted);
+
+        values.append(Tuple2<scalar,Type>(x, value));
+    }
+
+    table_.transfer(values);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::CSV<Type>::CSV(const word& entryName, const dictionary& dict)
+:
+    DataEntry<Type>(entryName),
+    headerLine_(false),
+    refColumn_(0),
+    componentColumns_(),
+    separator_(string(",")[0]),
+    fName_("none"),
+    table_()
+{
+    const dictionary coeffs(dict.subDict(type() + "Coeffs"));
+    coeffs.lookup("hasHeaderLine") >> headerLine_;
+    coeffs.lookup("refColumn") >> refColumn_;
+    coeffs.lookup("componentColumns") >> componentColumns_;
+    coeffs.readIfPresent("separator", string(separator_)[0]);
+    coeffs.lookup("fileName") >> fName_;
+
+    if (componentColumns_.size() != pTraits<Type>::nComponents)
+    {
+        FatalErrorIn("Foam::CSV<Type>::CSV(const word&, Istream&)")
+            << componentColumns_ << " does not have the expected length "
+            << pTraits<Type>::nComponents << endl
+            << exit(FatalError);
+    }
+
+    read();
+
+    if (!table_.size())
+    {
+        FatalErrorIn("Foam::CSV<Type>::CSV(const Istream&)")
+            << "CSV for entry " << this->name_ << " is invalid (empty)"
+            << nl << exit(FatalError);
+    }
+}
+
+
+template<class Type>
+Foam::CSV<Type>::CSV(const CSV<Type>& tbl)
+:
+    DataEntry<Type>(tbl),
+    headerLine_(tbl.headerLine_),
+    refColumn_(tbl.refColumn_),
+    componentColumns_(tbl.componentColumns_),
+    separator_(tbl.separator_),
+    fName_(tbl.fName_),
+    table_(tbl.table_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::CSV<Type>::~CSV()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Type Foam::CSV<Type>::value(const scalar x) const
+{
+    // Return zero if out of bounds
+    if (x < table_[0].first() || x > table_.last().first())
+    {
+        return pTraits<Type>::zero;
+    }
+
+    // Find i such that x(i) < x < x(i+1)
+    label i = 0;
+    while ((table_[i+1].first() < x) && (i+1 < table_.size()))
+    {
+        i++;
+    }
+
+    // Linear interpolation to find value. Note constructor needed for
+    // CSV<label> to convert intermediate scalar back to label.
+    return Type
+    (
+        (x - table_[i].first())/(table_[i+1].first() - table_[i].first())
+      * (table_[i+1].second() - table_[i].second())
+      + table_[i].second()
+    );
+}
+
+
+template<class Type>
+Type Foam::CSV<Type>::integrate(const scalar x1, const scalar x2) const
+{
+    // Initialise return value
+    Type sum = pTraits<Type>::zero;
+
+    // Return zero if out of bounds
+    if ((x1 > table_.last().first()) || (x2 < table_[0].first()))
+    {
+        return sum;
+    }
+
+    // Find next index greater than x1
+    label id1 = 0;
+    while ((table_[id1].first() < x1) && (id1 < table_.size()))
+    {
+        id1++;
+    }
+
+    // Find next index less than x2
+    label id2 = table_.size() - 1;
+    while ((table_[id2].first() > x2) && (id2 >= 1))
+    {
+        id2--;
+    }
+
+    if ((id1 - id2) == 1)
+    {
+        // x1 and x2 lie within 1 interval
+        sum = 0.5*(value(x1) + value(x2))*(x2 - x1);
+    }
+    else
+    {
+        // x1 and x2 cross multiple intervals
+
+        // Integrate table body
+        for (label i=id1; i<id2; i++)
+        {
+            sum +=
+                (table_[i].second() + table_[i+1].second())
+              * (table_[i+1].first() - table_[i].first());
+        }
+        sum *= 0.5;
+
+        // Add table ends (partial segments)
+        if (id1 > 0)
+        {
+            sum += 0.5
+              * (value(x1) + table_[id1].second())
+              * (table_[id1].first() - x1);
+        }
+        if (id2 < table_.size() - 1)
+        {
+            sum += 0.5
+              * (table_[id2].second() + value(x2))
+              * (x2 - table_[id2].first());
+        }
+    }
+
+    return sum;
+}
+
+
+// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+
+#include "CSVIO.C"
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
new file mode 100644
index 0000000000..66679a21f3
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 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::CSV
+
+Description
+    Templated CSV container data entry.  Reference column is always a scalar,
+    e.g. time
+
+    \verbatim
+        <entryName>   CSV
+        {
+            hasHeaderLine   true;
+            refColumn       0;              // reference column index
+            componentColumns (0 1 2);       // component column indices
+            separator       ",";            // optional (defaults to ",")
+            fileName        fileXYZ;        // name of csv data file
+        }
+    \endverbatim
+
+SourceFiles
+    CSV.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CSV_H
+#define CSV_H
+
+#include "DataEntry.H"
+#include "Tuple2.H"
+#include "labelList.H"
+#include "ISstream.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class Type>
+class CSV;
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const CSV<Type>&
+);
+
+/*---------------------------------------------------------------------------*\
+                           Class CSV Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class CSV
+:
+    public DataEntry<Type>
+{
+    // Private data
+
+        //- Does the file have a header line?
+        bool headerLine_;
+
+        //- Column of the time
+        label refColumn_;
+
+        //- Labels of the components
+        labelList componentColumns_;
+
+        //- Separator character
+        char separator_;
+
+        //- File name for csv table (optional)
+        fileName fName_;
+
+        //- CSV data
+        List<Tuple2<scalar, Type> > table_;
+
+
+    // Private Member Functions
+
+        //- Read csv data table
+        void read();
+
+        //- Read the next value from the splitted string
+        Type readValue(const List<string>&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const CSV<Type>&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("csv");
+
+
+    // Constructors
+
+        //- Construct from entry name and Istream
+        CSV(const word& entryName, const dictionary& dict);
+
+        //- Copy constructor
+        CSV(const CSV<Type>& tbl);
+
+        //- Construct and return a clone
+        virtual tmp<DataEntry<Type> > clone() const
+        {
+            return tmp<DataEntry<Type> >(new CSV<Type>(*this));
+        }
+
+
+    //- Destructor
+    virtual ~CSV();
+
+
+    // Member Functions
+
+        //- Return CSV value
+        Type value(const scalar x) const;
+
+        //- Integrate between two (scalar) values
+        Type integrate(const scalar x1, const scalar x2) const;
+
+
+    // I/O
+
+        //- Ostream Operator
+        friend Ostream& operator<< <Type>
+        (
+            Ostream& os,
+            const CSV<Type>& cnst
+        );
+
+        //- Write in dictionary format
+        virtual void writeData(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "CSV.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C
new file mode 100644
index 0000000000..98d784ac5b
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 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 "DataEntry.H"
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const CSV<Type>& tbl
+)
+{
+    if (os.format() == IOstream::ASCII)
+    {
+        os  << static_cast<const DataEntry<Type>& >(tbl)
+            << token::SPACE << tbl.headerLine_
+            << token::SPACE << tbl.timeColumn_
+            << token::SPACE << tbl.componentColumns_
+            << token::SPACE << tbl.separator_
+            << token::SPACE << tbl.fileName_;
+    }
+    else
+    {
+        os  << static_cast<const DataEntry<Type>& >(tbl);
+        os.write
+        (
+            reinterpret_cast<const char*>(&tbl.table_),
+            sizeof(tbl.table_)
+        );
+    }
+
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, const CSV<Type>&)"
+    );
+
+    return os;
+}
+
+
+template<class Type>
+void Foam::CSV<Type>::writeData(Ostream& os) const
+{
+    DataEntry<Type>::writeData(os);
+
+    os  << token::END_STATEMENT << nl;
+    os  << indent << word(type() + "Coeffs") << nl;
+    os  << indent << token::BEGIN_BLOCK << incrIndent << nl;
+    os.writeKeyword("headerLine") << headerLine_ << token::END_STATEMENT << nl;
+    os.writeKeyword("refColumn") << refColumn_ << token::END_STATEMENT << nl;
+    os.writeKeyword("componentColumns") << componentColumns_
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("separator") << string(separator_)
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("fileName") << fName_ << token::END_STATEMENT << nl;
+    os  << decrIndent << indent << token::END_BLOCK << endl;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
index 2fe5238d8d..410052f560 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
@@ -28,11 +28,14 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Constant<Type>::Constant(const word& entryName, Istream& is)
+Foam::Constant<Type>::Constant(const word& entryName, const dictionary& dict)
 :
     DataEntry<Type>(entryName),
     value_(pTraits<Type>::zero)
 {
+    Istream& is(dict.lookup(entryName));
+    word entryType(is);
+
     is  >> value_;
 }
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
index 658a667240..c42e07e054 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
@@ -83,7 +83,7 @@ public:
     // Constructors
 
         //- Construct from entry name and Istream
-        Constant(const word& entryName, Istream& is);
+        Constant(const word& entryName, const dictionary& dict);
 
         //- Copy constructor
         Constant(const Constant<Type>& cnst);
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
index 03d1da361a..5b3e783101 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
@@ -92,9 +92,9 @@ public:
         dictionary,
         (
             const word& entryName,
-            Istream& is
+            const dictionary& dict
         ),
-        (entryName, is)
+        (entryName, dict)
     );
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
index a62ce1054f..57cf79c419 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C
@@ -35,7 +35,6 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
 )
 {
     Istream& is(dict.lookup(entryName));
-
     word DataEntryType(is);
 
     typename dictionaryConstructorTable::iterator cstrIter =
@@ -54,7 +53,7 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
             << exit(FatalError);
     }
 
-    return autoPtr<DataEntry<Type> >(cstrIter()(entryName, is));
+    return autoPtr<DataEntry<Type> >(cstrIter()(entryName, dict));
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
index 91e501f5be..2ee8180be6 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C
@@ -28,11 +28,16 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Table<Type>::Table(const word& entryName, Istream& is)
+Foam::Table<Type>::Table(const word& entryName, const dictionary& dict)
 :
     DataEntry<Type>(entryName),
-    table_(is)
+    table_()
 {
+    Istream& is(dict.lookup(entryName));
+    word entryType(is);
+
+    is  >> table_;
+
     if (!table_.size())
     {
         FatalErrorIn("Foam::Table<Type>::Table(const Istream&)")
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
index ab4ee3dd16..fc849488e5 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
@@ -93,7 +93,7 @@ public:
     // Constructors
 
         //- Construct from entry name and Istream
-        Table(const word& entryName, Istream& is);
+        Table(const word& entryName, const dictionary& dict);
 
         //- Copy constructor
         Table(const Table<Type>& tbl);
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
index 6d002412c5..11f5f27380 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
@@ -23,27 +23,49 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DataEntry.H"
 #include "Constant.H"
+#include "CSV.H"
+#include "DataEntry.H"
 #include "Table.H"
 
 #include "label.H"
 #include "scalar.H"
 #include "vector.H"
+#include "sphericalTensor.H"
+#include "symmTensor.H"
+#include "tensor.H"
 
 namespace Foam
 {
     makeDataEntry(label);
     makeDataEntryType(Constant, label);
+//    makeDataEntryType(CSV, label);
     makeDataEntryType(Table, label);
 
     makeDataEntry(scalar);
     makeDataEntryType(Constant, scalar);
+    makeDataEntryType(CSV, scalar);
     makeDataEntryType(Table, scalar);
 
     makeDataEntry(vector);
     makeDataEntryType(Constant, vector);
+    makeDataEntryType(CSV, vector);
     makeDataEntryType(Table, vector);
+
+    makeDataEntry(sphericalTensor);
+    makeDataEntryType(Constant, sphericalTensor);
+    makeDataEntryType(CSV, sphericalTensor);
+    makeDataEntryType(Table, sphericalTensor);
+
+    makeDataEntry(symmTensor);
+    makeDataEntryType(Constant, symmTensor);
+    makeDataEntryType(CSV, symmTensor);
+    makeDataEntryType(Table, symmTensor);
+
+    makeDataEntry(tensor);
+    makeDataEntryType(Constant, tensor);
+    makeDataEntryType(CSV, tensor);
+    makeDataEntryType(Table, tensor);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C
index e81f5a7bf1..10111c8680 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C
@@ -34,12 +34,17 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::polynomial::polynomial(const word& entryName, Istream& is)
+Foam::polynomial::polynomial(const word& entryName, const dictionary& dict)
 :
     DataEntry<scalar>(entryName),
-    coeffs_(is),
+    coeffs_(),
     canIntegrate_(true)
 {
+    Istream& is(dict.lookup(entryName));
+    word entryType(is);
+
+    is  >> coeffs_;
+
     if (!coeffs_.size())
     {
         FatalErrorIn("Foam::polynomial::polynomial(const word&, Istream&)")
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
index 7aa5ecb3fd..37a45b3316 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H
@@ -94,7 +94,7 @@ public:
 
     // Constructors
 
-        polynomial(const word& entryName, Istream& is);
+        polynomial(const word& entryName, const dictionary& dict);
 
         //- Copy constructor
         polynomial(const polynomial& poly);