liquidProperties: simplified and generalized the IO

When liquids are constructed from dictionary the coefficients are now first
initialized to their standard values and overridden by the now optional entries
provided in the dictionary.  For example to specify water with all the standard
temperature varying properties but override only the density with a constant
value of 1000 specify in thermophysicalProperties

liquids
{
    H2O
    {
        defaultCoeffs   no;

        H2OCoeffs
        {
            rho
            {
                a 1000;
                b 0;
                c 0;
                d 0;
            }
        }
    }
}

src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C

@@ -121,21 +121,27 @@ Foam::Ar::Ar
 
 Foam::Ar::Ar(const dictionary& dict)
 :
-    liquidProperties(dict),
+    Ar()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::Ar::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const Ar& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H

@@ -79,6 +79,8 @@ class Ar
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("Ar");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const Ar& l)
+        friend Ostream& operator<<(Ostream& os, const Ar& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const Ar& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C

@@ -129,21 +129,27 @@ Foam::C10H22::C10H22
 
 Foam::C10H22::C10H22(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C10H22()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C10H22::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C10H22& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H

@@ -79,6 +79,8 @@ class C10H22
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C10H22");
 
@@ -165,34 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
-
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C10H22& l)
+        friend Ostream& operator<<(Ostream& os, const C10H22& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C10H22& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C

@@ -121,21 +121,27 @@ Foam::C12H26::C12H26
 
 Foam::C12H26::C12H26(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C12H26()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C12H26::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C12H26& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H

@@ -79,6 +79,8 @@ class C12H26
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C12H26");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C12H26& l)
+        friend Ostream& operator<<(Ostream& os, const C12H26& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C12H26& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C

@@ -129,21 +129,27 @@ Foam::C13H28::C13H28
 
 Foam::C13H28::C13H28(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C13H28()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C13H28::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C13H28& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H

@@ -79,6 +79,8 @@ class C13H28
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C13H28");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C13H28& l)
+        friend Ostream& operator<<(Ostream& os, const C13H28& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C13H28& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C

@@ -129,21 +129,27 @@ Foam::C14H30::C14H30
 
 Foam::C14H30::C14H30(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C14H30()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C14H30::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C14H30& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H

@@ -79,6 +79,8 @@ class C14H30
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C14H30");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C14H30& l)
+        friend Ostream& operator<<(Ostream& os, const C14H30& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C14H30& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C

@@ -129,21 +129,27 @@ Foam::C16H34::C16H34
 
 Foam::C16H34::C16H34(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C16H34()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C16H34::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C16H34& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H

@@ -79,6 +79,8 @@ class C16H34
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C16H34");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C16H34& l)
+        friend Ostream& operator<<(Ostream& os, const C16H34& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C16H34& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C

@@ -129,21 +129,27 @@ Foam::C2H5OH::C2H5OH
 
 Foam::C2H5OH::C2H5OH(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C2H5OH()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C2H5OH::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C2H5OH& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H

@@ -79,6 +79,8 @@ class C2H5OH
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C2H5OH");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C2H5OH& l)
+        friend Ostream& operator<<(Ostream& os, const C2H5OH& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C2H5OH& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C

@@ -120,21 +120,27 @@ Foam::C2H6::C2H6
 
 Foam::C2H6::C2H6(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C2H6()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C2H6::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C2H6& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H

@@ -79,6 +79,8 @@ class C2H6
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C2H6");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C2H6& l)
+        friend Ostream& operator<<(Ostream& os, const C2H6& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C2H6& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C

@@ -130,21 +130,27 @@ Foam::C2H6O::C2H6O
 
 Foam::C2H6O::C2H6O(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C2H6O()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C2H6O::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C2H6O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H

@@ -79,6 +79,8 @@ class C2H6O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C2H6O");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C2H6O& l)
+        friend Ostream& operator<<(Ostream& os, const C2H6O& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C2H6O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C

@@ -129,21 +129,27 @@ Foam::C3H6O::C3H6O
 
 Foam::C3H6O::C3H6O(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C3H6O()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C3H6O::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C3H6O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H

@@ -79,6 +79,8 @@ class C3H6O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C3H6O");
 
@@ -165,34 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-
+        friend Ostream& operator<<(Ostream& os, const C3H6O& l);
-        friend Ostream& operator<<(Ostream& os, const C3H6O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C3H6O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C

@@ -119,21 +119,27 @@ Foam::C3H8::C3H8
 
 Foam::C3H8::C3H8(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C3H8()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C3H8::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C3H8& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H

@@ -79,6 +79,8 @@ class C3H8
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C3H8");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C3H8& l)
+        friend Ostream& operator<<(Ostream& os, const C3H8& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C3H8& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C

@@ -129,21 +129,27 @@ Foam::C4H10O::C4H10O
 
 Foam::C4H10O::C4H10O(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C4H10O()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C4H10O::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C4H10O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H

@@ -79,6 +79,8 @@ class C4H10O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C4H10O");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C4H10O& l)
+        friend Ostream& operator<<(Ostream& os, const C4H10O& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C4H10O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C

@@ -129,21 +129,27 @@ Foam::C6H14::C6H14
 
 Foam::C6H14::C6H14(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C6H14()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C6H14::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C6H14& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H

@@ -79,6 +79,8 @@ class C6H14
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C6H14");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C6H14& l)
+        friend Ostream& operator<<(Ostream& os, const C6H14& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C6H14& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C

@@ -129,21 +129,27 @@ Foam::C6H6::C6H6
 
 Foam::C6H6::C6H6(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C6H6()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C6H6::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C6H6& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H

@@ -79,6 +79,8 @@ class C6H6
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C6H6");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C6H6& l)
+        friend Ostream& operator<<(Ostream& os, const C6H6& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C6H6& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C

@@ -128,21 +128,27 @@ Foam::C7H16::C7H16
 
 Foam::C7H16::C7H16(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C7H16()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C7H16::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C7H16& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H

@@ -79,6 +79,8 @@ class C7H16
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C7H16");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C7H16& l)
+        friend Ostream& operator<<(Ostream& os, const C7H16& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C7H16& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C

@@ -129,21 +129,27 @@ Foam::C7H8::C7H8
 
 Foam::C7H8::C7H8(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C7H8()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C7H8::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C7H8& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H

@@ -79,6 +79,8 @@ class C7H8
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C7H8");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C7H8& l)
+        friend Ostream& operator<<(Ostream& os, const C7H8& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C7H8& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C

@@ -129,21 +129,27 @@ Foam::C8H10::C8H10
 
 Foam::C8H10::C8H10(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C8H10()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C8H10::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C8H10& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H

@@ -78,6 +78,8 @@ class C8H10
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C8H10");
 
@@ -164,33 +166,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C8H10& l)
+        friend Ostream& operator<<(Ostream& os, const C8H10& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C8H10& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C

@@ -129,21 +129,27 @@ Foam::C8H18::C8H18
 
 Foam::C8H18::C8H18(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C8H18()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C8H18::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C8H18& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H

@@ -79,6 +79,8 @@ class C8H18
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C8H18");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C8H18& l)
+        friend Ostream& operator<<(Ostream& os, const C8H18& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C8H18& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C

@@ -129,21 +129,27 @@ Foam::C9H20::C9H20
 
 Foam::C9H20::C9H20(const dictionary& dict)
 :
-    liquidProperties(dict),
+    C9H20()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::C9H20::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C9H20& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H

@@ -79,6 +79,8 @@ class C9H20
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("C9H20");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C9H20& l)
+        friend Ostream& operator<<(Ostream& os, const C9H20& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const C9H20& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C

@@ -129,21 +129,27 @@ Foam::CH3OH::CH3OH
 
 Foam::CH3OH::CH3OH(const dictionary& dict)
 :
-    liquidProperties(dict),
+    CH3OH()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::CH3OH::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const CH3OH& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H

@@ -79,6 +79,8 @@ class CH3OH
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("CH3OH");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const CH3OH& l)
+        friend Ostream& operator<<(Ostream& os, const CH3OH& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const CH3OH& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C

@@ -113,21 +113,27 @@ Foam::CH4N2O::CH4N2O
 
 Foam::CH4N2O::CH4N2O(const dictionary& dict)
 :
-    liquidProperties(dict),
+    CH4N2O()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::CH4N2O::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const CH4N2O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H

@@ -79,6 +79,8 @@ class CH4N2O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("CH4N2O");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const CH4N2O& l)
+        friend Ostream& operator<<(Ostream& os, const CH4N2O& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const CH4N2O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C

@@ -138,25 +138,24 @@ Foam::H2O::H2O(const dictionary& dict)
 :
     H2O()
 {
-//     liquidProperties(dict),
+    readIfPresent(*this, dict);
-//     rho_(dict.subDict("rho")),
+}
-    InfoInFunction;
+
-    if (dict.found("rho"))
+
-    {
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-        rho_ = NSRDSfunc5(dict.subDict("rho"));
+
-    }
+void Foam::H2O::writeData(Ostream& os) const
-//     pv_(dict.subDict("pv")),
+{
-//     hl_(dict.subDict("hl")),
+    liquidProperties::writeData(*this, os);
-//     Cp_(dict.subDict("Cp")),
+}
-//     h_(dict.subDict("h")),
+
-//     Cpg_(dict.subDict("Cpg")),
+
-//     B_(dict.subDict("B")),
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
-//     mu_(dict.subDict("mu")),
+
-//     mug_(dict.subDict("mug")),
+Foam::Ostream& Foam::operator<<(Ostream& os, const H2O& l)
-//     kappa_(dict.subDict("K")),
+{
-//     kappag_(dict.subDict("kappag")),
+    l.writeData(os);
-//     sigma_(dict.subDict("sigma")),
+    return os;
-//     D_(dict.subDict("D"))
 }
 
 

src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H

@@ -78,6 +78,8 @@ class H2O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("H2O");
 
@@ -164,33 +166,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const H2O& l)
+        friend Ostream& operator<<(Ostream& os, const H2O& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const H2O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C

@@ -129,21 +129,27 @@ Foam::IC8H18::IC8H18
 
 Foam::IC8H18::IC8H18(const dictionary& dict)
 :
-    liquidProperties(dict),
+    IC8H18()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::IC8H18::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const IC8H18& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H

@@ -79,6 +79,8 @@ class IC8H18
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("IC8H18");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const IC8H18& l)
+        friend Ostream& operator<<(Ostream& os, const IC8H18& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const IC8H18& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C

@@ -149,21 +149,27 @@ Foam::IDEA::IDEA
 
 Foam::IDEA::IDEA(const dictionary& dict)
 :
-    liquidProperties(dict),
+    IDEA()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::IDEA::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const IDEA& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H

@@ -101,6 +101,8 @@ class IDEA
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("IDEA");
 
@@ -187,32 +189,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const IDEA& l)
+        friend Ostream& operator<<(Ostream& os, const IDEA& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const IDEA& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/MB/MB.C

@@ -113,21 +113,27 @@ Foam::MB::MB
 
 Foam::MB::MB(const dictionary& dict)
 :
-    liquidProperties(dict),
+    MB()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::MB::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const MB& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/MB/MB.H

@@ -79,6 +79,8 @@ class MB
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("MB");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const MB& l)
+        friend Ostream& operator<<(Ostream& os, const MB& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const MB& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/N2/N2.C

@@ -129,21 +129,27 @@ Foam::N2::N2
 
 Foam::N2::N2(const dictionary& dict)
 :
-    liquidProperties(dict),
+    N2()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::N2::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const N2& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/N2/N2.H

@@ -79,6 +79,8 @@ class N2
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("N2");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const N2& l)
+        friend Ostream& operator<<(Ostream& os, const N2& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const N2& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C

@@ -121,21 +121,27 @@ Foam::aC10H7CH3::aC10H7CH3
 
 Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict)
 :
-    liquidProperties(dict),
+    aC10H7CH3()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::aC10H7CH3::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const aC10H7CH3& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H

@@ -79,6 +79,8 @@ class aC10H7CH3
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("aC11H10");
 
@@ -165,34 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
-
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const aC10H7CH3& l)
+        friend Ostream& operator<<(Ostream& os, const aC10H7CH3& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const aC10H7CH3& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C

@@ -122,21 +122,27 @@ Foam::bC10H7CH3::bC10H7CH3
 
 Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict)
 :
-    liquidProperties(dict),
+    bC10H7CH3()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::bC10H7CH3::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const bC10H7CH3& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H

@@ -79,6 +79,8 @@ class bC10H7CH3
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("bC11H10");
 
@@ -165,33 +167,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const bC10H7CH3& l)
+        friend Ostream& operator<<(Ostream& os, const bC10H7CH3& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const bC10H7CH3& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C

@@ -129,21 +129,27 @@ Foam::iC3H8O::iC3H8O
 
 Foam::iC3H8O::iC3H8O(const dictionary& dict)
 :
-    liquidProperties(dict),
+    iC3H8O()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::iC3H8O::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const iC3H8O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H

@@ -77,6 +77,8 @@ class iC3H8O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("iC3H8O");
 
@@ -164,33 +166,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const iC3H8O& l)
+        friend Ostream& operator<<(Ostream& os, const iC3H8O& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const iC3H8O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C

@@ -275,6 +275,22 @@ Foam::scalar Foam::liquidProperties::pvInvert(scalar p) const
 }
 
 
+void Foam::liquidProperties::readIfPresent(const dictionary &dict)
+{
+    dict.readIfPresent("W", W_);
+    dict.readIfPresent("Tc", Tc_);
+    dict.readIfPresent("Pc", Pc_);
+    dict.readIfPresent("Vc", Vc_);
+    dict.readIfPresent("Zc", Zc_);
+    dict.readIfPresent("Tt", Tt_);
+    dict.readIfPresent("Pt", Pt_);
+    dict.readIfPresent("Tb", Tb_);
+    dict.readIfPresent("dipm", dipm_);
+    dict.readIfPresent("omega", omega_);
+    dict.readIfPresent("delta", delta_);
+}
+
+
 void Foam::liquidProperties::writeData(Ostream& os) const
 {
     os  << W_ << token::SPACE
@@ -291,4 +307,13 @@ void Foam::liquidProperties::writeData(Ostream& os) const
 }
 
 
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const liquidProperties& l)
+{
+    l.writeData(os);
+    return os;
+}
+
+
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H

@@ -284,18 +284,47 @@ public:
 
     // I-O
 
+        //- Read and set the properties present it the given dictionary
+        void readIfPresent(const dictionary& dict);
+
+        //- Read and set the function coefficients
+        //  if present it the given dictionary
+        template<class Func>
+        inline void readIfPresent
+        (
+            Func& f,
+            const word& name,
+            const dictionary& dict
+        );
+
+        //- Read and set the function coefficients
+        //  if present it the given dictionary
+        template<class Liquid>
+        inline void readIfPresent
+        (
+            Liquid& l,
+            const dictionary& dict
+        );
+
         //- Write the function coefficients
         virtual void writeData(Ostream& os) const;
 
+        //- Write the data for each of the property functions
+        template<class Liquid>
+        inline void writeData
+        (
+            const Liquid& l,
+            Ostream& os
+        ) const;
+
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const liquidProperties& l)
+        friend Ostream& operator<<(Ostream& os, const liquidProperties& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const liquidProperties& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H

@@ -137,4 +137,67 @@ inline Foam::scalar Foam::liquidProperties::alphah(scalar p, scalar T) const
 }
 
 
+template<class Func>
+inline void Foam::liquidProperties::readIfPresent
+(
+    Func& f,
+    const word& name,
+    const dictionary& dict
+)
+{
+    if (dict.found(name))
+    {
+        f = Func(dict.subDict(name));
+    }
+}
+
+
+template<class Liquid>
+inline void Foam::liquidProperties::readIfPresent
+(
+    Liquid& l,
+    const dictionary& dict
+)
+{
+    l.liquidProperties::readIfPresent(dict);
+    readIfPresent(l.rho_, "rho", dict);
+    readIfPresent(l.pv_, "pv", dict);
+    readIfPresent(l.hl_, "hl", dict);
+    readIfPresent(l.Cp_, "Cp", dict);
+    readIfPresent(l.h_, "h", dict);
+    readIfPresent(l.Cpg_, "Cpg", dict);
+    readIfPresent(l.B_, "B", dict);
+    readIfPresent(l.mu_, "mu", dict);
+    readIfPresent(l.mug_, "mug", dict);
+    readIfPresent(l.kappa_, "K", dict);
+    readIfPresent(l.kappag_, "kappag", dict);
+    readIfPresent(l.sigma_, "sigma", dict);
+    readIfPresent(l.D_, "D", dict);
+}
+
+
+template<class Liquid>
+inline void Foam::liquidProperties::writeData
+(
+    const Liquid& l,
+    Ostream& os
+) const
+{
+    l.liquidProperties::writeData(os); os << nl;
+    l.rho_.writeData(os); os << nl;
+    l.pv_.writeData(os); os << nl;
+    l.hl_.writeData(os); os << nl;
+    l.Cp_.writeData(os); os << nl;
+    l.h_.writeData(os); os << nl;
+    l.Cpg_.writeData(os); os << nl;
+    l.B_.writeData(os); os << nl;
+    l.mu_.writeData(os); os << nl;
+    l.mug_.writeData(os); os << nl;
+    l.kappa_.writeData(os); os << nl;
+    l.kappag_.writeData(os); os << nl;
+    l.sigma_.writeData(os); os << nl;
+    l.D_.writeData(os); os << endl;
+}
+
+
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C

@@ -129,21 +129,27 @@ Foam::nC3H8O::nC3H8O
 
 Foam::nC3H8O::nC3H8O(const dictionary& dict)
 :
-    liquidProperties(dict),
+    nC3H8O()
-    rho_(dict.subDict("rho")),
+{
-    pv_(dict.subDict("pv")),
+    readIfPresent(*this, dict);
-    hl_(dict.subDict("hl")),
+}
-    Cp_(dict.subDict("Cp")),
+
-    h_(dict.subDict("h")),
+
-    Cpg_(dict.subDict("Cpg")),
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-    B_(dict.subDict("B")),
+
-    mu_(dict.subDict("mu")),
+void Foam::nC3H8O::writeData(Ostream& os) const
-    mug_(dict.subDict("mug")),
+{
-    kappa_(dict.subDict("K")),
+    liquidProperties::writeData(*this, os);
-    kappag_(dict.subDict("kappag")),
+}
-    sigma_(dict.subDict("sigma")),
+
-    D_(dict.subDict("D"))
+
-{}
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const nC3H8O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //

src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H

@@ -77,6 +77,8 @@ class nC3H8O
 
 public:
 
+    friend class liquidProperties;
+
     //- Runtime type information
     TypeName("nC3H8O");
 
@@ -164,33 +166,16 @@ public:
     // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
+        void writeData(Ostream& os) const;
-        {
-            liquidProperties::writeData(os); os << nl;
-            rho_.writeData(os); os << nl;
-            pv_.writeData(os); os << nl;
-            hl_.writeData(os); os << nl;
-            Cp_.writeData(os); os << nl;
-            h_.writeData(os); os << nl;
-            Cpg_.writeData(os); os << nl;
-            B_.writeData(os); os << nl;
-            mu_.writeData(os); os << nl;
-            mug_.writeData(os); os << nl;
-            kappa_.writeData(os); os << nl;
-            kappag_.writeData(os); os << nl;
-            sigma_.writeData(os); os << nl;
-            D_.writeData(os); os << endl;
-        }
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const nC3H8O& l)
+        friend Ostream& operator<<(Ostream& os, const nC3H8O& l);
-        {
-            l.writeData(os);
-            return os;
-        }
 };
 
 
+Ostream& operator<<(Ostream& os, const nC3H8O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam