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

applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C

@@ -48,11 +48,13 @@ int main(int argc, char *argv[])
 
     OFstream reactionsFile(args[3]);
     reactionsFile
-        << "species" << cr.species() << token::END_STATEMENT << nl << nl
+        << "species" << cr.species() << token::END_STATEMENT << nl << nl;
-        << "reactions" << cr.reactions() << token::END_STATEMENT << endl;
+
+    cr.reactions().write(reactionsFile);
+
 
     OFstream thermoFile(args[4]);
-    thermoFile<< cr.speciesThermo() << endl;
+    cr.speciesThermo().write(thermoFile);
 
     Info<< "End\n" << endl;
 

doc/doxygen/Doxyfile

@@ -574,12 +574,14 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-# INPUT                  = $(WM_PROJECT_DIR)/src \
+#INPUT                  = $(WM_PROJECT_DIR)/src \
 #                         $(WM_PROJECT_DIR)/applications/utilities \
 #                         $(WM_PROJECT_DIR)/applications/solvers
 
 # limit input for testing purposes
-INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM/global
+INPUT                  = $(WM_PROJECT_DIR)/src/OpenFOAM/global \
+                         $(WM_PROJECT_DIR)/src/OpenFOAM/containers \
+                         $(WM_PROJECT_DIR)/src/OpenFOAM/primitives
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

etc/settings.csh

@@ -108,6 +108,12 @@ case OpenFOAM:
         set gmp_version=gmp-4.2.4
         set mpfr_version=mpfr-2.4.1
         breaksw
+    case Clang:
+        # using clang - not gcc
+        setenv WM_CC 'clang'
+        setenv WM_CXX 'clang++'
+        set clang_version=llvm-2.8
+        breaksw
     default:
         echo
         echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
@@ -159,6 +165,25 @@ case OpenFOAM:
     endif
     unset gcc_version gccDir
     unset gmp_version gmpDir  mpfr_version mpfrDir  mpc_version mpcDir
+
+    if ( $?clang_version ) then
+        set clangDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$clang_version
+
+        # Check that the compiler directory can be found
+        if ( ! -d "$clangDir" ) then
+            echo
+            echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
+            echo "    Cannot find $clangDir installation."
+            echo "    Please install this compiler version or if you wish to use the system compiler,"
+            echo "    change the 'compilerInstall' setting to 'system' in this file"
+            echo
+        endif
+
+        _foamAddMan     $clangDir/man
+        _foamAddPath    $clangDir/bin
+    endif
+    unset clang_version clangDir
+
     breaksw
 endsw
 

etc/settings.sh

@@ -131,6 +131,12 @@ OpenFOAM)
         gmp_version=gmp-4.2.4
         mpfr_version=mpfr-2.4.1
         ;;
+    Clang)
+        # using clang - not gcc
+        export WM_CC='clang'
+        export WM_CXX='clang++'
+        clang_version=llvm-2.8
+        ;;
     *)
         echo
         echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
@@ -183,6 +189,25 @@ OpenFOAM)
     fi
     unset gcc_version gccDir
     unset gmp_version gmpDir  mpfr_version mpfrDir  mpc_version mpcDir
+
+    if [ -n "$clang_version" ]
+    then
+        clangDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$clang_version
+
+        # Check that the compiler directory can be found
+        [ -d "$clangDir" ] || {
+            echo
+            echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
+            echo "    Cannot find $clangDir installation."
+            echo "    Please install this compiler version or if you wish to use the system compiler,"
+            echo "    change the 'compilerInstall' setting to 'system' in this file"
+            echo
+        }
+
+        _foamAddMan     $clangDir/share/man
+        _foamAddPath    $clangDir/bin
+    fi
+    unset clang_version clangDir
     ;;
 esac
 

src/OSspecific/POSIX/fileMonitor.C

@@ -49,19 +49,19 @@ Class
 
 defineTypeNameAndDebug(Foam::fileMonitor, 0);
 
-template<>
-const char* Foam::NamedEnum<Foam::fileMonitor::fileState, 3>::names[] =
-{
-    "unmodified",
-    "modified",
-    "deleted"
-};
 const Foam::NamedEnum<Foam::fileMonitor::fileState, 3>
     Foam::fileMonitor::fileStateNames_;
 
-
 namespace Foam
 {
+    template<>
+    const char* Foam::NamedEnum<Foam::fileMonitor::fileState, 3>::names[] =
+    {
+        "unmodified",
+        "modified",
+        "deleted"
+    };
+
     //- Reduction operator for PackedList of fileState
     class reduceFileStates
     {

src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H

@@ -72,6 +72,11 @@ class HashPtrTable
         template<class INew>
         void read(Istream&, const INew& inewt);
 
+        //- Read from dictionary using given dictionary constructor class
+        template<class INew>
+        void read(const dictionary& dict, const INew& inewt);
+
+
 
 public:
 
@@ -91,6 +96,10 @@ public:
         //- Construct from Istream using default Istream constructor class
         HashPtrTable(Istream&);
 
+        //- Construct from dictionary using default dictionary constructor
+        //  class
+        HashPtrTable(const dictionary& dict);
+
         //- Construct as copy
         HashPtrTable(const HashPtrTable<T, Key, Hash>&);
 
@@ -112,6 +121,9 @@ public:
             //- Clear all entries from table
             void clear();
 
+            //- Write
+            void write(Ostream& os) const;
+
 
     // Member Operators
 

src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C

@@ -27,6 +27,7 @@ License
 #include "Istream.H"
 #include "Ostream.H"
 #include "INew.H"
+#include "dictionary.H"
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
@@ -137,6 +138,39 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
 }
 
 
+template<class T, class Key, class Hash>
+template<class INew>
+void Foam::HashPtrTable<T, Key, Hash>::read
+(
+    const dictionary& dict,
+    const INew& inewt
+)
+{
+    forAllConstIter(dictionary, dict, iter)
+    {
+        insert(iter().keyword(), inewt(dict.subDict(iter().keyword())).ptr());
+    }
+}
+
+
+template<class T, class Key, class Hash>
+void Foam::HashPtrTable<T, Key, Hash>::write(Ostream& os) const
+{
+
+    for
+    (
+        typename HashPtrTable<T, Key, Hash>::const_iterator
+        iter = this->begin();
+        iter != this->end();
+        ++iter
+    )
+    {
+        const T* ptr = iter();
+        ptr->write(os);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
@@ -154,6 +188,13 @@ Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(Istream& is)
 }
 
 
+template<class T, class Key, class Hash>
+Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(const dictionary& dict)
+{
+    read(dict, INew<T>());
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>

src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H

@@ -51,6 +51,12 @@ SeeAlso
 namespace Foam
 {
 
+// Forward declaration
+class PackedBoolList;
+
+//- @typedef A List of PackedBoolList
+typedef List<PackedBoolList> PackedBoolListList;
+
 /*---------------------------------------------------------------------------*\
                        Class PackedBoolList Declaration
 \*---------------------------------------------------------------------------*/

src/OpenFOAM/containers/Lists/UList/UList.H

@@ -59,6 +59,7 @@ template<class T> class SubList;
 template<class T> class UList;
 template<class T> Ostream& operator<<(Ostream&, const UList<T>&);
 
+typedef UList<label> labelUList;
 
 /*---------------------------------------------------------------------------*\
                            Class UList Declaration

src/OpenFOAM/db/IOstreams/IOstreams/INew.H

@@ -25,7 +25,7 @@ Class
     Foam::INew
 
 Description
-    A helper class when constructing from an Istream
+    A helper class when constructing from an Istream or dictionary
 
 \*---------------------------------------------------------------------------*/
 
@@ -52,18 +52,33 @@ class INew
 
 public:
 
+    //- Construct null
     INew()
     {}
 
+    //- Construct from Istream
     autoPtr<T> operator()(Istream& is) const
     {
         return T::New(is);
     }
 
+    //- Construct from word and Istream
     autoPtr<T> operator()(const word&, Istream& is) const
     {
         return T::New(is);
     }
+
+    //- Construct from dictionary
+    autoPtr<T> operator()(const dictionary& dict) const
+    {
+        return T::New(dict);
+    }
+
+    //- Construct from word and dictionary
+    autoPtr<T> operator()(const word&, const dictionary& dict) const
+    {
+        return T::New(dict);
+    }
 };
 
 

src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C

@@ -32,13 +32,17 @@ License
 
 defineTypeNameAndDebug(Foam::UPstream, 0);
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::UPstream::commsTypes, 3>::names[] =
 {
-    "blocking",
+    template<>
-    "scheduled",
+    const char* Foam::NamedEnum<Foam::UPstream::commsTypes, 3>::names[] =
-    "nonBlocking"
+    {
-};
+        "blocking",
+        "scheduled",
+        "nonBlocking"
+    };
+}
+
 
 const Foam::NamedEnum<Foam::UPstream::commsTypes, 3>
     Foam::UPstream::commsTypeNames;

src/OpenFOAM/db/Time/Time.C

@@ -32,28 +32,31 @@ License
 
 defineTypeNameAndDebug(Foam::Time, 0);
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::Time::stopAtControls, 4>::names[] =
 {
-    "endTime",
+    template<>
-    "noWriteNow",
+    const char* Foam::NamedEnum<Foam::Time::stopAtControls, 4>::names[] =
-    "writeNow",
+    {
-    "nextWrite"
+        "endTime",
-};
+        "noWriteNow",
+        "writeNow",
+        "nextWrite"
+    };
+
+    template<>
+    const char* Foam::NamedEnum<Foam::Time::writeControls, 5>::names[] =
+    {
+        "timeStep",
+        "runTime",
+        "adjustableRunTime",
+        "clockTime",
+        "cpuTime"
+    };
+}
 
 const Foam::NamedEnum<Foam::Time::stopAtControls, 4>
     Foam::Time::stopAtControlNames_;
 
-template<>
-const char* Foam::NamedEnum<Foam::Time::writeControls, 5>::names[] =
-{
-    "timeStep",
-    "runTime",
-    "adjustableRunTime",
-    "clockTime",
-    "cpuTime"
-};
-
 const Foam::NamedEnum<Foam::Time::writeControls, 5>
     Foam::Time::writeControlNames_;
 

src/OpenFOAM/db/dictionary/dictionary.H

@@ -111,6 +111,23 @@ public:
         {
             return name_;
         }
+
+        //- Return the local dictionary name (final part of scoped name)
+        const word dictName() const
+        {
+            const word scopedName = name_.name();
+
+            string::size_type i = scopedName.rfind(':');
+
+            if (i == scopedName.npos)
+            {
+                return scopedName;
+            }
+            else
+            {
+                return scopedName.substr(i + 1, scopedName.npos);
+            }
+        }
 };
 
 

src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H

@@ -106,13 +106,19 @@ public:
 
     // Member functions
 
-        //- Return the dictionary name
+        //- Return the local dictionary name (final part of scoped name)
+        const word dictName() const
+        {
+            return dictionary::dictName();
+        }
+
+        //- Return the dictionary name (scoped, e.g. dictA::dictB::dictC)
         const fileName& name() const
         {
             return dictionary::name();
         }
 
-        //- Return the dictionary name
+        //- Return the dictionary name (scoped, e.g. dictA::dictB::dictC)
         fileName& name()
         {
             return dictionary::name();

src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C

@@ -27,16 +27,19 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum
-<
-    Foam::outputFilterOutputControl::outputControls,
-    2
->::names[] =
 {
-    "timeStep",
+    template<>
-    "outputTime"
+    const char* Foam::NamedEnum
-};
+    <
+        Foam::outputFilterOutputControl::outputControls,
+        2
+    >::names[] =
+    {
+        "timeStep",
+        "outputTime"
+    };
+}
 
 const Foam::NamedEnum<Foam::outputFilterOutputControl::outputControls, 2>
     Foam::outputFilterOutputControl::outputControlNames_;

src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduSchedule/lduSchedule.H

@@ -42,7 +42,7 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-class lduScheduleEntry;
+struct lduScheduleEntry;
 Ostream& operator<<(Ostream& os, const lduScheduleEntry& lb);
 
 

src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C

@@ -44,16 +44,20 @@ namespace Foam
 
     addToRunTimeSelectionTable(polyPatch, cyclicPolyPatch, word);
     addToRunTimeSelectionTable(polyPatch, cyclicPolyPatch, dictionary);
-}
 
-template<>
+    template<>
-const char* Foam::NamedEnum<Foam::cyclicPolyPatch::transformType, 4>::names[] =
+    const char* Foam::NamedEnum
-{
+    <
-    "unknown",
+        Foam::cyclicPolyPatch::transformType,
-    "rotational",
+        4
-    "translational",
+    >::names[] =
-    "noOrdering"
+    {
-};
+        "unknown",
+        "rotational",
+        "translational",
+        "noOrdering"
+    };
+}
 
 const Foam::NamedEnum<Foam::cyclicPolyPatch::transformType, 4>
     Foam::cyclicPolyPatch::transformTypeNames;

src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C

@@ -49,7 +49,7 @@ Foam::PatchTools::sortedEdgeFaces
     const Field<PointType>& localPoints = p.localPoints();
 
     // create the lists for the various results. (resized on completion)
-    labelListList& sortedEdgeFaces = labelListList(edgeFaces.size());
+    labelListList sortedEdgeFaces(edgeFaces.size());
 
     forAll(edgeFaces, edgeI)
     {

src/OpenFOAM/meshes/primitiveShapes/triangle/intersection.C

@@ -29,27 +29,29 @@ License
 
 Foam::scalar Foam::intersection::planarTol_ = 0.2;
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::intersection::direction, 2>::names[] =
 {
-    "vector",
+    template<>
-    "contactSphere"
+    const char* Foam::NamedEnum<Foam::intersection::direction, 2>::names[] =
-};
+    {
+        "vector",
+        "contactSphere"
+    };
+
+    template<>
+    const char* Foam::NamedEnum<Foam::intersection::algorithm, 3>::names[] =
+    {
+        "fullRay",
+        "halfRay",
+        "visible"
+    };
+}
 
 const Foam::NamedEnum<Foam::intersection::direction, 2>
 Foam::intersection::directionNames_;
 
-template<>
-const char* Foam::NamedEnum<Foam::intersection::algorithm, 3>::names[] =
-{
-    "fullRay",
-    "halfRay",
-    "visible"
-};
-
 const Foam::NamedEnum<Foam::intersection::algorithm, 3>
 Foam::intersection::algorithmNames_;
 
 
-
 // ************************************************************************* //

src/OpenFOAM/primitives/Lists/boolList.H

@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::boolUList
+
+Description
+    A UList of bool
+
 Typedef
     Foam::boolList
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<bool> boolUList;
+
     typedef List<bool> boolList;
     typedef List<List<bool> > boolListList;
 }

src/OpenFOAM/primitives/Lists/fileNameList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::fileNameUList
+
+Description
+    A UList of fileNames.
+
 Typedef
     Foam::fileNameList
 
 Description
-    List of fileNames.
+    A List of fileNames.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<fileName> fileNameUList;
+
     typedef List<fileName> fileNameList;
 }
 

src/OpenFOAM/primitives/Lists/labelList.H

@@ -25,7 +25,19 @@ Typedef
     Foam::labelList
 
 Description
-    Label container classes
+    A List of labels
+
+Typedef
+    Foam::labelListList
+
+Description
+    A List of labelList
+
+Typedef
+    Foam::labelListListList
+
+Description
+    A List of labelListList
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,11 +51,11 @@ Description
 
 namespace Foam
 {
+    // Note: frequently used UList version is located in container itself
+
     typedef List<label> labelList;
     typedef List<labelList> labelListList;
     typedef List<labelListList> labelListListList;
-
-    typedef UList<label> unallocLabelList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/OpenFOAM/primitives/Lists/scalarList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::scalarUList
+
+Description
+    A UList of scalars.
+
 Typedef
     Foam::scalarList
 
 Description
-    List of scalars.
+    A List of scalars.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<scalar> scalarUList;
+
     typedef List<scalar> scalarList;
     typedef List<scalarList> scalarListList;
 }

src/OpenFOAM/primitives/Lists/sphericalTensorList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::sphericalTensorUList
+
+Description
+    A UList of sphericalTensors.
+
 Typedef
     Foam::sphericalTensorList
 
 Description
-    List of sphericalTensors.
+    A List of sphericalTensors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<sphericalTensor> sphericalTensorUList;
+
     typedef List<sphericalTensor> sphericalTensorList;
 }
 

src/OpenFOAM/primitives/Lists/stringList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::stringUList
+
+Description
+    A UList of strings.
+
 Typedef
     Foam::stringList
 
 Description
-    List of strings.
+    A List of strings.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<string> stringUList;
+
     typedef List<string> stringList;
 }
 

src/OpenFOAM/primitives/Lists/symmTensorList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::symmTensorUList
+
+Description
+    A UList of symmTensors.
+
 Typedef
     Foam::symmTensorList
 
 Description
-    List of symmTensors.
+    A List of symmTensors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<symmTensor> symmTensorUList;
+
     typedef List<symmTensor> symmTensorList;
 }
 

src/OpenFOAM/primitives/Lists/tensorList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::tensorUList
+
+Description
+    A UList of tensors.
+
 Typedef
     Foam::tensorList
 
 Description
-    List of tensors.
+    A List of tensors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<tensor> tensorUList;
+
     typedef List<tensor> tensorList;
 }
 

src/OpenFOAM/primitives/Lists/vectorList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::vectorUList
+
+Description
+    A UList of vectors.
+
 Typedef
     Foam::vectorList
 
 Description
-    List of vectors.
+    A List of vectors.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<vector> vectorUList;
+
     typedef List<vector> vectorList;
 }
 

src/OpenFOAM/primitives/Lists/wordList.H

@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::wordUList
+
+Description
+    A UList of words.
+
 Typedef
     Foam::wordList
 
 Description
-    List of words.
+    A List of words.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<word> wordUList;
+
     typedef List<word> wordList;
 }
 

src/OpenFOAM/primitives/Lists/wordReList.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,11 +21,17 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Typedef
+    Foam::wordReUList
+
+Description
+    A UList of wordRe (word or regular expression)
+
 Typedef
     Foam::wordReList
 
 Description
-    List of wordRe (word or regular expression)
+    A List of wordRe (word or regular expression)
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,6 +45,8 @@ Description
 
 namespace Foam
 {
+    typedef UList<wordRe> wordReUList;
+
     typedef List<wordRe> wordReList;
 }
 

src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C

@@ -28,32 +28,35 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* const Foam::labelTensor::typeName = "labelTensor";
-
-template<>
-const char* Foam::labelTensor::componentNames[] =
 {
-    "xx", "xy", "xz",
+    template<>
-    "yx", "yy", "yz",
+    const char* const Foam::labelTensor::typeName = "labelTensor";
-    "zx", "zy", "zz"
-};
 
-template<>
+    template<>
-const Foam::labelTensor Foam::labelTensor::zero
+    const char* Foam::labelTensor::componentNames[] =
-(
+    {
-    0, 0, 0,
+        "xx", "xy", "xz",
-    0, 0, 0,
+        "yx", "yy", "yz",
-    0, 0, 0
+        "zx", "zy", "zz"
-);
+    };
 
-template<>
+    template<>
-const Foam::labelTensor Foam::labelTensor::one
+    const Foam::labelTensor Foam::labelTensor::zero
-(
+    (
-    1, 1, 1,
+        0, 0, 0,
-    1, 1, 1,
+        0, 0, 0,
-    1, 1, 1
+        0, 0, 0
-);
+    );
+
+    template<>
+    const Foam::labelTensor Foam::labelTensor::one
+    (
+        1, 1, 1,
+        1, 1, 1,
+        1, 1, 1
+    );
+}
 
 
 // ************************************************************************* //

src/OpenFOAM/primitives/Vector/labelVector/labelVector.C

@@ -27,17 +27,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* const Foam::labelVector::typeName = "labelVector";
+{
+    template<>
+    const char* const Foam::labelVector::typeName = "labelVector";
 
-template<>
+    template<>
-const char* Foam::labelVector::componentNames[] = {"x", "y", "z"};
+    const char* Foam::labelVector::componentNames[] = {"x", "y", "z"};
 
-template<>
+    template<>
-const Foam::labelVector Foam::labelVector::zero(0, 0, 0);
+    const Foam::labelVector Foam::labelVector::zero(0, 0, 0);
-
-template<>
-const Foam::labelVector Foam::labelVector::one(1, 1, 1);
 
+    template<>
+    const Foam::labelVector Foam::labelVector::one(1, 1, 1);
+}
 
 // ************************************************************************* //

src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C

@@ -111,6 +111,15 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
 }
 
 
+template<int PolySize>
+Foam::Polynomial<PolySize>::Polynomial(Istream& is)
+:
+    VectorSpace<Polynomial<PolySize>, scalar, PolySize>(is),
+    logActive_(false),
+    logCoeff_(0.0)
+{}
+
+
 template<int PolySize>
 Foam::Polynomial<PolySize>::Polynomial
 (

src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H

@@ -110,6 +110,9 @@ public:
         //- Construct from a list of coefficients
         explicit Polynomial(const UList<scalar>& coeffs);
 
+        //- Construct from Istream
+        Polynomial(Istream& is);
+
         //- Construct from name and Istream
         Polynomial(const word& name, Istream& is);
 

src/OpenFOAM/primitives/strings/wordRe/wordRe.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/primitives/strings/wordRe/wordRe.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/OpenFOAM/primitives/strings/wordRe/wordReI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/dynamicMesh/meshCut/directions/directions.C

@@ -35,19 +35,21 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::directions::directionType, 3>::names[] =
 {
-    "tan1",
+    template<>
-    "tan2",
+    const char* Foam::NamedEnum<Foam::directions::directionType, 3>::names[] =
-    "normal"
+    {
-};
+        "tan1",
+        "tan2",
+        "normal"
+    };
+}
 
 const Foam::NamedEnum<Foam::directions::directionType, 3>
     Foam::directions::directionTypeNames_;
 
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // For debugging

src/dynamicMesh/slidingInterface/slidingInterface.C

@@ -45,17 +45,20 @@ namespace Foam
         slidingInterface,
         dictionary
     );
+
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::slidingInterface::typeOfMatch,
+        2
+    >::names[] =
+    {
+        "integral",
+        "partial"
+    };
 }
 
 
-template<>
-const char* Foam::NamedEnum<Foam::slidingInterface::typeOfMatch, 2>::names[] =
-{
-    "integral",
-    "partial"
-};
-
-
 const Foam::NamedEnum<Foam::slidingInterface::typeOfMatch, 2>
 Foam::slidingInterface::typeOfMatchNames_;
 

src/finiteVolume/cfdTools/general/porousMedia/porousZone.H

@@ -21,6 +21,12 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Namespace
+    Foam::porousMedia
+
+Description
+    Namespace for models related to porous media
+
 Class
     Foam::porousZone
 

src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C

@@ -27,15 +27,17 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>::names[] =
 {
-    "gas",
+    template<>
-    "liquid",
+    const char* Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>::names[] =
-    "solid",
+    {
-    "unknown"
+        "gas",
-};
+        "liquid",
-
+        "solid",
+        "unknown"
+    };
+}
 
 const Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>
     Foam::phaseProperties::phaseTypeNames_;

src/mesh/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C

@@ -34,15 +34,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char*
-Foam::NamedEnum<Foam::refinementSurfaces::areaSelectionAlgo, 4>::names[] =
 {
-    "inside",
+    template<>
-    "outside",
+    const char*
-    "insidePoint",
+    Foam::NamedEnum<Foam::refinementSurfaces::areaSelectionAlgo, 4>::names[] =
-    "none"
+    {
-};
+        "inside",
+        "outside",
+        "insidePoint",
+        "none"
+    };
+}
+
 
 const Foam::NamedEnum<Foam::refinementSurfaces::areaSelectionAlgo, 4>
     Foam::refinementSurfaces::areaSelectionAlgoNames;
@@ -388,7 +392,7 @@ Foam::labelList Foam::refinementSurfaces::getClosedNamedSurfaces() const
 }
 
 
-// Get indices of named surfaces with a 
+// Get indices of named surfaces with a
 Foam::labelList Foam::refinementSurfaces::getInsidePointNamedSurfaces() const
 {
     labelList closed(cellZoneNames_.size());
@@ -411,9 +415,9 @@ Foam::labelList Foam::refinementSurfaces::getInsidePointNamedSurfaces() const
 // Foam::labelList Foam::refinementSurfaces::countRegions(const triSurface& s)
 // {
 //     const geometricSurfacePatchList& regions = s.patches();
-// 
+//
 //     labelList nTris(regions.size(), 0);
-// 
+//
 //     forAll(s, triI)
 //     {
 //         nTris[s[triI].region()]++;
@@ -433,15 +437,15 @@ Foam::labelList Foam::refinementSurfaces::getInsidePointNamedSurfaces() const
 // ) const
 // {
 //     const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
-// 
+//
 //     // Get per element the region
 //     labelList region;
 //     geom.getRegion(info, region);
-// 
+//
 //     // Initialise fields to region wise minLevel
 //     minLevelField.setSize(ctrs.size());
 //     minLevelField = -1;
-// 
+//
 //     forAll(minLevelField, i)
 //     {
 //         if (info[i].hit())
@@ -449,12 +453,12 @@ Foam::labelList Foam::refinementSurfaces::getInsidePointNamedSurfaces() const
 //             minLevelField[i] = minLevel(surfI, region[i]);
 //         }
 //     }
-// 
+//
 //     // Find out if triangle inside shell with higher level
 //     // What level does shell want to refine fc to?
 //     labelList shellLevel;
 //     shells.findHigherLevel(ctrs, minLevelField, shellLevel);
-// 
+//
 //     forAll(minLevelField, i)
 //     {
 //         minLevelField[i] = max(minLevelField[i], shellLevel[i]);

src/meshTools/sets/cellSources/faceToCell/faceToCell.C

@@ -33,13 +33,18 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(faceToCell, 0);
+    addToRunTimeSelectionTable(topoSetSource, faceToCell, word);
+    addToRunTimeSelectionTable(topoSetSource, faceToCell, istream);
 
-defineTypeNameAndDebug(faceToCell, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::faceToCell::faceAction, 4>::names[] =
-addToRunTimeSelectionTable(topoSetSource, faceToCell, word);
+    {
-
+        "neighbour",
-addToRunTimeSelectionTable(topoSetSource, faceToCell, istream);
+        "owner",
-
+        "any",
+        "all"
+    };
 }
 
 
@@ -51,15 +56,6 @@ Foam::topoSetSource::addToUsageTable Foam::faceToCell::usage_
     " of the faces in the faceSet or where all faces are in the faceSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::faceToCell::faceAction, 4>::names[] =
-{
-    "neighbour",
-    "owner",
-    "any",
-    "all"
-};
-
 const Foam::NamedEnum<Foam::faceToCell::faceAction, 4>
     Foam::faceToCell::faceActionNames_;
 

src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C

@@ -32,13 +32,16 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(faceZoneToCell, 0);
+    addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, word);
+    addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, istream);
 
-defineTypeNameAndDebug(faceZoneToCell, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>::names[] =
-addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, word);
+    {
-
+        "master",
-addToRunTimeSelectionTable(topoSetSource, faceZoneToCell, istream);
+        "slave"
-
+    };
 }
 
 
@@ -51,14 +54,6 @@ Foam::topoSetSource::addToUsageTable Foam::faceZoneToCell::usage_
 );
 
 
-template<>
-const char* Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>::names[] =
-{
-    "master",
-    "slave"
-};
-
-
 const Foam::NamedEnum<Foam::faceZoneToCell::faceAction, 2>
     Foam::faceZoneToCell::faceActionNames_;
 

src/meshTools/sets/cellSources/pointToCell/pointToCell.C

@@ -33,13 +33,15 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(pointToCell, 0);
+    addToRunTimeSelectionTable(topoSetSource, pointToCell, word);
+    addToRunTimeSelectionTable(topoSetSource, pointToCell, istream);
 
-defineTypeNameAndDebug(pointToCell, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::pointToCell::pointAction, 1>::names[] =
-addToRunTimeSelectionTable(topoSetSource, pointToCell, word);
+    {
-
+        "any"
-addToRunTimeSelectionTable(topoSetSource, pointToCell, istream);
+    };
-
 }
 
 
@@ -50,13 +52,6 @@ Foam::topoSetSource::addToUsageTable Foam::pointToCell::usage_
     "    Select all cells with any point in the pointSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::pointToCell::pointAction, 1>::names[] =
-{
-    "any"
-};
-
-
 const Foam::NamedEnum<Foam::pointToCell::pointAction, 1>
     Foam::pointToCell::pointActionNames_;
 

src/meshTools/sets/faceSources/cellToFace/cellToFace.C

@@ -34,13 +34,16 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(cellToFace, 0);
+    addToRunTimeSelectionTable(topoSetSource, cellToFace, word);
+    addToRunTimeSelectionTable(topoSetSource, cellToFace, istream);
 
-defineTypeNameAndDebug(cellToFace, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::cellToFace::cellAction, 2>::names[] =
-addToRunTimeSelectionTable(topoSetSource, cellToFace, word);
+    {
-
+        "all",
-addToRunTimeSelectionTable(topoSetSource, cellToFace, istream);
+        "both"
-
+    };
 }
 
 
@@ -52,13 +55,6 @@ Foam::topoSetSource::addToUsageTable Foam::cellToFace::usage_
     "           -both: faces where both neighbours are in the cellSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::cellToFace::cellAction, 2>::names[] =
-{
-    "all",
-    "both"
-};
-
 const Foam::NamedEnum<Foam::cellToFace::cellAction, 2>
     Foam::cellToFace::cellActionNames_;
 

src/meshTools/sets/faceSources/pointToFace/pointToFace.C

@@ -33,13 +33,16 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(pointToFace, 0);
+    addToRunTimeSelectionTable(topoSetSource, pointToFace, word);
+    addToRunTimeSelectionTable(topoSetSource, pointToFace, istream);
 
-defineTypeNameAndDebug(pointToFace, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::pointToFace::pointAction, 2>::names[] =
-addToRunTimeSelectionTable(topoSetSource, pointToFace, word);
+    {
-
+        "any",
-addToRunTimeSelectionTable(topoSetSource, pointToFace, istream);
+        "all"
-
+    };
 }
 
 
@@ -52,13 +55,6 @@ Foam::topoSetSource::addToUsageTable Foam::pointToFace::usage_
     "    -all points in the pointSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::pointToFace::pointAction, 2>::names[] =
-{
-    "any",
-    "all"
-};
-
 const Foam::NamedEnum<Foam::pointToFace::pointAction, 2>
     Foam::pointToFace::pointActionNames_;
 

src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C

@@ -33,13 +33,15 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(cellToPoint, 0);
+    addToRunTimeSelectionTable(topoSetSource, cellToPoint, word);
+    addToRunTimeSelectionTable(topoSetSource, cellToPoint, istream);
 
-defineTypeNameAndDebug(cellToPoint, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>::names[] =
-addToRunTimeSelectionTable(topoSetSource, cellToPoint, word);
+    {
-
+        "all"
-addToRunTimeSelectionTable(topoSetSource, cellToPoint, istream);
+    };
-
 }
 
 
@@ -50,12 +52,6 @@ Foam::topoSetSource::addToUsageTable Foam::cellToPoint::usage_
     "    Select all points of cells in the cellSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>::names[] =
-{
-    "all"
-};
-
 const Foam::NamedEnum<Foam::cellToPoint::cellAction, 1>
     Foam::cellToPoint::cellActionNames_;
 

src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C

@@ -33,13 +33,15 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(faceToPoint, 0);
+    addToRunTimeSelectionTable(topoSetSource, faceToPoint, word);
+    addToRunTimeSelectionTable(topoSetSource, faceToPoint, istream);
 
-defineTypeNameAndDebug(faceToPoint, 0);
+    template<>
-
+    const char* Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>::names[] =
-addToRunTimeSelectionTable(topoSetSource, faceToPoint, word);
+    {
-
+        "all"
-addToRunTimeSelectionTable(topoSetSource, faceToPoint, istream);
+    };
-
 }
 
 
@@ -50,12 +52,6 @@ Foam::topoSetSource::addToUsageTable Foam::faceToPoint::usage_
     "    Select all points of faces in the faceSet\n\n"
 );
 
-template<>
-const char* Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>::names[] =
-{
-    "all"
-};
-
 const Foam::NamedEnum<Foam::faceToPoint::faceAction, 1>
     Foam::faceToPoint::faceActionNames_;
 

src/meshTools/sets/topoSetSource/topoSetSource.C

@@ -34,24 +34,24 @@ namespace Foam
     defineTypeNameAndDebug(topoSetSource, 0);
     defineRunTimeSelectionTable(topoSetSource, word);
     defineRunTimeSelectionTable(topoSetSource, istream);
+
+    template<>
+    const char* Foam::NamedEnum<Foam::topoSetSource::setAction, 8>::names[] =
+    {
+        "clear",
+        "new",
+        "invert",
+        "add",
+        "delete",
+        "subset",
+        "list",
+        "remove"
+    };
 }
 
 
 Foam::HashTable<Foam::string>* Foam::topoSetSource::usageTablePtr_ = NULL;
 
-template<>
-const char* Foam::NamedEnum<Foam::topoSetSource::setAction, 8>::names[] =
-{
-    "clear",
-    "new",
-    "invert",
-    "add",
-    "delete",
-    "subset",
-    "list",
-    "remove"
-};
-
 
 const Foam::NamedEnum<Foam::topoSetSource::setAction, 8>
     Foam::topoSetSource::actionNames_;

src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C

@@ -49,18 +49,20 @@ namespace Foam
         distributedTriSurfaceMesh,
         dict
     );
+
+    template<>
+    const char* Foam::NamedEnum
+    <
+        Foam::distributedTriSurfaceMesh::distributionType,
+        3
+    >::names[] =
+    {
+        "follow",
+        "independent",
+        "frozen"
+    };
 }
 
-
-template<>
-const char*
-Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3>::names[] =
-{
-    "follow",
-    "independent",
-    "frozen"
-};
-
 const Foam::NamedEnum<Foam::distributedTriSurfaceMesh::distributionType, 3>
     Foam::distributedTriSurfaceMesh::distributionTypeNames_;
 

src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C

@@ -27,12 +27,16 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::fieldAverageItem::baseType, 2>::names[] =
 {
-    "iteration",
+    template<>
-    "time"
+    const char* Foam::NamedEnum<Foam::fieldAverageItem::baseType, 2>::names[] =
-};
+    {
+        "iteration",
+        "time"
+    };
+}
+
 
 const Foam::NamedEnum<Foam::fieldAverageItem::baseType, 2>
     Foam::fieldAverageItem::baseTypeNames_;

src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C

@@ -33,13 +33,15 @@ License
 
 defineTypeNameAndDebug(Foam::fieldMinMax, 0);
 
-
+namespace Foam
-template<>
-const char* Foam::NamedEnum<Foam::fieldMinMax::modeType, 2>::names[] =
 {
-    "magnitude",
+    template<>
-    "component"
+    const char* Foam::NamedEnum<Foam::fieldMinMax::modeType, 2>::names[] =
-};
+    {
+        "magnitude",
+        "component"
+    };
+}
 
 
 const Foam::NamedEnum<Foam::fieldMinMax::modeType, 2>

src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C

@@ -37,13 +37,21 @@ defineTypeNameAndDebug(Foam::abortCalculation, 0);
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::abortCalculation::actionType, 3>::names[] =
 {
-    "noWriteNow",
+    template<>
-    "writeNow",
+    const char* Foam::NamedEnum
-    "nextWrite"
+    <
-};
+       Foam::abortCalculation::actionType,
+       3
+    >::names[] =
+    {
+        "noWriteNow",
+        "writeNow",
+        "nextWrite"
+    };
+}
+
 
 const Foam::NamedEnum<Foam::abortCalculation::actionType, 3>
     Foam::abortCalculation::actionTypeNames_;

src/sampling/sampledSet/coordSet/coordSet.C

@@ -27,15 +27,19 @@ License
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
-template<>
+namespace Foam
-const char* Foam::NamedEnum<Foam::coordSet::coordFormat, 5>::names[] =
 {
-    "xyz",
+    template<>
-    "x",
+    const char* Foam::NamedEnum<Foam::coordSet::coordFormat, 5>::names[] =
-    "y",
+    {
-    "z",
+        "xyz",
-    "distance"
+        "x",
-};
+        "y",
+        "z",
+        "distance"
+    };
+}
+
 
 const Foam::NamedEnum<Foam::coordSet::coordFormat, 5>
     Foam::coordSet::coordFormatNames_;

src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.C

@@ -23,8 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
 #include "basicMixture.H"
 #include "fvMesh.H"
 
@@ -39,11 +37,7 @@ defineTypeNameAndDebug(basicMixture, 0);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-basicMixture::basicMixture
+basicMixture::basicMixture(const dictionary&, const fvMesh&)
-(
-    const dictionary&,
-    const fvMesh&
-)
 {}
 
 

src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.C

@@ -23,8 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
 #include "pureMixture.H"
 #include "fvMesh.H"
 
@@ -43,7 +41,7 @@ pureMixture<ThermoType>::pureMixture
 )
 :
     basicMixture(thermoDict, mesh),
-    mixture_(thermoDict.lookup("mixture"))
+    mixture_(thermoDict.subDict("mixture"))
 {}
 
 
@@ -59,7 +57,7 @@ pureMixture<ThermoType>::~pureMixture()
 template<class ThermoType>
 void pureMixture<ThermoType>::read(const dictionary& thermoDict)
 {
-    mixture_ = ThermoType(thermoDict.lookup("mixture"));
+    mixture_ = ThermoType(thermoDict.subDict("mixture"));
 }
 
 

src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C

@@ -114,7 +114,7 @@ Foam::ePsiThermo<MixtureType>::ePsiThermo(const fvMesh& mesh)
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionSet(0, 2, -2, 0, 0),
+        dimEnergy/dimMass,
         this->eBoundaryTypes()
     )
 {
@@ -245,7 +245,7 @@ Foam::tmp<Foam::volScalarField> Foam::ePsiThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 
@@ -308,7 +308,7 @@ Foam::tmp<Foam::volScalarField> Foam::ePsiThermo<MixtureType>::Cv() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 

src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C

@@ -112,7 +112,7 @@ Foam::hPsiThermo<MixtureType>::hPsiThermo(const fvMesh& mesh)
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionSet(0, 2, -2, 0, 0),
+        dimEnergy/dimMass,
         this->hBoundaryTypes()
     )
 {
@@ -243,7 +243,7 @@ Foam::tmp<Foam::volScalarField> Foam::hPsiThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 
@@ -306,7 +306,7 @@ Foam::tmp<Foam::volScalarField> Foam::hPsiThermo<MixtureType>::Cv() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 

src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C

@@ -243,7 +243,7 @@ Foam::tmp<Foam::volScalarField> Foam::hsPsiThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 

src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C

@@ -117,7 +117,7 @@ Foam::hRhoThermo<MixtureType>::hRhoThermo(const fvMesh& mesh)
             IOobject::NO_WRITE
         ),
         mesh,
-        dimensionSet(0, 2, -2, 0, 0),
+        dimEnergy/dimMass,
         this->hBoundaryTypes()
     )
 {
@@ -242,7 +242,7 @@ Foam::tmp<Foam::volScalarField> Foam::hRhoThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 
@@ -305,7 +305,7 @@ Foam::tmp<Foam::volScalarField> Foam::hRhoThermo<MixtureType>::Cv() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 

src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H

@@ -46,7 +46,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                            Class basicSolidThermo Declaration
+                       Class basicSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicSolidThermo
@@ -69,8 +69,7 @@ public:
     TypeName("basicSolidThermo");
 
 
-    // Declare run-time constructor selection tables
+    //- Declare run-time constructor selection tables
-
     declareRunTimeSelectionTable
     (
         autoPtr,
@@ -91,9 +90,8 @@ public:
         static autoPtr<basicSolidThermo> New(const fvMesh&);
 
 
-    // Destructor
+    //- Destructor
-
+    virtual ~basicSolidThermo();
-        virtual ~basicSolidThermo();
 
 
     // Member Functions
@@ -149,6 +147,7 @@ public:
                 //- Emissivity []
                 virtual tmp<scalarField> emissivity(const label) const = 0;
 
+
 //        // Point wise properties
 //
 //            //- Density [kg/m3]
@@ -166,6 +165,7 @@ public:
 //            //- Emissivity []
 //            virtual scalar emissivity(const scalar T) const = 0;
 
+
         // I-O
 
             //- Write the basicSolidThermo properties

src/thermophysicalModels/basicSolidThermo/directionalSolidThermo/directionalSolidThermo.C

@@ -228,8 +228,6 @@ Foam::directionalSolidThermo::directionalSolidThermo(const fvMesh& mesh)
         }
     }
 
-
-
     correct();
 }
 
@@ -269,7 +267,7 @@ Foam::symmTensor Foam::directionalSolidThermo::transformPrincipal
         tt.yx()*st.x()*tt.zx()
       + tt.yy()*st.y()*tt.zy()
       + tt.yz()*st.z()*tt.zz(),
-        
+
         tt.zx()*st.x()*tt.zx()
       + tt.zy()*st.y()*tt.zy()
       + tt.zz()*st.z()*tt.zz()
@@ -419,9 +417,9 @@ Foam::tmp<Foam::volScalarField> Foam::directionalSolidThermo::K() const
         const vector& v = KValues_[i];
         if
         (
-            v.x() != v.y() 
+            v.x() != v.y()
-         || v.x() != v.z() 
+         || v.x() != v.z()
-         || v.y() != v.z() 
+         || v.y() != v.z()
         )
         {
             FatalErrorIn("directionalSolidThermo::K() const")
@@ -597,9 +595,9 @@ Foam::tmp<Foam::scalarField> Foam::directionalSolidThermo::K
         const vector& v = KValues_[i];
         if
         (
-            v.x() != v.y() 
+            v.x() != v.y()
-         || v.x() != v.z() 
+         || v.x() != v.z()
-         || v.y() != v.z() 
+         || v.y() != v.z()
         )
         {
             FatalErrorIn("directionalSolidThermo::K() const")
@@ -634,7 +632,7 @@ Foam::tmp<Foam::symmTensorField> Foam::directionalSolidThermo::directionalK
 
     tmp<symmTensorField> tglobalK(new symmTensorField(localK.size()));
     transformField(tglobalK(), ccTransforms_.boundaryField()[patchI], localK);
-    
+
     return tglobalK;
 }
 

src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C

@@ -57,11 +57,7 @@ Foam::liquidMixture::liquidMixture
 
     forAll(components_, i)
     {
-        properties_.set
+        properties_.set(i, liquid::New(props.subDict(components_[i])));
-        (
-            i,
-            liquid::New(props.lookup(components_[i]))
-        );
     }
 }
 
@@ -79,12 +75,8 @@ Foam::autoPtr<Foam::liquidMixture> Foam::liquidMixture::New
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalar Foam::liquidMixture::Tc
+Foam::scalar Foam::liquidMixture::Tc(const scalarField& x) const
-(
-    const scalarField& x
-) const
 {
-
     scalar vTc = 0.0;
     scalar vc = 0.0;
 
@@ -99,10 +91,7 @@ Foam::scalar Foam::liquidMixture::Tc
 }
 
 
-Foam::scalar Foam::liquidMixture::Tpc
+Foam::scalar Foam::liquidMixture::Tpc(const scalarField& x) const
-(
-    const scalarField& x
-) const
 {
     scalar Tpc = 0.0;
     forAll(properties_, i)
@@ -114,10 +103,7 @@ Foam::scalar Foam::liquidMixture::Tpc
 }
 
 
-Foam::scalar Foam::liquidMixture::Ppc
+Foam::scalar Foam::liquidMixture::Ppc(const scalarField& x) const
-(
-    const scalarField& x
-) const
 {
     scalar Vc = 0.0;
     scalar Zc = 0.0;
@@ -131,10 +117,7 @@ Foam::scalar Foam::liquidMixture::Ppc
 }
 
 
-Foam::scalar Foam::liquidMixture::omega
+Foam::scalar Foam::liquidMixture::omega(const scalarField& x) const
-(
-    const scalarField& x
-) const
 {
     scalar omega = 0.0;
     forAll(properties_, i)
@@ -167,10 +150,7 @@ Foam::scalarField Foam::liquidMixture::Xs
 }
 
 
-Foam::scalar Foam::liquidMixture::W
+Foam::scalar Foam::liquidMixture::W(const scalarField& x) const
-(
-    const scalarField& x
-) const
 {
     scalar W = 0.0;
     forAll(properties_, i)
@@ -182,10 +162,7 @@ Foam::scalar Foam::liquidMixture::W
 }
 
 
-Foam::scalarField Foam::liquidMixture::Y
+Foam::scalarField Foam::liquidMixture::Y(const scalarField& X) const
-(
-    const scalarField& X
-) const
 {
     scalarField Y(X/W(X));
 
@@ -198,10 +175,7 @@ Foam::scalarField Foam::liquidMixture::Y
 }
 
 
-Foam::scalarField Foam::liquidMixture::X
+Foam::scalarField Foam::liquidMixture::X(const scalarField& Y) const
-(
-    const scalarField& Y
-) const
 {
     scalarField X(Y.size());
     scalar Winv = 0.0;

src/thermophysicalModels/liquids/Ar/Ar.C

@@ -33,9 +33,9 @@ namespace Foam
     defineTypeNameAndDebug(Ar, 0);
     addToRunTimeSelectionTable(liquid, Ar,);
     addToRunTimeSelectionTable(liquid, Ar, Istream);
+    addToRunTimeSelectionTable(liquid, Ar, dictionary);
 }
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::Ar::Ar()
@@ -139,4 +139,23 @@ Foam::Ar::Ar(Istream& is)
 {}
 
 
+Foam::Ar::Ar(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/Ar/Ar.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         Ar(Istream& is);
 
+        //- Construct from dictionary
+        Ar(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C10H22/C10H22.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C10H22, 0);
     addToRunTimeSelectionTable(liquid, C10H22,);
     addToRunTimeSelectionTable(liquid, C10H22, Istream);
+    addToRunTimeSelectionTable(liquid, C10H22, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C10H22::C10H22(Istream& is)
 {}
 
 
+Foam::C10H22::C10H22(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C10H22/C10H22.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C10H22(Istream& is);
 
+        //- Construct from dictionary
+        C10H22(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C12H26/C12H26.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C12H26, 0);
     addToRunTimeSelectionTable(liquid, C12H26,);
     addToRunTimeSelectionTable(liquid, C12H26, Istream);
+    addToRunTimeSelectionTable(liquid, C12H26, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -138,4 +139,23 @@ Foam::C12H26::C12H26(Istream& is)
 {}
 
 
+Foam::C12H26::C12H26(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C12H26/C12H26.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C12H26(Istream& is);
 
+        //- Construct from dictionary
+        C12H26(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C13H28/C13H28.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C13H28, 0);
     addToRunTimeSelectionTable(liquid, C13H28,);
     addToRunTimeSelectionTable(liquid, C13H28, Istream);
+    addToRunTimeSelectionTable(liquid, C13H28, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C13H28::C13H28(Istream& is)
 {}
 
 
+Foam::C13H28::C13H28(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C13H28/C13H28.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C13H28(Istream& is);
 
+        //- Construct from dictionary
+        C13H28(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C14H30/C14H30.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C14H30, 0);
     addToRunTimeSelectionTable(liquid, C14H30,);
     addToRunTimeSelectionTable(liquid, C14H30, Istream);
+    addToRunTimeSelectionTable(liquid, C14H30, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C14H30::C14H30(Istream& is)
 {}
 
 
+Foam::C14H30::C14H30(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C14H30/C14H30.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C14H30(Istream& is);
 
+        //- Construct from dictionary
+        C14H30(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C16H34/C16H34.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C16H34, 0);
     addToRunTimeSelectionTable(liquid, C16H34,);
     addToRunTimeSelectionTable(liquid, C16H34, Istream);
+    addToRunTimeSelectionTable(liquid, C16H34, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C16H34::C16H34(Istream& is)
 {}
 
 
+Foam::C16H34::C16H34(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C16H34/C16H34.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C16H34(Istream& is);
 
+        //- Construct from dictionary
+        C16H34(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C2H5OH, 0);
     addToRunTimeSelectionTable(liquid, C2H5OH,);
     addToRunTimeSelectionTable(liquid, C2H5OH, Istream);
+    addToRunTimeSelectionTable(liquid, C2H5OH, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C2H5OH::C2H5OH(Istream& is)
 {}
 
 
+Foam::C2H5OH::C2H5OH(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C2H5OH(Istream& is);
 
+        //- Construct from dictionary
+        C2H5OH(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C2H6/C2H6.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C2H6, 0);
     addToRunTimeSelectionTable(liquid, C2H6,);
     addToRunTimeSelectionTable(liquid, C2H6, Istream);
+    addToRunTimeSelectionTable(liquid, C2H6, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -137,4 +138,23 @@ Foam::C2H6::C2H6(Istream& is)
 {}
 
 
+Foam::C2H6::C2H6(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C2H6/C2H6.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C2H6(Istream& is);
 
+        //- Construct from dictionary
+        C2H6(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C2H6O/C2H6O.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C2H6O, 0);
     addToRunTimeSelectionTable(liquid, C2H6O,);
     addToRunTimeSelectionTable(liquid, C2H6O, Istream);
+    addToRunTimeSelectionTable(liquid, C2H6O, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C2H6O::C2H6O(Istream& is)
 {}
 
 
+Foam::C2H6O::C2H6O(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C2H6O/C2H6O.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C2H6O(Istream& is);
 
+        //- Construct from dictionary
+        C2H6O(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C3H6O/C3H6O.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C3H6O, 0);
     addToRunTimeSelectionTable(liquid, C3H6O,);
     addToRunTimeSelectionTable(liquid, C3H6O, Istream);
+    addToRunTimeSelectionTable(liquid, C3H6O, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C3H6O::C3H6O(Istream& is)
 {}
 
 
+Foam::C3H6O::C3H6O(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C3H6O/C3H6O.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C3H6O(Istream& is);
 
+        //- Construct from dictionary
+        C3H6O(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C3H8/C3H8.C

@@ -33,7 +33,9 @@ namespace Foam
     defineTypeNameAndDebug(C3H8, 0);
     addToRunTimeSelectionTable(liquid, C3H8,);
     addToRunTimeSelectionTable(liquid, C3H8, Istream);
+    addToRunTimeSelectionTable(liquid, C3H8, dictionary);
 }
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::C3H8::C3H8()
@@ -135,4 +137,23 @@ Foam::C3H8::C3H8(Istream& is)
 {}
 
 
+Foam::C3H8::C3H8(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C3H8/C3H8.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C3H8(Istream& is);
 
+        //- Construct from dictionary
+        C3H8(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C4H10O/C4H10O.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C4H10O, 0);
     addToRunTimeSelectionTable(liquid, C4H10O,);
     addToRunTimeSelectionTable(liquid, C4H10O, Istream);
+    addToRunTimeSelectionTable(liquid, C4H10O, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C4H10O::C4H10O(Istream& is)
 {}
 
 
+Foam::C4H10O::C4H10O(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C4H10O/C4H10O.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C4H10O(Istream& is);
 
+        //- Construct from dictionary
+        C4H10O(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C6H14/C6H14.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C6H14, 0);
     addToRunTimeSelectionTable(liquid, C6H14,);
     addToRunTimeSelectionTable(liquid, C6H14, Istream);
+    addToRunTimeSelectionTable(liquid, C6H14, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C6H14::C6H14(Istream& is)
 {}
 
 
+Foam::C6H14::C6H14(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C6H14/C6H14.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C6H14(Istream& is);
 
+        //- Construct from dictionary
+        C6H14(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C6H6/C6H6.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C6H6, 0);
     addToRunTimeSelectionTable(liquid, C6H6,);
     addToRunTimeSelectionTable(liquid, C6H6, Istream);
+    addToRunTimeSelectionTable(liquid, C6H6, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C6H6::C6H6(Istream& is)
 {}
 
 
+Foam::C6H6::C6H6(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C6H6/C6H6.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C6H6(Istream& is);
 
+        //- Construct from dictionary
+        C6H6(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C7H16/C7H16.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C7H16, 0);
     addToRunTimeSelectionTable(liquid, C7H16,);
     addToRunTimeSelectionTable(liquid, C7H16, Istream);
+    addToRunTimeSelectionTable(liquid, C7H16, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -145,4 +146,23 @@ Foam::C7H16::C7H16(Istream& is)
 {}
 
 
+Foam::C7H16::C7H16(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C7H16/C7H16.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C7H16(Istream& is);
 
+        //- Construct from dictionary
+        C7H16(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C7H8/C7H8.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C7H8, 0);
     addToRunTimeSelectionTable(liquid, C7H8,);
     addToRunTimeSelectionTable(liquid, C7H8, Istream);
+    addToRunTimeSelectionTable(liquid, C7H8, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C7H8::C7H8(Istream& is)
 {}
 
 
+Foam::C7H8::C7H8(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C7H8/C7H8.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C7H8(Istream& is);
 
+        //- Construct from dictionary
+        C7H8(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C8H10/C8H10.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C8H10, 0);
     addToRunTimeSelectionTable(liquid, C8H10,);
     addToRunTimeSelectionTable(liquid, C8H10, Istream);
+    addToRunTimeSelectionTable(liquid, C8H10, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C8H10::C8H10(Istream& is)
 {}
 
 
+Foam::C8H10::C8H10(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C8H10/C8H10.H

@@ -109,6 +109,9 @@ public:
         //- Construct from Istream
         C8H10(Istream& is);
 
+        //- Construct from dictionary
+        C8H10(const dictionary& dict);
+
 
     // Member Functions
 

src/thermophysicalModels/liquids/C8H18/C8H18.C

@@ -33,6 +33,7 @@ namespace Foam
     defineTypeNameAndDebug(C8H18, 0);
     addToRunTimeSelectionTable(liquid, C8H18,);
     addToRunTimeSelectionTable(liquid, C8H18, Istream);
+    addToRunTimeSelectionTable(liquid, C8H18, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -146,4 +147,23 @@ Foam::C8H18::C8H18(Istream& is)
 {}
 
 
+Foam::C8H18::C8H18(const dictionary& dict)
+:
+    liquid(dict),
+    rho_(dict.subDict("rho")),
+    pv_(dict.subDict("pv")),
+    hl_(dict.subDict("hl")),
+    cp_(dict.subDict("cp")),
+    h_(dict.subDict("h")),
+    cpg_(dict.subDict("cpg")),
+    B_(dict.subDict("B")),
+    mu_(dict.subDict("mu")),
+    mug_(dict.subDict("mug")),
+    K_(dict.subDict("K")),
+    Kg_(dict.subDict("Kg")),
+    sigma_(dict.subDict("sigma")),
+    D_(dict.subDict("D"))
+{}
+
+
 // ************************************************************************* //

src/thermophysicalModels/liquids/C8H18/C8H18.H

@@ -110,6 +110,9 @@ public:
         //- Construct from Istream
         C8H18(Istream& is);
 
+        //- Construct from dictionary
+        C8H18(const dictionary& dict);
+
 
     // Member Functions