From 93fbd41785fa50b8e7b4dd3bfa906b3eacb2ed96 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 3 Feb 2017 10:52:35 +0000
Subject: [PATCH 01/40] kOmegaSSTBase: make correctNut(S2, F2) virtual
 kOmegaSSTSato: Change correctNut() to correctNut(S2, F2)

Resolves bug-report https://bugs.openfoam.org/view.php?id=2450
---
 .../RAS/kOmegaSSTSato/kOmegaSSTSato.C            | 16 ++++++++--------
 .../RAS/kOmegaSSTSato/kOmegaSSTSato.H            | 13 +++++++++----
 .../Base/kOmegaSST/kOmegaSSTBase.C               |  2 +-
 .../Base/kOmegaSST/kOmegaSSTBase.H               |  8 ++++++--
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
index 7f0af09be6..505d794a1e 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,8 +130,13 @@ kOmegaSSTSato<BasicTurbulenceModel>::gasTurbulence() const
 
 
 template<class BasicTurbulenceModel>
-void kOmegaSSTSato<BasicTurbulenceModel>::correctNut()
+void kOmegaSSTSato<BasicTurbulenceModel>::correctNut
+(
+    const volScalarField& S2,
+    const volScalarField& F2
+)
 {
+    InfoInFunction;
     const PhaseCompressibleTurbulenceModel<transportModel>& gasTurbulence =
         this->gasTurbulence();
 
@@ -141,12 +146,7 @@ void kOmegaSSTSato<BasicTurbulenceModel>::correctNut()
     );
 
     this->nut_ =
-        this->a1_*this->k_
-       /max
-        (
-            this->a1_*this->omega_,
-            this->F23()*sqrt(2.0)*mag(symm(fvc::grad(this->U_)))
-        )
+        this->a1_*this->k_/max(this->a1_*this->omega_, this->b1_*F2*sqrt(S2))
       + sqr(1 - exp(-yPlus/16.0))
        *Cmub_*gasTurbulence.transport().d()*gasTurbulence.alpha()
        *(mag(this->U_ - gasTurbulence.U()));
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
index 4a95eb1aba..37fd2a8b4c 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,8 +68,8 @@ Description
     to specify the near-wall omega as appropriate.
 
     The blending functions (15) and (16) are not currently used because of the
-    uncertainty in their origin, range of applicability and that is y+ becomes
-    sufficiently small blending u_tau in this manner clearly becomes nonsense.
+    uncertainty in their origin, range of applicability and that as y+ becomes
+    sufficiently small blending u_tau in this manner is clearly nonsense.
 
     The default model coefficients correspond to the following:
     \verbatim
@@ -156,7 +156,12 @@ protected:
 
     // Protected Member Functions
 
-        virtual void correctNut();
+        virtual void correctNut
+        (
+            const volScalarField& S2,
+            const volScalarField& F2
+        );
+
 
 public:
 
diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
index c6c65b51bc..8832e2bd34 100644
--- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
+++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
index 72301b6792..4001b77e04 100644
--- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
+++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -215,7 +215,11 @@ protected:
             return blend(F1, gamma1_, gamma2_);
         }
 
-        void correctNut(const volScalarField& S2, const volScalarField& F2);
+        virtual void correctNut
+        (
+            const volScalarField& S2,
+            const volScalarField& F2
+        );
 
         virtual void correctNut();
 

From 74f38251f87e7559d1cd4732bab9db87d1ce1a22 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 3 Feb 2017 11:37:56 +0000
Subject: [PATCH 02/40] kOmegaSSTSato: removed debug message

---
 .../phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
index 505d794a1e..1b0d5feb31 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
@@ -136,7 +136,6 @@ void kOmegaSSTSato<BasicTurbulenceModel>::correctNut
     const volScalarField& F2
 )
 {
-    InfoInFunction;
     const PhaseCompressibleTurbulenceModel<transportModel>& gasTurbulence =
         this->gasTurbulence();
 

From 83787036a93c9ee0947ba1eeae355a9a750d0088 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 3 Feb 2017 14:25:02 +0000
Subject: [PATCH 03/40] functionObjects::streamLine: Reinstated default "U"

---
 src/functionObjects/field/streamLine/streamLine.C | 2 +-
 src/functionObjects/field/streamLine/streamLine.H | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/functionObjects/field/streamLine/streamLine.C b/src/functionObjects/field/streamLine/streamLine.C
index 0c66a5fce0..2947d0d801 100644
--- a/src/functionObjects/field/streamLine/streamLine.C
+++ b/src/functionObjects/field/streamLine/streamLine.C
@@ -311,7 +311,7 @@ bool Foam::functionObjects::streamLine::read(const dictionary& dict)
     Info<< type() << " " << name() << ":" << nl;
 
     dict.lookup("fields") >> fields_;
-    dict.lookup("U") >> UName_;
+    UName_ = dict.lookupOrDefault("U", word("U"));
 
     if (findIndex(fields_, UName_) == -1)
     {
diff --git a/src/functionObjects/field/streamLine/streamLine.H b/src/functionObjects/field/streamLine/streamLine.H
index 7c0995e69f..07a124c481 100644
--- a/src/functionObjects/field/streamLine/streamLine.H
+++ b/src/functionObjects/field/streamLine/streamLine.H
@@ -72,7 +72,7 @@ Usage
         Property     | Description             | Required    | Default value
         type         | Type name: streamLine   | yes         |
         setFormat    | Output data type        | yes         |
-        U            | Tracking velocity field name | yes    |
+        U            | Tracking velocity field name | no     | U
         fields       | Fields to sample        | yes         |
         lifetime     | Maximum number of particle tracking steps | yes |
         trackLength  | Tracking segment length | no          |

From 78ee6c2abb17713297ce89188c65cb2904c01b1e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 3 Feb 2017 14:27:38 +0000
Subject: [PATCH 04/40] Time: When increasing precision check if the time name
 is unchanged

Patch contributed by Mattijs Janssens
---
 src/OpenFOAM/db/Time/Time.C | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 9a306d7eac..5738f5f4dd 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -184,6 +184,8 @@ void Foam::Time::setControls()
         int oldPrecision = precision_;
         int requiredPrecision = -1;
         bool found = false;
+        word oldTime(timeName());
+
         for
         (
             precision_ = maxPrecision_;
@@ -194,6 +196,14 @@ void Foam::Time::setControls()
             // Update the time formatting
             setTime(startTime_, 0);
 
+            // Check that the time name has changed otherwise exit loop
+            word newTime(timeName());
+            if (newTime == oldTime)
+            {
+                break;
+            }
+            oldTime = newTime;
+
             // Check the existence of the time directory with the new format
             found = exists(timePath(), false);
 

From 7612b5182807f7c578dab45ccea496f7bb6be4d1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 3 Feb 2017 14:29:07 +0000
Subject: [PATCH 05/40] lagrangian::NonInertialFrameForce: Use field references
 rather than copies

Patch contributed by Mattijs Janssens
---
 .../NonInertialFrame/NonInertialFrameForce.C          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
index 9630f242b2..17f57041f4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,7 +121,7 @@ void Foam::NonInertialFrameForce<CloudType>::cacheFields(const bool store)
             )
         )
         {
-            uniformDimensionedVectorField W = this->mesh().template
+            const uniformDimensionedVectorField& W = this->mesh().template
                 lookupObject<uniformDimensionedVectorField>(WName_);
 
             W_ = W.value();
@@ -135,7 +135,7 @@ void Foam::NonInertialFrameForce<CloudType>::cacheFields(const bool store)
             )
         )
         {
-            uniformDimensionedVectorField omega = this->mesh().template
+            const uniformDimensionedVectorField& omega = this->mesh().template
                 lookupObject<uniformDimensionedVectorField>(omegaName_);
 
             omega_ = omega.value();
@@ -149,7 +149,8 @@ void Foam::NonInertialFrameForce<CloudType>::cacheFields(const bool store)
             )
         )
         {
-            uniformDimensionedVectorField omegaDot = this->mesh().template
+            const uniformDimensionedVectorField& omegaDot =
+                this->mesh().template
                 lookupObject<uniformDimensionedVectorField>(omegaDotName_);
 
             omegaDot_ = omegaDot.value();
@@ -163,7 +164,7 @@ void Foam::NonInertialFrameForce<CloudType>::cacheFields(const bool store)
             )
         )
         {
-            uniformDimensionedVectorField centreOfRotation =
+            const uniformDimensionedVectorField& centreOfRotation =
                 this->mesh().template
                 lookupObject<uniformDimensionedVectorField>
                 (

From 7a7fa4350df2dbdcd6e81c67c40004189a57acf7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 3 Feb 2017 14:51:04 +0000
Subject: [PATCH 06/40] Time: when "writeFormat" is set to "binary" disallow
 compression

Compressing and decompressing binary files introduces a significant IO overhead
without a providing significant reduction in file-size.
---
 src/OpenFOAM/db/Time/TimeIO.C | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 436661040f..39e88a66d1 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -347,6 +347,20 @@ void Foam::Time::readDict()
         (
             controlDict_.lookup("writeCompression")
         );
+
+        if
+        (
+            writeFormat_ == IOstream::BINARY
+         && writeCompression_ == IOstream::COMPRESSED
+        )
+        {
+            IOWarningInFunction(controlDict_)
+                << "Selecting compressed binary is inefficient and ineffective"
+                   ", resetting to uncompressed binary"
+                << endl;
+
+            writeCompression_ = IOstream::UNCOMPRESSED;
+        }
     }
 
     controlDict_.readIfPresent("graphFormat", graphFormat_);

From 23809f7ae70bec62391839de93a598cc3400e9d8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 3 Feb 2017 18:36:40 +0000
Subject: [PATCH 07/40] PBiCG: Suggest changing to the more robust PBiCGStab
 solver

if convergence is not achieved within the maximum number of iterations.

Sometimes, particularly running in parallel, PBiCG fails to converge or diverges
without warning or obvious cause leaving a solution field containing significant
errors which can cause divergence of the application.  PBiCGStab is more robust
and does not suffer from the problems encountered with PBiCG.
---
 .../matrices/LduMatrix/LduMatrix/LduMatrix.H         |  5 ++++-
 .../matrices/LduMatrix/LduMatrix/LduMatrixSolver.C   |  4 ++--
 .../matrices/lduMatrix/lduMatrix/lduMatrix.C         |  5 ++++-
 .../matrices/lduMatrix/lduMatrix/lduMatrix.H         |  5 ++++-
 .../matrices/lduMatrix/lduMatrix/lduMatrixSolver.C   |  8 ++++----
 .../matrices/lduMatrix/solvers/PBiCG/PBiCG.C         | 12 +++++++++++-
 6 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
index 1da27f106b..f96d583b1f 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,6 +122,9 @@ public:
             //- Dictionary of controls
             dictionary controlDict_;
 
+            //- Default maximum number of iterations in the solver
+            static const label defaultMaxIter_ = 1000;
+
             //- Maximum number of iterations in the solver
             label maxIter_;
 
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
index 651be6cee2..dd908b91f0 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ Foam::LduMatrix<Type, DType, LUType>::solver::solver
 
     controlDict_(solverDict),
 
-    maxIter_(1000),
+    maxIter_(defaultMaxIter_),
     minIter_(0),
     tolerance_(1e-6*pTraits<Type>::one),
     relTol_(Zero)
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
index 11cdf31485..e9eb25143a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,9 @@ namespace Foam
 }
 
 
+const Foam::label Foam::lduMatrix::solver::defaultMaxIter_ = 1000;
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Foam::lduMatrix::lduMatrix(const lduMesh& mesh)
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 575916f633..30ba325a5a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,6 +106,9 @@ public:
             //- Dictionary of controls
             dictionary controlDict_;
 
+            //- Default maximum number of iterations in the solver
+            static const label defaultMaxIter_;
+
             //- Maximum number of iterations in the solver
             label maxIter_;
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
index d554375cae..bc1e134741 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -157,10 +157,10 @@ Foam::lduMatrix::solver::solver
 
 void Foam::lduMatrix::solver::readControls()
 {
-    maxIter_   = controlDict_.lookupOrDefault<label>("maxIter", 1000);
-    minIter_   = controlDict_.lookupOrDefault<label>("minIter", 0);
+    maxIter_ = controlDict_.lookupOrDefault<label>("maxIter", defaultMaxIter_);
+    minIter_ = controlDict_.lookupOrDefault<label>("minIter", 0);
     tolerance_ = controlDict_.lookupOrDefault<scalar>("tolerance", 1e-6);
-    relTol_    = controlDict_.lookupOrDefault<scalar>("relTol", 0);
+    relTol_ = controlDict_.lookupOrDefault<scalar>("relTol", 0);
 }
 
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
index 54088f550f..b4e630571f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -208,6 +208,16 @@ Foam::solverPerformance Foam::PBiCG::solve
         );
     }
 
+    // Recommend PBiCGStab if PBiCG fails to converge
+    if (solverPerf.nIterations() > max(defaultMaxIter_, maxIter_))
+    {
+        FatalErrorInFunction
+            << "PBiCG has failed to converge within the maximum number"
+               " of iterations " << max(defaultMaxIter_, maxIter_) << nl
+            << "    Please try the more robust PBiCGStab solver."
+            << exit(FatalError);
+    }
+
     return solverPerf;
 }
 

From ddf1268e730940e896de8078176a6f2554cac4f5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 6 Feb 2017 15:48:11 +0000
Subject: [PATCH 08/40] functionObjects:surfaceFieldValue, volFieldValue: Added
 weightedSum and weighted[Area|Vol]Integrate

Patch contributed by Timo Niemi, VTT.
Resolves patch request https://bugs.openfoam.org/view.php?id=2452
---
 .../surfaceFieldValue/surfaceFieldValue.C     |  8 +++--
 .../surfaceFieldValue/surfaceFieldValue.H     |  8 +++--
 .../surfaceFieldValueTemplates.C              | 28 +++++++++++++++-
 .../fieldValues/volFieldValue/volFieldValue.C |  8 +++--
 .../fieldValues/volFieldValue/volFieldValue.H | 32 +++++++++++--------
 .../volFieldValue/volFieldValueTemplates.C    | 12 ++++++-
 6 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
index b532696e40..3ac33748e2 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,11 +65,12 @@ template<>
 const char* Foam::NamedEnum
 <
     Foam::functionObjects::fieldValues::surfaceFieldValue::operationType,
-    15
+    17
 >::names[] =
 {
     "none",
     "sum",
+    "weightedSum",
     "sumMag",
     "sumDirection",
     "sumDirectionBalance",
@@ -78,6 +79,7 @@ const char* Foam::NamedEnum
     "areaAverage",
     "weightedAreaAverage",
     "areaIntegrate",
+    "weightedAreaIntegrate",
     "min",
     "max",
     "CoV",
@@ -94,7 +96,7 @@ const Foam::NamedEnum
 const Foam::NamedEnum
 <
     Foam::functionObjects::fieldValues::surfaceFieldValue::operationType,
-    15
+    17
 > Foam::functionObjects::fieldValues::surfaceFieldValue::operationTypeNames_;
 
 
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
index 7a58ba56a9..3c85014755 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,6 +116,7 @@ Usage
     \plaintable
        none          | no operation
        sum           | sum
+       weightedSum   | weighted sum
        sumMag        | sum of component magnitudes
        sumDirection  | sum values which are positive in given direction
        sumDirectionBalance | sum of balance of values in given direction
@@ -124,6 +125,7 @@ Usage
        areaAverage   | area weighted average
        weightedAreaAverage | weighted area average
        areaIntegrate | area integral
+       weightedAreaIntegrate | weighted area integral
        min           | minimum
        max           | maximum
        CoV           | coefficient of variation: standard deviation/mean
@@ -209,6 +211,7 @@ public:
         {
             opNone,
             opSum,
+            opWeightedSum,
             opSumMag,
             opSumDirection,
             opSumDirectionBalance,
@@ -217,6 +220,7 @@ public:
             opAreaAverage,
             opWeightedAreaAverage,
             opAreaIntegrate,
+            opWeightedAreaIntegrate,
             opMin,
             opMax,
             opCoV,
@@ -225,7 +229,7 @@ public:
         };
 
         //- Operation type names
-        static const NamedEnum<operationType, 15> operationTypeNames_;
+        static const NamedEnum<operationType, 17> operationTypeNames_;
 
 
 private:
diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
index cfcd2c2464..ddb9107f4d 100644
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -141,6 +141,18 @@ processSameTypeValues
             result = sum(values);
             break;
         }
+        case opWeightedSum:
+        {
+            if (weightField.size())
+            {
+                result = sum(weightField*values);
+            }
+            else
+            {
+                result = sum(values);
+            }
+            break;
+        }
         case opSumMag:
         {
             result = sum(cmptMag(values));
@@ -213,6 +225,20 @@ processSameTypeValues
             result = sum(magSf*values);
             break;
         }
+        case opWeightedAreaIntegrate:
+        {
+            const scalarField magSf(mag(Sf));
+
+            if (weightField.size())
+            {
+                result = sum(weightField*magSf*values);
+            }
+            else
+            {
+                result = sum(magSf*values);
+            }
+            break;
+        }
         case opMin:
         {
             result = min(values);
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
index 5f3667e21f..9383526d33 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,17 +48,19 @@ const char*
 Foam::NamedEnum
 <
     Foam::functionObjects::fieldValues::volFieldValue::operationType,
-    11
+    13
 >::names[] =
 {
     "none",
     "sum",
+    "weightedSum",
     "sumMag",
     "average",
     "weightedAverage",
     "volAverage",
     "weightedVolAverage",
     "volIntegrate",
+    "weightedVolIntegrate",
     "min",
     "max",
     "CoV"
@@ -67,7 +69,7 @@ Foam::NamedEnum
 const Foam::NamedEnum
 <
     Foam::functionObjects::fieldValues::volFieldValue::operationType,
-    11
+    13
 > Foam::functionObjects::fieldValues::volFieldValue::operationTypeNames_;
 
 
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
index d8d94b5070..a36597e094 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,17 +79,19 @@ Usage
 
     The \c operation is one of:
     \plaintable
-       none               | No operation
-       sum                | Sum
-       sumMag             | Sum of component magnitudes
-       average            | Ensemble average
-       weightedAverage    | Weighted average
-       volAverage         | Volume weighted average
-       weightedVolAverage | Weighted volume average
-       volIntegrate       | Volume integral
-       min                | Minimum
-       max                | Maximum
-       CoV                | Coefficient of variation: standard deviation/mean
+       none                 | No operation
+       sum                  | Sum
+       weightedSum          | Weighted sum
+       sumMag               | Sum of component magnitudes
+       average              | Ensemble average
+       weightedAverage      | Weighted average
+       volAverage           | Volume weighted average
+       weightedVolAverage   | Weighted volume average
+       volIntegrate         | Volume integral
+       weightedVolIntegrate | Weighted volume integral
+       min                  | Minimum
+       max                  | Maximum
+       CoV                  | Coefficient of variation: standard deviation/mean
     \endplaintable
 
 See also
@@ -136,19 +138,21 @@ public:
         {
             opNone,
             opSum,
+            opWeightedSum,
             opSumMag,
             opAverage,
             opWeightedAverage,
             opVolAverage,
             opWeightedVolAverage,
             opVolIntegrate,
+            opWeightedVolIntegrate,
             opMin,
             opMax,
             opCoV
         };
 
         //- Operation type names
-        static const NamedEnum<operationType, 11> operationTypeNames_;
+        static const NamedEnum<operationType, 13> operationTypeNames_;
 
 
 protected:
@@ -158,7 +162,7 @@ protected:
         //- Operation to apply to values
         operationType operation_;
 
-        //- Weight field name - only used for opWeightedAverage mode
+        //- Weight field name - only used for weighted modes
         word weightFieldName_;
 
 
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
index 54b9e2d528..a23dd1e5f5 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,6 +87,11 @@ Type Foam::functionObjects::fieldValues::volFieldValue::processValues
             result = gSum(values);
             break;
         }
+        case opWeightedSum:
+        {
+            result = gSum(weightField*values);
+            break;
+        }
         case opSumMag:
         {
             result = gSum(cmptMag(values));
@@ -117,6 +122,11 @@ Type Foam::functionObjects::fieldValues::volFieldValue::processValues
             result = gSum(V*values);
             break;
         }
+        case opWeightedVolIntegrate:
+        {
+            result = gSum(weightField*V*values);
+            break;
+        }
         case opMin:
         {
             result = gMin(values);

From 8264c3b988dd33a8680f5bd947c07376352a219a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 7 Feb 2017 09:59:19 +0000
Subject: [PATCH 09/40] interDyMFoam: Reinstate alphaPhiCorr0 for moving meshes
 without topology change

---
 .../multiphase/interFoam/interDyMFoam/interDyMFoam.C        | 6 +++++-
 .../multiphase/interDyMFoam/RAS/DTCHull/system/fvSolution   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index f544fcde28..f750308c44 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -126,7 +126,11 @@ int main(int argc, char *argv[])
                         << " s" << endl;
 
                     // Do not apply previous time-step mesh compression flux
-                    talphaPhiCorr0.clear();
+                    // if the mesh topology changed
+                    if (mesh.topoChanging())
+                    {
+                        talphaPhiCorr0.clear();
+                    }
 
                     gh = (g & mesh.C()) - ghRef;
                     ghf = (g & mesh.Cf()) - ghRef;
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/fvSolution b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/fvSolution
index f215226a43..a9167ea880 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/fvSolution
@@ -41,7 +41,7 @@ solvers
 
         smoother        DIC;
 
-        tolerance       0.1;
+        tolerance       1e-3;
         relTol          0;
     };
 

From 29e83f3958209cab89c8bb67d98ffb069eb64e3e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 7 Feb 2017 18:59:40 +0000
Subject: [PATCH 10/40] compressibleInterFoam: Added support for fvOptions in
 both the U and T equations

---
 .../solvers/multiphase/compressibleInterFoam/TEqn.H      | 9 +++++++--
 .../solvers/multiphase/compressibleInterFoam/UEqn.H      | 6 ++++++
 .../compressibleInterDyMFoam/compressibleInterDyMFoam.C  | 4 +++-
 .../compressibleInterDyMFoam/pEqn.H                      | 4 +---
 .../compressibleInterFoam/compressibleInterFoam.C        | 4 +++-
 .../solvers/multiphase/compressibleInterFoam/pEqn.H      | 4 +---
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleInterFoam/TEqn.H b/applications/solvers/multiphase/compressibleInterFoam/TEqn.H
index 13e1feb546..7bd4ca3568 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/TEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/TEqn.H
@@ -12,12 +12,17 @@
            alpha1/mixture.thermo1().Cv()
          + alpha2/mixture.thermo2().Cv()
         )
+     ==
+        fvOptions(rho, T)
     );
 
     TEqn.relax();
+
+    fvOptions.constrain(TEqn);
+
     TEqn.solve();
 
-    mixture.correct();
+    fvOptions.correct(T);
 
-    Info<< "min(T) " << min(T).value() << endl;
+    mixture.correct();
 }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/UEqn.H b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
index 44be32aac2..18e947c8a7 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
@@ -3,10 +3,14 @@
         fvm::ddt(rho, U)
       + fvm::div(rhoPhi, U)
       + turbulence->divDevRhoReff(U)
+     ==
+        fvOptions(rho, U)
     );
 
     UEqn.relax();
 
+    fvOptions.constrain(UEqn);
+
     if (pimple.momentumPredictor())
     {
         solve
@@ -23,5 +27,7 @@
             )
         );
 
+        fvOptions.correct(U);
+
         K = 0.5*magSqr(U);
     }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 6f7ee7ffce..157830ae6b 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,6 +46,7 @@ Description
 #include "twoPhaseMixtureThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
+#include "fvOptions.H"
 #include "CorrectPhi.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,6 +61,7 @@ int main(int argc, char *argv[])
     #include "initContinuityErrs.H"
     #include "createControl.H"
     #include "createFields.H"
+    #include "createFvOptions.H"
     #include "createUf.H"
     #include "createControls.H"
     #include "CourantNo.H"
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
index fef73aa365..661cb3a78e 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
@@ -101,6 +101,7 @@
             U = HbyA
               + rAU*fvc::reconstruct((phig + p_rghEqnIncomp.flux())/rAUf);
             U.correctBoundaryConditions();
+            fvOptions.correct(U);
         }
     }
 
@@ -121,7 +122,4 @@
     p_rgh.correctBoundaryConditions();
 
     K = 0.5*magSqr(U);
-
-    Info<< "max(U) " << max(mag(U)).value() << endl;
-    Info<< "min(p_rgh) " << min(p_rgh).value() << endl;
 }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 150cc8bdfd..8775d0fbd3 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,6 +44,7 @@ Description
 #include "twoPhaseMixtureThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
+#include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,6 +58,7 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createTimeControls.H"
     #include "createFields.H"
+    #include "createFvOptions.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index 78e46f4664..1328b0abd9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -98,6 +98,7 @@
             U = HbyA
               + rAU*fvc::reconstruct((phig + p_rghEqnIncomp.flux())/rAUf);
             U.correctBoundaryConditions();
+            fvOptions.correct(U);
         }
     }
 
@@ -112,7 +113,4 @@
     p_rgh.correctBoundaryConditions();
 
     K = 0.5*magSqr(U);
-
-    Info<< "max(U) " << max(mag(U)).value() << endl;
-    Info<< "min(p_rgh) " << min(p_rgh).value() << endl;
 }

From 5f25843392700145d0b0c0d442769607fc7c3da1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 7 Feb 2017 19:00:58 +0000
Subject: [PATCH 11/40] porosityModels: Corrected documentation

---
 .../porosityModel/DarcyForchheimer/DarcyForchheimer.H        | 4 ++--
 .../cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H   | 4 ++--
 .../cfdTools/general/porosityModel/powerLaw/powerLaw.H       | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
index 4f1751e1b8..ac0a6871bb 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DarcyForchheimer
+    Foam::porosityModels::DarcyForchheimer
 
 Description
     Darcy-Forchheimer law porosity model, given by:
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
index 4ccfa87da5..e9ca67327f 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::fixedCoeff
+    Foam::porosityModels::fixedCoeff
 
 Description
     Fixed coefficient form of porosity model
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
index f17a639e09..33db437908 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::powerLaw
+    Foam::porosityModels::powerLaw
 
 Description
     Power law porosity model, given by:
@@ -37,7 +37,6 @@ Description
         C_1      | model exponent coefficient
     \endvartable
 
-
 SourceFiles
     powerLaw.C
     powerLawTemplates.C

From c5e7f356c928f342cf21f8cd11aa735c713ead6b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 7 Feb 2017 19:01:34 +0000
Subject: [PATCH 12/40] porosityModel::powerLaw: Added groupName to rho lookup
 to support multiphase

---
 .../general/porosityModel/powerLaw/powerLaw.C | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C
index e49e2a410a..280b0e4ba2 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,14 +94,16 @@ void Foam::porosityModels::powerLaw::correct
     fvVectorMatrix& UEqn
 ) const
 {
-    const vectorField& U = UEqn.psi();
+    const volVectorField& U = UEqn.psi();
     const scalarField& V = mesh_.V();
     scalarField& Udiag = UEqn.diag();
- 
+
     if (UEqn.dimensions() == dimForce)
     {
-        const volScalarField& rho =
-            mesh_.lookupObject<volScalarField>(rhoName_);
+        const volScalarField& rho = mesh_.lookupObject<volScalarField>
+        (
+            IOobject::groupName(rhoName_, U.group())
+        );
 
         apply(Udiag, V, rho, U);
     }
@@ -122,7 +124,7 @@ void Foam::porosityModels::powerLaw::correct
     const vectorField& U = UEqn.psi();
     const scalarField& V = mesh_.V();
     scalarField& Udiag = UEqn.diag();
- 
+
     apply(Udiag, V, rho, U);
 }
 
@@ -133,12 +135,14 @@ void Foam::porosityModels::powerLaw::correct
     volTensorField& AU
 ) const
 {
-    const vectorField& U = UEqn.psi();
+    const volVectorField& U = UEqn.psi();
 
     if (UEqn.dimensions() == dimForce)
     {
-        const volScalarField& rho =
-            mesh_.lookupObject<volScalarField>(rhoName_);
+        const volScalarField& rho = mesh_.lookupObject<volScalarField>
+        (
+            IOobject::groupName(rhoName_, U.group())
+        );
 
         apply(AU, rho, U);
     }

From 974624766fedeb1ae199ad982035cc0053b2d96a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 7 Feb 2017 19:02:30 +0000
Subject: [PATCH 13/40] porosityModels::solidification: New porosity model to
 simulate solidification

Description
    Simple solidification porosity model

    This is a simple approximation to solidification where the solid phase
    is represented as a porous blockage with the drag-coefficient evaluated from

        \f[
            S = - \rho D(T) U
        \f]

    where
    \vartable
        D(T) | User-defined drag-coefficient as function of temperature
    \endvartable

    Note that the latent heat of solidification is not included and the
    temperature is unchanged by the modelled change of phase.

    Example of the solidification model specification:
    \verbatim
        type            solidification;

        solidificationCoeffs
        {
            // Solidify between 330K and 330.5K
            D table
            (
                (330.0     10000) // Solid below 330K
                (330.5     0)     // Liquid above 330.5K
            );

            // Solidification porosity is isotropic
            // use the global coordinate system
            coordinateSystem
            {
                type    cartesian;
                origin  (0 0 0);
                coordinateRotation
                {
                    type    axesRotation;
                    e1      (1 0 0);
                    e2      (0 1 0);
                }
            }
        }
    \endverbatim
---
 src/finiteVolume/Make/files                   |   1 +
 .../solidification/solidification.C           | 163 +++++++++++++
 .../solidification/solidification.H           | 214 ++++++++++++++++++
 .../solidification/solidificationTemplates.C  |  83 +++++++
 4 files changed, 461 insertions(+)
 create mode 100644 src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
 create mode 100644 src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
 create mode 100644 src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index d79bbff4e8..2d7fbce130 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -417,6 +417,7 @@ $(porosity)/porosityModel/IOporosityModelList.C
 $(porosity)/DarcyForchheimer/DarcyForchheimer.C
 $(porosity)/fixedCoeff/fixedCoeff.C
 $(porosity)/powerLaw/powerLaw.C
+$(porosity)/solidification/solidification.C
 
 MRF = $(general)/MRF
 $(MRF)/MRFZone.C
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
new file mode 100644
index 0000000000..ac60cf0d04
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "addToRunTimeSelectionTable.H"
+#include "solidification.H"
+#include "geometricOneField.H"
+#include "fvMatrices.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    namespace porosityModels
+    {
+        defineTypeNameAndDebug(solidification, 0);
+        addToRunTimeSelectionTable(porosityModel, solidification, mesh);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::porosityModels::solidification::solidification
+(
+    const word& name,
+    const word& modelType,
+    const fvMesh& mesh,
+    const dictionary& dict,
+    const word& cellZoneName
+)
+:
+    porosityModel(name, modelType, mesh, dict, cellZoneName),
+    TName_(coeffs_.lookupOrDefault<word>("T", "T")),
+    rhoName_(coeffs_.lookupOrDefault<word>("rho", "rho")),
+    D_(Function1<scalar>::New("D", coeffs_))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::porosityModels::solidification::~solidification()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::porosityModels::solidification::calcTransformModelData()
+{}
+
+
+void Foam::porosityModels::solidification::calcForce
+(
+    const volVectorField& U,
+    const volScalarField& rho,
+    const volScalarField& mu,
+    vectorField& force
+) const
+{
+    scalarField Udiag(U.size(), 0.0);
+    const scalarField& V = mesh_.V();
+
+    apply(Udiag, V, rho, U);
+
+    force = Udiag*U;
+}
+
+
+void Foam::porosityModels::solidification::correct
+(
+    fvVectorMatrix& UEqn
+) const
+{
+    const volVectorField& U = UEqn.psi();
+    const scalarField& V = mesh_.V();
+    scalarField& Udiag = UEqn.diag();
+
+    if (UEqn.dimensions() == dimForce)
+    {
+        const volScalarField& rho = mesh_.lookupObject<volScalarField>
+        (
+            IOobject::groupName(rhoName_, U.group())
+        );
+
+        apply(Udiag, V, rho, U);
+    }
+    else
+    {
+        apply(Udiag, V, geometricOneField(), U);
+    }
+}
+
+
+void Foam::porosityModels::solidification::correct
+(
+    fvVectorMatrix& UEqn,
+    const volScalarField& rho,
+    const volScalarField& mu
+) const
+{
+    const volVectorField& U = UEqn.psi();
+    const scalarField& V = mesh_.V();
+    scalarField& Udiag = UEqn.diag();
+
+    apply(Udiag, V, rho, U);
+}
+
+
+void Foam::porosityModels::solidification::correct
+(
+    const fvVectorMatrix& UEqn,
+    volTensorField& AU
+) const
+{
+    const volVectorField& U = UEqn.psi();
+
+    if (UEqn.dimensions() == dimForce)
+    {
+        const volScalarField& rho = mesh_.lookupObject<volScalarField>
+        (
+            IOobject::groupName(rhoName_, U.group())
+        );
+
+        apply(AU, rho, U);
+    }
+    else
+    {
+        apply(AU, geometricOneField(), U);
+    }
+}
+
+
+bool Foam::porosityModels::solidification::writeData(Ostream& os) const
+{
+    os  << indent << name_ << endl;
+    dict_.write(os);
+
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
new file mode 100644
index 0000000000..7f86849f64
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
@@ -0,0 +1,214 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::porosityModels::solidification
+
+Description
+    Simple solidification porosity model
+
+    This is a simple approximation to solidification where the solid phase
+    is represented as a porous blockage with the drag-coefficient evaluated from
+
+        \f[
+            S = - \rho D(T) U
+        \f]
+
+    where
+    \vartable
+        D(T) | User-defined drag-coefficient as function of temperature
+    \endvartable
+
+    Note that the latent heat of solidification is not included and the
+    temperature is unchanged by the modelled change of phase.
+
+    Example of the solidification model specification:
+    \verbatim
+        type            solidification;
+
+        solidificationCoeffs
+        {
+            // Solidify between 330K and 330.5K
+            D table
+            (
+                (330.0     10000) // Solid below 330K
+                (330.5     0)     // Liquid above 330.5K
+            );
+
+            // Solidification porosity is isotropic
+            // use the global coordinate system
+            coordinateSystem
+            {
+                type    cartesian;
+                origin  (0 0 0);
+                coordinateRotation
+                {
+                    type    axesRotation;
+                    e1      (1 0 0);
+                    e2      (0 1 0);
+                }
+            }
+        }
+    \endverbatim
+
+SourceFiles
+    solidification.C
+    solidificationTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef solidification_H
+#define solidification_H
+
+#include "porosityModel.H"
+#include "Function1.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace porosityModels
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class solidification Declaration
+\*---------------------------------------------------------------------------*/
+
+class solidification
+:
+    public porosityModel
+{
+    // Private data
+
+        //- Name of temperature field, default = "T"
+        word TName_;
+
+        //- Name of density field, default = "rho"
+        word rhoName_;
+
+        //- User-defined drag-coefficient as function of temperature
+        autoPtr<Function1<scalar>> D_;
+
+
+    // Private Member Functions
+
+        //- Apply resistance
+        template<class RhoFieldType>
+        void apply
+        (
+            scalarField& Udiag,
+            const scalarField& V,
+            const RhoFieldType& rho,
+            const volVectorField& U
+        ) const;
+
+        //- Apply resistance
+        template<class RhoFieldType>
+        void apply
+        (
+            tensorField& AU,
+            const RhoFieldType& rho,
+            const volVectorField& U
+        ) const;
+
+        //- Disallow default bitwise copy construct
+        solidification(const solidification&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const solidification&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("solidification");
+
+    //- Constructor
+    solidification
+    (
+        const word& name,
+        const word& modelType,
+        const fvMesh& mesh,
+        const dictionary& dict,
+        const word& cellZoneName
+    );
+
+    //- Destructor
+    virtual ~solidification();
+
+
+    // Member Functions
+
+        //- Transform the model data wrt mesh changes
+        virtual void calcTransformModelData();
+
+        //- Calculate the porosity force
+        virtual void calcForce
+        (
+            const volVectorField& U,
+            const volScalarField& rho,
+            const volScalarField& mu,
+            vectorField& force
+        ) const;
+
+        //- Add resistance
+        virtual void correct(fvVectorMatrix& UEqn) const;
+
+        //- Add resistance
+        virtual void correct
+        (
+            fvVectorMatrix& UEqn,
+            const volScalarField& rho,
+            const volScalarField& mu
+        ) const;
+
+        //- Add resistance
+        virtual void correct
+        (
+            const fvVectorMatrix& UEqn,
+            volTensorField& AU
+        ) const;
+
+
+    // I-O
+
+        //- Write
+        bool writeData(Ostream& os) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace porosityModels
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "solidificationTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C
new file mode 100644
index 0000000000..71b290af17
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "volFields.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class RhoFieldType>
+void Foam::porosityModels::solidification::apply
+(
+    scalarField& Udiag,
+    const scalarField& V,
+    const RhoFieldType& rho,
+    const volVectorField& U
+) const
+{
+    const volScalarField& T = mesh_.lookupObject<volScalarField>
+    (
+        IOobject::groupName(TName_, U.group())
+    );
+
+    forAll(cellZoneIDs_, zoneI)
+    {
+        const labelList& cells = mesh_.cellZones()[cellZoneIDs_[zoneI]];
+
+        forAll(cells, i)
+        {
+            const label celli = cells[i];
+            Udiag[celli] += V[celli]*rho[celli]*D_->value(T[celli]);
+        }
+    }
+}
+
+
+template<class RhoFieldType>
+void Foam::porosityModels::solidification::apply
+(
+    tensorField& AU,
+    const RhoFieldType& rho,
+    const volVectorField& U
+) const
+{
+    const volScalarField& T = mesh_.lookupObject<volScalarField>
+    (
+        IOobject::groupName(TName_, U.group())
+    );
+
+    forAll(cellZoneIDs_, zoneI)
+    {
+        const labelList& cells = mesh_.cellZones()[cellZoneIDs_[zoneI]];
+
+        forAll(cells, i)
+        {
+            const label celli = cells[i];
+            AU[celli] += tensor::I*rho[celli]*D_->value(T[celli]);
+        }
+    }
+}
+
+
+// ************************************************************************* //

From 160efd89a63aa45f10e7768646312a9cbf99c2f8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 8 Feb 2017 10:40:14 +0000
Subject: [PATCH 14/40] porosityModels::solidification: Added optional
 phase-fraction for VoF solvers etc.

Description
    Simple solidification porosity model

    This is a simple approximation to solidification where the solid phase
    is represented as a porous blockage with the drag-coefficient evaluated from

        \f[
            S = - \alpha \rho D(T) U
        \f]

    where
    \vartable
        \alpha  | Optional phase-fraction of solidifying phase
        D(T)    | User-defined drag-coefficient as function of temperature
    \endvartable

    Note that the latent heat of solidification is not included and the
    temperature is unchanged by the modelled change of phase.

    Example of the solidification model specification:
    \verbatim
        type            solidification;

        solidificationCoeffs
        {
            // Solidify between 330K and 330.5K
            D table
            (
                (330.0     10000) // Solid below 330K
                (330.5     0)     // Liquid above 330.5K
            );

            // Optional phase-fraction of solidifying phase
            alpha alpha.liquid;

            // Solidification porosity is isotropic
            // use the global coordinate system
            coordinateSystem
            {
                type    cartesian;
                origin  (0 0 0);
                coordinateRotation
                {
                    type    axesRotation;
                    e1      (1 0 0);
                    e2      (0 1 0);
                }
            }
        }
    \endverbatim
---
 .../solidification/solidification.C           |  1 +
 .../solidification/solidification.H           | 32 +++++++-
 .../solidification/solidificationTemplates.C  | 82 +++++++++++++++----
 3 files changed, 99 insertions(+), 16 deletions(-)

diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
index ac60cf0d04..68d3edcf77 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
@@ -53,6 +53,7 @@ Foam::porosityModels::solidification::solidification
 :
     porosityModel(name, modelType, mesh, dict, cellZoneName),
     TName_(coeffs_.lookupOrDefault<word>("T", "T")),
+    alphaName_(coeffs_.lookupOrDefault<word>("alpha", "none")),
     rhoName_(coeffs_.lookupOrDefault<word>("rho", "rho")),
     D_(Function1<scalar>::New("D", coeffs_))
 {}
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
index 7f86849f64..119ba56805 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
@@ -31,12 +31,13 @@ Description
     is represented as a porous blockage with the drag-coefficient evaluated from
 
         \f[
-            S = - \rho D(T) U
+            S = - \alpha \rho D(T) U
         \f]
 
     where
     \vartable
-        D(T) | User-defined drag-coefficient as function of temperature
+        \alpha  | Optional phase-fraction of solidifying phase
+        D(T)    | User-defined drag-coefficient as function of temperature
     \endvartable
 
     Note that the latent heat of solidification is not included and the
@@ -55,6 +56,9 @@ Description
                 (330.5     0)     // Liquid above 330.5K
             );
 
+            // Optional phase-fraction of solidifying phase
+            alpha alpha.liquid;
+
             // Solidification porosity is isotropic
             // use the global coordinate system
             coordinateSystem
@@ -103,6 +107,9 @@ class solidification
         //- Name of temperature field, default = "T"
         word TName_;
 
+        //- Name of optional phase-fraction field, default = "none"
+        word alphaName_;
+
         //- Name of density field, default = "rho"
         word rhoName_;
 
@@ -112,6 +119,27 @@ class solidification
 
     // Private Member Functions
 
+        //- Apply resistance
+        template<class AlphaFieldType, class RhoFieldType>
+        void apply
+        (
+            scalarField& Udiag,
+            const scalarField& V,
+            const AlphaFieldType& alpha,
+            const RhoFieldType& rho,
+            const volVectorField& U
+        ) const;
+
+        //- Apply resistance
+        template<class AlphaFieldType, class RhoFieldType>
+        void apply
+        (
+            tensorField& AU,
+            const AlphaFieldType& alpha,
+            const RhoFieldType& rho,
+            const volVectorField& U
+        ) const;
+
         //- Apply resistance
         template<class RhoFieldType>
         void apply
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C
index 71b290af17..d9ea04d59e 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C
@@ -24,14 +24,16 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "volFields.H"
+#include "geometricOneField.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class RhoFieldType>
+template<class AlphaFieldType, class RhoFieldType>
 void Foam::porosityModels::solidification::apply
 (
     scalarField& Udiag,
     const scalarField& V,
+    const AlphaFieldType& alpha,
     const RhoFieldType& rho,
     const volVectorField& U
 ) const
@@ -48,12 +50,66 @@ void Foam::porosityModels::solidification::apply
         forAll(cells, i)
         {
             const label celli = cells[i];
-            Udiag[celli] += V[celli]*rho[celli]*D_->value(T[celli]);
+            Udiag[celli] +=
+                V[celli]*alpha[celli]*rho[celli]*D_->value(T[celli]);
         }
     }
 }
 
 
+template<class AlphaFieldType, class RhoFieldType>
+void Foam::porosityModels::solidification::apply
+(
+    tensorField& AU,
+    const AlphaFieldType& alpha,
+    const RhoFieldType& rho,
+    const volVectorField& U
+) const
+{
+    const volScalarField& T = mesh_.lookupObject<volScalarField>
+    (
+        IOobject::groupName(TName_, U.group())
+    );
+
+    forAll(cellZoneIDs_, zoneI)
+    {
+        const labelList& cells = mesh_.cellZones()[cellZoneIDs_[zoneI]];
+
+        forAll(cells, i)
+        {
+            const label celli = cells[i];
+            AU[celli] +=
+                tensor::I*alpha[celli]*rho[celli]*D_->value(T[celli]);
+        }
+    }
+}
+
+
+template<class RhoFieldType>
+void Foam::porosityModels::solidification::apply
+(
+    scalarField& Udiag,
+    const scalarField& V,
+    const RhoFieldType& rho,
+    const volVectorField& U
+) const
+{
+    if (alphaName_ == "none")
+    {
+        return apply(Udiag, V, geometricOneField(), rho, U);
+    }
+    else
+    {
+        const volScalarField& alpha = mesh_.lookupObject<volScalarField>
+        (
+            IOobject::groupName(alphaName_, U.group())
+        );
+
+        return apply(Udiag, V, alpha, rho, U);
+    }
+}
+
+
 template<class RhoFieldType>
 void Foam::porosityModels::solidification::apply
 (
@@ -62,20 +118,18 @@ void Foam::porosityModels::solidification::apply
     const volVectorField& U
 ) const
 {
-    const volScalarField& T = mesh_.lookupObject<volScalarField>
-    (
-        IOobject::groupName(TName_, U.group())
-    );
-
-    forAll(cellZoneIDs_, zoneI)
+    if (alphaName_ == "none")
     {
-        const labelList& cells = mesh_.cellZones()[cellZoneIDs_[zoneI]];
+        return apply(AU, geometricOneField(), rho, U);
+    }
+    else
+    {
+        const volScalarField& alpha = mesh_.lookupObject<volScalarField>
+        (
+            IOobject::groupName(alphaName_, U.group())
+        );
 
-        forAll(cells, i)
-        {
-            const label celli = cells[i];
-            AU[celli] += tensor::I*rho[celli]*D_->value(T[celli]);
-        }
+        return apply(AU, alpha, rho, U);
     }
 }
 

From 9d85d34f3ae2cc43847e42aed71eeded7bcdc62a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 8 Feb 2017 16:57:30 +0000
Subject: [PATCH 15/40] functionObjects::scalarTransport: Corrected FatalError

---
 src/functionObjects/solvers/scalarTransport/scalarTransport.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
index 5aecbd37e3..954a5d6e4d 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -254,7 +254,7 @@ bool Foam::functionObjects::scalarTransport::execute()
         FatalErrorInFunction
             << "Incompatible dimensions for phi: " << phi.dimensions() << nl
             << "Dimensions should be " << dimMass/dimTime << " or "
-            << dimVolume/dimTime << endl;
+            << dimVolume/dimTime << exit(FatalError);
     }
 
     Info<< endl;

From 3879cf48fbb898c3a856c2e77638c30bc72da4aa Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 8 Feb 2017 20:46:31 +0000
Subject: [PATCH 16/40] interMixingFoam: Renamed alphaEqns.H and
 alphaEqnsSubCycle.H for consistency with interFoam

---
 .../interFoam/interMixingFoam/{alphaEqns.H => alphaEqn.H}     | 0
 .../{alphaEqnsSubCycle.H => alphaEqnSubCycle.H}               | 4 ++--
 .../multiphase/interFoam/interMixingFoam/interMixingFoam.C    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename applications/solvers/multiphase/interFoam/interMixingFoam/{alphaEqns.H => alphaEqn.H} (100%)
 rename applications/solvers/multiphase/interFoam/interMixingFoam/{alphaEqnsSubCycle.H => alphaEqnSubCycle.H} (93%)

diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H
similarity index 100%
rename from applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H
rename to applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H
similarity index 93%
rename from applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H
rename to applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H
index 6025b60069..2f117f2cd4 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H
@@ -19,7 +19,7 @@ if (nAlphaSubCycles > 1)
         !(++alphaSubCycle).end();
     )
     {
-        #include "alphaEqns.H"
+        #include "alphaEqn.H"
         rhoPhiSum += (runTime.deltaT()/totalDeltaT)*rhoPhi;
     }
 
@@ -27,7 +27,7 @@ if (nAlphaSubCycles > 1)
 }
 else
 {
-    #include "alphaEqns.H"
+    #include "alphaEqn.H"
 }
 
 {
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
index b26630d360..52dc9a1500 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
         while (pimple.loop())
         {
             #include "alphaControls.H"
-            #include "alphaEqnsSubCycle.H"
+            #include "alphaEqnSubCycle.H"
 
             mixture.correct();
 

From ba4eefae1d5fbb455f6c9c777c586ece2adbea1c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 8 Feb 2017 20:47:59 +0000
Subject: [PATCH 17/40] interFoam, interDyMFoam: Removed duplicate include

---
 .../solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C   | 1 -
 applications/solvers/multiphase/interFoam/interFoam.C          | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index f750308c44..df826479f0 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -44,7 +44,6 @@ Description
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
-#include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index 5db4d7d32e..93d70dea5e 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,6 @@ Description
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
-#include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

From 6fc2a3dc58c3902a0453ba423e9d902d1aafb0ff Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 8 Feb 2017 20:50:07 +0000
Subject: [PATCH 18/40] compressibleInterFoam: More consistent with interFoam
 and added partial support for LTS

---
 .../compressibleInterFoam/Make/options        |   2 +
 .../multiphase/compressibleInterFoam/TEqn.H   |   1 +
 .../multiphase/compressibleInterFoam/UEqn.H   |   2 +-
 .../{alphaEqns.H => alphaEqn.H}               |  41 +------
 ...alphaEqnsSubCycle.H => alphaEqnSubCycle.H} |   8 +-
 .../compressibleInterFoam/alphaSuSp.H         |  37 ++++++
 .../compressibleInterDyMFoam/Make/options     |   1 +
 .../compressibleInterDyMFoam.C                | 107 +++++++++---------
 .../compressibleInterDyMFoam/createControls.H |   5 +
 .../compressibleInterDyMFoam/pEqn.H           |   2 +-
 .../compressibleInterDyMFoam/readControls.H   |   3 +
 .../compressibleInterFoam.C                   |  34 ++++--
 .../compressibleInterFoam/createFields.H      |   7 +-
 .../multiphase/compressibleInterFoam/pEqn.H   |   2 +-
 .../twoPhaseMixtureThermo/Make/options        |   2 +
 .../twoPhaseMixtureThermo.C                   |  22 ++--
 .../twoPhaseMixtureThermo.H                   |  16 ++-
 17 files changed, 165 insertions(+), 127 deletions(-)
 rename applications/solvers/multiphase/compressibleInterFoam/{alphaEqns.H => alphaEqn.H} (52%)
 rename applications/solvers/multiphase/compressibleInterFoam/{alphaEqnsSubCycle.H => alphaEqnSubCycle.H} (83%)
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H

diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options
index e24e6697f9..27e73ef53a 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options
@@ -1,4 +1,6 @@
 EXE_INC = \
+    -I. \
+    -I../interFoam \
     -ItwoPhaseMixtureThermo \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/applications/solvers/multiphase/compressibleInterFoam/TEqn.H b/applications/solvers/multiphase/compressibleInterFoam/TEqn.H
index 7bd4ca3568..60dd2aecc8 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/TEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/TEqn.H
@@ -24,5 +24,6 @@
 
     fvOptions.correct(T);
 
+    mixture.correctThermo();
     mixture.correct();
 }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/UEqn.H b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
index 18e947c8a7..2eaeaa25f4 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
@@ -20,7 +20,7 @@
             fvc::reconstruct
             (
                 (
-                    interface.surfaceTensionForce()
+                    mixture.surfaceTensionForce()
                   - ghf*fvc::snGrad(rho)
                   - fvc::snGrad(p_rgh)
                 ) * mesh.magSf()
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqn.H
similarity index 52%
rename from applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H
rename to applications/solvers/multiphase/compressibleInterFoam/alphaEqn.H
index eedf020670..8105650296 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/alphaEqn.H
@@ -2,48 +2,11 @@
     word alphaScheme("div(phi,alpha)");
     word alpharScheme("div(phirb,alpha)");
 
-    surfaceScalarField phir(phic*interface.nHatf());
+    surfaceScalarField phir(phic*mixture.nHatf());
 
     for (int gCorr=0; gCorr<nAlphaCorr; gCorr++)
     {
-        volScalarField::Internal Sp
-        (
-            IOobject
-            (
-                "Sp",
-                runTime.timeName(),
-                mesh
-            ),
-            mesh,
-            dimensionedScalar("Sp", dgdt.dimensions(), 0.0)
-        );
-
-        volScalarField::Internal Su
-        (
-            IOobject
-            (
-                "Su",
-                runTime.timeName(),
-                mesh
-            ),
-            // Divergence term is handled explicitly to be
-            // consistent with the explicit transport solution
-            divU*min(alpha1, scalar(1))
-        );
-
-        forAll(dgdt, celli)
-        {
-            if (dgdt[celli] > 0.0 && alpha1[celli] > 0.0)
-            {
-                Sp[celli] -= dgdt[celli]*alpha1[celli];
-                Su[celli] += dgdt[celli]*alpha1[celli];
-            }
-            else if (dgdt[celli] < 0.0 && alpha1[celli] < 1.0)
-            {
-                Sp[celli] += dgdt[celli]*(1.0 - alpha1[celli]);
-            }
-        }
-
+        #include "alphaSuSp.H"
 
         surfaceScalarField alphaPhi1
         (
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqnSubCycle.H
similarity index 83%
rename from applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
rename to applications/solvers/multiphase/compressibleInterFoam/alphaEqnSubCycle.H
index 89e5619150..54141d34a7 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/alphaEqnsSubCycle.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/alphaEqnSubCycle.H
@@ -1,8 +1,6 @@
 {
-    #include "alphaControls.H"
-
     surfaceScalarField phic(mag(phi/mesh.magSf()));
-    phic = min(interface.cAlpha()*phic, max(phic));
+    phic = min(mixture.cAlpha()*phic, max(phic));
 
     volScalarField divU(fvc::div(fvc::absolute(phi, U)));
 
@@ -27,7 +25,7 @@
             !(++alphaSubCycle).end();
         )
         {
-            #include "alphaEqns.H"
+            #include "alphaEqn.H"
             rhoPhiSum += (runTime.deltaT()/totalDeltaT)*rhoPhi;
         }
 
@@ -35,6 +33,6 @@
     }
     else
     {
-        #include "alphaEqns.H"
+        #include "alphaEqn.H"
     }
 }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H b/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H
new file mode 100644
index 0000000000..a1b383e89e
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H
@@ -0,0 +1,37 @@
+        volScalarField::Internal Sp
+        (
+            IOobject
+            (
+                "Sp",
+                runTime.timeName(),
+                mesh
+            ),
+            mesh,
+            dimensionedScalar("Sp", dgdt.dimensions(), 0.0)
+        );
+
+        volScalarField::Internal Su
+        (
+            IOobject
+            (
+                "Su",
+                runTime.timeName(),
+                mesh
+            ),
+            // Divergence term is handled explicitly to be
+            // consistent with the explicit transport solution
+            divU*min(alpha1, scalar(1))
+        );
+
+        forAll(dgdt, celli)
+        {
+            if (dgdt[celli] > 0.0 && alpha1[celli] > 0.0)
+            {
+                Sp[celli] -= dgdt[celli]*alpha1[celli];
+                Su[celli] += dgdt[celli]*alpha1[celli];
+            }
+            else if (dgdt[celli] < 0.0 && alpha1[celli] < 1.0)
+            {
+                Sp[celli] += dgdt[celli]*(1.0 - alpha1[celli]);
+            }
+        }
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
index cc7d5a2832..73e50e5ef6 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I.. \
+    -I../../interFoam \
     -I../twoPhaseMixtureThermo \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 157830ae6b..9f09b35184 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -41,13 +41,14 @@ Description
 #include "dynamicFvMesh.H"
 #include "MULES.H"
 #include "subCycle.H"
-#include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
 #include "twoPhaseMixtureThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
+#include "localEulerDdtScheme.H"
+#include "fvcSmooth.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -81,64 +82,67 @@ int main(int argc, char *argv[])
     {
         #include "readControls.H"
 
-        {
-            // Store divU from the previous mesh so that it can be mapped
-            // and used in correctPhi to ensure the corrected phi has the
-            // same divergence
-            volScalarField divU("divU0", fvc::div(fvc::absolute(phi, U)));
+        // Store divU from the previous mesh so that it can be mapped
+        // and used in correctPhi to ensure the corrected phi has the
+        // same divergence
+        volScalarField divU("divU0", fvc::div(fvc::absolute(phi, U)));
 
+        if (LTS)
+        {
+            #include "setRDeltaT.H"
+        }
+        else
+        {
             #include "CourantNo.H"
+            #include "alphaCourantNo.H"
             #include "setDeltaT.H"
-
-            runTime++;
-
-            Info<< "Time = " << runTime.timeName() << nl << endl;
-
-            scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
-
-            // Do any mesh changes
-            mesh.update();
-
-            if (mesh.changing())
-            {
-                Info<< "Execution time for mesh.update() = "
-                    << runTime.elapsedCpuTime() - timeBeforeMeshUpdate
-                    << " s" << endl;
-
-                gh = (g & mesh.C()) - ghRef;
-                ghf = (g & mesh.Cf()) - ghRef;
-            }
-
-            if (mesh.changing() && correctPhi)
-            {
-                // Calculate absolute flux from the mapped surface velocity
-                phi = mesh.Sf() & Uf;
-
-                #include "correctPhi.H"
-
-                // Make the fluxes relative to the mesh motion
-                fvc::makeRelative(phi, U);
-            }
         }
 
-        if (mesh.changing() && checkMeshCourantNo)
-        {
-            #include "meshCourantNo.H"
-        }
+        runTime++;
 
-        turbulence->correct();
+        Info<< "Time = " << runTime.timeName() << nl << endl;
 
         // --- Pressure-velocity PIMPLE corrector loop
         while (pimple.loop())
         {
-            #include "alphaEqnsSubCycle.H"
-
-            // correct interface on first PIMPLE corrector
-            if (pimple.corr() == 1)
+            if (pimple.firstIter() || moveMeshOuterCorrectors)
             {
-                interface.correct();
+                scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
+
+                mesh.update();
+
+                if (mesh.changing())
+                {
+                    Info<< "Execution time for mesh.update() = "
+                        << runTime.elapsedCpuTime() - timeBeforeMeshUpdate
+                        << " s" << endl;
+
+                    gh = (g & mesh.C()) - ghRef;
+                    ghf = (g & mesh.Cf()) - ghRef;
+                }
+
+                if (mesh.changing() && correctPhi)
+                {
+                    // Calculate absolute flux from the mapped surface velocity
+                    phi = mesh.Sf() & Uf;
+
+                    #include "correctPhi.H"
+
+                    // Make the fluxes relative to the mesh motion
+                    fvc::makeRelative(phi, U);
+
+                    mixture.correct();
+                }
+
+                if (mesh.changing() && checkMeshCourantNo)
+                {
+                    #include "meshCourantNo.H"
+                }
             }
 
+            #include "alphaControls.H"
+            #include "alphaEqnSubCycle.H"
+
             solve(fvm::ddt(rho) + fvc::div(rhoPhi));
 
             #include "UEqn.H"
@@ -149,14 +153,13 @@ int main(int argc, char *argv[])
             {
                 #include "pEqn.H"
             }
+
+            if (pimple.turbCorr())
+            {
+                turbulence->correct();
+            }
         }
 
-        rho = alpha1*rho1 + alpha2*rho2;
-
-        // Correct p_rgh for consistency with p and the updated densities
-        p_rgh = p - rho*gh;
-        p_rgh.correctBoundaryConditions();
-
         runTime.write();
 
         Info<< "ExecutionTime = "
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/createControls.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/createControls.H
index aed0e76956..f1930cdfc0 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/createControls.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/createControls.H
@@ -9,3 +9,8 @@ bool checkMeshCourantNo
 (
     pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
 );
+
+bool moveMeshOuterCorrectors
+(
+    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false)
+);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
index 661cb3a78e..d0dbfada56 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
@@ -12,7 +12,7 @@
     surfaceScalarField phig
     (
         (
-            interface.surfaceTensionForce()
+            mixture.surfaceTensionForce()
           - ghf*fvc::snGrad(rho)
         )*rAUf*mesh.magSf()
     );
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H
index ed2db49fb4..d82dcecb8a 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H
@@ -4,3 +4,6 @@ correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
 
 checkMeshCourantNo =
     pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
+
+moveMeshOuterCorrectors =
+    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 8775d0fbd3..bcc28de1bd 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -39,12 +39,13 @@ Description
 #include "MULES.H"
 #include "subCycle.H"
 #include "rhoThermo.H"
-#include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
 #include "twoPhaseMixtureThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
+#include "localEulerDdtScheme.H"
+#include "fvcSmooth.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -59,8 +60,6 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "createFields.H"
     #include "createFvOptions.H"
-    #include "CourantNo.H"
-    #include "setInitialDeltaT.H"
 
     volScalarField& p = mixture.p();
     volScalarField& T = mixture.T();
@@ -69,6 +68,13 @@ int main(int argc, char *argv[])
 
     turbulence->validate();
 
+    if (!LTS)
+    {
+        #include "readTimeControls.H"
+        #include "CourantNo.H"
+        #include "setInitialDeltaT.H"
+    }
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
@@ -76,8 +82,17 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readTimeControls.H"
-        #include "CourantNo.H"
-        #include "setDeltaT.H"
+
+        if (LTS)
+        {
+            #include "setRDeltaT.H"
+        }
+        else
+        {
+            #include "CourantNo.H"
+            #include "alphaCourantNo.H"
+            #include "setDeltaT.H"
+        }
 
         runTime++;
 
@@ -86,13 +101,8 @@ int main(int argc, char *argv[])
         // --- Pressure-velocity PIMPLE corrector loop
         while (pimple.loop())
         {
-            #include "alphaEqnsSubCycle.H"
-
-            // correct interface on first PIMPLE corrector
-            if (pimple.corr() == 1)
-            {
-                interface.correct();
-            }
+            #include "alphaControls.H"
+            #include "alphaEqnSubCycle.H"
 
             solve(fvm::ddt(rho) + fvc::div(rhoPhi));
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
index 9a49e504c6..7af8f15fe4 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "createRDeltaT.H"
+
 Info<< "Reading field p_rgh\n" << endl;
 volScalarField p_rgh
 (
@@ -29,7 +31,7 @@ volVectorField U
 #include "createPhi.H"
 
 Info<< "Constructing twoPhaseMixtureThermo\n" << endl;
-twoPhaseMixtureThermo mixture(mesh);
+twoPhaseMixtureThermo mixture(U, phi);
 
 volScalarField& alpha1(mixture.alpha1());
 volScalarField& alpha2(mixture.alpha2());
@@ -89,9 +91,6 @@ volScalarField dgdt
     pos(alpha2)*fvc::div(phi)/max(alpha2, scalar(0.0001))
 );
 
-// Construct interface from alpha1 distribution
-interfaceProperties interface(alpha1, U, mixture);
-
 // Construct compressible turbulence model
 autoPtr<compressible::turbulenceModel> turbulence
 (
diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index 1328b0abd9..a40a98fd0a 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -12,7 +12,7 @@
     surfaceScalarField phig
     (
         (
-            interface.surfaceTensionForce()
+            mixture.surfaceTensionForce()
           - ghf*fvc::snGrad(rho)
         )*rAUf*mesh.magSf()
     );
diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options
index ed39dee58b..aca6fad2c2 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
+    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
@@ -9,4 +10,5 @@ LIB_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -ltwoPhaseMixture \
+    -linterfaceProperties \
     -lfiniteVolume
diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
index c713498ef6..cfad517482 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,11 +40,13 @@ namespace Foam
 
 Foam::twoPhaseMixtureThermo::twoPhaseMixtureThermo
 (
-    const fvMesh& mesh
+    const volVectorField& U,
+    const surfaceScalarField& phi
 )
 :
-    psiThermo(mesh, word::null),
-    twoPhaseMixture(mesh, *this),
+    psiThermo(U.mesh(), word::null),
+    twoPhaseMixture(U.mesh(), *this),
+    interfaceProperties(alpha1(), U, *this),
     thermo1_(nullptr),
     thermo2_(nullptr)
 {
@@ -58,8 +60,8 @@ Foam::twoPhaseMixtureThermo::twoPhaseMixtureThermo
         T2.write();
     }
 
-    thermo1_ = rhoThermo::New(mesh, phase1Name());
-    thermo2_ = rhoThermo::New(mesh, phase2Name());
+    thermo1_ = rhoThermo::New(U.mesh(), phase1Name());
+    thermo2_ = rhoThermo::New(U.mesh(), phase2Name());
 
     thermo1_->validate(phase1Name(), "e");
     thermo2_->validate(phase2Name(), "e");
@@ -76,17 +78,23 @@ Foam::twoPhaseMixtureThermo::~twoPhaseMixtureThermo()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void Foam::twoPhaseMixtureThermo::correct()
+void Foam::twoPhaseMixtureThermo::correctThermo()
 {
     thermo1_->he() = thermo1_->he(p_, T_);
     thermo1_->correct();
 
     thermo2_->he() = thermo2_->he(p_, T_);
     thermo2_->correct();
+}
 
+
+void Foam::twoPhaseMixtureThermo::correct()
+{
     psi_ = alpha1()*thermo1_->psi() + alpha2()*thermo2_->psi();
     mu_ = alpha1()*thermo1_->mu() + alpha2()*thermo2_->mu();
     alpha_ = alpha1()*thermo1_->alpha() + alpha2()*thermo2_->alpha();
+
+    interfaceProperties::correct();
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
index 3cde04bb46..82b0ac90a2 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,6 +39,7 @@ SourceFiles
 #include "rhoThermo.H"
 #include "psiThermo.H"
 #include "twoPhaseMixture.H"
+#include "interfaceProperties.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,7 +53,8 @@ namespace Foam
 class twoPhaseMixtureThermo
 :
     public psiThermo,
-    public twoPhaseMixture
+    public twoPhaseMixture,
+    public interfaceProperties
 {
     // Private data
 
@@ -71,10 +73,11 @@ public:
 
     // Constructors
 
-        //- Construct from mesh
+        //- Construct from components
         twoPhaseMixtureThermo
         (
-            const fvMesh& mesh
+            const volVectorField& U,
+            const surfaceScalarField& phi
         );
 
 
@@ -104,7 +107,10 @@ public:
             return thermo2_();
         }
 
-        //- Update properties
+        //- Correct the thermodynamics of each phase
+        virtual void correctThermo();
+
+        //- Update mixture properties
         virtual void correct();
 
         //- Return true if the equation of state is incompressible

From b167c95f19d431a43097ed0f7804ec294180ab64 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 9 Feb 2017 17:31:57 +0000
Subject: [PATCH 19/40] compressibleInterFoam: Completed LTS and semi-implicit
 MULES support

Now the interFoam and compressibleInterFoam families of solvers use the same
alphaEqn formulation and supporting all of the MULES options without
code-duplication.

The semi-implicit MULES support allows running with significantly larger
time-steps but this does reduce the interface sharpness.
---
 .../{interFoam => VoF}/alphaCourantNo.H       |  2 +-
 .../multiphase/{interFoam => VoF}/alphaEqn.H  | 36 ++++++++-
 .../{interFoam => VoF}/alphaEqnSubCycle.H     |  0
 .../multiphase/{interFoam => VoF}/setDeltaT.H |  2 +-
 .../{interFoam => VoF}/setRDeltaT.H           |  0
 .../compressibleInterFoam/Make/options        |  2 +-
 .../multiphase/compressibleInterFoam/UEqn.H   |  4 +-
 .../compressibleInterFoam/alphaControls.H     |  5 --
 .../compressibleInterFoam/alphaEqn.H          | 51 ------------
 .../compressibleInterFoam/alphaEqnSubCycle.H  | 38 ---------
 .../compressibleInterFoam/alphaSuSp.H         | 76 +++++++++---------
 .../compressibleAlphaEqnSubCycle.H            |  3 +
 .../compressibleInterDyMFoam/Make/options     |  3 +-
 .../compressibleInterDyMFoam.C                |  8 +-
 .../compressibleInterDyMFoam/pEqn.H           |  3 +-
 .../compressibleInterFoam.C                   |  6 +-
 .../compressibleInterFoam/createFields.H      | 20 +++++
 .../multiphase/compressibleInterFoam/pEqn.H   |  3 +-
 .../multiphase/compressibleInterFoam/rhofs.H  |  2 +
 .../Make/options                              |  1 +
 .../solvers/multiphase/interFoam/Make/options |  1 +
 .../solvers/multiphase/interFoam/alphaSuSp.H  |  3 +
 .../interFoam/interDyMFoam/Make/options       |  1 +
 .../multiphase/interFoam/interDyMFoam/pEqn.H  |  2 +-
 .../interFoam/interMixingFoam/Make/options    |  1 +
 .../solvers/multiphase/interFoam/rhofs.H      |  2 +
 .../multiphaseInterFoam/Make/options          |  1 +
 .../multiphaseInterDyMFoam/Make/options       |  1 +
 .../twoLiquidMixingFoam/Make/options          |  2 +-
 .../fields/Fields/zeroField/zeroField.H       |  6 +-
 .../fields/Fields/zeroField/zeroFieldI.H      | 78 ++++++++++++++++++-
 .../geometricZeroField/geometricZeroField.H   |  6 +-
 .../geometricZeroField/geometricZeroFieldI.H  |  7 +-
 .../laminar/depthCharge2D/system/controlDict  | 11 ++-
 .../laminar/depthCharge2D/system/fvSolution   | 12 ++-
 .../laminar/depthCharge3D/system/controlDict  |  7 +-
 .../laminar/depthCharge3D/system/fvSolution   | 12 ++-
 37 files changed, 251 insertions(+), 167 deletions(-)
 rename applications/solvers/multiphase/{interFoam => VoF}/alphaCourantNo.H (96%)
 rename applications/solvers/multiphase/{interFoam => VoF}/alphaEqn.H (86%)
 rename applications/solvers/multiphase/{interFoam => VoF}/alphaEqnSubCycle.H (100%)
 rename applications/solvers/multiphase/{interFoam => VoF}/setDeltaT.H (95%)
 rename applications/solvers/multiphase/{interFoam => VoF}/setRDeltaT.H (100%)
 delete mode 100644 applications/solvers/multiphase/compressibleInterFoam/alphaControls.H
 delete mode 100644 applications/solvers/multiphase/compressibleInterFoam/alphaEqn.H
 delete mode 100644 applications/solvers/multiphase/compressibleInterFoam/alphaEqnSubCycle.H
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H
 create mode 100644 applications/solvers/multiphase/compressibleInterFoam/rhofs.H
 create mode 100644 applications/solvers/multiphase/interFoam/alphaSuSp.H
 create mode 100644 applications/solvers/multiphase/interFoam/rhofs.H

diff --git a/applications/solvers/multiphase/interFoam/alphaCourantNo.H b/applications/solvers/multiphase/VoF/alphaCourantNo.H
similarity index 96%
rename from applications/solvers/multiphase/interFoam/alphaCourantNo.H
rename to applications/solvers/multiphase/VoF/alphaCourantNo.H
index a084155c8a..24f6e48a22 100644
--- a/applications/solvers/multiphase/interFoam/alphaCourantNo.H
+++ b/applications/solvers/multiphase/VoF/alphaCourantNo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/VoF/alphaEqn.H
similarity index 86%
rename from applications/solvers/multiphase/interFoam/alphaEqn.H
rename to applications/solvers/multiphase/VoF/alphaEqn.H
index 312c1d6723..570442a304 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/VoF/alphaEqn.H
@@ -79,6 +79,8 @@
 
     if (MULESCorr)
     {
+        #include "alphaSuSp.H"
+
         fvScalarMatrix alpha1Eqn
         (
             (
@@ -92,6 +94,8 @@
                 phiCN,
                 upwind<scalar>(mesh, phiCN)
             ).fvmDiv(phiCN, alpha1)
+         ==
+            Su + fvm::Sp(Sp + divU, alpha1)
         );
 
         alpha1Eqn.solve();
@@ -124,6 +128,8 @@
 
     for (int aCorr=0; aCorr<nAlphaCorr; aCorr++)
     {
+        #include "alphaSuSp.H"
+
         surfaceScalarField phir(phic*mixture.nHatf());
 
         tmp<surfaceScalarField> talphaPhiUn
@@ -154,7 +160,17 @@
             tmp<surfaceScalarField> talphaPhiCorr(talphaPhiUn() - alphaPhi);
             volScalarField alpha10("alpha10", alpha1);
 
-            MULES::correct(alpha1, talphaPhiUn(), talphaPhiCorr.ref(), 1, 0);
+            MULES::correct
+            (
+                geometricOneField(),
+                alpha1,
+                talphaPhiUn(),
+                talphaPhiCorr.ref(),
+                Sp,
+                (-Sp*alpha1)(),
+                1,
+                0
+            );
 
             // Under-relax the correction for all but the 1st corrector
             if (aCorr == 0)
@@ -171,7 +187,17 @@
         {
             alphaPhi = talphaPhiUn;
 
-            MULES::explicitSolve(alpha1, phiCN, alphaPhi, 1, 0);
+            MULES::explicitSolve
+            (
+                geometricOneField(),
+                alpha1,
+                phiCN,
+                alphaPhi,
+                Sp,
+                (Su + divU*min(alpha1(), scalar(1)))(),
+                1,
+                0
+            );
         }
 
         alpha2 = 1.0 - alpha1;
@@ -195,7 +221,8 @@
      == fv::EulerDdtScheme<vector>::typeName
     )
     {
-        rhoPhi = alphaPhi*(rho1 - rho2) + phiCN*rho2;
+        #include "rhofs.H"
+        rhoPhi = alphaPhi*(rho1f - rho2f) + phiCN*rho2f;
     }
     else
     {
@@ -206,7 +233,8 @@
         }
 
         // Calculate the end-of-time-step mass flux
-        rhoPhi = alphaPhi*(rho1 - rho2) + phi*rho2;
+        #include "rhofs.H"
+        rhoPhi = alphaPhi*(rho1f - rho2f) + phi*rho2f;
     }
 
     Info<< "Phase-1 volume fraction = "
diff --git a/applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/VoF/alphaEqnSubCycle.H
similarity index 100%
rename from applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
rename to applications/solvers/multiphase/VoF/alphaEqnSubCycle.H
diff --git a/applications/solvers/multiphase/interFoam/setDeltaT.H b/applications/solvers/multiphase/VoF/setDeltaT.H
similarity index 95%
rename from applications/solvers/multiphase/interFoam/setDeltaT.H
rename to applications/solvers/multiphase/VoF/setDeltaT.H
index 9cc860c032..924d24c8ea 100644
--- a/applications/solvers/multiphase/interFoam/setDeltaT.H
+++ b/applications/solvers/multiphase/VoF/setDeltaT.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/interFoam/setRDeltaT.H b/applications/solvers/multiphase/VoF/setRDeltaT.H
similarity index 100%
rename from applications/solvers/multiphase/interFoam/setRDeltaT.H
rename to applications/solvers/multiphase/VoF/setRDeltaT.H
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options
index 27e73ef53a..b947836f65 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
     -I. \
-    -I../interFoam \
+    -I../VoF \
     -ItwoPhaseMixtureThermo \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/applications/solvers/multiphase/compressibleInterFoam/UEqn.H b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
index 2eaeaa25f4..b5e66ec33f 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H
@@ -1,7 +1,7 @@
     fvVectorMatrix UEqn
     (
-        fvm::ddt(rho, U)
-      + fvm::div(rhoPhi, U)
+        fvm::ddt(rho, U) + fvm::div(rhoPhi, U)
+      + MRF.DDt(rho, U)
       + turbulence->divDevRhoReff(U)
      ==
         fvOptions(rho, U)
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaControls.H b/applications/solvers/multiphase/compressibleInterFoam/alphaControls.H
deleted file mode 100644
index a99a0b39e2..0000000000
--- a/applications/solvers/multiphase/compressibleInterFoam/alphaControls.H
+++ /dev/null
@@ -1,5 +0,0 @@
-const dictionary& alphaControls = mesh.solverDict(alpha1.name());
-
-label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
-
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqn.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqn.H
deleted file mode 100644
index 8105650296..0000000000
--- a/applications/solvers/multiphase/compressibleInterFoam/alphaEqn.H
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    word alphaScheme("div(phi,alpha)");
-    word alpharScheme("div(phirb,alpha)");
-
-    surfaceScalarField phir(phic*mixture.nHatf());
-
-    for (int gCorr=0; gCorr<nAlphaCorr; gCorr++)
-    {
-        #include "alphaSuSp.H"
-
-        surfaceScalarField alphaPhi1
-        (
-            fvc::flux
-            (
-                phi,
-                alpha1,
-                alphaScheme
-            )
-          + fvc::flux
-            (
-                -fvc::flux(-phir, alpha2, alpharScheme),
-                alpha1,
-                alpharScheme
-            )
-        );
-
-        MULES::explicitSolve
-        (
-            geometricOneField(),
-            alpha1,
-            phi,
-            alphaPhi1,
-            Sp,
-            Su,
-            1,
-            0
-        );
-
-        surfaceScalarField rho1f(fvc::interpolate(rho1));
-        surfaceScalarField rho2f(fvc::interpolate(rho2));
-        rhoPhi = alphaPhi1*(rho1f - rho2f) + phi*rho2f;
-
-        alpha2 = scalar(1) - alpha1;
-    }
-
-    Info<< "Liquid phase volume fraction = "
-        << alpha1.weightedAverage(mesh.V()).value()
-        << "  Min(" << alpha1.name() << ") = " << min(alpha1).value()
-        << "  Min(" << alpha2.name() << ") = " << min(alpha2).value()
-        << endl;
-}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqnSubCycle.H
deleted file mode 100644
index 54141d34a7..0000000000
--- a/applications/solvers/multiphase/compressibleInterFoam/alphaEqnSubCycle.H
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    surfaceScalarField phic(mag(phi/mesh.magSf()));
-    phic = min(mixture.cAlpha()*phic, max(phic));
-
-    volScalarField divU(fvc::div(fvc::absolute(phi, U)));
-
-    if (nAlphaSubCycles > 1)
-    {
-        dimensionedScalar totalDeltaT = runTime.deltaT();
-        surfaceScalarField rhoPhiSum
-        (
-            IOobject
-            (
-                "rhoPhiSum",
-                runTime.timeName(),
-                mesh
-            ),
-            mesh,
-            dimensionedScalar("0", rhoPhi.dimensions(), 0)
-        );
-
-        for
-        (
-            subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
-            !(++alphaSubCycle).end();
-        )
-        {
-            #include "alphaEqn.H"
-            rhoPhiSum += (runTime.deltaT()/totalDeltaT)*rhoPhi;
-        }
-
-        rhoPhi = rhoPhiSum;
-    }
-    else
-    {
-        #include "alphaEqn.H"
-    }
-}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H b/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H
index a1b383e89e..81309cd091 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H
@@ -1,37 +1,43 @@
-        volScalarField::Internal Sp
-        (
-            IOobject
-            (
-                "Sp",
-                runTime.timeName(),
-                mesh
-            ),
-            mesh,
-            dimensionedScalar("Sp", dgdt.dimensions(), 0.0)
-        );
+volScalarField::Internal Sp
+(
+    IOobject
+    (
+        "Sp",
+        runTime.timeName(),
+        mesh
+    ),
+    mesh,
+    dimensionedScalar("Sp", dgdt.dimensions(), 0)
+);
 
-        volScalarField::Internal Su
-        (
-            IOobject
-            (
-                "Su",
-                runTime.timeName(),
-                mesh
-            ),
-            // Divergence term is handled explicitly to be
-            // consistent with the explicit transport solution
-            divU*min(alpha1, scalar(1))
-        );
+volScalarField::Internal Su
+(
+    IOobject
+    (
+        "Su",
+        runTime.timeName(),
+        mesh
+    ),
+    mesh,
+    dimensionedScalar("Su", dgdt.dimensions(), 0)
+);
 
-        forAll(dgdt, celli)
-        {
-            if (dgdt[celli] > 0.0 && alpha1[celli] > 0.0)
-            {
-                Sp[celli] -= dgdt[celli]*alpha1[celli];
-                Su[celli] += dgdt[celli]*alpha1[celli];
-            }
-            else if (dgdt[celli] < 0.0 && alpha1[celli] < 1.0)
-            {
-                Sp[celli] += dgdt[celli]*(1.0 - alpha1[celli]);
-            }
-        }
+forAll(dgdt, celli)
+{
+    if (dgdt[celli] > 0.0 && alpha1[celli] > 0.0)
+    {
+        Sp[celli] -= dgdt[celli]*alpha1[celli];
+        Su[celli] += dgdt[celli]*alpha1[celli];
+    }
+    else if (dgdt[celli] < 0.0 && alpha1[celli] < 1.0)
+    {
+        Sp[celli] += dgdt[celli]*(1.0 - alpha1[celli]);
+    }
+}
+
+volScalarField::Internal divU
+(
+    mesh.moving()
+  ? fvc::div(phiCN() + mesh.phi())
+  : fvc::div(phiCN())
+);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H
new file mode 100644
index 0000000000..f8d0a15836
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H
@@ -0,0 +1,3 @@
+{
+    #include "alphaEqnSubCycle.H"
+}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
index 73e50e5ef6..b44af44a72 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
+    -I. \
     -I.. \
-    -I../../interFoam \
+    -I../../VoF \
     -I../twoPhaseMixtureThermo \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 9f09b35184..f82665a49e 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -39,7 +39,10 @@ Description
 
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
-#include "MULES.H"
+#include "CMULES.H"
+#include "EulerDdtScheme.H"
+#include "localEulerDdtScheme.H"
+#include "CrankNicolsonDdtScheme.H"
 #include "subCycle.H"
 #include "twoPhaseMixture.H"
 #include "twoPhaseMixtureThermo.H"
@@ -47,7 +50,6 @@ Description
 #include "pimpleControl.H"
 #include "fvOptions.H"
 #include "CorrectPhi.H"
-#include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -141,7 +143,7 @@ int main(int argc, char *argv[])
             }
 
             #include "alphaControls.H"
-            #include "alphaEqnSubCycle.H"
+            #include "compressibleAlphaEqnSubCycle.H"
 
             solve(fvm::ddt(rho) + fvc::div(rhoPhi));
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
index d0dbfada56..7733f6a288 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H
@@ -8,6 +8,7 @@
         fvc::flux(HbyA)
       + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, Uf)
     );
+    MRF.makeRelative(phiHbyA);
 
     surfaceScalarField phig
     (
@@ -20,7 +21,7 @@
     phiHbyA += phig;
 
     // Update the pressure BCs to ensure flux consistency
-    constrainPressure(p_rgh, U, phiHbyA, rAUf);
+    constrainPressure(p_rgh, U, phiHbyA, rAUf, MRF);
 
     // Make the fluxes relative to the mesh motion
     fvc::makeRelative(phiHbyA, U);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index bcc28de1bd..f6ec5d20cd 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -36,7 +36,10 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "MULES.H"
+#include "CMULES.H"
+#include "EulerDdtScheme.H"
+#include "localEulerDdtScheme.H"
+#include "CrankNicolsonDdtScheme.H"
 #include "subCycle.H"
 #include "rhoThermo.H"
 #include "twoPhaseMixture.H"
@@ -44,7 +47,6 @@ Description
 #include "turbulentFluidThermoModel.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
-#include "localEulerDdtScheme.H"
 #include "fvcSmooth.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
index 7af8f15fe4..9bac4d8259 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -63,6 +63,7 @@ dimensionedScalar pMin
 );
 
 mesh.setFluxRequired(p_rgh.name());
+mesh.setFluxRequired(alpha1.name());
 
 
 #include "readGravitationalAcceleration.H"
@@ -99,3 +100,22 @@ autoPtr<compressible::turbulenceModel> turbulence
 
 Info<< "Creating field kinetic energy K\n" << endl;
 volScalarField K("K", 0.5*magSqr(U));
+
+// MULES flux from previous time-step
+surfaceScalarField alphaPhi
+(
+    IOobject
+    (
+        "alphaPhi",
+        runTime.timeName(),
+        mesh,
+        IOobject::READ_IF_PRESENT,
+        IOobject::AUTO_WRITE
+    ),
+    phi*fvc::interpolate(alpha1)
+);
+
+// MULES Correction
+tmp<surfaceScalarField> talphaPhiCorr0;
+
+#include "createMRF.H"
diff --git a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
index a40a98fd0a..51c58ba536 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -8,6 +8,7 @@
         fvc::flux(HbyA)
       + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, phi)
     );
+    MRF.makeRelative(phiHbyA);
 
     surfaceScalarField phig
     (
@@ -20,7 +21,7 @@
     phiHbyA += phig;
 
     // Update the pressure BCs to ensure flux consistency
-    constrainPressure(p_rgh, U, phiHbyA, rAUf);
+    constrainPressure(p_rgh, U, phiHbyA, rAUf, MRF);
 
     tmp<fvScalarMatrix> p_rghEqnComp1;
     tmp<fvScalarMatrix> p_rghEqnComp2;
diff --git a/applications/solvers/multiphase/compressibleInterFoam/rhofs.H b/applications/solvers/multiphase/compressibleInterFoam/rhofs.H
new file mode 100644
index 0000000000..67dc10f378
--- /dev/null
+++ b/applications/solvers/multiphase/compressibleInterFoam/rhofs.H
@@ -0,0 +1,2 @@
+surfaceScalarField rho1f(fvc::interpolate(rho1));
+surfaceScalarField rho2f(fvc::interpolate(rho2));
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
index f3010e0e57..9df3add9e2 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I. \
+    -I../VoF \
     -I../interFoam \
     -ImultiphaseMixtureThermo/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
diff --git a/applications/solvers/multiphase/interFoam/Make/options b/applications/solvers/multiphase/interFoam/Make/options
index cfe4a92072..7f2fed1d16 100644
--- a/applications/solvers/multiphase/interFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I../VoF \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
diff --git a/applications/solvers/multiphase/interFoam/alphaSuSp.H b/applications/solvers/multiphase/interFoam/alphaSuSp.H
new file mode 100644
index 0000000000..0b8e05e187
--- /dev/null
+++ b/applications/solvers/multiphase/interFoam/alphaSuSp.H
@@ -0,0 +1,3 @@
+zeroField Su;
+zeroField Sp;
+zeroField divU;
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
index bceea20c81..3d028feaf7 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
     -I. \
     -I.. \
+    -I../../VoF \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
index 2c7df14ae7..aafc10bcc4 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H
@@ -28,7 +28,7 @@
     phiHbyA += phig;
 
     // Update the pressure BCs to ensure flux consistency
-    constrainPressure(p_rgh, U, phiHbyA, rAUf);
+    constrainPressure(p_rgh, U, phiHbyA, rAUf, MRF);
 
     while (pimple.correctNonOrthogonal())
     {
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
index ce7222ff1b..a07545b216 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
     -I. \
     -I.. \
+    -I../../VoF \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -IimmiscibleIncompressibleThreePhaseMixture \
     -IincompressibleThreePhaseMixture \
diff --git a/applications/solvers/multiphase/interFoam/rhofs.H b/applications/solvers/multiphase/interFoam/rhofs.H
new file mode 100644
index 0000000000..5949bf1e0a
--- /dev/null
+++ b/applications/solvers/multiphase/interFoam/rhofs.H
@@ -0,0 +1,2 @@
+const dimensionedScalar& rho1f(rho1);
+const dimensionedScalar& rho2f(rho2);
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
index 99850d69be..576e7aa224 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I. \
+    -I../VoF \
     -I../interFoam \
     -ImultiphaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels \
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options
index 1a210c20e6..b7d051f1ca 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I.. \
+    -I../../VoF \
     -I../../interFoam/interDyMFoam \
     -I../../interFoam \
     -I../multiphaseMixture/lnInclude \
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
index 4dfc63419d..e9549744ce 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
     -I. \
-    -I../interFoam \
+    -I../VoF \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
diff --git a/src/OpenFOAM/fields/Fields/zeroField/zeroField.H b/src/OpenFOAM/fields/Fields/zeroField/zeroField.H
index f8e53959e6..15f25f504d 100644
--- a/src/OpenFOAM/fields/Fields/zeroField/zeroField.H
+++ b/src/OpenFOAM/fields/Fields/zeroField/zeroField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,6 +66,10 @@ public:
         inline scalar operator[](const label) const;
 
         inline zeroField field() const;
+
+        inline zeroField operator()() const;
+
+        inline zeroField operator-() const;
 };
 
 
diff --git a/src/OpenFOAM/fields/Fields/zeroField/zeroFieldI.H b/src/OpenFOAM/fields/Fields/zeroField/zeroFieldI.H
index fb63a48bf9..59287815fd 100644
--- a/src/OpenFOAM/fields/Fields/zeroField/zeroFieldI.H
+++ b/src/OpenFOAM/fields/Fields/zeroField/zeroFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,4 +39,80 @@ inline Foam::zeroField Foam::zeroField::field() const
 }
 
 
+inline Foam::zeroField Foam::zeroField::operator()() const
+{
+    return zeroField();
+}
+
+
+inline Foam::zeroField Foam::zeroField::operator-() const
+{
+    return zeroField();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+inline const zeroField operator+(const zeroField&, const zeroField&)
+{
+    return zeroField();
+}
+
+template<class Type>
+inline const Type& operator+(const Type& t, const zeroField&)
+{
+    return t;
+}
+
+template<class Type>
+inline const Type& operator+(const zeroField&, const Type& t)
+{
+    return t;
+}
+
+inline const zeroField operator-(const zeroField&, const zeroField&)
+{
+    return zeroField();
+}
+
+template<class Type>
+inline const Type& operator-(const Type& t, const zeroField&)
+{
+    return t;
+}
+
+template<class Type>
+inline Type operator-(const zeroField&, const Type& t)
+{
+    return -t;
+}
+
+template<class Type>
+inline zeroField operator*(const Type& t, const zeroField&)
+{
+    return zeroField();
+}
+
+template<class Type>
+inline zeroField operator*(const zeroField&, const Type& t)
+{
+    return zeroField();
+}
+
+template<class Type>
+inline zeroField operator/(const zeroField&, const Type& t)
+{
+    return zeroField();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H
index 0eb7c87235..2a9b4fe591 100644
--- a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H
+++ b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,6 +72,8 @@ public:
 
         inline zeroField field() const;
 
+        inline zeroField operator()() const;
+
         inline zeroField oldTime() const;
 
         inline zeroFieldField boundaryField() const;
@@ -84,7 +86,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    #include "geometricZeroFieldI.H"
+#include "geometricZeroFieldI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H
index d6188702d5..ca5d89f3f0 100644
--- a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H
+++ b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,11 @@ inline Foam::zeroField Foam::geometricZeroField::field() const
     return zeroField();
 }
 
+inline Foam::zeroField Foam::geometricZeroField::operator()() const
+{
+    return zeroField();
+}
+
 inline Foam::zeroField Foam::geometricZeroField::oldTime() const
 {
     return zeroField();
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
index c1d09089d0..dc0b7630a1 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
@@ -29,15 +29,15 @@ deltaT          0.0001;
 
 writeControl    adjustableRunTime;
 
-writeInterval   0.005;
+writeInterval   0.01;
 
 purgeWrite      0;
 
-writeFormat     ascii;
+writeFormat     binary;
 
 writePrecision  8;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -47,10 +47,9 @@ runTimeModifiable yes;
 
 adjustTimeStep  yes;
 
-maxCo           0.25;
-
+maxCo           0.5;
+maxAlphaCo      0.5;
 maxDeltaT       1;
-maxAlphaCo      1;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
index 7c97abb05a..041112222d 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution
@@ -17,11 +17,19 @@ FoamFile
 
 solvers
 {
-    alpha.water
+    "alpha.water.*"
     {
         nAlphaCorr      1;
-        nAlphaSubCycles 1;
+        nAlphaSubCycles 2;
         cAlpha          1;
+
+        MULESCorr       no;
+        nLimiterIter    5;
+
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
     }
 
     ".*(rho|rhoFinal)"
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
index bb61973589..a049876aa2 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
@@ -29,7 +29,7 @@ deltaT          0.0001;
 
 writeControl    adjustableRunTime;
 
-writeInterval   0.005;
+writeInterval   0.01;
 
 purgeWrite      0;
 
@@ -47,10 +47,9 @@ runTimeModifiable yes;
 
 adjustTimeStep  yes;
 
-maxCo           0.25;
-
+maxCo           0.5;
+maxAlphaCo      0.5;
 maxDeltaT       1;
-maxAlphaCo      1;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
index f75504c675..dac0efd3b8 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution
@@ -17,11 +17,19 @@ FoamFile
 
 solvers
 {
-    alpha.water
+    "alpha.water.*"
     {
         nAlphaCorr      1;
-        nAlphaSubCycles 1;
+        nAlphaSubCycles 2;
         cAlpha          1;
+
+        MULESCorr       no;
+        nLimiterIter    5;
+
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
     }
 
     pcorr

From dd8b8bceac6d0c83bfa0fa486c8846d20c711159 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 9 Feb 2017 17:47:56 +0000
Subject: [PATCH 20/40] csvSetWriter: Corrected axis header

Resolves bug-report https://bugs.openfoam.org/view.php?id=2455
---
 src/OpenFOAM/primitives/strings/word/wordI.H    |  5 +----
 .../sampledSetWriters/csv/csvSetWriter.C        | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/OpenFOAM/primitives/strings/word/wordI.H b/src/OpenFOAM/primitives/strings/word/wordI.H
index 587adfac99..7873387a3b 100644
--- a/src/OpenFOAM/primitives/strings/word/wordI.H
+++ b/src/OpenFOAM/primitives/strings/word/wordI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,8 +25,6 @@ License
 
 #include <cctype>
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 inline void Foam::word::stripInvalid()
@@ -175,6 +173,5 @@ inline Foam::word Foam::operator&(const word& a, const word& b)
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // ************************************************************************* //
diff --git a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
index 8d69d32cb3..e87fb0338c 100644
--- a/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
+++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,7 +147,7 @@ namespace Foam
 
         os << nl;
     }
-} // end namespace
+}
 
 
 template<class Type>
@@ -183,17 +183,24 @@ void Foam::csvSetWriter<Type>::writeCoordHeader
     Ostream& os
 ) const
 {
+    const word axisName(points.axis());
+
     if (points.hasVectorAxis())
     {
-        forAll(points, i)
+        for
+        (
+            word::const_iterator iter = axisName.begin();
+            iter != axisName.end();
+            ++iter
+        )
         {
-            os << points.axis()[i];
+            os << *iter;
             writeSeparator(os);
         }
     }
     else
     {
-        os << points.axis();
+        os << axisName;
         writeSeparator(os);
     }
 }

From ae9522f01751a307da78842b87b7bb59a28b195d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 12 Feb 2017 17:19:27 +0000
Subject: [PATCH 21/40] functionObjects::scalarTransport: Added support for
 optional laminar and turbulent diffusion coefficients

Description
    Evolves a passive scalar transport equation.

    - To specify the field name set the \c field entry
    - To employ the same numerical schemes as another field set
      the \c schemesField entry,
    - A constant diffusivity may be specified with the \c D entry,

    - Alternatively if a turbulence model is available a turbulent diffusivity
      may be constructed from the laminar and turbulent viscosities using the
      optional diffusivity coefficients \c alphaD and \c alphaDt (which default
      to 1):
      \verbatim
          D = alphaD*nu + alphaDt*nut
      \endverbatim

Resolves feature request https://bugs.openfoam.org/view.php?id=2453
---
 .../solvers/scalarTransport/scalarTransport.C | 12 ++++------
 .../solvers/scalarTransport/scalarTransport.H | 23 +++++++++++++++----
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
index 954a5d6e4d..bcb02d7ec4 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
@@ -89,7 +89,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
             turbulenceModel::propertiesName
         );
 
-        return model.nuEff();
+        return alphaD_*model.nu() + alphaDt_*model.nut();
     }
     else if (mesh_.foundObject<cmpModel>(turbulenceModel::propertiesName))
     {
@@ -98,7 +98,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
             turbulenceModel::propertiesName
         );
 
-        return model.muEff();
+        return alphaD_*model.mu() + alphaDt_*model.mut();
     }
     else
     {
@@ -169,11 +169,9 @@ bool Foam::functionObjects::scalarTransport::read(const dictionary& dict)
     rhoName_ = dict.lookupOrDefault<word>("rho", "rho");
     schemesField_ = dict.lookupOrDefault<word>("schemesField", fieldName_);
 
-    constantD_ = false;
-    if (dict.readIfPresent("D", D_))
-    {
-        constantD_ = true;
-    }
+    constantD_ = dict.readIfPresent("D", D_);
+    alphaD_ = dict.lookupOrDefault("alphat", 1.0);
+    alphaDt_ = dict.lookupOrDefault("alphaDt", 1.0);
 
     dict.readIfPresent("nCorr", nCorr_);
 
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.H b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
index 86c92bdee7..8d056cbe3a 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.H
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,11 +30,18 @@ Group
 Description
     Evolves a passive scalar transport equation.
 
-    - To specify the field name set the 'field' entry
+    - To specify the field name set the \c field entry
     - To employ the same numerical schemes as another field set
-      the 'schemesField' entry,
-    - The diffusivity can be set manually using the 'D' entry, or retrieved
-      from the turbulence model (if applicable).
+      the \c schemesField entry,
+    - A constant diffusivity may be specified with the \c D entry,
+
+    - Alternatively if a turbulence model is available a turbulent diffusivity
+      may be constructed from the laminar and turbulent viscosities using the
+      optional diffusivity coefficients \c alphaD and \c alphaDt (which default
+      to 1):
+      \verbatim
+          D = alphaD*nu + alphaDt*nut
+      \endverbatim
 
 See also
     Foam::functionObjects::fvMeshFunctionObject
@@ -83,6 +90,12 @@ class scalarTransport
         //- Flag to indicate whether a constant, uniform D_ is specified
         bool constantD_;
 
+        //- Laminar diffusion coefficient (optional)
+        scalar alphaD_;
+
+        //- Turbulent diffusion coefficient (optional)
+        scalar alphaDt_;
+
         //- Number of corrector iterations (optional)
         label nCorr_;
 

From 2f5185a048787b2b9ca58902c27ced80e9aa177d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 13 Feb 2017 18:25:33 +0000
Subject: [PATCH 22/40] functionObjects::scalarTransport: Corrected typo

---
 src/functionObjects/solvers/scalarTransport/scalarTransport.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
index bcb02d7ec4..a0d14dda4a 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
@@ -170,7 +170,7 @@ bool Foam::functionObjects::scalarTransport::read(const dictionary& dict)
     schemesField_ = dict.lookupOrDefault<word>("schemesField", fieldName_);
 
     constantD_ = dict.readIfPresent("D", D_);
-    alphaD_ = dict.lookupOrDefault("alphat", 1.0);
+    alphaD_ = dict.lookupOrDefault("alphaD", 1.0);
     alphaDt_ = dict.lookupOrDefault("alphaDt", 1.0);
 
     dict.readIfPresent("nCorr", nCorr_);

From c52e4b58a17f05e98183422b8c6faa7b54241362 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 17 Feb 2017 11:22:14 +0000
Subject: [PATCH 23/40] thermophysicalModels: Changed specie thermodynamics
 from mole to mass basis

The fundamental properties provided by the specie class hierarchy were
mole-based, i.e. provide the properties per mole whereas the fundamental
properties provided by the liquidProperties and solidProperties classes are
mass-based, i.e. per unit mass.  This inconsistency made it impossible to
instantiate the thermodynamics packages (rhoThermo, psiThermo) used by the FV
transport solvers on liquidProperties.  In order to combine VoF with film and/or
Lagrangian models it is essential that the physical propertied of the three
representations of the liquid are consistent which means that it is necessary to
instantiate the thermodynamics packages on liquidProperties.  This requires
either liquidProperties to be rewritten mole-based or the specie classes to be
rewritten mass-based.  Given that most of OpenFOAM solvers operate
mass-based (solve for mass-fractions and provide mass-fractions to sub-models it
is more consistent and efficient if the low-level thermodynamics is also
mass-based.

This commit includes all of the changes necessary for all of the thermodynamics
in OpenFOAM to operate mass-based and supports the instantiation of
thermodynamics packages on liquidProperties.

Note that most users, developers and contributors to OpenFOAM will not notice
any difference in the operation of the code except that the confusing

    nMoles     1;

entries in the thermophysicalProperties files are no longer needed or used and
have been removed in this commet.  The only substantial change to the internals
is that species thermodynamics are now "mixed" with mass rather than mole
fractions.  This is more convenient except for defining reaction equilibrium
thermodynamics for which the molar rather than mass composition is usually know.
The consequence of this can be seen in the adiabaticFlameT, equilibriumCO and
equilibriumFlameT utilities in which the species thermodynamics are
pre-multiplied by their molecular mass to effectively convert them to mole-basis
to simplify the definition of the reaction equilibrium thermodynamics, e.g. in
equilibriumCO

    // Reactants (mole-based)
    thermo FUEL(thermoData.subDict(fuelName)); FUEL *= FUEL.W();

    // Oxidant (mole-based)
    thermo O2(thermoData.subDict("O2")); O2 *= O2.W();
    thermo N2(thermoData.subDict("N2")); N2 *= N2.W();

    // Intermediates (mole-based)
    thermo H2(thermoData.subDict("H2")); H2 *= H2.W();

    // Products (mole-based)
    thermo CO2(thermoData.subDict("CO2")); CO2 *= CO2.W();
    thermo H2O(thermoData.subDict("H2O")); H2O *= H2O.W();
    thermo CO(thermoData.subDict("CO")); CO *= CO.W();

    // Product dissociation reactions

    thermo CO2BreakUp
    (
        CO2 == CO + 0.5*O2
    );

    thermo H2OBreakUp
    (
        H2O == H2 + 0.5*O2
    );

Please report any problems with this substantial but necessary rewrite of the
thermodynamic at https://bugs.openfoam.org

Henry G. Weller
CFD Direct Ltd.
---
 .../solvers/combustion/fireFoam/Make/options  |    3 -
 .../rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H  |   26 -
 .../rhoPorousSimpleFoam/createFields.H        |   11 +
 .../rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H  |    2 +
 .../lagrangian/coalChemistryFoam/Make/options |    4 -
 .../reactingParcelFilmFoam/Make/options       |    3 -
 .../reactingParcelFoam/Make/options           |    4 -
 .../simpleReactingParcelFoam/Make/options     |    4 -
 .../solvers/lagrangian/sprayFoam/Make/options |    4 -
 .../sprayFoam/sprayDyMFoam/Make/options       |    4 -
 .../sprayFoam/sprayEngineFoam/Make/options    |    4 -
 .../interfacialCompositionModels/Make/options |    2 -
 applications/test/thermoMixture/thermoDict    |    2 -
 .../miscellaneous/foamList/Make/options       |    2 -
 .../adiabaticFlameT/adiabaticFlameT.C         |   82 +-
 .../equilibriumCO/equilibriumCO.C             |   52 +-
 .../equilibriumFlameT/equilibriumFlameT.C     |   29 +-
 .../constant/thermophysicalProperties         |    1 -
 etc/thermoData/thermoData                     | 2332 -----------------
 .../thermalBaffle1DFvPatchScalarField.H       |    3 +-
 src/lagrangian/coalCombustion/Make/options    |    4 -
 src/lagrangian/intermediate/Make/options      |    4 -
 src/lagrangian/spray/Make/options             |    4 -
 src/lagrangian/turbulence/Make/options        |    4 -
 src/regionModels/regionCoupling/Make/options  |    2 -
 .../surfaceFilmModels/Make/options            |    4 -
 .../wallFunctions/Make/options                |    4 -
 .../liquidFilmThermo/liquidFilmThermo.C       |    4 +-
 .../thermalBaffleFvPatchScalarField.H         |    3 +-
 .../SLGThermo/Make/options                    |    2 -
 .../basic/heThermo/heThermo.C                 |   40 +-
 src/thermophysicalModels/properties/Allwmake  |    2 -
 .../liquidMixtureProperties/Make/files        |    3 -
 .../liquidMixtureProperties/Make/options      |   10 -
 .../properties/liquidProperties/Ar/Ar.C       |   22 +-
 .../properties/liquidProperties/Ar/Ar.H       |   14 +-
 .../properties/liquidProperties/Ar/ArI.H      |   10 +-
 .../liquidProperties/C10H22/C10H22.C          |   22 +-
 .../liquidProperties/C10H22/C10H22.H          |   14 +-
 .../liquidProperties/C10H22/C10H22I.H         |   10 +-
 .../liquidProperties/C12H26/C12H26.C          |   22 +-
 .../liquidProperties/C12H26/C12H26.H          |   14 +-
 .../liquidProperties/C12H26/C12H26I.H         |   10 +-
 .../liquidProperties/C13H28/C13H28.C          |   22 +-
 .../liquidProperties/C13H28/C13H28.H          |   14 +-
 .../liquidProperties/C13H28/C13H28I.H         |   10 +-
 .../liquidProperties/C14H30/C14H30.C          |   22 +-
 .../liquidProperties/C14H30/C14H30.H          |   14 +-
 .../liquidProperties/C14H30/C14H30I.H         |   10 +-
 .../liquidProperties/C16H34/C16H34.C          |   22 +-
 .../liquidProperties/C16H34/C16H34.H          |   14 +-
 .../liquidProperties/C16H34/C16H34I.H         |   10 +-
 .../liquidProperties/C2H5OH/C2H5OH.C          |   22 +-
 .../liquidProperties/C2H5OH/C2H5OH.H          |   14 +-
 .../liquidProperties/C2H5OH/C2H5OHI.H         |   10 +-
 .../properties/liquidProperties/C2H6/C2H6.C   |   22 +-
 .../properties/liquidProperties/C2H6/C2H6.H   |   14 +-
 .../properties/liquidProperties/C2H6/C2H6I.H  |   10 +-
 .../properties/liquidProperties/C2H6O/C2H6O.C |   22 +-
 .../properties/liquidProperties/C2H6O/C2H6O.H |   14 +-
 .../liquidProperties/C2H6O/C2H6OI.H           |   10 +-
 .../properties/liquidProperties/C3H6O/C3H6O.C |   22 +-
 .../properties/liquidProperties/C3H6O/C3H6O.H |   14 +-
 .../liquidProperties/C3H6O/C3H6OI.H           |   10 +-
 .../properties/liquidProperties/C3H8/C3H8.C   |   22 +-
 .../properties/liquidProperties/C3H8/C3H8.H   |   14 +-
 .../properties/liquidProperties/C3H8/C3H8I.H  |   10 +-
 .../liquidProperties/C4H10O/C4H10O.C          |   22 +-
 .../liquidProperties/C4H10O/C4H10O.H          |   14 +-
 .../liquidProperties/C4H10O/C4H10OI.H         |   10 +-
 .../properties/liquidProperties/C6H14/C6H14.C |   22 +-
 .../properties/liquidProperties/C6H14/C6H14.H |   14 +-
 .../liquidProperties/C6H14/C6H14I.H           |   10 +-
 .../properties/liquidProperties/C6H6/C6H6.C   |   22 +-
 .../properties/liquidProperties/C6H6/C6H6.H   |   14 +-
 .../properties/liquidProperties/C6H6/C6H6I.H  |   10 +-
 .../properties/liquidProperties/C7H16/C7H16.C |   22 +-
 .../properties/liquidProperties/C7H16/C7H16.H |   14 +-
 .../liquidProperties/C7H16/C7H16I.H           |   10 +-
 .../properties/liquidProperties/C7H8/C7H8.C   |   22 +-
 .../properties/liquidProperties/C7H8/C7H8.H   |   14 +-
 .../properties/liquidProperties/C7H8/C7H8I.H  |   10 +-
 .../properties/liquidProperties/C8H10/C8H10.C |   22 +-
 .../properties/liquidProperties/C8H10/C8H10.H |   14 +-
 .../liquidProperties/C8H10/C8H10I.H           |   10 +-
 .../properties/liquidProperties/C8H18/C8H18.C |   22 +-
 .../properties/liquidProperties/C8H18/C8H18.H |   14 +-
 .../liquidProperties/C8H18/C8H18I.H           |   10 +-
 .../properties/liquidProperties/C9H20/C9H20.C |   22 +-
 .../properties/liquidProperties/C9H20/C9H20.H |   14 +-
 .../liquidProperties/C9H20/C9H20I.H           |   10 +-
 .../properties/liquidProperties/CH3OH/CH3OH.C |   22 +-
 .../properties/liquidProperties/CH3OH/CH3OH.H |   14 +-
 .../liquidProperties/CH3OH/CH3OHI.H           |   10 +-
 .../liquidProperties/CH4N2O/CH4N2O.C          |   22 +-
 .../liquidProperties/CH4N2O/CH4N2O.H          |   14 +-
 .../liquidProperties/CH4N2O/CH4N2OI.H         |    8 +-
 .../properties/liquidProperties/H2O/H2O.C     |   50 +-
 .../properties/liquidProperties/H2O/H2O.H     |   14 +-
 .../properties/liquidProperties/H2O/H2OI.H    |   10 +-
 .../liquidProperties/IC8H18/IC8H18.C          |   22 +-
 .../liquidProperties/IC8H18/IC8H18.H          |   14 +-
 .../liquidProperties/IC8H18/IC8H18I.H         |   10 +-
 .../properties/liquidProperties/IDEA/IDEA.C   |   22 +-
 .../properties/liquidProperties/IDEA/IDEA.H   |   14 +-
 .../properties/liquidProperties/IDEA/IDEAI.H  |   10 +-
 .../properties/liquidProperties/MB/MB.C       |   22 +-
 .../properties/liquidProperties/MB/MB.H       |   14 +-
 .../properties/liquidProperties/MB/MBI.H      |   10 +-
 .../properties/liquidProperties/Make/files    |    2 +
 .../properties/liquidProperties/Make/options  |    2 +
 .../properties/liquidProperties/N2/N2.C       |   22 +-
 .../properties/liquidProperties/N2/N2.H       |   14 +-
 .../properties/liquidProperties/N2/N2I.H      |   10 +-
 .../liquidProperties/aC10H7CH3/aC10H7CH3.C    |   22 +-
 .../liquidProperties/aC10H7CH3/aC10H7CH3.H    |   14 +-
 .../liquidProperties/aC10H7CH3/aC10H7CH3I.H   |   10 +-
 .../liquidProperties/bC10H7CH3/bC10H7CH3.C    |   22 +-
 .../liquidProperties/bC10H7CH3/bC10H7CH3.H    |   14 +-
 .../liquidProperties/bC10H7CH3/bC10H7CH3I.H   |   10 +-
 .../liquidProperties/iC3H8O/iC3H8O.C          |   22 +-
 .../liquidProperties/iC3H8O/iC3H8O.H          |   12 +-
 .../liquidProperties/iC3H8O/iC3H8OI.H         |    8 +-
 .../liquidMixtureProperties.C                 |    8 +-
 .../liquidMixtureProperties.H                 |    4 +-
 .../liquidProperties/liquidProperties.C       |   50 +-
 .../liquidProperties/liquidProperties.H       |   64 +-
 .../liquidProperties/liquidPropertiesI.H      |   50 +-
 .../liquidProperties/nC3H8O/nC3H8O.C          |   22 +-
 .../liquidProperties/nC3H8O/nC3H8O.H          |   12 +-
 .../liquidProperties/nC3H8O/nC3H8OI.H         |    8 +-
 .../solidMixtureProperties/Make/files         |    3 -
 .../solidMixtureProperties/Make/options       |    3 -
 .../properties/solidProperties/Make/files     |    1 +
 .../solidMixtureProperties.C                  |    2 +-
 .../solidMixtureProperties.H                  |    2 +-
 .../solidProperties/solidProperties.C         |   12 +-
 .../solidProperties/solidProperties.H         |    6 +-
 .../solidProperties/solidPropertiesI.H        |    6 +-
 .../radiation/Make/options                    |    4 -
 .../chemkinReader/chemkinLexer.L              |    9 +-
 .../mixtures/SpecieMixture/SpecieMixture.C    |   12 +-
 .../mixtures/SpecieMixture/SpecieMixture.H    |    5 +-
 .../basicSpecieMixture/basicSpecieMixture.H   |    5 +-
 .../mixtures/egrMixture/egrMixture.C          |    8 +-
 .../homogeneousMixture/homogeneousMixture.C   |    6 +-
 .../inhomogeneousMixture.C                    |    8 +-
 .../multiComponentMixture.C                   |   14 +-
 .../veryInhomogeneousMixture.C                |    8 +-
 .../psiuReactionThermo/psiuReactionThermos.C  |   15 +-
 .../rhoReactionThermo/rhoReactionThermos.C    |    6 +-
 .../const/constAnIsoSolidTransport.H          |    6 +-
 .../const/constAnIsoSolidTransportI.H         |   25 +-
 .../transport/const/constIsoSolidTransport.H  |    3 +-
 .../transport/const/constIsoSolidTransportI.H |   26 +-
 .../exponential/exponentialSolidTransport.H   |    3 +-
 .../exponential/exponentialSolidTransportI.H  |   31 +-
 .../polynomial/polynomialSolidTransport.H     |   29 +-
 .../polynomial/polynomialSolidTransportI.H    |   67 +-
 .../equationOfState/Boussinesq/Boussinesq.C   |    2 +-
 .../equationOfState/Boussinesq/Boussinesq.H   |   33 +-
 .../equationOfState/Boussinesq/BoussinesqI.H  |  107 +-
 .../PengRobinsonGas/PengRobinsonGas.C         |    2 +-
 .../PengRobinsonGas/PengRobinsonGas.H         |   35 +-
 .../PengRobinsonGas/PengRobinsonGasI.H        |  281 +-
 .../adiabaticPerfectFluid.C                   |    2 +-
 .../adiabaticPerfectFluid.H                   |   35 +-
 .../adiabaticPerfectFluidI.H                  |  123 +-
 .../icoPolynomial/icoPolynomial.C             |   14 +-
 .../icoPolynomial/icoPolynomial.H             |   33 +-
 .../icoPolynomial/icoPolynomialI.H            |  101 +-
 .../incompressiblePerfectGas.C                |    2 +-
 .../incompressiblePerfectGas.H                |   33 +-
 .../incompressiblePerfectGasI.H               |   93 +-
 .../specie/equationOfState/linear/linear.C    |    2 +-
 .../specie/equationOfState/linear/linear.H    |   33 +-
 .../specie/equationOfState/linear/linearI.H   |  107 +-
 .../perfectFluid/perfectFluid.C               |    2 +-
 .../perfectFluid/perfectFluid.H               |   33 +-
 .../perfectFluid/perfectFluidI.H              |  109 +-
 .../equationOfState/perfectGas/perfectGas.C   |    2 +-
 .../equationOfState/perfectGas/perfectGas.H   |   33 +-
 .../equationOfState/perfectGas/perfectGasI.H  |   44 +-
 .../equationOfState/rhoConst/rhoConst.H       |   33 +-
 .../equationOfState/rhoConst/rhoConstI.H      |   96 +-
 .../reaction/Reactions/Reaction/Reaction.C    |   46 +-
 .../specie/specie/specie.C                    |   13 +-
 .../specie/specie/specie.H                    |   18 +-
 .../specie/specie/specieI.H                   |   98 +-
 .../absoluteEnthalpy/absoluteEnthalpy.H       |   26 +-
 .../absoluteInternalEnergy.H                  |   27 +-
 .../specie/thermo/eConst/eConstThermo.C       |   16 +-
 .../specie/thermo/eConst/eConstThermo.H       |   38 +-
 .../specie/thermo/eConst/eConstThermoI.H      |  116 +-
 .../specie/thermo/hConst/hConstThermo.C       |   16 +-
 .../specie/thermo/hConst/hConstThermo.H       |   36 +-
 .../specie/thermo/hConst/hConstThermoI.H      |  118 +-
 .../thermo/hPolynomial/hPolynomialThermo.C    |   22 +-
 .../thermo/hPolynomial/hPolynomialThermo.H    |   36 +-
 .../thermo/hPolynomial/hPolynomialThermoI.H   |  140 +-
 .../specie/thermo/hPower/hPowerThermo.C       |   10 +-
 .../specie/thermo/hPower/hPowerThermo.H       |   30 +-
 .../specie/thermo/hPower/hPowerThermoI.H      |  141 +-
 .../specie/thermo/hRefConst/hRefConstThermo.C |   22 +-
 .../specie/thermo/hRefConst/hRefConstThermo.H |   36 +-
 .../thermo/hRefConst/hRefConstThermoI.H       |  128 +-
 .../specie/thermo/janaf/janafThermo.C         |   51 +-
 .../specie/thermo/janaf/janafThermo.H         |   42 +-
 .../specie/thermo/janaf/janafThermoI.H        |  359 ++-
 .../sensibleEnthalpy/sensibleEnthalpy.H       |   26 +-
 .../sensibleInternalEnergy.H                  |   26 +-
 .../specie/thermo/thermo/thermo.H             |  139 +-
 .../specie/thermo/thermo/thermoI.H            |  276 +-
 .../specie/transport/const/constTransport.H   |   30 +-
 .../specie/transport/const/constTransportI.H  |   92 +-
 .../logPolynomial/logPolynomialTransport.C    |   20 +-
 .../logPolynomial/logPolynomialTransport.H    |   31 +-
 .../logPolynomial/logPolynomialTransportI.H   |  101 +-
 .../polynomial/polynomialTransport.C          |   20 +-
 .../polynomial/polynomialTransport.H          |   31 +-
 .../polynomial/polynomialTransportI.H         |  101 +-
 .../sutherland/sutherlandTransport.H          |   30 +-
 .../sutherland/sutherlandTransportI.H         |   97 +-
 .../constant/thermophysicalProperties         |    3 -
 .../constant/thermophysicalProperties         |   41 +-
 .../thermophysicalProperties.hydrogen         |    2 -
 .../constant/thermophysicalProperties         |    3 -
 .../constant/pyrolysisRegion/thermo.solid     |    2 -
 .../pyrolysisRegion/thermophysicalProperties  |    1 -
 .../constant/thermo.compressibleGas           |    5 -
 .../constant/panelRegion/thermo.solid         |    2 -
 .../panelRegion/thermophysicalProperties      |    1 -
 .../constant/thermo.compressibleGas           |    5 -
 .../constant/thermo.compressibleGas           |    5 -
 .../constant/thermo.compressibleGas           |    5 -
 .../constant/thermo.compressibleGas           |    5 -
 .../constant/thermo.compressibleGas           |    5 -
 .../constant/thermo.compressibleGas           |    5 -
 .../constant/thermo.compressibleGasGRI        |   53 -
 .../constant/thermo.compressibleGas           |    5 -
 .../constant/thermo.compressibleGasGRI        |   53 -
 .../constant/thermo.compressibleGas           |    5 -
 .../constant/thermo.compressibleGasGRI        |   53 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../cavity/constant/thermophysicalProperties  |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../prism/constant/thermophysicalProperties   |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../hotRoom/constant/thermophysicalProperties |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../include/1DBaffle/1DbaffleSolidThermo      |    1 -
 .../include/3DBaffle/3DbaffleSolidThermo      |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../constant/thermophysicalProperties         |    1 -
 .../bottomWater/thermophysicalProperties      |    1 -
 .../constant/heater/thermophysicalProperties  |    1 -
 .../constant/topAir/thermophysicalProperties  |    1 -
 .../bottomAir/thermophysicalProperties        |    1 -
 .../constant/heater/thermophysicalProperties  |    1 -
 .../constant/air/thermophysicalProperties     |    1 -
 .../constant/porous/thermophysicalProperties  |    1 -
 .../bottomAir/thermophysicalProperties        |    1 -
 .../constant/heater/thermophysicalProperties  |    1 -
 .../simplifiedSiwek/constant/foam.dat         |    6 -
 .../cylinder/constant/foam.dat                |    3 -
 .../hotBoxes/constant/foam.dat                |    3 -
 .../rivuletPanel/constant/foam.dat            |    3 -
 .../splashPanel/constant/foam.dat             |    3 -
 .../constant/thermo.compressibleGas           |    5 -
 .../filter/constant/thermo.incompressiblePoly |    4 -
 .../constant/thermo.incompressiblePoly        |    4 -
 .../constant/thermo.incompressiblePoly        |    3 -
 .../constant/thermo.incompressiblePoly        |    3 -
 .../constant/thermo.incompressiblePoly        |    3 -
 .../OpenCFD/constant/thermophysicalProperties |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.mercury |    1 -
 .../constant/thermophysicalProperties.oil     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.mercury |    1 -
 .../constant/thermophysicalProperties.oil     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.gas     |    1 -
 .../constant/thermophysicalProperties.solids  |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermo.gas                       |    5 -
 .../constant/thermophysicalProperties.liquid  |    2 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../thermophysicalProperties.particles        |    1 -
 .../constant/thermophysicalProperties.gas     |    1 -
 .../constant/thermophysicalProperties.liquid  |    1 -
 .../constant/thermophysicalProperties.gas     |    1 -
 .../constant/thermophysicalProperties.liquid  |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.gas     |    2 -
 .../constant/thermophysicalProperties.liquid  |    2 -
 .../constant/thermophysicalProperties.gas     |    2 -
 .../constant/thermophysicalProperties.liquid  |    2 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../thermophysicalProperties.particles        |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.steam   |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../thermophysicalProperties.particles        |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../thermophysicalProperties.particles        |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 .../constant/thermophysicalProperties.air     |    1 -
 .../constant/thermophysicalProperties.water   |    1 -
 356 files changed, 2654 insertions(+), 6318 deletions(-)
 delete mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H
 delete mode 100644 src/thermophysicalModels/properties/liquidMixtureProperties/Make/files
 delete mode 100644 src/thermophysicalModels/properties/liquidMixtureProperties/Make/options
 rename src/thermophysicalModels/properties/{liquidMixtureProperties => liquidProperties}/liquidMixtureProperties/liquidMixtureProperties.C (97%)
 rename src/thermophysicalModels/properties/{liquidMixtureProperties => liquidProperties}/liquidMixtureProperties/liquidMixtureProperties.H (98%)
 delete mode 100644 src/thermophysicalModels/properties/solidMixtureProperties/Make/files
 delete mode 100644 src/thermophysicalModels/properties/solidMixtureProperties/Make/options
 rename src/thermophysicalModels/properties/{solidMixtureProperties => solidProperties}/solidMixtureProperties/solidMixtureProperties.C (97%)
 rename src/thermophysicalModels/properties/{solidMixtureProperties => solidProperties}/solidMixtureProperties/solidMixtureProperties.H (98%)

diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index b49c426e87..4b25d248ea 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -14,9 +14,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -39,7 +37,6 @@ EXE_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lSLGThermo \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H
deleted file mode 100644
index 56e78ff630..0000000000
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    volScalarField& he = thermo.he();
-
-    fvScalarMatrix EEqn
-    (
-        fvm::div(phi, he)
-      + (
-            he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ekp", 0.5*magSqr(U) + p/rho))
-          : fvc::div(phi, volScalarField("K", 0.5*magSqr(U)))
-        )
-      - fvm::laplacian(turbulence->alphaEff(), he)
-     ==
-        fvOptions(rho, he)
-    );
-
-    EEqn.relax();
-
-    fvOptions.constrain(EEqn);
-
-    EEqn.solve();
-
-    fvOptions.correct(he);
-
-    thermo.correct();
-}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
index e7136c52d0..5daef0c2de 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
@@ -67,6 +67,17 @@ dimensionedScalar rhoMin
     )
 );
 
+dimensionedScalar pMin
+(
+    dimensionedScalar::lookupOrDefault
+    (
+        "pMin",
+        simple.dict(),
+        dimPressure,
+        10
+    )
+);
+
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence
 (
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
index 7b55983161..ca8725b499 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
@@ -83,6 +83,8 @@
             /fvc::domainIntegrate(psi);
     }
 
+    p = max(p, pMin);
+
     rho = thermo.rho();
     rho = max(rho, rhoMin);
     rho = min(rho, rhoMax);
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index 9c23effa57..978ea9d9b2 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -11,9 +11,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -39,9 +37,7 @@ EXE_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lSLGThermo \
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index 014cd4e356..4e218c6dbc 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -10,9 +10,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -37,7 +35,6 @@ EXE_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lSLGThermo \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index f39888db2f..f66d16750b 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -12,9 +12,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -40,9 +38,7 @@ EXE_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lSLGThermo \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
index f39888db2f..f66d16750b 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
@@ -12,9 +12,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -40,9 +38,7 @@ EXE_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lSLGThermo \
diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options
index 35233e06cb..28b5e6ac7a 100644
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@@ -14,9 +14,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -38,9 +36,7 @@ EXE_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lSLGThermo \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
index 75d59e0933..ebb0621e93 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
@@ -15,9 +15,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -42,9 +40,7 @@ EXE_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lSLGThermo \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
index 86c7ad23f2..3cda53424f 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
@@ -16,9 +16,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -45,9 +43,7 @@ EXE_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lSLGThermo \
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
index 3a5eb7ac71..5f109df522 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
@@ -3,9 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
diff --git a/applications/test/thermoMixture/thermoDict b/applications/test/thermoMixture/thermoDict
index 426ae0a9f3..e17e34c5e7 100644
--- a/applications/test/thermoMixture/thermoDict
+++ b/applications/test/thermoMixture/thermoDict
@@ -2,7 +2,6 @@ specie1
 {
    specie
    {
-      nMoles 1;
       molWeight 1;
    }
 
@@ -24,7 +23,6 @@ specie2
 {
    specie
    {
-      nMoles 1;
       molWeight 0.5;
    }
 
diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options
index 2c3bcc70fe..5ce9e05d42 100644
--- a/applications/utilities/miscellaneous/foamList/Make/options
+++ b/applications/utilities/miscellaneous/foamList/Make/options
@@ -49,7 +49,6 @@ EXE_LIBS = \
     -llagrangianSpray \
     -llagrangianTurbulence \
     -llaminarFlameSpeedModels \
-    -lliquidMixtureProperties \
     -lliquidProperties \
     -lmeshTools \
     -lmolecularMeasurements \
@@ -81,7 +80,6 @@ EXE_LIBS = \
     -lSLGThermo \
     -lsnappyHexMesh \
     -lsolidChemistryModel \
-    -lsolidMixtureProperties \
     -lsolidParticle \
     -lsolidProperties \
     -lsolidSpecie \
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 7cc7e44c7c..523e6b4f63 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,28 +97,59 @@ int main(int argc, char *argv[])
 
 
     scalar stoicO2 = n + m/4.0;
-    scalar stoicN2 = (0.79/0.21)*(n + m/4.0);
+    scalar stoicN2 = (0.79/0.21)*stoicO2;
     scalar stoicCO2 = n;
     scalar stoicH2O = m/2.0;
 
-    thermo fuel
+    thermo FUEL
     (
         "fuel",
         thermo(thermoData.subDict(fuelName))
     );
+    Info<< "fuel " << FUEL << ';' << endl;
+    FUEL *= FUEL.W();
+
+    thermo O2
+    (
+        "O2",
+        thermo(thermoData.subDict("O2"))
+    );
+    O2 *= O2.W();
+
+    thermo N2
+    (
+        "N2",
+        thermo(thermoData.subDict("N2"))
+    );
+    N2 *= N2.W();
+
+    thermo CO2
+    (
+        "CO2",
+        thermo(thermoData.subDict("CO2"))
+    );
+    CO2 *= CO2.W();
+
+    thermo H2O
+    (
+        "H2O",
+        thermo(thermoData.subDict("H2O"))
+    );
+    H2O *= H2O.W();
 
     thermo oxidant
     (
         "oxidant",
-        stoicO2*thermo(thermoData.subDict("O2"))
-      + stoicN2*thermo(thermoData.subDict("N2"))
+        stoicO2*O2
+      + stoicN2*N2
     );
+    Info<< "oxidant " << (1/oxidant.Y())*oxidant << ';' << endl;
 
     dimensionedScalar stoichiometricAirFuelMassRatio
     (
         "stoichiometricAirFuelMassRatio",
         dimless,
-        (oxidant.W()*oxidant.nMoles())/fuel.W()
+        oxidant.Y()/FUEL.W()
     );
 
     Info<< "stoichiometricAirFuelMassRatio "
@@ -138,49 +169,34 @@ int main(int argc, char *argv[])
         scalar ores = max(1.0/equiv - 1.0, 0.0);
         scalar fburnt = 1.0 - fres;
 
-        thermo fuel
-        (
-            "fuel",
-            thermo(thermoData.subDict(fuelName))
-        );
-        Info<< "fuel " << fuel << ';' << endl;
-
-        thermo oxidant
-        (
-            "oxidant",
-            o2*thermo(thermoData.subDict("O2"))
-          + n2*thermo(thermoData.subDict("N2"))
-        );
-        Info<< "oxidant " << (1/oxidant.nMoles())*oxidant << ';' << endl;
-
         thermo reactants
         (
             "reactants",
-            fuel + oxidant
+            FUEL + (1.0/equiv)*oxidant
         );
-        Info<< "reactants " << (1/reactants.nMoles())*reactants << ';' << endl;
+        Info<< "reactants " << (1/reactants.Y())*reactants << ';' << endl;
 
         thermo burntProducts
         (
             "burntProducts",
-          + (n2 - (0.79/0.21)*ores*stoicO2)*thermo(thermoData.subDict("N2"))
-          + fburnt*stoicCO2*thermo(thermoData.subDict("CO2"))
-          + fburnt*stoicH2O*thermo(thermoData.subDict("H2O"))
+          + (n2 - (0.79/0.21)*ores*stoicO2)*N2
+          + fburnt*stoicCO2*CO2
+          + fburnt*stoicH2O*H2O
         );
         Info<< "burntProducts "
-            << (1/burntProducts.nMoles())*burntProducts << ';' << endl;
+            << (1/burntProducts.Y())*burntProducts << ';' << endl;
 
         thermo products
         (
             "products",
-            fres*fuel
-          + n2*thermo(thermoData.subDict("N2"))
-          + fburnt*stoicCO2*thermo(thermoData.subDict("CO2"))
-          + fburnt*stoicH2O*thermo(thermoData.subDict("H2O"))
-          + ores*stoicO2*thermo(thermoData.subDict("O2"))
+            fres*FUEL
+          + n2*N2
+          + fburnt*stoicCO2*CO2
+          + fburnt*stoicH2O*H2O
+          + ores*stoicO2*O2
         );
 
-        Info<< "products " << (1/products.nMoles())*products << ';' << endl;
+        Info<< "products " << (1/products.Y())*products << ';' << endl;
 
         scalar Tad = products.THa(reactants.Ha(P, T0), P, 1000.0);
         Info<< "Tad = " << Tad << nl << endl;
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index 478c2ae9f5..62313f789d 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,52 +73,44 @@ int main(int argc, char *argv[])
 
 
 
-    scalar P = 1e5;
-    scalar T = 3000.0;
+    const scalar P = 1e5;
+    const scalar T = 3000.0;
+
+    // Oxidant (mole-based)
+    thermo O2(thermoData.subDict("O2")); O2 *= O2.W();
+    thermo N2(thermoData.subDict("N2")); N2 *= N2.W();
+
+    // Intermediates (mole-based)
+    thermo H2(thermoData.subDict("H2")); H2 *= H2.W();
+    thermo OH(thermoData.subDict("OH")); OH *= OH.W();
+    thermo H(thermoData.subDict("H")); H *= H.W();
+    thermo O(thermoData.subDict("O")); O *= O.W();
+
+    // Products (mole-based)
+    thermo CO2(thermoData.subDict("CO2")); CO2 *= CO2.W();
+    thermo H2O(thermoData.subDict("H2O")); H2O *= H2O.W();
+    thermo CO(thermoData.subDict("CO")); CO *= CO.W();
 
     SLPtrList<thermo> EQreactions;
 
     EQreactions.append
     (
-        new thermo
-        (
-            thermo(thermoData.subDict("CO2"))
-         ==
-            thermo(thermoData.subDict("CO"))
-          + 0.5*thermo(thermoData.subDict("O2"))
-        )
+        new thermo(CO2 == CO + 0.5*O2)
     );
 
     EQreactions.append
     (
-        new thermo
-        (
-            thermo(thermoData.subDict("O2"))
-         ==
-            2.0*thermo(thermoData.subDict("O"))
-        )
+        new thermo(O2 == 2*O)
     );
 
     EQreactions.append
     (
-        new thermo
-        (
-            thermo(thermoData.subDict("H2O"))
-         ==
-            thermo(thermoData.subDict("H2"))
-          + 0.5*thermo(thermoData.subDict("O2"))
-        )
+        new thermo(H2O == H2 + 0.5*O2)
     );
 
     EQreactions.append
     (
-        new thermo
-        (
-            thermo(thermoData.subDict("H2O"))
-         ==
-            thermo(thermoData.subDict("H"))
-          + thermo(thermoData.subDict("OH"))
-        )
+        new thermo(H2O == H + OH)
     );
 
 
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index e95e74819a..c24b3693e1 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,25 +100,27 @@ int main(int argc, char *argv[])
     Info<< nl << "Reading thermodynamic data for relevant species"
         << nl << endl;
 
-    // Reactants
-    thermo FUEL(thermoData.subDict(fuelName));
-    thermo O2(thermoData.subDict("O2"));
-    thermo N2(thermoData.subDict("N2"));
+    // Reactants (mole-based)
+    thermo FUEL(thermoData.subDict(fuelName)); FUEL *= FUEL.W();
 
-    // Products
-    thermo CO2(thermoData.subDict("CO2"));
-    thermo H2O(thermoData.subDict("H2O"));
+    // Oxidant (mole-based)
+    thermo O2(thermoData.subDict("O2")); O2 *= O2.W();
+    thermo N2(thermoData.subDict("N2")); N2 *= N2.W();
 
-    // Product fragments
-    thermo CO(thermoData.subDict("CO"));
-    thermo H2(thermoData.subDict("H2"));
+    // Intermediates (mole-based)
+    thermo H2(thermoData.subDict("H2")); H2 *= H2.W();
+
+    // Products (mole-based)
+    thermo CO2(thermoData.subDict("CO2")); CO2 *= CO2.W();
+    thermo H2O(thermoData.subDict("H2O")); H2O *= H2O.W();
+    thermo CO(thermoData.subDict("CO")); CO *= CO.W();
 
 
     // Product dissociation reactions
 
     thermo CO2BreakUp
     (
-        CO2 == CO + 0.5* O2
+        CO2 == CO + 0.5*O2
     );
 
     thermo H2OBreakUp
@@ -145,7 +147,7 @@ int main(int argc, char *argv[])
     (
         "stoichiometricAirFuelMassRatio",
         dimless,
-        (oxidant.W()*oxidant.nMoles())/FUEL.W()
+        oxidant.Y()/FUEL.W()
     );
 
     Info<< "stoichiometricAirFuelMassRatio "
@@ -209,7 +211,6 @@ int main(int argc, char *argv[])
         // Iteration loop for adiabatic flame temperature
         for (int j=0; j<20; j++)
         {
-
             if (j > 0)
             {
                 co = co2*
diff --git a/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties b/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties
index 691d73fdd7..9c4f1daea4 100644
--- a/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties
+++ b/etc/templates/compressibleInflowOutflow/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture // air at room temperature (293 K)
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/etc/thermoData/thermoData b/etc/thermoData/thermoData
index dddc4e85f7..d7b7827e67 100644
--- a/etc/thermoData/thermoData
+++ b/etc/thermoData/thermoData
@@ -28,7 +28,6 @@ PF5
 {
     specie
     {
-        nMoles          1;
         molWeight       125.966;
     }
     thermodynamics
@@ -44,7 +43,6 @@ T-C3H5_CH3C*=CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0733;
     }
     thermodynamics
@@ -60,7 +58,6 @@ C3H8S_PropanThiol
 {
     specie
     {
-        nMoles          1;
         molWeight       76.1612;
     }
     thermodynamics
@@ -76,7 +73,6 @@ MgS(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       56.376;
     }
     thermodynamics
@@ -92,7 +88,6 @@ Fe(d)
 {
     specie
     {
-        nMoles          1;
         molWeight       55.847;
     }
     thermodynamics
@@ -108,7 +103,6 @@ Bi(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       208.98;
     }
     thermodynamics
@@ -124,7 +118,6 @@ C2H2_Vinylidene
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0382;
     }
     thermodynamics
@@ -140,7 +133,6 @@ Pb-
 {
     specie
     {
-        nMoles          1;
         molWeight       207.191;
     }
     thermodynamics
@@ -156,7 +148,6 @@ GeCl4
 {
     specie
     {
-        nMoles          1;
         molWeight       214.402;
     }
     thermodynamics
@@ -172,7 +163,6 @@ C7H15_n-heptyl
 {
     specie
     {
-        nMoles          1;
         molWeight       99.1976;
     }
     thermodynamics
@@ -188,7 +178,6 @@ C17H33O2_C16-Rad
 {
     specie
     {
-        nMoles          1;
         molWeight       269.451;
     }
     thermodynamics
@@ -204,7 +193,6 @@ C4H9O_T_butoxy_r
 {
     specie
     {
-        nMoles          1;
         molWeight       73.1157;
     }
     thermodynamics
@@ -220,7 +208,6 @@ C2H2O4_Oxalic_ac
 {
     specie
     {
-        nMoles          1;
         molWeight       90.0358;
     }
     thermodynamics
@@ -236,7 +223,6 @@ Fe2O3(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       159.692;
     }
     thermodynamics
@@ -252,7 +238,6 @@ s-*CH2NH2
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0497;
     }
     thermodynamics
@@ -268,7 +253,6 @@ C7H7+__C6H5CH2*+
 {
     specie
     {
-        nMoles          1;
         molWeight       91.1333;
     }
     thermodynamics
@@ -284,7 +268,6 @@ S(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       320.64;
     }
     thermodynamics
@@ -300,7 +283,6 @@ C5H4__1,2,4-cycl
 {
     specie
     {
-        nMoles          1;
         molWeight       64.0876;
     }
     thermodynamics
@@ -316,7 +298,6 @@ PF2-
 {
     specie
     {
-        nMoles          1;
         molWeight       68.9711;
     }
     thermodynamics
@@ -332,7 +313,6 @@ Br_Bromine_atom
 {
     specie
     {
-        nMoles          1;
         molWeight       79.9009;
     }
     thermodynamics
@@ -348,7 +328,6 @@ C6H3Cl3O_linear
 {
     specie
     {
-        nMoles          1;
         molWeight       197.449;
     }
     thermodynamics
@@ -364,7 +343,6 @@ C4H5+_CH3CC=CH2*+
 {
     specie
     {
-        nMoles          1;
         molWeight       53.0839;
     }
     thermodynamics
@@ -380,7 +358,6 @@ C4H9O_i-butoxy_r
 {
     specie
     {
-        nMoles          1;
         molWeight       73.1157;
     }
     thermodynamics
@@ -396,7 +373,6 @@ C10H18_Bicypentyl
 {
     specie
     {
-        nMoles          1;
         molWeight       138.255;
     }
     thermodynamics
@@ -412,7 +388,6 @@ CDO
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0247;
     }
     thermodynamics
@@ -428,7 +403,6 @@ P-CHLOROPHENYL
 {
     specie
     {
-        nMoles          1;
         molWeight       111.552;
     }
     thermodynamics
@@ -444,7 +418,6 @@ Ni3S4(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       304.386;
     }
     thermodynamics
@@ -460,7 +433,6 @@ C2HBr2_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       184.832;
     }
     thermodynamics
@@ -476,7 +448,6 @@ NOO-___anion
 {
     specie
     {
-        nMoles          1;
         molWeight       46.006;
     }
     thermodynamics
@@ -492,7 +463,6 @@ C10H21,n-decyl
 {
     specie
     {
-        nMoles          1;
         molWeight       141.279;
     }
     thermodynamics
@@ -508,7 +478,6 @@ H2
 {
     specie
     {
-        nMoles          1;
         molWeight       2.01594;
     }
     thermodynamics
@@ -524,7 +493,6 @@ F2O-__FOF-
 {
     specie
     {
-        nMoles          1;
         molWeight       53.9967;
     }
     thermodynamics
@@ -540,7 +508,6 @@ CCl
 {
     specie
     {
-        nMoles          1;
         molWeight       47.4642;
     }
     thermodynamics
@@ -556,7 +523,6 @@ AlCl+
 {
     specie
     {
-        nMoles          1;
         molWeight       62.434;
     }
     thermodynamics
@@ -572,7 +538,6 @@ C20H36O2_EtLinolea
 {
     specie
     {
-        nMoles          1;
         molWeight       308.509;
     }
     thermodynamics
@@ -588,7 +553,6 @@ Cl2O__Cl-O-Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       86.9054;
     }
     thermodynamics
@@ -604,7 +568,6 @@ C6H8O_3,4DiMeFuran
 {
     specie
     {
-        nMoles          1;
         molWeight       96.1301;
     }
     thermodynamics
@@ -620,7 +583,6 @@ NH4ClO4(II)
 {
     specie
     {
-        nMoles          1;
         molWeight       117.489;
     }
     thermodynamics
@@ -636,7 +598,6 @@ C5H12O_3-Pentanol
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1508;
     }
     thermodynamics
@@ -652,7 +613,6 @@ C14H12_t-Stilbene
 {
     specie
     {
-        nMoles          1;
         molWeight       180.252;
     }
     thermodynamics
@@ -668,7 +628,6 @@ K(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       39.102;
     }
     thermodynamics
@@ -684,7 +643,6 @@ C3H7NO2_Nitropro
 {
     specie
     {
-        nMoles          1;
         molWeight       89.0947;
     }
     thermodynamics
@@ -700,7 +658,6 @@ C3H6S__THIETHANE
 {
     specie
     {
-        nMoles          1;
         molWeight       74.1453;
     }
     thermodynamics
@@ -716,7 +673,6 @@ CH3NH-_radical_a
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0503;
     }
     thermodynamics
@@ -732,7 +688,6 @@ C9H7_INDENYL_RAD
 {
     specie
     {
-        nMoles          1;
         molWeight       115.156;
     }
     thermodynamics
@@ -748,7 +703,6 @@ PbBr4
 {
     specie
     {
-        nMoles          1;
         molWeight       526.794;
     }
     thermodynamics
@@ -764,7 +718,6 @@ C3N2O__NCO-CO-CN
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0463;
     }
     thermodynamics
@@ -780,7 +733,6 @@ C6H14O_1-hexanol
 {
     specie
     {
-        nMoles          1;
         molWeight       102.178;
     }
     thermodynamics
@@ -796,7 +748,6 @@ C17H31O2_Palmitole
 {
     specie
     {
-        nMoles          1;
         molWeight       267.435;
     }
     thermodynamics
@@ -812,7 +763,6 @@ C2H5NO3_EtNitrate
 {
     specie
     {
-        nMoles          1;
         molWeight       91.067;
     }
     thermodynamics
@@ -828,7 +778,6 @@ Bi2O3_O=Bi-O-Bi=O
 {
     specie
     {
-        nMoles          1;
         molWeight       465.958;
     }
     thermodynamics
@@ -844,7 +793,6 @@ C4H6O2_MeAcrylat
 {
     specie
     {
-        nMoles          1;
         molWeight       86.0912;
     }
     thermodynamics
@@ -860,7 +808,6 @@ C8H9+_1,3MeC6H4CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       105.16;
     }
     thermodynamics
@@ -876,7 +823,6 @@ C2H2I2_trans
 {
     specie
     {
-        nMoles          1;
         molWeight       279.847;
     }
     thermodynamics
@@ -892,7 +838,6 @@ C60
 {
     specie
     {
-        nMoles          1;
         molWeight       720.669;
     }
     thermodynamics
@@ -908,7 +853,6 @@ HCl
 {
     specie
     {
-        nMoles          1;
         molWeight       36.461;
     }
     thermodynamics
@@ -924,7 +868,6 @@ C10H21_3by4-decyl
 {
     specie
     {
-        nMoles          1;
         molWeight       141.279;
     }
     thermodynamics
@@ -940,7 +883,6 @@ CH2F
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0255;
     }
     thermodynamics
@@ -956,7 +898,6 @@ HNOH_cis__ATcT_C
 {
     specie
     {
-        nMoles          1;
         molWeight       32.022;
     }
     thermodynamics
@@ -972,7 +913,6 @@ NH2CH2C(O)OH
 {
     specie
     {
-        nMoles          1;
         molWeight       75.0677;
     }
     thermodynamics
@@ -988,7 +928,6 @@ HNO2_equil__ATcT
 {
     specie
     {
-        nMoles          1;
         molWeight       47.0135;
     }
     thermodynamics
@@ -1004,7 +943,6 @@ FeCl3(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       162.206;
     }
     thermodynamics
@@ -1020,7 +958,6 @@ C3H2Br2__1,3_Dib
 {
     specie
     {
-        nMoles          1;
         molWeight       197.851;
     }
     thermodynamics
@@ -1036,7 +973,6 @@ C4H8N8O8_HMX
 {
     specie
     {
-        nMoles          1;
         molWeight       296.157;
     }
     thermodynamics
@@ -1052,7 +988,6 @@ SnCl4
 {
     specie
     {
-        nMoles          1;
         molWeight       260.502;
     }
     thermodynamics
@@ -1068,7 +1003,6 @@ C6H11_2M-1ENE-5YL
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1546;
     }
     thermodynamics
@@ -1084,7 +1018,6 @@ C5H2Cl3_VinAllenyl
 {
     specie
     {
-        nMoles          1;
         molWeight       168.431;
     }
     thermodynamics
@@ -1100,7 +1033,6 @@ PS
 {
     specie
     {
-        nMoles          1;
         molWeight       63.0378;
     }
     thermodynamics
@@ -1116,7 +1048,6 @@ BCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       117.17;
     }
     thermodynamics
@@ -1132,7 +1063,6 @@ C2H4F2__HFC-152a
 {
     specie
     {
-        nMoles          1;
         molWeight       66.051;
     }
     thermodynamics
@@ -1148,7 +1078,6 @@ MgF
 {
     specie
     {
-        nMoles          1;
         molWeight       43.3104;
     }
     thermodynamics
@@ -1164,7 +1093,6 @@ BO-
 {
     specie
     {
-        nMoles          1;
         molWeight       26.8109;
     }
     thermodynamics
@@ -1180,7 +1108,6 @@ C15H30___1-penta
 {
     specie
     {
-        nMoles          1;
         molWeight       210.406;
     }
     thermodynamics
@@ -1196,7 +1123,6 @@ B2O3
 {
     specie
     {
-        nMoles          1;
         molWeight       69.6202;
     }
     thermodynamics
@@ -1212,7 +1138,6 @@ s-1-C10H7-C*=CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       153.206;
     }
     thermodynamics
@@ -1228,7 +1153,6 @@ CS
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0752;
     }
     thermodynamics
@@ -1244,7 +1168,6 @@ C5H11OH__1-penta
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1508;
     }
     thermodynamics
@@ -1260,7 +1183,6 @@ H2NN+_Isodiazene+
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0288;
     }
     thermodynamics
@@ -1276,7 +1198,6 @@ C+
 {
     specie
     {
-        nMoles          1;
         molWeight       12.0106;
     }
     thermodynamics
@@ -1292,7 +1213,6 @@ C10H10_2-meIndene
 {
     specie
     {
-        nMoles          1;
         molWeight       130.191;
     }
     thermodynamics
@@ -1308,7 +1228,6 @@ C7H16O_neo-C7H16O
 {
     specie
     {
-        nMoles          1;
         molWeight       116.205;
     }
     thermodynamics
@@ -1324,7 +1243,6 @@ C6H5F+__Cation
 {
     specie
     {
-        nMoles          1;
         molWeight       96.1046;
     }
     thermodynamics
@@ -1340,7 +1258,6 @@ N2H-
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0219;
     }
     thermodynamics
@@ -1356,7 +1273,6 @@ C6H10_1,3-Hexadien
 {
     specie
     {
-        nMoles          1;
         molWeight       82.1466;
     }
     thermodynamics
@@ -1372,7 +1288,6 @@ C9H17_1-nonenyl-4
 {
     specie
     {
-        nMoles          1;
         molWeight       125.236;
     }
     thermodynamics
@@ -1388,7 +1303,6 @@ C10H7-CCH
 {
     specie
     {
-        nMoles          1;
         molWeight       152.198;
     }
     thermodynamics
@@ -1404,7 +1318,6 @@ C2H4O2_HG(O)OCH3
 {
     specie
     {
-        nMoles          1;
         molWeight       60.053;
     }
     thermodynamics
@@ -1420,7 +1333,6 @@ B3O3Cl3
 {
     specie
     {
-        nMoles          1;
         molWeight       186.79;
     }
     thermodynamics
@@ -1436,7 +1348,6 @@ C3Cl4_PerClAllene
 {
     specie
     {
-        nMoles          1;
         molWeight       177.845;
     }
     thermodynamics
@@ -1452,7 +1363,6 @@ Al2O3(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       101.961;
     }
     thermodynamics
@@ -1468,7 +1378,6 @@ C13H10__Fluorene
 {
     specie
     {
-        nMoles          1;
         molWeight       166.225;
     }
     thermodynamics
@@ -1484,7 +1393,6 @@ C5H9N__Cy
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1342;
     }
     thermodynamics
@@ -1500,7 +1408,6 @@ C6H4Cl2_p-Clbenzen
 {
     specie
     {
-        nMoles          1;
         molWeight       147.005;
     }
     thermodynamics
@@ -1516,7 +1423,6 @@ NITRO-BENZENE
 {
     specie
     {
-        nMoles          1;
         molWeight       123.112;
     }
     thermodynamics
@@ -1532,7 +1438,6 @@ C6H5OH,phenol
 {
     specie
     {
-        nMoles          1;
         molWeight       94.1141;
     }
     thermodynamics
@@ -1548,7 +1453,6 @@ C3Br3_1,2,3_CyRad
 {
     specie
     {
-        nMoles          1;
         molWeight       275.736;
     }
     thermodynamics
@@ -1564,7 +1468,6 @@ s-*CH2NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0326;
     }
     thermodynamics
@@ -1580,7 +1483,6 @@ C2Cl3F3_FC-113A
 {
     specie
     {
-        nMoles          1;
         molWeight       187.377;
     }
     thermodynamics
@@ -1596,7 +1498,6 @@ C12H9Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       188.659;
     }
     thermodynamics
@@ -1612,7 +1513,6 @@ CH3-O-C(O)-NH2
 {
     specie
     {
-        nMoles          1;
         molWeight       75.0677;
     }
     thermodynamics
@@ -1628,7 +1528,6 @@ C18H31O2_Linoleate
 {
     specie
     {
-        nMoles          1;
         molWeight       279.447;
     }
     thermodynamics
@@ -1644,7 +1543,6 @@ C6H8O_2,5DiMeFuran
 {
     specie
     {
-        nMoles          1;
         molWeight       96.1301;
     }
     thermodynamics
@@ -1660,7 +1558,6 @@ C8H7_C6H4CH=CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       103.145;
     }
     thermodynamics
@@ -1676,7 +1573,6 @@ MgClF
 {
     specie
     {
-        nMoles          1;
         molWeight       78.7634;
     }
     thermodynamics
@@ -1692,7 +1588,6 @@ C16H10_Pyrene
 {
     specie
     {
-        nMoles          1;
         molWeight       202.258;
     }
     thermodynamics
@@ -1708,7 +1603,6 @@ SiO2(a-qz)
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0848;
     }
     thermodynamics
@@ -1724,7 +1618,6 @@ s-1-C4H8__1-buten
 {
     specie
     {
-        nMoles          1;
         molWeight       56.1084;
     }
     thermodynamics
@@ -1740,7 +1633,6 @@ C4H6__1,3-butadien
 {
     specie
     {
-        nMoles          1;
         molWeight       54.0924;
     }
     thermodynamics
@@ -1756,7 +1648,6 @@ s-1,2-C6H4_BENZYNE
 {
     specie
     {
-        nMoles          1;
         molWeight       76.0988;
     }
     thermodynamics
@@ -1772,7 +1663,6 @@ C5H10O2_EtPropanoa
 {
     specie
     {
-        nMoles          1;
         molWeight       102.134;
     }
     thermodynamics
@@ -1788,7 +1678,6 @@ C14H14_Bibenzyl
 {
     specie
     {
-        nMoles          1;
         molWeight       182.268;
     }
     thermodynamics
@@ -1804,7 +1693,6 @@ OS(liq)
 {
     specie
     {
-        nMoles          1;
         molWeight       190.2;
     }
     thermodynamics
@@ -1820,7 +1708,6 @@ CH2NH+_MethaneIm
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0412;
     }
     thermodynamics
@@ -1836,7 +1723,6 @@ HS2_anharmonic
 {
     specie
     {
-        nMoles          1;
         molWeight       65.136;
     }
     thermodynamics
@@ -1852,7 +1738,6 @@ CH2__EQUILIBRIUM
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0271;
     }
     thermodynamics
@@ -1868,7 +1753,6 @@ CNH2__triradical
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0338;
     }
     thermodynamics
@@ -1884,7 +1768,6 @@ MgSiO3(I)
 {
     specie
     {
-        nMoles          1;
         molWeight       100.396;
     }
     thermodynamics
@@ -1900,7 +1783,6 @@ C4H7O__*(CH2)3CHO
 {
     specie
     {
-        nMoles          1;
         molWeight       71.0998;
     }
     thermodynamics
@@ -1916,7 +1798,6 @@ HClO3
 {
     specie
     {
-        nMoles          1;
         molWeight       84.4592;
     }
     thermodynamics
@@ -1932,7 +1813,6 @@ C2H3F3__FC-143A
 {
     specie
     {
-        nMoles          1;
         molWeight       84.0414;
     }
     thermodynamics
@@ -1948,7 +1828,6 @@ C5H10__2MB-1-ene
 {
     specie
     {
-        nMoles          1;
         molWeight       70.1355;
     }
     thermodynamics
@@ -1964,7 +1843,6 @@ C2H3O2_HOCHCH=O
 {
     specie
     {
-        nMoles          1;
         molWeight       59.045;
     }
     thermodynamics
@@ -1980,7 +1858,6 @@ C4H6__1,2-butadi
 {
     specie
     {
-        nMoles          1;
         molWeight       54.0924;
     }
     thermodynamics
@@ -1996,7 +1873,6 @@ CuCl
 {
     specie
     {
-        nMoles          1;
         molWeight       98.993;
     }
     thermodynamics
@@ -2012,7 +1888,6 @@ SO-
 {
     specie
     {
-        nMoles          1;
         molWeight       48.0639;
     }
     thermodynamics
@@ -2028,7 +1903,6 @@ PbCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       278.096;
     }
     thermodynamics
@@ -2044,7 +1918,6 @@ C12H23O2__7,9
 {
     specie
     {
-        nMoles          1;
         molWeight       199.316;
     }
     thermodynamics
@@ -2060,7 +1933,6 @@ Fe3O4(S)_Solid-B
 {
     specie
     {
-        nMoles          1;
         molWeight       231.539;
     }
     thermodynamics
@@ -2076,7 +1948,6 @@ C2_triplet
 {
     specie
     {
-        nMoles          1;
         molWeight       24.0223;
     }
     thermodynamics
@@ -2092,7 +1963,6 @@ Zr+
 {
     specie
     {
-        nMoles          1;
         molWeight       91.2195;
     }
     thermodynamics
@@ -2108,7 +1978,6 @@ SF2+
 {
     specie
     {
-        nMoles          1;
         molWeight       70.0603;
     }
     thermodynamics
@@ -2124,7 +1993,6 @@ PETN___Solid
 {
     specie
     {
-        nMoles          1;
         molWeight       316.139;
     }
     thermodynamics
@@ -2140,7 +2008,6 @@ C3H3O__CH2=CHC*O
 {
     specie
     {
-        nMoles          1;
         molWeight       55.0568;
     }
     thermodynamics
@@ -2156,7 +2023,6 @@ SB(CH3)2
 {
     specie
     {
-        nMoles          1;
         molWeight       151.82;
     }
     thermodynamics
@@ -2172,7 +2038,6 @@ BF2Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       84.2608;
     }
     thermodynamics
@@ -2188,7 +2053,6 @@ C2N2_Isocyanogen
 {
     specie
     {
-        nMoles          1;
         molWeight       52.0357;
     }
     thermodynamics
@@ -2204,7 +2068,6 @@ Sb(OH)2
 {
     specie
     {
-        nMoles          1;
         molWeight       155.765;
     }
     thermodynamics
@@ -2220,7 +2083,6 @@ MgS(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       56.376;
     }
     thermodynamics
@@ -2236,7 +2098,6 @@ C4H6O2_Crotonic_ac
 {
     specie
     {
-        nMoles          1;
         molWeight       86.0912;
     }
     thermodynamics
@@ -2252,7 +2113,6 @@ BOCl
 {
     specie
     {
-        nMoles          1;
         molWeight       62.2634;
     }
     thermodynamics
@@ -2268,7 +2128,6 @@ H
 {
     specie
     {
-        nMoles          1;
         molWeight       1.00797;
     }
     thermodynamics
@@ -2284,7 +2143,6 @@ HNNH+_Trans
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0288;
     }
     thermodynamics
@@ -2300,7 +2158,6 @@ s-*CH2NH2+
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0492;
     }
     thermodynamics
@@ -2316,7 +2173,6 @@ PbF
 {
     specie
     {
-        nMoles          1;
         molWeight       226.188;
     }
     thermodynamics
@@ -2332,7 +2188,6 @@ C6H12_4MP-2en_tran
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1625;
     }
     thermodynamics
@@ -2348,7 +2203,6 @@ CHBr2F__FC-23
 {
     specie
     {
-        nMoles          1;
         molWeight       191.819;
     }
     thermodynamics
@@ -2364,7 +2218,6 @@ C8H5_HCC-CH=CH-C
 {
     specie
     {
-        nMoles          1;
         molWeight       101.129;
     }
     thermodynamics
@@ -2380,7 +2233,6 @@ C5H11,pentyl
 {
     specie
     {
-        nMoles          1;
         molWeight       71.1434;
     }
     thermodynamics
@@ -2396,7 +2248,6 @@ AlBr2
 {
     specie
     {
-        nMoles          1;
         molWeight       186.783;
     }
     thermodynamics
@@ -2412,7 +2263,6 @@ F+
 {
     specie
     {
-        nMoles          1;
         molWeight       18.9979;
     }
     thermodynamics
@@ -2428,7 +2278,6 @@ CHD2NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       63.0528;
     }
     thermodynamics
@@ -2444,7 +2293,6 @@ o-C6H4I2
 {
     specie
     {
-        nMoles          1;
         molWeight       329.908;
     }
     thermodynamics
@@ -2460,7 +2308,6 @@ HS2__RRHO
 {
     specie
     {
-        nMoles          1;
         molWeight       65.136;
     }
     thermodynamics
@@ -2476,7 +2323,6 @@ Al
 {
     specie
     {
-        nMoles          1;
         molWeight       26.9815;
     }
     thermodynamics
@@ -2492,7 +2338,6 @@ N2H2_cis
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0293;
     }
     thermodynamics
@@ -2508,7 +2353,6 @@ O4_cyclo
 {
     specie
     {
-        nMoles          1;
         molWeight       63.9976;
     }
     thermodynamics
@@ -2524,7 +2368,6 @@ BrI
 {
     specie
     {
-        nMoles          1;
         molWeight       206.805;
     }
     thermodynamics
@@ -2540,7 +2383,6 @@ C4H9_t-butyl
 {
     specie
     {
-        nMoles          1;
         molWeight       57.1163;
     }
     thermodynamics
@@ -2556,7 +2398,6 @@ ND3
 {
     specie
     {
-        nMoles          1;
         molWeight       20.049;
     }
     thermodynamics
@@ -2572,7 +2413,6 @@ CF2-
 {
     specie
     {
-        nMoles          1;
         molWeight       50.0085;
     }
     thermodynamics
@@ -2588,7 +2428,6 @@ Ge(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       72.59;
     }
     thermodynamics
@@ -2604,7 +2443,6 @@ C5H7_1,3-diene-5yl
 {
     specie
     {
-        nMoles          1;
         molWeight       67.1115;
     }
     thermodynamics
@@ -2620,7 +2458,6 @@ C9H12__C(CH=CH2)4
 {
     specie
     {
-        nMoles          1;
         molWeight       120.196;
     }
     thermodynamics
@@ -2636,7 +2473,6 @@ C2F5___PentaFluo
 {
     specie
     {
-        nMoles          1;
         molWeight       119.014;
     }
     thermodynamics
@@ -2652,7 +2488,6 @@ C5H8O_1-C5H7-3-OH
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1189;
     }
     thermodynamics
@@ -2668,7 +2503,6 @@ PH2-
 {
     specie
     {
-        nMoles          1;
         molWeight       32.9903;
     }
     thermodynamics
@@ -2684,7 +2518,6 @@ C12H5O3Cl4_DOH2
 {
     specie
     {
-        nMoles          1;
         molWeight       338.984;
     }
     thermodynamics
@@ -2700,7 +2533,6 @@ C2H5O__CH3CH2O*
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0616;
     }
     thermodynamics
@@ -2716,7 +2548,6 @@ C22H44O2_Behenic
 {
     specie
     {
-        nMoles          1;
         molWeight       340.595;
     }
     thermodynamics
@@ -2732,7 +2563,6 @@ Al2
 {
     specie
     {
-        nMoles          1;
         molWeight       53.963;
     }
     thermodynamics
@@ -2748,7 +2578,6 @@ NaO2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       54.9886;
     }
     thermodynamics
@@ -2764,7 +2593,6 @@ SiO2(b-crt)
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0848;
     }
     thermodynamics
@@ -2780,7 +2608,6 @@ C2Cl2F2_1,2-trans
 {
     specie
     {
-        nMoles          1;
         molWeight       132.925;
     }
     thermodynamics
@@ -2796,7 +2623,6 @@ C6H5_FULVENYL_RA
 {
     specie
     {
-        nMoles          1;
         molWeight       77.1068;
     }
     thermodynamics
@@ -2812,7 +2638,6 @@ C7H8O2__Guaiacol
 {
     specie
     {
-        nMoles          1;
         molWeight       124.141;
     }
     thermodynamics
@@ -2828,7 +2653,6 @@ MnO_(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       70.9374;
     }
     thermodynamics
@@ -2844,7 +2668,6 @@ C3F8_FC-218
 {
     specie
     {
-        nMoles          1;
         molWeight       188.021;
     }
     thermodynamics
@@ -2860,7 +2683,6 @@ MgF+
 {
     specie
     {
-        nMoles          1;
         molWeight       43.3099;
     }
     thermodynamics
@@ -2876,7 +2698,6 @@ C12H4O2Cl4__2378
 {
     specie
     {
-        nMoles          1;
         molWeight       321.976;
     }
     thermodynamics
@@ -2892,7 +2713,6 @@ C2D6O_dimeether
 {
     specie
     {
-        nMoles          1;
         molWeight       52.1063;
     }
     thermodynamics
@@ -2908,7 +2728,6 @@ C16H29O2_paloleR
 {
     specie
     {
-        nMoles          1;
         molWeight       253.408;
     }
     thermodynamics
@@ -2924,7 +2743,6 @@ N2H
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0214;
     }
     thermodynamics
@@ -2940,7 +2758,6 @@ CH(NO2)3
 {
     specie
     {
-        nMoles          1;
         molWeight       151.036;
     }
     thermodynamics
@@ -2956,7 +2773,6 @@ S6
 {
     specie
     {
-        nMoles          1;
         molWeight       192.384;
     }
     thermodynamics
@@ -2972,7 +2788,6 @@ C14H28___1-tetra
 {
     specie
     {
-        nMoles          1;
         molWeight       196.379;
     }
     thermodynamics
@@ -2988,7 +2803,6 @@ H2NN-_Isodiazene-
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0299;
     }
     thermodynamics
@@ -3004,7 +2818,6 @@ GeS2_linear___HF
 {
     specie
     {
-        nMoles          1;
         molWeight       136.718;
     }
     thermodynamics
@@ -3020,7 +2833,6 @@ P2H4
 {
     specie
     {
-        nMoles          1;
         molWeight       65.9795;
     }
     thermodynamics
@@ -3036,7 +2848,6 @@ C12_linear_singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       144.134;
     }
     thermodynamics
@@ -3052,7 +2863,6 @@ HCNO+_Fulminic_cat
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -3068,7 +2878,6 @@ CH3Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       50.4881;
     }
     thermodynamics
@@ -3084,7 +2893,6 @@ Ni-
 {
     specie
     {
-        nMoles          1;
         molWeight       58.7105;
     }
     thermodynamics
@@ -3100,7 +2908,6 @@ F2O2__F-O-O-F
 {
     specie
     {
-        nMoles          1;
         molWeight       69.9956;
     }
     thermodynamics
@@ -3116,7 +2923,6 @@ C10H14__C5H7-C5H7
 {
     specie
     {
-        nMoles          1;
         molWeight       134.223;
     }
     thermodynamics
@@ -3132,7 +2938,6 @@ H3PO__HOPH2
 {
     specie
     {
-        nMoles          1;
         molWeight       49.9971;
     }
     thermodynamics
@@ -3148,7 +2953,6 @@ Mg(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       24.312;
     }
     thermodynamics
@@ -3164,7 +2968,6 @@ C3F3__PerFOroargyl
 {
     specie
     {
-        nMoles          1;
         molWeight       93.0286;
     }
     thermodynamics
@@ -3180,7 +2983,6 @@ Mo(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       95.94;
     }
     thermodynamics
@@ -3196,7 +2998,6 @@ CH2N2O__H2C=N-N=O
 {
     specie
     {
-        nMoles          1;
         molWeight       58.0399;
     }
     thermodynamics
@@ -3212,7 +3013,6 @@ C8H18(L)_isooctane
 {
     specie
     {
-        nMoles          1;
         molWeight       114.233;
     }
     thermodynamics
@@ -3228,7 +3028,6 @@ CBrCl2F___11B1
 {
     specie
     {
-        nMoles          1;
         molWeight       181.816;
     }
     thermodynamics
@@ -3244,7 +3043,6 @@ N2O5
 {
     specie
     {
-        nMoles          1;
         molWeight       108.01;
     }
     thermodynamics
@@ -3260,7 +3058,6 @@ H2SO4
 {
     specie
     {
-        nMoles          1;
         molWeight       98.0775;
     }
     thermodynamics
@@ -3276,7 +3073,6 @@ C2H4O2_acetaldeh
 {
     specie
     {
-        nMoles          1;
         molWeight       60.053;
     }
     thermodynamics
@@ -3292,7 +3088,6 @@ FeS(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       87.911;
     }
     thermodynamics
@@ -3308,7 +3103,6 @@ C7H10_24C5H4(CH3)2
 {
     specie
     {
-        nMoles          1;
         molWeight       94.1578;
     }
     thermodynamics
@@ -3324,7 +3118,6 @@ CHF__singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0175;
     }
     thermodynamics
@@ -3340,7 +3133,6 @@ C6H2
 {
     specie
     {
-        nMoles          1;
         molWeight       74.0828;
     }
     thermodynamics
@@ -3356,7 +3148,6 @@ SbF
 {
     specie
     {
-        nMoles          1;
         molWeight       140.748;
     }
     thermodynamics
@@ -3372,7 +3163,6 @@ C2D4O_Acetaldehy
 {
     specie
     {
-        nMoles          1;
         molWeight       48.0781;
     }
     thermodynamics
@@ -3388,7 +3178,6 @@ C8H8___1,3,5,7_Cy
 {
     specie
     {
-        nMoles          1;
         molWeight       104.153;
     }
     thermodynamics
@@ -3404,7 +3193,6 @@ C4H5O2_MeAcrylatR
 {
     specie
     {
-        nMoles          1;
         molWeight       85.0833;
     }
     thermodynamics
@@ -3420,7 +3208,6 @@ B2O
 {
     specie
     {
-        nMoles          1;
         molWeight       37.6214;
     }
     thermodynamics
@@ -3436,7 +3223,6 @@ C8H6S__Benzothyo
 {
     specie
     {
-        nMoles          1;
         molWeight       134.201;
     }
     thermodynamics
@@ -3452,7 +3238,6 @@ Si+
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0855;
     }
     thermodynamics
@@ -3468,7 +3253,6 @@ SiCl4
 {
     specie
     {
-        nMoles          1;
         molWeight       169.898;
     }
     thermodynamics
@@ -3484,7 +3268,6 @@ NO2-cyclo_N(OO)-
 {
     specie
     {
-        nMoles          1;
         molWeight       46.006;
     }
     thermodynamics
@@ -3500,7 +3283,6 @@ SiO2(b-qz)
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0848;
     }
     thermodynamics
@@ -3516,7 +3298,6 @@ FeCl2(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       126.753;
     }
     thermodynamics
@@ -3532,7 +3313,6 @@ C18H32O2_Linoleic
 {
     specie
     {
-        nMoles          1;
         molWeight       280.455;
     }
     thermodynamics
@@ -3548,7 +3328,6 @@ N3
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0201;
     }
     thermodynamics
@@ -3564,7 +3343,6 @@ CH4O2__CH3OOH
 {
     specie
     {
-        nMoles          1;
         molWeight       48.0418;
     }
     thermodynamics
@@ -3580,7 +3358,6 @@ CBr2Cl2
 {
     specie
     {
-        nMoles          1;
         molWeight       242.719;
     }
     thermodynamics
@@ -3596,7 +3373,6 @@ PN
 {
     specie
     {
-        nMoles          1;
         molWeight       44.9805;
     }
     thermodynamics
@@ -3612,7 +3388,6 @@ C4H4N2_PYRIMIDINE
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0899;
     }
     thermodynamics
@@ -3628,7 +3403,6 @@ C3Br3_Allene_Rad.
 {
     specie
     {
-        nMoles          1;
         molWeight       275.736;
     }
     thermodynamics
@@ -3644,7 +3418,6 @@ BiO
 {
     specie
     {
-        nMoles          1;
         molWeight       224.979;
     }
     thermodynamics
@@ -3660,7 +3433,6 @@ H2O+
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0148;
     }
     thermodynamics
@@ -3676,7 +3448,6 @@ Fe2Cl6
 {
     specie
     {
-        nMoles          1;
         molWeight       324.412;
     }
     thermodynamics
@@ -3692,7 +3463,6 @@ CHBr3_Bromoform
 {
     specie
     {
-        nMoles          1;
         molWeight       252.722;
     }
     thermodynamics
@@ -3708,7 +3478,6 @@ BI2
 {
     specie
     {
-        nMoles          1;
         molWeight       264.62;
     }
     thermodynamics
@@ -3724,7 +3493,6 @@ C2HClF_1,1-ClF
 {
     specie
     {
-        nMoles          1;
         molWeight       79.4817;
     }
     thermodynamics
@@ -3740,7 +3508,6 @@ Mg2F4
 {
     specie
     {
-        nMoles          1;
         molWeight       124.618;
     }
     thermodynamics
@@ -3756,7 +3523,6 @@ C6H2Cl3O_RAD
 {
     specie
     {
-        nMoles          1;
         molWeight       196.441;
     }
     thermodynamics
@@ -3772,7 +3538,6 @@ I2O__I-I-O
 {
     specie
     {
-        nMoles          1;
         molWeight       269.808;
     }
     thermodynamics
@@ -3788,7 +3553,6 @@ N2H3___Rad.
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0373;
     }
     thermodynamics
@@ -3804,7 +3568,6 @@ BiF2
 {
     specie
     {
-        nMoles          1;
         molWeight       246.977;
     }
     thermodynamics
@@ -3820,7 +3583,6 @@ AlH3(a)_hexagonal
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0054;
     }
     thermodynamics
@@ -3836,7 +3598,6 @@ C6H9_c_CyHexenyl-3
 {
     specie
     {
-        nMoles          1;
         molWeight       81.1386;
     }
     thermodynamics
@@ -3852,7 +3613,6 @@ C9_linear_biradi
 {
     specie
     {
-        nMoles          1;
         molWeight       108.1;
     }
     thermodynamics
@@ -3868,7 +3628,6 @@ P+
 {
     specie
     {
-        nMoles          1;
         molWeight       30.9733;
     }
     thermodynamics
@@ -3884,7 +3643,6 @@ CH3N3_MethylAzyd
 {
     specie
     {
-        nMoles          1;
         molWeight       57.0552;
     }
     thermodynamics
@@ -3900,7 +3658,6 @@ BBr
 {
     specie
     {
-        nMoles          1;
         molWeight       90.7119;
     }
     thermodynamics
@@ -3916,7 +3673,6 @@ C7H7_Cyheptatrien
 {
     specie
     {
-        nMoles          1;
         molWeight       91.1338;
     }
     thermodynamics
@@ -3932,7 +3688,6 @@ MgH2(b)
 {
     specie
     {
-        nMoles          1;
         molWeight       26.3279;
     }
     thermodynamics
@@ -3948,7 +3703,6 @@ n-C20H42_Eicosane
 {
     specie
     {
-        nMoles          1;
         molWeight       282.558;
     }
     thermodynamics
@@ -3964,7 +3718,6 @@ FeS(a)
 {
     specie
     {
-        nMoles          1;
         molWeight       87.911;
     }
     thermodynamics
@@ -3980,7 +3733,6 @@ RDX_Solid_293-47
 {
     specie
     {
-        nMoles          1;
         molWeight       222.118;
     }
     thermodynamics
@@ -3996,7 +3748,6 @@ I
 {
     specie
     {
-        nMoles          1;
         molWeight       126.904;
     }
     thermodynamics
@@ -4012,7 +3763,6 @@ C2H5O__CH3-O-CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0616;
     }
     thermodynamics
@@ -4028,7 +3778,6 @@ C8H12_3,6-Dimeth
 {
     specie
     {
-        nMoles          1;
         molWeight       108.185;
     }
     thermodynamics
@@ -4044,7 +3793,6 @@ CCl2F-CHF2
 {
     specie
     {
-        nMoles          1;
         molWeight       152.931;
     }
     thermodynamics
@@ -4060,7 +3808,6 @@ C4H8S2_1,4_Dithi
 {
     specie
     {
-        nMoles          1;
         molWeight       120.236;
     }
     thermodynamics
@@ -4076,7 +3823,6 @@ C6H5OO_peroxy_rad
 {
     specie
     {
-        nMoles          1;
         molWeight       109.106;
     }
     thermodynamics
@@ -4092,7 +3838,6 @@ CH3OO-__anion
 {
     specie
     {
-        nMoles          1;
         molWeight       47.0344;
     }
     thermodynamics
@@ -4108,7 +3853,6 @@ CH3-CHBr2
 {
     specie
     {
-        nMoles          1;
         molWeight       187.856;
     }
     thermodynamics
@@ -4124,7 +3868,6 @@ H3O+
 {
     specie
     {
-        nMoles          1;
         molWeight       19.0228;
     }
     thermodynamics
@@ -4140,7 +3883,6 @@ C3HBr2*1,1-Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       196.843;
     }
     thermodynamics
@@ -4156,7 +3898,6 @@ C2Br2F4__CBrF2-C
 {
     specie
     {
-        nMoles          1;
         molWeight       259.818;
     }
     thermodynamics
@@ -4172,7 +3913,6 @@ C7H8O_CRESOL
 {
     specie
     {
-        nMoles          1;
         molWeight       108.141;
     }
     thermodynamics
@@ -4188,7 +3928,6 @@ FO3F
 {
     specie
     {
-        nMoles          1;
         molWeight       85.995;
     }
     thermodynamics
@@ -4204,7 +3943,6 @@ CH3Br+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       94.9354;
     }
     thermodynamics
@@ -4220,7 +3958,6 @@ C3H6O__C2H3-O-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       58.0807;
     }
     thermodynamics
@@ -4236,7 +3973,6 @@ Ca+
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0795;
     }
     thermodynamics
@@ -4252,7 +3988,6 @@ FeCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       126.753;
     }
     thermodynamics
@@ -4268,7 +4003,6 @@ C12H8_Acenaphtyl
 {
     specie
     {
-        nMoles          1;
         molWeight       152.198;
     }
     thermodynamics
@@ -4284,7 +4018,6 @@ PF3Cl2
 {
     specie
     {
-        nMoles          1;
         molWeight       158.875;
     }
     thermodynamics
@@ -4300,7 +4033,6 @@ Mg2
 {
     specie
     {
-        nMoles          1;
         molWeight       48.624;
     }
     thermodynamics
@@ -4316,7 +4048,6 @@ O2_singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -4332,7 +4063,6 @@ AlF+
 {
     specie
     {
-        nMoles          1;
         molWeight       45.9794;
     }
     thermodynamics
@@ -4348,7 +4078,6 @@ B2
 {
     specie
     {
-        nMoles          1;
         molWeight       21.622;
     }
     thermodynamics
@@ -4364,7 +4093,6 @@ C6H4ClO_o-Cl-pheno
 {
     specie
     {
-        nMoles          1;
         molWeight       127.551;
     }
     thermodynamics
@@ -4380,7 +4108,6 @@ HPO2__HOPO
 {
     specie
     {
-        nMoles          1;
         molWeight       63.9806;
     }
     thermodynamics
@@ -4396,7 +4123,6 @@ CNO
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0173;
     }
     thermodynamics
@@ -4412,7 +4138,6 @@ SB(l)
 {
     specie
     {
-        nMoles          1;
         molWeight       0;
     }
     thermodynamics
@@ -4428,7 +4153,6 @@ CH3Br
 {
     specie
     {
-        nMoles          1;
         molWeight       94.936;
     }
     thermodynamics
@@ -4444,7 +4168,6 @@ DO2-
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0134;
     }
     thermodynamics
@@ -4460,7 +4183,6 @@ CH4-__Anion
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0436;
     }
     thermodynamics
@@ -4476,7 +4198,6 @@ BH5
 {
     specie
     {
-        nMoles          1;
         molWeight       15.8509;
     }
     thermodynamics
@@ -4492,7 +4213,6 @@ C3F4__PerFAllene
 {
     specie
     {
-        nMoles          1;
         molWeight       112.027;
     }
     thermodynamics
@@ -4508,7 +4228,6 @@ C2F
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0207;
     }
     thermodynamics
@@ -4524,7 +4243,6 @@ C16H33_Hexadecyl
 {
     specie
     {
-        nMoles          1;
         molWeight       225.441;
     }
     thermodynamics
@@ -4540,7 +4258,6 @@ BENZOTRIFUROXAN
 {
     specie
     {
-        nMoles          1;
         molWeight       252.103;
     }
     thermodynamics
@@ -4556,7 +4273,6 @@ CHI2
 {
     specie
     {
-        nMoles          1;
         molWeight       266.828;
     }
     thermodynamics
@@ -4572,7 +4288,6 @@ C4H2N2__Fumaroni
 {
     specie
     {
-        nMoles          1;
         molWeight       78.0739;
     }
     thermodynamics
@@ -4588,7 +4303,6 @@ O-CHLOROPHENYL
 {
     specie
     {
-        nMoles          1;
         molWeight       111.552;
     }
     thermodynamics
@@ -4604,7 +4318,6 @@ CD3_Methyl-D3
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0535;
     }
     thermodynamics
@@ -4620,7 +4333,6 @@ C9H12__1-3-5-TMB
 {
     specie
     {
-        nMoles          1;
         molWeight       120.196;
     }
     thermodynamics
@@ -4636,7 +4348,6 @@ C20H14_Alpha_BiN
 {
     specie
     {
-        nMoles          1;
         molWeight       254.335;
     }
     thermodynamics
@@ -4652,7 +4363,6 @@ C2N2_Dicyanogen
 {
     specie
     {
-        nMoles          1;
         molWeight       52.0357;
     }
     thermodynamics
@@ -4668,7 +4378,6 @@ H3B3O6
 {
     specie
     {
-        nMoles          1;
         molWeight       131.453;
     }
     thermodynamics
@@ -4684,7 +4393,6 @@ N
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0067;
     }
     thermodynamics
@@ -4700,7 +4408,6 @@ NO2F
 {
     specie
     {
-        nMoles          1;
         molWeight       65.0039;
     }
     thermodynamics
@@ -4716,7 +4423,6 @@ CO2-
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0105;
     }
     thermodynamics
@@ -4732,7 +4438,6 @@ PCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       137.333;
     }
     thermodynamics
@@ -4748,7 +4453,6 @@ Na2O2(a)
 {
     specie
     {
-        nMoles          1;
         molWeight       77.9784;
     }
     thermodynamics
@@ -4764,7 +4468,6 @@ C2D_Ethynyl-D1
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0364;
     }
     thermodynamics
@@ -4780,7 +4483,6 @@ Zn(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       65.37;
     }
     thermodynamics
@@ -4796,7 +4498,6 @@ GeH3Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       111.067;
     }
     thermodynamics
@@ -4812,7 +4513,6 @@ BrS
 {
     specie
     {
-        nMoles          1;
         molWeight       111.965;
     }
     thermodynamics
@@ -4828,7 +4528,6 @@ C9H18O2_Nonanoic
 {
     specie
     {
-        nMoles          1;
         molWeight       158.243;
     }
     thermodynamics
@@ -4844,7 +4543,6 @@ P2O5
 {
     specie
     {
-        nMoles          1;
         molWeight       141.945;
     }
     thermodynamics
@@ -4860,7 +4558,6 @@ MoC__Solid-C
 {
     specie
     {
-        nMoles          1;
         molWeight       107.951;
     }
     thermodynamics
@@ -4876,7 +4573,6 @@ CF
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0096;
     }
     thermodynamics
@@ -4892,7 +4588,6 @@ C4H9_isobutyl_rad
 {
     specie
     {
-        nMoles          1;
         molWeight       57.1163;
     }
     thermodynamics
@@ -4908,7 +4603,6 @@ CH3C-_triradical
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0468;
     }
     thermodynamics
@@ -4924,7 +4618,6 @@ CF3
 {
     specie
     {
-        nMoles          1;
         molWeight       69.0063;
     }
     thermodynamics
@@ -4940,7 +4633,6 @@ CH2N2_H2N-CN
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0405;
     }
     thermodynamics
@@ -4956,7 +4648,6 @@ C12H4Cl4O_2468
 {
     specie
     {
-        nMoles          1;
         molWeight       305.977;
     }
     thermodynamics
@@ -4972,7 +4663,6 @@ F2H-____FHF-
 {
     specie
     {
-        nMoles          1;
         molWeight       39.0053;
     }
     thermodynamics
@@ -4988,7 +4678,6 @@ C6H3Cl3O_TriClPhen
 {
     specie
     {
-        nMoles          1;
         molWeight       197.449;
     }
     thermodynamics
@@ -5004,7 +4693,6 @@ SiC
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0971;
     }
     thermodynamics
@@ -5020,7 +4708,6 @@ SbOH_tripet
 {
     specie
     {
-        nMoles          1;
         molWeight       138.757;
     }
     thermodynamics
@@ -5036,7 +4723,6 @@ N2O
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0128;
     }
     thermodynamics
@@ -5052,7 +4738,6 @@ Tetryl_Solid_Yin
 {
     specie
     {
-        nMoles          1;
         molWeight       287.147;
     }
     thermodynamics
@@ -5068,7 +4753,6 @@ C8H18,isooctane
 {
     specie
     {
-        nMoles          1;
         molWeight       114.233;
     }
     thermodynamics
@@ -5084,7 +4768,6 @@ C5H10__2-Pentene
 {
     specie
     {
-        nMoles          1;
         molWeight       70.1355;
     }
     thermodynamics
@@ -5100,7 +4783,6 @@ C6_linear_biradi
 {
     specie
     {
-        nMoles          1;
         molWeight       72.0669;
     }
     thermodynamics
@@ -5116,7 +4798,6 @@ s-1,2-C7H5NS1,2-Be
 {
     specie
     {
-        nMoles          1;
         molWeight       135.189;
     }
     thermodynamics
@@ -5132,7 +4813,6 @@ C8H_linear
 {
     specie
     {
-        nMoles          1;
         molWeight       97.0972;
     }
     thermodynamics
@@ -5148,7 +4828,6 @@ CH3OH-_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       32.043;
     }
     thermodynamics
@@ -5164,7 +4843,6 @@ CF3O_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       85.0057;
     }
     thermodynamics
@@ -5180,7 +4858,6 @@ C5H10O2_Peroxy-en
 {
     specie
     {
-        nMoles          1;
         molWeight       102.134;
     }
     thermodynamics
@@ -5196,7 +4873,6 @@ SO3
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0622;
     }
     thermodynamics
@@ -5212,7 +4888,6 @@ F2-
 {
     specie
     {
-        nMoles          1;
         molWeight       37.9973;
     }
     thermodynamics
@@ -5228,7 +4903,6 @@ C2H4O_vinyl_alco
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0536;
     }
     thermodynamics
@@ -5244,7 +4918,6 @@ H2O2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0147;
     }
     thermodynamics
@@ -5260,7 +4933,6 @@ C3Cl3_triClallene
 {
     specie
     {
-        nMoles          1;
         molWeight       142.392;
     }
     thermodynamics
@@ -5276,7 +4948,6 @@ PH2
 {
     specie
     {
-        nMoles          1;
         molWeight       32.9897;
     }
     thermodynamics
@@ -5292,7 +4963,6 @@ C5H6_1-ene-3yne,
 {
     specie
     {
-        nMoles          1;
         molWeight       66.1036;
     }
     thermodynamics
@@ -5308,7 +4978,6 @@ C9H19_n-nonyl
 {
     specie
     {
-        nMoles          1;
         molWeight       127.252;
     }
     thermodynamics
@@ -5324,7 +4993,6 @@ NiO(liq)
 {
     specie
     {
-        nMoles          1;
         molWeight       74.7094;
     }
     thermodynamics
@@ -5340,7 +5008,6 @@ S-C5H11_1m-butyl
 {
     specie
     {
-        nMoles          1;
         molWeight       71.1434;
     }
     thermodynamics
@@ -5356,7 +5023,6 @@ s-1,2-C2H2F2-cis
 {
     specie
     {
-        nMoles          1;
         molWeight       64.035;
     }
     thermodynamics
@@ -5372,7 +5038,6 @@ B
 {
     specie
     {
-        nMoles          1;
         molWeight       10.811;
     }
     thermodynamics
@@ -5388,7 +5053,6 @@ C2H2F4_1,1,2,2
 {
     specie
     {
-        nMoles          1;
         molWeight       102.032;
     }
     thermodynamics
@@ -5404,7 +5068,6 @@ C9H__linear
 {
     specie
     {
-        nMoles          1;
         molWeight       109.108;
     }
     thermodynamics
@@ -5420,7 +5083,6 @@ C18H34O3_RicinOlei
 {
     specie
     {
-        nMoles          1;
         molWeight       298.47;
     }
     thermodynamics
@@ -5436,7 +5098,6 @@ P
 {
     specie
     {
-        nMoles          1;
         molWeight       30.9738;
     }
     thermodynamics
@@ -5452,7 +5113,6 @@ C4H7__cyclobutyl
 {
     specie
     {
-        nMoles          1;
         molWeight       55.1004;
     }
     thermodynamics
@@ -5468,7 +5128,6 @@ C5H6_Vinyl-Allene
 {
     specie
     {
-        nMoles          1;
         molWeight       66.1036;
     }
     thermodynamics
@@ -5484,7 +5143,6 @@ CT3__methyl_T-3
 {
     specie
     {
-        nMoles          1;
         molWeight       155.711;
     }
     thermodynamics
@@ -5500,7 +5158,6 @@ Sn(CH3)4
 {
     specie
     {
-        nMoles          1;
         molWeight       178.83;
     }
     thermodynamics
@@ -5516,7 +5173,6 @@ BiH3
 {
     specie
     {
-        nMoles          1;
         molWeight       212.004;
     }
     thermodynamics
@@ -5532,7 +5188,6 @@ HCCO_Ketyl_radical
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0297;
     }
     thermodynamics
@@ -5548,7 +5203,6 @@ CD4__RRHO
 {
     specie
     {
-        nMoles          1;
         molWeight       20.0676;
     }
     thermodynamics
@@ -5564,7 +5218,6 @@ NH2__AMIDOGEN_RAD
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0226;
     }
     thermodynamics
@@ -5580,7 +5233,6 @@ C18H30O2_Linolenic
 {
     specie
     {
-        nMoles          1;
         molWeight       278.439;
     }
     thermodynamics
@@ -5596,7 +5248,6 @@ C2H2FCl_1,1-FCl
 {
     specie
     {
-        nMoles          1;
         molWeight       80.4896;
     }
     thermodynamics
@@ -5612,7 +5263,6 @@ Al(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       26.9815;
     }
     thermodynamics
@@ -5628,7 +5278,6 @@ C10H7-CH2CH2*
 {
     specie
     {
-        nMoles          1;
         molWeight       155.221;
     }
     thermodynamics
@@ -5644,7 +5293,6 @@ BF2+
 {
     specie
     {
-        nMoles          1;
         molWeight       48.8073;
     }
     thermodynamics
@@ -5660,7 +5308,6 @@ C3H5O__*CH2C2H3O
 {
     specie
     {
-        nMoles          1;
         molWeight       57.0727;
     }
     thermodynamics
@@ -5676,7 +5323,6 @@ CP
 {
     specie
     {
-        nMoles          1;
         molWeight       42.9849;
     }
     thermodynamics
@@ -5692,7 +5338,6 @@ C7H5N___PhenylCN
 {
     specie
     {
-        nMoles          1;
         molWeight       103.125;
     }
     thermodynamics
@@ -5708,7 +5353,6 @@ ND
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0208;
     }
     thermodynamics
@@ -5724,7 +5368,6 @@ Br+
 {
     specie
     {
-        nMoles          1;
         molWeight       79.9004;
     }
     thermodynamics
@@ -5740,7 +5383,6 @@ C4H5O__EtKetene
 {
     specie
     {
-        nMoles          1;
         molWeight       69.0838;
     }
     thermodynamics
@@ -5756,7 +5398,6 @@ Ni3S2(b)
 {
     specie
     {
-        nMoles          1;
         molWeight       240.258;
     }
     thermodynamics
@@ -5772,7 +5413,6 @@ C3F7_CF3CF*CF3_M
 {
     specie
     {
-        nMoles          1;
         molWeight       169.022;
     }
     thermodynamics
@@ -5788,7 +5428,6 @@ C12H4Cl6O2_BIFENYL
 {
     specie
     {
-        nMoles          1;
         molWeight       392.882;
     }
     thermodynamics
@@ -5804,7 +5443,6 @@ NH4NO3(I)
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0435;
     }
     thermodynamics
@@ -5820,7 +5458,6 @@ CH2OH+
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0339;
     }
     thermodynamics
@@ -5836,7 +5473,6 @@ PCl2-
 {
     specie
     {
-        nMoles          1;
         molWeight       101.88;
     }
     thermodynamics
@@ -5852,7 +5488,6 @@ HSO2__HO-SO
 {
     specie
     {
-        nMoles          1;
         molWeight       65.0708;
     }
     thermodynamics
@@ -5868,7 +5503,6 @@ C19H40_NanoDecane
 {
     specie
     {
-        nMoles          1;
         molWeight       268.531;
     }
     thermodynamics
@@ -5884,7 +5518,6 @@ CH3N2_cy(-CH*N=NH-
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0485;
     }
     thermodynamics
@@ -5900,7 +5533,6 @@ Ag_liq
 {
     specie
     {
-        nMoles          1;
         molWeight       107.87;
     }
     thermodynamics
@@ -5916,7 +5548,6 @@ C3H7I_1-IodoProp
 {
     specie
     {
-        nMoles          1;
         molWeight       169.994;
     }
     thermodynamics
@@ -5932,7 +5563,6 @@ C7H7O2__p-guyacyl
 {
     specie
     {
-        nMoles          1;
         molWeight       123.133;
     }
     thermodynamics
@@ -5948,7 +5578,6 @@ C6H5_CHAIN
 {
     specie
     {
-        nMoles          1;
         molWeight       77.1068;
     }
     thermodynamics
@@ -5964,7 +5593,6 @@ I2O__I-O-I
 {
     specie
     {
-        nMoles          1;
         molWeight       269.808;
     }
     thermodynamics
@@ -5980,7 +5608,6 @@ C6H13__2-M-2yl
 {
     specie
     {
-        nMoles          1;
         molWeight       85.1705;
     }
     thermodynamics
@@ -5996,7 +5623,6 @@ C2H3O2_*CH2CH=O
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0456;
     }
     thermodynamics
@@ -6012,7 +5638,6 @@ C2Cl2F2_1,2-cis
 {
     specie
     {
-        nMoles          1;
         molWeight       132.925;
     }
     thermodynamics
@@ -6028,7 +5653,6 @@ CHO+
 {
     specie
     {
-        nMoles          1;
         molWeight       29.018;
     }
     thermodynamics
@@ -6044,7 +5668,6 @@ C6H12_2Me-2en
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1625;
     }
     thermodynamics
@@ -6060,7 +5683,6 @@ Na(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       22.9898;
     }
     thermodynamics
@@ -6076,7 +5698,6 @@ C5H9O2_MeButyratC2
 {
     specie
     {
-        nMoles          1;
         molWeight       101.126;
     }
     thermodynamics
@@ -6092,7 +5713,6 @@ SF-
 {
     specie
     {
-        nMoles          1;
         molWeight       51.0629;
     }
     thermodynamics
@@ -6108,7 +5728,6 @@ DT
 {
     specie
     {
-        nMoles          1;
         molWeight       49.9141;
     }
     thermodynamics
@@ -6124,7 +5743,6 @@ C9H7+_C6H5CH=C=CH
 {
     specie
     {
-        nMoles          1;
         molWeight       115.156;
     }
     thermodynamics
@@ -6140,7 +5758,6 @@ C23H48__tricosan
 {
     specie
     {
-        nMoles          1;
         molWeight       324.639;
     }
     thermodynamics
@@ -6156,7 +5773,6 @@ s-1,5-C6H4__cis
 {
     specie
     {
-        nMoles          1;
         molWeight       76.0988;
     }
     thermodynamics
@@ -6172,7 +5788,6 @@ CO3-__gas
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0099;
     }
     thermodynamics
@@ -6188,7 +5803,6 @@ TF_Tritium_Fluor
 {
     specie
     {
-        nMoles          1;
         molWeight       66.8984;
     }
     thermodynamics
@@ -6204,7 +5818,6 @@ HPO3__HOPO2
 {
     specie
     {
-        nMoles          1;
         molWeight       79.98;
     }
     thermodynamics
@@ -6220,7 +5833,6 @@ C10H20_3-decene-
 {
     specie
     {
-        nMoles          1;
         molWeight       140.271;
     }
     thermodynamics
@@ -6236,7 +5848,6 @@ C3H5Cl__CHCl=CHCH3
 {
     specie
     {
-        nMoles          1;
         molWeight       76.5263;
     }
     thermodynamics
@@ -6252,7 +5863,6 @@ MgSiO3(II)
 {
     specie
     {
-        nMoles          1;
         molWeight       100.396;
     }
     thermodynamics
@@ -6268,7 +5878,6 @@ BrOBr
 {
     specie
     {
-        nMoles          1;
         molWeight       175.801;
     }
     thermodynamics
@@ -6284,7 +5893,6 @@ S3
 {
     specie
     {
-        nMoles          1;
         molWeight       96.192;
     }
     thermodynamics
@@ -6300,7 +5908,6 @@ C4H8O_n-Butanal
 {
     specie
     {
-        nMoles          1;
         molWeight       72.1078;
     }
     thermodynamics
@@ -6316,7 +5923,6 @@ C3H3-_CH3CC*-
 {
     specie
     {
-        nMoles          1;
         molWeight       39.0579;
     }
     thermodynamics
@@ -6332,7 +5938,6 @@ C4H9N_PYRROLIDINE
 {
     specie
     {
-        nMoles          1;
         molWeight       71.123;
     }
     thermodynamics
@@ -6348,7 +5953,6 @@ C
 {
     specie
     {
-        nMoles          1;
         molWeight       12.0112;
     }
     thermodynamics
@@ -6364,7 +5968,6 @@ PbCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       313.549;
     }
     thermodynamics
@@ -6380,7 +5983,6 @@ KNO3(b)_Hexagonal
 {
     specie
     {
-        nMoles          1;
         molWeight       101.107;
     }
     thermodynamics
@@ -6396,7 +5998,6 @@ SH
 {
     specie
     {
-        nMoles          1;
         molWeight       33.072;
     }
     thermodynamics
@@ -6412,7 +6013,6 @@ C6H9_1-C5H7-3-CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       81.1386;
     }
     thermodynamics
@@ -6428,7 +6028,6 @@ C8H14__cis_Penta
 {
     specie
     {
-        nMoles          1;
         molWeight       110.201;
     }
     thermodynamics
@@ -6444,7 +6043,6 @@ GeS
 {
     specie
     {
-        nMoles          1;
         molWeight       104.654;
     }
     thermodynamics
@@ -6460,7 +6058,6 @@ C8H6O2_BENZODIOXIN
 {
     specie
     {
-        nMoles          1;
         molWeight       134.136;
     }
     thermodynamics
@@ -6476,7 +6073,6 @@ C12H9N__CARBAZOLE
 {
     specie
     {
-        nMoles          1;
         molWeight       167.212;
     }
     thermodynamics
@@ -6492,7 +6088,6 @@ HOOOH
 {
     specie
     {
-        nMoles          1;
         molWeight       50.0141;
     }
     thermodynamics
@@ -6508,7 +6103,6 @@ C4H6O4_Succinic_ac
 {
     specie
     {
-        nMoles          1;
         molWeight       118.09;
     }
     thermodynamics
@@ -6524,7 +6118,6 @@ C24H48O2_Lignocer
 {
     specie
     {
-        nMoles          1;
         molWeight       368.649;
     }
     thermodynamics
@@ -6540,7 +6133,6 @@ Pb(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       207.19;
     }
     thermodynamics
@@ -6556,7 +6148,6 @@ HOBr
 {
     specie
     {
-        nMoles          1;
         molWeight       96.9083;
     }
     thermodynamics
@@ -6572,7 +6163,6 @@ C12H7_Acenaphtynyl
 {
     specie
     {
-        nMoles          1;
         molWeight       151.19;
     }
     thermodynamics
@@ -6588,7 +6178,6 @@ C5H3Cl3_CY-1,2,4Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       169.439;
     }
     thermodynamics
@@ -6604,7 +6193,6 @@ C3D6_Cyclopropan
 {
     specie
     {
-        nMoles          1;
         molWeight       48.1181;
     }
     thermodynamics
@@ -6620,7 +6208,6 @@ Cl2O2
 {
     specie
     {
-        nMoles          1;
         molWeight       102.905;
     }
     thermodynamics
@@ -6636,7 +6223,6 @@ PH3+
 {
     specie
     {
-        nMoles          1;
         molWeight       33.9972;
     }
     thermodynamics
@@ -6652,7 +6238,6 @@ MgAl2O4(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       142.273;
     }
     thermodynamics
@@ -6668,7 +6253,6 @@ Ca(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       40.08;
     }
     thermodynamics
@@ -6684,7 +6268,6 @@ NO3
 {
     specie
     {
-        nMoles          1;
         molWeight       62.0049;
     }
     thermodynamics
@@ -6700,7 +6283,6 @@ SiCl
 {
     specie
     {
-        nMoles          1;
         molWeight       63.539;
     }
     thermodynamics
@@ -6716,7 +6298,6 @@ C11N_Cyanoundecyl
 {
     specie
     {
-        nMoles          1;
         molWeight       146.129;
     }
     thermodynamics
@@ -6732,7 +6313,6 @@ s-1-C10H7CH2CH2OH
 {
     specie
     {
-        nMoles          1;
         molWeight       172.229;
     }
     thermodynamics
@@ -6748,7 +6328,6 @@ C6H4O2__O=C6H4=O
 {
     specie
     {
-        nMoles          1;
         molWeight       108.098;
     }
     thermodynamics
@@ -6764,7 +6343,6 @@ C2H3ClO2
 {
     specie
     {
-        nMoles          1;
         molWeight       94.498;
     }
     thermodynamics
@@ -6780,7 +6358,6 @@ S2F10
 {
     specie
     {
-        nMoles          1;
         molWeight       254.112;
     }
     thermodynamics
@@ -6796,7 +6373,6 @@ Hg(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       200.59;
     }
     thermodynamics
@@ -6812,7 +6388,6 @@ C12H4Cl5O2_Radic
 {
     specie
     {
-        nMoles          1;
         molWeight       357.429;
     }
     thermodynamics
@@ -6828,7 +6403,6 @@ SiH4__Silane
 {
     specie
     {
-        nMoles          1;
         molWeight       32.1179;
     }
     thermodynamics
@@ -6844,7 +6418,6 @@ C5H10O_2-Me_Furan
 {
     specie
     {
-        nMoles          1;
         molWeight       86.1349;
     }
     thermodynamics
@@ -6860,7 +6433,6 @@ Ge
 {
     specie
     {
-        nMoles          1;
         molWeight       72.59;
     }
     thermodynamics
@@ -6876,7 +6448,6 @@ C5H2Cl3_1,3,4_Cyc
 {
     specie
     {
-        nMoles          1;
         molWeight       168.431;
     }
     thermodynamics
@@ -6892,7 +6463,6 @@ C9H8_INDENE
 {
     specie
     {
-        nMoles          1;
         molWeight       116.164;
     }
     thermodynamics
@@ -6908,7 +6478,6 @@ C4H8O2_Butyricacid
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1072;
     }
     thermodynamics
@@ -6924,7 +6493,6 @@ CF3-CHClF__FC-124
 {
     specie
     {
-        nMoles          1;
         molWeight       136.477;
     }
     thermodynamics
@@ -6940,7 +6508,6 @@ Ag
 {
     specie
     {
-        nMoles          1;
         molWeight       107.87;
     }
     thermodynamics
@@ -6956,7 +6523,6 @@ AlF2
 {
     specie
     {
-        nMoles          1;
         molWeight       64.9783;
     }
     thermodynamics
@@ -6972,7 +6538,6 @@ CF3-_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       69.0069;
     }
     thermodynamics
@@ -6988,7 +6553,6 @@ CHO
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0185;
     }
     thermodynamics
@@ -7004,7 +6568,6 @@ C7H14_CY-HEPTANE
 {
     specie
     {
-        nMoles          1;
         molWeight       98.1896;
     }
     thermodynamics
@@ -7020,7 +6583,6 @@ C6H12_2-Me-1en
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1625;
     }
     thermodynamics
@@ -7036,7 +6598,6 @@ C5H10__2MB-3-ene
 {
     specie
     {
-        nMoles          1;
         molWeight       70.1355;
     }
     thermodynamics
@@ -7052,7 +6613,6 @@ C2Br5
 {
     specie
     {
-        nMoles          1;
         molWeight       423.527;
     }
     thermodynamics
@@ -7068,7 +6628,6 @@ C6H2Cl3O3_BiCy
 {
     specie
     {
-        nMoles          1;
         molWeight       228.44;
     }
     thermodynamics
@@ -7084,7 +6643,6 @@ CBrClF2
 {
     specie
     {
-        nMoles          1;
         molWeight       165.362;
     }
     thermodynamics
@@ -7100,7 +6658,6 @@ C11H22O2_cis-acid
 {
     specie
     {
-        nMoles          1;
         molWeight       186.297;
     }
     thermodynamics
@@ -7116,7 +6673,6 @@ C8H5_C6H5-CC*
 {
     specie
     {
-        nMoles          1;
         molWeight       101.129;
     }
     thermodynamics
@@ -7132,7 +6688,6 @@ COHCl2___Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       99.9245;
     }
     thermodynamics
@@ -7148,7 +6703,6 @@ C7H6O___C6H5-CHO
 {
     specie
     {
-        nMoles          1;
         molWeight       106.125;
     }
     thermodynamics
@@ -7164,7 +6718,6 @@ C18H12__Naphtace
 {
     specie
     {
-        nMoles          1;
         molWeight       228.296;
     }
     thermodynamics
@@ -7180,7 +6733,6 @@ C17H34O2_mepalmita
 {
     specie
     {
-        nMoles          1;
         molWeight       270.459;
     }
     thermodynamics
@@ -7196,7 +6748,6 @@ C12H20O10_Cellobi
 {
     specie
     {
-        nMoles          1;
         molWeight       324.287;
     }
     thermodynamics
@@ -7212,7 +6763,6 @@ C5H7Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       102.565;
     }
     thermodynamics
@@ -7228,7 +6778,6 @@ C7H16_n-heptane
 {
     specie
     {
-        nMoles          1;
         molWeight       100.206;
     }
     thermodynamics
@@ -7244,7 +6793,6 @@ C8H6O_BENZOFURAN
 {
     specie
     {
-        nMoles          1;
         molWeight       118.136;
     }
     thermodynamics
@@ -7260,7 +6808,6 @@ C10H20O2_cis-acid
 {
     specie
     {
-        nMoles          1;
         molWeight       172.27;
     }
     thermodynamics
@@ -7276,7 +6823,6 @@ CHBr2CHBr2
 {
     specie
     {
-        nMoles          1;
         molWeight       345.642;
     }
     thermodynamics
@@ -7292,7 +6838,6 @@ C5H4O2_Ketene
 {
     specie
     {
-        nMoles          1;
         molWeight       96.0864;
     }
     thermodynamics
@@ -7308,7 +6853,6 @@ C6D5,phenyl
 {
     specie
     {
-        nMoles          1;
         molWeight       82.1374;
     }
     thermodynamics
@@ -7324,7 +6868,6 @@ NH4NO3(IV)
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0435;
     }
     thermodynamics
@@ -7340,7 +6883,6 @@ C3H2Cl__ClAllene
 {
     specie
     {
-        nMoles          1;
         molWeight       73.5024;
     }
     thermodynamics
@@ -7356,7 +6898,6 @@ C3H5O2_Methyl_ac
 {
     specie
     {
-        nMoles          1;
         molWeight       73.0721;
     }
     thermodynamics
@@ -7372,7 +6913,6 @@ CD___excited_4si
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0252;
     }
     thermodynamics
@@ -7388,7 +6928,6 @@ C14H10__Anthracene
 {
     specie
     {
-        nMoles          1;
         molWeight       178.236;
     }
     thermodynamics
@@ -7404,7 +6943,6 @@ C4H5N__Pyrole_cy
 {
     specie
     {
-        nMoles          1;
         molWeight       67.0911;
     }
     thermodynamics
@@ -7420,7 +6958,6 @@ Bi+
 {
     specie
     {
-        nMoles          1;
         molWeight       208.979;
     }
     thermodynamics
@@ -7436,7 +6973,6 @@ H2CNO_H2C*N=O
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0332;
     }
     thermodynamics
@@ -7452,7 +6988,6 @@ C11H__linear
 {
     specie
     {
-        nMoles          1;
         molWeight       133.131;
     }
     thermodynamics
@@ -7468,7 +7003,6 @@ C4H7O_C2H5C(O)CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       71.0998;
     }
     thermodynamics
@@ -7484,7 +7018,6 @@ C6H7__C5H4-1-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       79.1227;
     }
     thermodynamics
@@ -7500,7 +7033,6 @@ C3H5Cl_CH2=CHCH2Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       76.5263;
     }
     thermodynamics
@@ -7516,7 +7048,6 @@ Sn
 {
     specie
     {
-        nMoles          1;
         molWeight       118.69;
     }
     thermodynamics
@@ -7532,7 +7063,6 @@ CH3C+_triradical
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0457;
     }
     thermodynamics
@@ -7548,7 +7078,6 @@ CO2_cy__C(OO)
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -7564,7 +7093,6 @@ PbCl4
 {
     specie
     {
-        nMoles          1;
         molWeight       349.002;
     }
     thermodynamics
@@ -7580,7 +7108,6 @@ C20H40O2_etStearat
 {
     specie
     {
-        nMoles          1;
         molWeight       312.541;
     }
     thermodynamics
@@ -7596,7 +7123,6 @@ PCl
 {
     specie
     {
-        nMoles          1;
         molWeight       66.4268;
     }
     thermodynamics
@@ -7612,7 +7138,6 @@ C3H7N__AZETIDINE
 {
     specie
     {
-        nMoles          1;
         molWeight       57.0959;
     }
     thermodynamics
@@ -7628,7 +7153,6 @@ C2Cl4_Tetrachlor
 {
     specie
     {
-        nMoles          1;
         molWeight       165.834;
     }
     thermodynamics
@@ -7644,7 +7168,6 @@ AlO-
 {
     specie
     {
-        nMoles          1;
         molWeight       42.9814;
     }
     thermodynamics
@@ -7660,7 +7183,6 @@ C5H10_1-pentene
 {
     specie
     {
-        nMoles          1;
         molWeight       70.1355;
     }
     thermodynamics
@@ -7676,7 +7198,6 @@ PT_TritiumPhosphor
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9818;
     }
     thermodynamics
@@ -7692,7 +7213,6 @@ C6H12_1-Hexene
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1625;
     }
     thermodynamics
@@ -7708,7 +7228,6 @@ Ar+
 {
     specie
     {
-        nMoles          1;
         molWeight       39.9475;
     }
     thermodynamics
@@ -7724,7 +7243,6 @@ C7H5O___C6H5-C*O
 {
     specie
     {
-        nMoles          1;
         molWeight       105.117;
     }
     thermodynamics
@@ -7740,7 +7258,6 @@ CHF3__FLUOROFORM
 {
     specie
     {
-        nMoles          1;
         molWeight       70.0143;
     }
     thermodynamics
@@ -7756,7 +7273,6 @@ BrCl
 {
     specie
     {
-        nMoles          1;
         molWeight       115.354;
     }
     thermodynamics
@@ -7772,7 +7288,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
@@ -7788,7 +7303,6 @@ NO+
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0056;
     }
     thermodynamics
@@ -7804,7 +7318,6 @@ s-1,3-C3H6S2_cy_di
 {
     specie
     {
-        nMoles          1;
         molWeight       106.209;
     }
     thermodynamics
@@ -7820,7 +7333,6 @@ C-
 {
     specie
     {
-        nMoles          1;
         molWeight       12.0117;
     }
     thermodynamics
@@ -7836,7 +7348,6 @@ C5H12O__3-methyl
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1508;
     }
     thermodynamics
@@ -7852,7 +7363,6 @@ C2H5O__CH2CH2OH
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0616;
     }
     thermodynamics
@@ -7868,7 +7378,6 @@ C2H4
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0542;
     }
     thermodynamics
@@ -7884,7 +7393,6 @@ CH3CO+__Acetylium
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0451;
     }
     thermodynamics
@@ -7900,7 +7408,6 @@ C6H6_1,5-Hexadiyn
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -7916,7 +7423,6 @@ C10H10_2,2p(C5H5)2
 {
     specie
     {
-        nMoles          1;
         molWeight       130.191;
     }
     thermodynamics
@@ -7932,7 +7438,6 @@ Mg(OH)2(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       58.3267;
     }
     thermodynamics
@@ -7948,7 +7453,6 @@ C6H12_trans_3
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1625;
     }
     thermodynamics
@@ -7964,7 +7468,6 @@ OH_A_2Sigma+
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0074;
     }
     thermodynamics
@@ -7980,7 +7483,6 @@ SF4+
 {
     specie
     {
-        nMoles          1;
         molWeight       108.057;
     }
     thermodynamics
@@ -7996,7 +7498,6 @@ CH3OD_Methanol_d1
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0486;
     }
     thermodynamics
@@ -8012,7 +7513,6 @@ C10_linear_single
 {
     specie
     {
-        nMoles          1;
         molWeight       120.112;
     }
     thermodynamics
@@ -8028,7 +7528,6 @@ CH3COOH
 {
     specie
     {
-        nMoles          1;
         molWeight       60.053;
     }
     thermodynamics
@@ -8044,7 +7543,6 @@ Ca(b)
 {
     specie
     {
-        nMoles          1;
         molWeight       40.08;
     }
     thermodynamics
@@ -8060,7 +7558,6 @@ TCl_Tritium_Chlo
 {
     specie
     {
-        nMoles          1;
         molWeight       83.353;
     }
     thermodynamics
@@ -8076,7 +7573,6 @@ OBrO
 {
     specie
     {
-        nMoles          1;
         molWeight       111.9;
     }
     thermodynamics
@@ -8092,7 +7588,6 @@ C2Br2
 {
     specie
     {
-        nMoles          1;
         molWeight       183.824;
     }
     thermodynamics
@@ -8108,7 +7603,6 @@ C20H40O2_Archidic
 {
     specie
     {
-        nMoles          1;
         molWeight       312.541;
     }
     thermodynamics
@@ -8124,7 +7618,6 @@ o-C6H3_Radical_Cy
 {
     specie
     {
-        nMoles          1;
         molWeight       75.0908;
     }
     thermodynamics
@@ -8140,7 +7633,6 @@ Pt_(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       195.09;
     }
     thermodynamics
@@ -8156,7 +7648,6 @@ B2H
 {
     specie
     {
-        nMoles          1;
         molWeight       22.63;
     }
     thermodynamics
@@ -8172,7 +7663,6 @@ C6H10O5_Levogluco
 {
     specie
     {
-        nMoles          1;
         molWeight       162.144;
     }
     thermodynamics
@@ -8188,7 +7678,6 @@ PFCl-
 {
     specie
     {
-        nMoles          1;
         molWeight       85.4257;
     }
     thermodynamics
@@ -8204,7 +7693,6 @@ C9H20(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       128.26;
     }
     thermodynamics
@@ -8220,7 +7708,6 @@ C6H3_CH2=C*-CC-CCH
 {
     specie
     {
-        nMoles          1;
         molWeight       75.0908;
     }
     thermodynamics
@@ -8236,7 +7723,6 @@ s-1-C10H7C*O
 {
     specie
     {
-        nMoles          1;
         molWeight       155.178;
     }
     thermodynamics
@@ -8252,7 +7738,6 @@ CH2ClF__GC-31
 {
     specie
     {
-        nMoles          1;
         molWeight       68.4785;
     }
     thermodynamics
@@ -8268,7 +7753,6 @@ SbOH_singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       138.757;
     }
     thermodynamics
@@ -8284,7 +7768,6 @@ C24H46O2_Nervonic
 {
     specie
     {
-        nMoles          1;
         molWeight       366.633;
     }
     thermodynamics
@@ -8300,7 +7783,6 @@ C10H10_1-meIndene
 {
     specie
     {
-        nMoles          1;
         molWeight       130.191;
     }
     thermodynamics
@@ -8316,7 +7798,6 @@ SF5+
 {
     specie
     {
-        nMoles          1;
         molWeight       127.055;
     }
     thermodynamics
@@ -8332,7 +7813,6 @@ C4H8_Cyclobutan
 {
     specie
     {
-        nMoles          1;
         molWeight       56.1084;
     }
     thermodynamics
@@ -8348,7 +7828,6 @@ DCl
 {
     specie
     {
-        nMoles          1;
         molWeight       37.4671;
     }
     thermodynamics
@@ -8364,7 +7843,6 @@ HD+
 {
     specie
     {
-        nMoles          1;
         molWeight       3.02153;
     }
     thermodynamics
@@ -8380,7 +7858,6 @@ NF3
 {
     specie
     {
-        nMoles          1;
         molWeight       71.0019;
     }
     thermodynamics
@@ -8396,7 +7873,6 @@ Na+
 {
     specie
     {
-        nMoles          1;
         molWeight       22.9893;
     }
     thermodynamics
@@ -8412,7 +7888,6 @@ C3HBr2O*__Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       212.843;
     }
     thermodynamics
@@ -8428,7 +7903,6 @@ s-1-C10H7O*
 {
     specie
     {
-        nMoles          1;
         molWeight       143.167;
     }
     thermodynamics
@@ -8444,7 +7918,6 @@ HF
 {
     specie
     {
-        nMoles          1;
         molWeight       20.0064;
     }
     thermodynamics
@@ -8460,7 +7933,6 @@ Pt_(liq)
 {
     specie
     {
-        nMoles          1;
         molWeight       195.09;
     }
     thermodynamics
@@ -8476,7 +7948,6 @@ CNO-
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0178;
     }
     thermodynamics
@@ -8492,7 +7963,6 @@ CO
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0106;
     }
     thermodynamics
@@ -8508,7 +7978,6 @@ HgBr2(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       360.392;
     }
     thermodynamics
@@ -8524,7 +7993,6 @@ Fe(OH)3(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       106.869;
     }
     thermodynamics
@@ -8540,7 +8008,6 @@ C7H8_Norbornadiene
 {
     specie
     {
-        nMoles          1;
         molWeight       92.1418;
     }
     thermodynamics
@@ -8556,7 +8023,6 @@ C4H3_i-2yl_Rad
 {
     specie
     {
-        nMoles          1;
         molWeight       51.0685;
     }
     thermodynamics
@@ -8572,7 +8038,6 @@ C8H15_1-octenyl-
 {
     specie
     {
-        nMoles          1;
         molWeight       111.209;
     }
     thermodynamics
@@ -8588,7 +8053,6 @@ SiCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       134.445;
     }
     thermodynamics
@@ -8604,7 +8068,6 @@ C2F6O2_CF3-OO-CF3
 {
     specie
     {
-        nMoles          1;
         molWeight       170.011;
     }
     thermodynamics
@@ -8620,7 +8083,6 @@ C12H4Cl4O2_1368
 {
     specie
     {
-        nMoles          1;
         molWeight       321.976;
     }
     thermodynamics
@@ -8636,7 +8098,6 @@ S4
 {
     specie
     {
-        nMoles          1;
         molWeight       128.256;
     }
     thermodynamics
@@ -8652,7 +8113,6 @@ Ni3S2(a)
 {
     specie
     {
-        nMoles          1;
         molWeight       240.258;
     }
     thermodynamics
@@ -8668,7 +8128,6 @@ C3F7H__FC227EA
 {
     specie
     {
-        nMoles          1;
         molWeight       170.03;
     }
     thermodynamics
@@ -8684,7 +8143,6 @@ HONC
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -8700,7 +8158,6 @@ C13H9__Phenalenyl
 {
     specie
     {
-        nMoles          1;
         molWeight       165.217;
     }
     thermodynamics
@@ -8716,7 +8173,6 @@ NH2-_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0232;
     }
     thermodynamics
@@ -8732,7 +8188,6 @@ CH
 {
     specie
     {
-        nMoles          1;
         molWeight       13.0191;
     }
     thermodynamics
@@ -8748,7 +8203,6 @@ C14H28O2_Myristcac
 {
     specie
     {
-        nMoles          1;
         molWeight       228.378;
     }
     thermodynamics
@@ -8764,7 +8218,6 @@ CH3Cl+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       50.4875;
     }
     thermodynamics
@@ -8780,7 +8233,6 @@ N2H2_equil_&_trans
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0293;
     }
     thermodynamics
@@ -8796,7 +8248,6 @@ F
 {
     specie
     {
-        nMoles          1;
         molWeight       18.9984;
     }
     thermodynamics
@@ -8812,7 +8263,6 @@ C6H6_BENZENE
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -8828,7 +8278,6 @@ C6H11O2_Caproyl_R
 {
     specie
     {
-        nMoles          1;
         molWeight       115.153;
     }
     thermodynamics
@@ -8844,7 +8293,6 @@ HCO-_Formyl_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0191;
     }
     thermodynamics
@@ -8860,7 +8308,6 @@ H2SO4(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       98.0775;
     }
     thermodynamics
@@ -8876,7 +8323,6 @@ H3PO3__O=PH(OH)2
 {
     specie
     {
-        nMoles          1;
         molWeight       81.9959;
     }
     thermodynamics
@@ -8892,7 +8338,6 @@ HOT__Water-T1
 {
     specie
     {
-        nMoles          1;
         molWeight       64.9074;
     }
     thermodynamics
@@ -8908,7 +8353,6 @@ B2O3(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       69.6202;
     }
     thermodynamics
@@ -8924,7 +8368,6 @@ C7H13_1-hepten4-yl
 {
     specie
     {
-        nMoles          1;
         molWeight       97.1817;
     }
     thermodynamics
@@ -8940,7 +8383,6 @@ Cr7C3(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       400.005;
     }
     thermodynamics
@@ -8956,7 +8398,6 @@ FeCl
 {
     specie
     {
-        nMoles          1;
         molWeight       91.3;
     }
     thermodynamics
@@ -8972,7 +8413,6 @@ PbS(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       239.254;
     }
     thermodynamics
@@ -8988,7 +8428,6 @@ C9H20O_1-Nonanol
 {
     specie
     {
-        nMoles          1;
         molWeight       144.259;
     }
     thermodynamics
@@ -9004,7 +8443,6 @@ NO2__cyclo_N(OO)
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0055;
     }
     thermodynamics
@@ -9020,7 +8458,6 @@ ZrF2
 {
     specie
     {
-        nMoles          1;
         molWeight       129.217;
     }
     thermodynamics
@@ -9036,7 +8473,6 @@ C5H7NO__CH3C(O)C
 {
     specie
     {
-        nMoles          1;
         molWeight       97.1176;
     }
     thermodynamics
@@ -9052,7 +8488,6 @@ C6H7+_C5H4-1-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       79.1221;
     }
     thermodynamics
@@ -9068,7 +8503,6 @@ PFCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       120.878;
     }
     thermodynamics
@@ -9084,7 +8518,6 @@ HT
 {
     specie
     {
-        nMoles          1;
         molWeight       48.908;
     }
     thermodynamics
@@ -9100,7 +8533,6 @@ C3D4_Cyclopropen
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0898;
     }
     thermodynamics
@@ -9116,7 +8548,6 @@ ZrN(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       105.227;
     }
     thermodynamics
@@ -9132,7 +8563,6 @@ CO2+
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0094;
     }
     thermodynamics
@@ -9148,7 +8578,6 @@ s-1-C10H7-C2H5
 {
     specie
     {
-        nMoles          1;
         molWeight       156.229;
     }
     thermodynamics
@@ -9164,7 +8593,6 @@ SB(s)
 {
     specie
     {
-        nMoles          1;
         molWeight       121.75;
     }
     thermodynamics
@@ -9180,7 +8608,6 @@ CClF2
 {
     specie
     {
-        nMoles          1;
         molWeight       85.4609;
     }
     thermodynamics
@@ -9196,7 +8623,6 @@ CH2BrF
 {
     specie
     {
-        nMoles          1;
         molWeight       112.926;
     }
     thermodynamics
@@ -9212,7 +8638,6 @@ C7H10_55C5H4(CH3)2
 {
     specie
     {
-        nMoles          1;
         molWeight       94.1578;
     }
     thermodynamics
@@ -9228,7 +8653,6 @@ C2H2-_Vinylidene-
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0388;
     }
     thermodynamics
@@ -9244,7 +8668,6 @@ C3H3ON_Isoxazole
 {
     specie
     {
-        nMoles          1;
         molWeight       69.0635;
     }
     thermodynamics
@@ -9260,7 +8683,6 @@ C10H16_exo_(JP-10)
 {
     specie
     {
-        nMoles          1;
         molWeight       136.239;
     }
     thermodynamics
@@ -9276,7 +8698,6 @@ C4H8S_T.H.Thiophen
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1724;
     }
     thermodynamics
@@ -9292,7 +8713,6 @@ SF6-
 {
     specie
     {
-        nMoles          1;
         molWeight       146.055;
     }
     thermodynamics
@@ -9308,7 +8728,6 @@ HNO3
 {
     specie
     {
-        nMoles          1;
         molWeight       63.0129;
     }
     thermodynamics
@@ -9324,7 +8743,6 @@ Zr(a)
 {
     specie
     {
-        nMoles          1;
         molWeight       91.22;
     }
     thermodynamics
@@ -9340,7 +8758,6 @@ CNC
 {
     specie
     {
-        nMoles          1;
         molWeight       38.029;
     }
     thermodynamics
@@ -9356,7 +8773,6 @@ C5H5OH_Cyclo-1,4
 {
     specie
     {
-        nMoles          1;
         molWeight       82.103;
     }
     thermodynamics
@@ -9372,7 +8788,6 @@ C6H4Cl2_m-Clbenzen
 {
     specie
     {
-        nMoles          1;
         molWeight       147.005;
     }
     thermodynamics
@@ -9388,7 +8803,6 @@ C2H5S_ethyl_thio
 {
     specie
     {
-        nMoles          1;
         molWeight       61.1262;
     }
     thermodynamics
@@ -9404,7 +8818,6 @@ C7H13__Cyheptanyl
 {
     specie
     {
-        nMoles          1;
         molWeight       97.1817;
     }
     thermodynamics
@@ -9420,7 +8833,6 @@ N+
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0062;
     }
     thermodynamics
@@ -9436,7 +8848,6 @@ C6H11__Cyhexyl
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1546;
     }
     thermodynamics
@@ -9452,7 +8863,6 @@ PbO2
 {
     specie
     {
-        nMoles          1;
         molWeight       239.189;
     }
     thermodynamics
@@ -9468,7 +8878,6 @@ C(NO)-_cy
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0178;
     }
     thermodynamics
@@ -9484,7 +8893,6 @@ o-C6H5BrO_trans_E
 {
     specie
     {
-        nMoles          1;
         molWeight       173.007;
     }
     thermodynamics
@@ -9500,7 +8908,6 @@ Ir_(g)_Iridium
 {
     specie
     {
-        nMoles          1;
         molWeight       192.2;
     }
     thermodynamics
@@ -9516,7 +8923,6 @@ NO2+
 {
     specie
     {
-        nMoles          1;
         molWeight       46.005;
     }
     thermodynamics
@@ -9532,7 +8938,6 @@ C2H3Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       62.4992;
     }
     thermodynamics
@@ -9548,7 +8953,6 @@ MgCO3(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       84.3213;
     }
     thermodynamics
@@ -9564,7 +8968,6 @@ Fe(CO)5
 {
     specie
     {
-        nMoles          1;
         molWeight       195.9;
     }
     thermodynamics
@@ -9580,7 +8983,6 @@ CHClF
 {
     specie
     {
-        nMoles          1;
         molWeight       67.4705;
     }
     thermodynamics
@@ -9596,7 +8998,6 @@ C2H2F3
 {
     specie
     {
-        nMoles          1;
         molWeight       83.0334;
     }
     thermodynamics
@@ -9612,7 +9013,6 @@ C6H5I+_Iodobenze
 {
     specie
     {
-        nMoles          1;
         molWeight       204.011;
     }
     thermodynamics
@@ -9628,7 +9028,6 @@ C32H14_Ovalene
 {
     specie
     {
-        nMoles          1;
         molWeight       398.468;
     }
     thermodynamics
@@ -9644,7 +9043,6 @@ CBr2_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       171.813;
     }
     thermodynamics
@@ -9660,7 +9058,6 @@ MnO_(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       70.9374;
     }
     thermodynamics
@@ -9676,7 +9073,6 @@ C2H5N3_Ethyl_Azyd
 {
     specie
     {
-        nMoles          1;
         molWeight       71.0823;
     }
     thermodynamics
@@ -9692,7 +9088,6 @@ C5H8__CycloPente
 {
     specie
     {
-        nMoles          1;
         molWeight       68.1195;
     }
     thermodynamics
@@ -9708,7 +9103,6 @@ CH2N2_cy(-CH=N-NH)
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0405;
     }
     thermodynamics
@@ -9724,7 +9118,6 @@ ZrCl2________GAS
 {
     specie
     {
-        nMoles          1;
         molWeight       162.126;
     }
     thermodynamics
@@ -9740,7 +9133,6 @@ C4H9NO2_Nitrobuta
 {
     specie
     {
-        nMoles          1;
         molWeight       103.122;
     }
     thermodynamics
@@ -9756,7 +9148,6 @@ Cr3C2(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       180.01;
     }
     thermodynamics
@@ -9772,7 +9163,6 @@ PCl5
 {
     specie
     {
-        nMoles          1;
         molWeight       208.239;
     }
     thermodynamics
@@ -9788,7 +9178,6 @@ N4-_tetrahedral
 {
     specie
     {
-        nMoles          1;
         molWeight       56.0273;
     }
     thermodynamics
@@ -9804,7 +9193,6 @@ O4-_cyclo_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       63.9981;
     }
     thermodynamics
@@ -9820,7 +9208,6 @@ C6H5NO_Nitrosobe
 {
     specie
     {
-        nMoles          1;
         molWeight       107.113;
     }
     thermodynamics
@@ -9836,7 +9223,6 @@ CClF3___FC-13
 {
     specie
     {
-        nMoles          1;
         molWeight       104.459;
     }
     thermodynamics
@@ -9852,7 +9238,6 @@ P2O4
 {
     specie
     {
-        nMoles          1;
         molWeight       125.945;
     }
     thermodynamics
@@ -9868,7 +9253,6 @@ CON3___Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       70.0307;
     }
     thermodynamics
@@ -9884,7 +9268,6 @@ C5H6_3-ene-1yne,
 {
     specie
     {
-        nMoles          1;
         molWeight       66.1036;
     }
     thermodynamics
@@ -9900,7 +9283,6 @@ CI2
 {
     specie
     {
-        nMoles          1;
         molWeight       265.82;
     }
     thermodynamics
@@ -9916,7 +9298,6 @@ NH
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0147;
     }
     thermodynamics
@@ -9932,7 +9313,6 @@ C5H9O2_MeButyratC4
 {
     specie
     {
-        nMoles          1;
         molWeight       101.126;
     }
     thermodynamics
@@ -9948,7 +9328,6 @@ HNO-
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0146;
     }
     thermodynamics
@@ -9964,7 +9343,6 @@ CHF+
 {
     specie
     {
-        nMoles          1;
         molWeight       32.017;
     }
     thermodynamics
@@ -9980,7 +9358,6 @@ C10H8__AZULENE
 {
     specie
     {
-        nMoles          1;
         molWeight       128.175;
     }
     thermodynamics
@@ -9996,7 +9373,6 @@ PF2Cl3
 {
     specie
     {
-        nMoles          1;
         molWeight       175.33;
     }
     thermodynamics
@@ -10012,7 +9388,6 @@ C8_linear_triplet
 {
     specie
     {
-        nMoles          1;
         molWeight       96.0892;
     }
     thermodynamics
@@ -10028,7 +9403,6 @@ CCl3O*
 {
     specie
     {
-        nMoles          1;
         molWeight       134.37;
     }
     thermodynamics
@@ -10044,7 +9418,6 @@ C6H4N4O2_4-Nitro
 {
     specie
     {
-        nMoles          1;
         molWeight       164.124;
     }
     thermodynamics
@@ -10060,7 +9433,6 @@ NiO(cr)A
 {
     specie
     {
-        nMoles          1;
         molWeight       74.7094;
     }
     thermodynamics
@@ -10076,7 +9448,6 @@ C3H6O2_EthylFormat
 {
     specie
     {
-        nMoles          1;
         molWeight       74.0801;
     }
     thermodynamics
@@ -10092,7 +9463,6 @@ C6HCl3OH__3-YL_RAD
 {
     specie
     {
-        nMoles          1;
         molWeight       196.441;
     }
     thermodynamics
@@ -10108,7 +9478,6 @@ s-1,3-C6H4_BENZYNE
 {
     specie
     {
-        nMoles          1;
         molWeight       76.0988;
     }
     thermodynamics
@@ -10124,7 +9493,6 @@ CCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       118.37;
     }
     thermodynamics
@@ -10140,7 +9508,6 @@ GeCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       178.949;
     }
     thermodynamics
@@ -10156,7 +9523,6 @@ C14H6N6O12_HNS
 {
     specie
     {
-        nMoles          1;
         molWeight       450.237;
     }
     thermodynamics
@@ -10172,7 +9538,6 @@ SiHCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       135.453;
     }
     thermodynamics
@@ -10188,7 +9553,6 @@ C3H6O2__Glycidol
 {
     specie
     {
-        nMoles          1;
         molWeight       74.0801;
     }
     thermodynamics
@@ -10204,7 +9568,6 @@ PbS
 {
     specie
     {
-        nMoles          1;
         molWeight       239.254;
     }
     thermodynamics
@@ -10220,7 +9583,6 @@ C2H6S2_(CH3SSCH3)
 {
     specie
     {
-        nMoles          1;
         molWeight       94.1981;
     }
     thermodynamics
@@ -10236,7 +9598,6 @@ PbBr3
 {
     specie
     {
-        nMoles          1;
         molWeight       446.893;
     }
     thermodynamics
@@ -10252,7 +9613,6 @@ C2H4F2__HFC-152
 {
     specie
     {
-        nMoles          1;
         molWeight       66.051;
     }
     thermodynamics
@@ -10268,7 +9628,6 @@ PF-
 {
     specie
     {
-        nMoles          1;
         molWeight       49.9727;
     }
     thermodynamics
@@ -10284,7 +9643,6 @@ OCCN
 {
     specie
     {
-        nMoles          1;
         molWeight       54.0284;
     }
     thermodynamics
@@ -10300,7 +9658,6 @@ C6H10,cyclo-
 {
     specie
     {
-        nMoles          1;
         molWeight       82.1466;
     }
     thermodynamics
@@ -10316,7 +9673,6 @@ C5H9O2_RadMeButyr
 {
     specie
     {
-        nMoles          1;
         molWeight       101.126;
     }
     thermodynamics
@@ -10332,7 +9688,6 @@ Mn3O4__Solid-B
 {
     specie
     {
-        nMoles          1;
         molWeight       228.812;
     }
     thermodynamics
@@ -10348,7 +9703,6 @@ C21H42O2_MeArchid
 {
     specie
     {
-        nMoles          1;
         molWeight       326.568;
     }
     thermodynamics
@@ -10364,7 +9718,6 @@ C6H9_b
 {
     specie
     {
-        nMoles          1;
         molWeight       81.1386;
     }
     thermodynamics
@@ -10380,7 +9733,6 @@ C6H12_4MP-2en_cis
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1625;
     }
     thermodynamics
@@ -10396,7 +9748,6 @@ MgTiO3(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       120.21;
     }
     thermodynamics
@@ -10412,7 +9763,6 @@ P-
 {
     specie
     {
-        nMoles          1;
         molWeight       30.9743;
     }
     thermodynamics
@@ -10428,7 +9778,6 @@ CH3C(O)O-NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       105.051;
     }
     thermodynamics
@@ -10444,7 +9793,6 @@ C2H2_acetylene
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0382;
     }
     thermodynamics
@@ -10460,7 +9808,6 @@ AlF3
 {
     specie
     {
-        nMoles          1;
         molWeight       83.9767;
     }
     thermodynamics
@@ -10476,7 +9823,6 @@ H3B3O3
 {
     specie
     {
-        nMoles          1;
         molWeight       83.4551;
     }
     thermodynamics
@@ -10492,7 +9838,6 @@ CH3I
 {
     specie
     {
-        nMoles          1;
         molWeight       141.939;
     }
     thermodynamics
@@ -10508,7 +9853,6 @@ C12H4Cl4O2_1379
 {
     specie
     {
-        nMoles          1;
         molWeight       321.976;
     }
     thermodynamics
@@ -10524,7 +9868,6 @@ C3H3N3_TRIAZINE
 {
     specie
     {
-        nMoles          1;
         molWeight       81.0775;
     }
     thermodynamics
@@ -10540,7 +9883,6 @@ C14H9_4-Phenantr
 {
     specie
     {
-        nMoles          1;
         molWeight       177.228;
     }
     thermodynamics
@@ -10556,7 +9898,6 @@ HNNH+_cis
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0288;
     }
     thermodynamics
@@ -10572,7 +9913,6 @@ C2(NO2)6_HexaNit
 {
     specie
     {
-        nMoles          1;
         molWeight       300.055;
     }
     thermodynamics
@@ -10588,7 +9928,6 @@ P2H2
 {
     specie
     {
-        nMoles          1;
         molWeight       63.9635;
     }
     thermodynamics
@@ -10604,7 +9943,6 @@ FO2__O-F-O
 {
     specie
     {
-        nMoles          1;
         molWeight       50.9972;
     }
     thermodynamics
@@ -10620,7 +9958,6 @@ HCl+
 {
     specie
     {
-        nMoles          1;
         molWeight       36.4604;
     }
     thermodynamics
@@ -10636,7 +9973,6 @@ C2HBr3
 {
     specie
     {
-        nMoles          1;
         molWeight       264.733;
     }
     thermodynamics
@@ -10652,7 +9988,6 @@ C10H22O_1-Decanol
 {
     specie
     {
-        nMoles          1;
         molWeight       158.286;
     }
     thermodynamics
@@ -10668,7 +10003,6 @@ C6H10O5_Cellulose
 {
     specie
     {
-        nMoles          1;
         molWeight       162.144;
     }
     thermodynamics
@@ -10684,7 +10018,6 @@ C10H12O3_Coniferyl
 {
     specie
     {
-        nMoles          1;
         molWeight       180.205;
     }
     thermodynamics
@@ -10700,7 +10033,6 @@ H2F2
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0127;
     }
     thermodynamics
@@ -10716,7 +10048,6 @@ C6H11_2M-2ENE-5YL
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1546;
     }
     thermodynamics
@@ -10732,7 +10063,6 @@ C4H7O_2-Methyl-A
 {
     specie
     {
-        nMoles          1;
         molWeight       71.0998;
     }
     thermodynamics
@@ -10748,7 +10078,6 @@ C5H4N__m-Pyridyl
 {
     specie
     {
-        nMoles          1;
         molWeight       78.0943;
     }
     thermodynamics
@@ -10764,7 +10093,6 @@ SiS2__Solid
 {
     specie
     {
-        nMoles          1;
         molWeight       92.214;
     }
     thermodynamics
@@ -10780,7 +10108,6 @@ SF+
 {
     specie
     {
-        nMoles          1;
         molWeight       51.0619;
     }
     thermodynamics
@@ -10796,7 +10123,6 @@ s-(HgN3)2
 {
     specie
     {
-        nMoles          1;
         molWeight       485.22;
     }
     thermodynamics
@@ -10812,7 +10138,6 @@ CH3NO__CH2=NH=O
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0412;
     }
     thermodynamics
@@ -10828,7 +10153,6 @@ C22H14__Pentacen
 {
     specie
     {
-        nMoles          1;
         molWeight       278.357;
     }
     thermodynamics
@@ -10844,7 +10168,6 @@ O
 {
     specie
     {
-        nMoles          1;
         molWeight       15.9994;
     }
     thermodynamics
@@ -10860,7 +10183,6 @@ C4H8,tr2-butene
 {
     specie
     {
-        nMoles          1;
         molWeight       56.1084;
     }
     thermodynamics
@@ -10876,7 +10198,6 @@ SOF2
 {
     specie
     {
-        nMoles          1;
         molWeight       86.0602;
     }
     thermodynamics
@@ -10892,7 +10213,6 @@ C14H9_9-Phenantr
 {
     specie
     {
-        nMoles          1;
         molWeight       177.228;
     }
     thermodynamics
@@ -10908,7 +10228,6 @@ Ag_cr
 {
     specie
     {
-        nMoles          1;
         molWeight       107.87;
     }
     thermodynamics
@@ -10924,7 +10243,6 @@ C6H5Cl_chlorobenz
 {
     specie
     {
-        nMoles          1;
         molWeight       112.56;
     }
     thermodynamics
@@ -10940,7 +10258,6 @@ C2H2O2__HOCCOH
 {
     specie
     {
-        nMoles          1;
         molWeight       58.037;
     }
     thermodynamics
@@ -10956,7 +10273,6 @@ C2HClF2-1,1
 {
     specie
     {
-        nMoles          1;
         molWeight       98.4801;
     }
     thermodynamics
@@ -10972,7 +10288,6 @@ ClO2___ClOO*___H
 {
     specie
     {
-        nMoles          1;
         molWeight       67.4518;
     }
     thermodynamics
@@ -10988,7 +10303,6 @@ SO2Cl2
 {
     specie
     {
-        nMoles          1;
         molWeight       134.969;
     }
     thermodynamics
@@ -11004,7 +10318,6 @@ IR(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       192.2;
     }
     thermodynamics
@@ -11020,7 +10333,6 @@ C18H36O2_Stearic
 {
     specie
     {
-        nMoles          1;
         molWeight       284.486;
     }
     thermodynamics
@@ -11036,7 +10348,6 @@ Mn2O3_(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       157.874;
     }
     thermodynamics
@@ -11052,7 +10363,6 @@ C7_linear_singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       84.0781;
     }
     thermodynamics
@@ -11068,7 +10378,6 @@ C5H
 {
     specie
     {
-        nMoles          1;
         molWeight       61.0637;
     }
     thermodynamics
@@ -11084,7 +10393,6 @@ C6H5O__2,4-cyclo
 {
     specie
     {
-        nMoles          1;
         molWeight       93.1061;
     }
     thermodynamics
@@ -11100,7 +10408,6 @@ C24H12__Coronene
 {
     specie
     {
-        nMoles          1;
         molWeight       300.363;
     }
     thermodynamics
@@ -11116,7 +10423,6 @@ C4H5_2-Butayn-1yl
 {
     specie
     {
-        nMoles          1;
         molWeight       53.0845;
     }
     thermodynamics
@@ -11132,7 +10438,6 @@ GeBr3
 {
     specie
     {
-        nMoles          1;
         molWeight       312.293;
     }
     thermodynamics
@@ -11148,7 +10453,6 @@ C2H2O+_Ethynol+
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0371;
     }
     thermodynamics
@@ -11164,7 +10468,6 @@ ZrO2(I)
 {
     specie
     {
-        nMoles          1;
         molWeight       123.219;
     }
     thermodynamics
@@ -11180,7 +10483,6 @@ PbF4
 {
     specie
     {
-        nMoles          1;
         molWeight       283.184;
     }
     thermodynamics
@@ -11196,7 +10498,6 @@ ZnCl2(G)
 {
     specie
     {
-        nMoles          1;
         molWeight       136.276;
     }
     thermodynamics
@@ -11212,7 +10513,6 @@ C4H5_E-1,3-en-1-yl
 {
     specie
     {
-        nMoles          1;
         molWeight       53.0845;
     }
     thermodynamics
@@ -11228,7 +10528,6 @@ CH3N2O3_H2COHN*NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       91.0467;
     }
     thermodynamics
@@ -11244,7 +10543,6 @@ P(cr)Red
 {
     specie
     {
-        nMoles          1;
         molWeight       30.9738;
     }
     thermodynamics
@@ -11260,7 +10558,6 @@ CH5N2___CH3N*NH2
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0644;
     }
     thermodynamics
@@ -11276,7 +10573,6 @@ C2H4+
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0536;
     }
     thermodynamics
@@ -11292,7 +10588,6 @@ N2D2,cis
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0416;
     }
     thermodynamics
@@ -11308,7 +10603,6 @@ C3HBr2*__Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       196.843;
     }
     thermodynamics
@@ -11324,7 +10618,6 @@ CHN2_cyc(-CH-N=N-)
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0325;
     }
     thermodynamics
@@ -11340,7 +10633,6 @@ C2H3Br_Bromoethy
 {
     specie
     {
-        nMoles          1;
         molWeight       106.947;
     }
     thermodynamics
@@ -11356,7 +10648,6 @@ C4H4O4_Fumaric_aci
 {
     specie
     {
-        nMoles          1;
         molWeight       116.074;
     }
     thermodynamics
@@ -11372,7 +10663,6 @@ C5H9_2-en-1-yl
 {
     specie
     {
-        nMoles          1;
         molWeight       69.1275;
     }
     thermodynamics
@@ -11388,7 +10678,6 @@ NH-_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0152;
     }
     thermodynamics
@@ -11404,7 +10693,6 @@ C2S2__S=C=C=S
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1503;
     }
     thermodynamics
@@ -11420,7 +10708,6 @@ H3F3
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0191;
     }
     thermodynamics
@@ -11436,7 +10723,6 @@ GeBr2
 {
     specie
     {
-        nMoles          1;
         molWeight       232.392;
     }
     thermodynamics
@@ -11452,7 +10738,6 @@ BOF2
 {
     specie
     {
-        nMoles          1;
         molWeight       64.8072;
     }
     thermodynamics
@@ -11468,7 +10753,6 @@ BO2
 {
     specie
     {
-        nMoles          1;
         molWeight       42.8098;
     }
     thermodynamics
@@ -11484,7 +10768,6 @@ C5H8O2_MeCrotanoat
 {
     specie
     {
-        nMoles          1;
         molWeight       100.118;
     }
     thermodynamics
@@ -11500,7 +10783,6 @@ PFCl4
 {
     specie
     {
-        nMoles          1;
         molWeight       191.784;
     }
     thermodynamics
@@ -11516,7 +10798,6 @@ C11_linear_Single
 {
     specie
     {
-        nMoles          1;
         molWeight       132.123;
     }
     thermodynamics
@@ -11532,7 +10813,6 @@ T2
 {
     specie
     {
-        nMoles          1;
         molWeight       95.8;
     }
     thermodynamics
@@ -11548,7 +10828,6 @@ HCHO_Formaldehy
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0265;
     }
     thermodynamics
@@ -11564,7 +10843,6 @@ CH4N4O2_nitrogua
 {
     specie
     {
-        nMoles          1;
         molWeight       104.069;
     }
     thermodynamics
@@ -11580,7 +10858,6 @@ BrO_Bromoxyl_rad
 {
     specie
     {
-        nMoles          1;
         molWeight       95.9003;
     }
     thermodynamics
@@ -11596,7 +10873,6 @@ MgTi2O5(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       200.109;
     }
     thermodynamics
@@ -11612,7 +10888,6 @@ Hg(CNO)2_Fulminat
 {
     specie
     {
-        nMoles          1;
         molWeight       284.625;
     }
     thermodynamics
@@ -11628,7 +10903,6 @@ ZrC(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       103.231;
     }
     thermodynamics
@@ -11644,7 +10918,6 @@ S7
 {
     specie
     {
-        nMoles          1;
         molWeight       224.448;
     }
     thermodynamics
@@ -11660,7 +10933,6 @@ N2O-_O(NN)-_cycl
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0133;
     }
     thermodynamics
@@ -11676,7 +10948,6 @@ C8H7___n-styryl
 {
     specie
     {
-        nMoles          1;
         molWeight       103.145;
     }
     thermodynamics
@@ -11692,7 +10963,6 @@ ZrO
 {
     specie
     {
-        nMoles          1;
         molWeight       107.219;
     }
     thermodynamics
@@ -11708,7 +10978,6 @@ C2H2O2_Oxyranone
 {
     specie
     {
-        nMoles          1;
         molWeight       58.037;
     }
     thermodynamics
@@ -11724,7 +10993,6 @@ C2H4O_OXYRANE
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0536;
     }
     thermodynamics
@@ -11740,7 +11008,6 @@ s-(CH3)2-N-NH2_U
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0995;
     }
     thermodynamics
@@ -11756,7 +11023,6 @@ NH4NO3(II)
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0435;
     }
     thermodynamics
@@ -11772,7 +11038,6 @@ C3H7NO3_amino_acid
 {
     specie
     {
-        nMoles          1;
         molWeight       105.094;
     }
     thermodynamics
@@ -11788,7 +11053,6 @@ C21H44_n-Heneico
 {
     specie
     {
-        nMoles          1;
         molWeight       296.585;
     }
     thermodynamics
@@ -11804,7 +11068,6 @@ PF
 {
     specie
     {
-        nMoles          1;
         molWeight       49.9722;
     }
     thermodynamics
@@ -11820,7 +11083,6 @@ BrCN+___ATcT_C
 {
     specie
     {
-        nMoles          1;
         molWeight       105.918;
     }
     thermodynamics
@@ -11836,7 +11098,6 @@ CH2+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0265;
     }
     thermodynamics
@@ -11852,7 +11113,6 @@ C5H7O_Cy_C5H7-O*
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1109;
     }
     thermodynamics
@@ -11868,7 +11128,6 @@ C6H7N_Aniline
 {
     specie
     {
-        nMoles          1;
         molWeight       93.1294;
     }
     thermodynamics
@@ -11884,7 +11143,6 @@ I2(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       253.809;
     }
     thermodynamics
@@ -11900,7 +11158,6 @@ S8
 {
     specie
     {
-        nMoles          1;
         molWeight       256.512;
     }
     thermodynamics
@@ -11916,7 +11173,6 @@ N2H4(L)_Hydrazin
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0453;
     }
     thermodynamics
@@ -11932,7 +11188,6 @@ C6H8
 {
     specie
     {
-        nMoles          1;
         molWeight       80.1307;
     }
     thermodynamics
@@ -11948,7 +11203,6 @@ C6H14_2-MePentan
 {
     specie
     {
-        nMoles          1;
         molWeight       86.1785;
     }
     thermodynamics
@@ -11964,7 +11218,6 @@ Ne+
 {
     specie
     {
-        nMoles          1;
         molWeight       20.1825;
     }
     thermodynamics
@@ -11980,7 +11233,6 @@ D2O2
 {
     specie
     {
-        nMoles          1;
         molWeight       36.027;
     }
     thermodynamics
@@ -11996,7 +11248,6 @@ CHCl=CH*
 {
     specie
     {
-        nMoles          1;
         molWeight       61.4912;
     }
     thermodynamics
@@ -12012,7 +11263,6 @@ C3O2
 {
     specie
     {
-        nMoles          1;
         molWeight       68.0323;
     }
     thermodynamics
@@ -12028,7 +11278,6 @@ C3H3NS_Thiazole
 {
     specie
     {
-        nMoles          1;
         molWeight       85.1281;
     }
     thermodynamics
@@ -12044,7 +11293,6 @@ Zn+
 {
     specie
     {
-        nMoles          1;
         molWeight       65.3695;
     }
     thermodynamics
@@ -12060,7 +11308,6 @@ C3H3I_CH2=C=CHI
 {
     specie
     {
-        nMoles          1;
         molWeight       165.962;
     }
     thermodynamics
@@ -12076,7 +11323,6 @@ CH2N__H2C=N*
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0338;
     }
     thermodynamics
@@ -12092,7 +11338,6 @@ C4H4__1-butene-3
 {
     specie
     {
-        nMoles          1;
         molWeight       52.0765;
     }
     thermodynamics
@@ -12108,7 +11353,6 @@ HClO2
 {
     specie
     {
-        nMoles          1;
         molWeight       68.4598;
     }
     thermodynamics
@@ -12124,7 +11368,6 @@ C4H8O_T.H.Furan
 {
     specie
     {
-        nMoles          1;
         molWeight       72.1078;
     }
     thermodynamics
@@ -12140,7 +11383,6 @@ HNOH-
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0226;
     }
     thermodynamics
@@ -12156,7 +11398,6 @@ C8H8_Benzocybutan
 {
     specie
     {
-        nMoles          1;
         molWeight       104.153;
     }
     thermodynamics
@@ -12172,7 +11413,6 @@ C2H5+__Ethyl_cat
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0616;
     }
     thermodynamics
@@ -12188,7 +11428,6 @@ O+
 {
     specie
     {
-        nMoles          1;
         molWeight       15.9989;
     }
     thermodynamics
@@ -12204,7 +11443,6 @@ C12H5Cl4O3_Rad
 {
     specie
     {
-        nMoles          1;
         molWeight       338.984;
     }
     thermodynamics
@@ -12220,7 +11458,6 @@ C2D4_Ethylene-D4
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0787;
     }
     thermodynamics
@@ -12236,7 +11473,6 @@ C6H14_3-MethylPe
 {
     specie
     {
-        nMoles          1;
         molWeight       86.1785;
     }
     thermodynamics
@@ -12252,7 +11488,6 @@ C2H5O_CH3CH*OH
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0616;
     }
     thermodynamics
@@ -12268,7 +11503,6 @@ C3H3Cl_3CyClPropen
 {
     specie
     {
-        nMoles          1;
         molWeight       74.5104;
     }
     thermodynamics
@@ -12284,7 +11518,6 @@ C12H5OCl3O3
 {
     specie
     {
-        nMoles          1;
         molWeight       303.531;
     }
     thermodynamics
@@ -12300,7 +11533,6 @@ BH
 {
     specie
     {
-        nMoles          1;
         molWeight       11.819;
     }
     thermodynamics
@@ -12316,7 +11548,6 @@ B2Cl4
 {
     specie
     {
-        nMoles          1;
         molWeight       163.434;
     }
     thermodynamics
@@ -12332,7 +11563,6 @@ C6H6_2,4-Hexadiyn
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -12348,7 +11578,6 @@ C3H3N__CH2=CHCN
 {
     specie
     {
-        nMoles          1;
         molWeight       53.0641;
     }
     thermodynamics
@@ -12364,7 +11593,6 @@ C6H12O_Cy-hexanol
 {
     specie
     {
-        nMoles          1;
         molWeight       100.162;
     }
     thermodynamics
@@ -12380,7 +11608,6 @@ MgSO4(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       120.374;
     }
     thermodynamics
@@ -12396,7 +11623,6 @@ C10H9_fenylbutadie
 {
     specie
     {
-        nMoles          1;
         molWeight       129.183;
     }
     thermodynamics
@@ -12412,7 +11638,6 @@ Zr
 {
     specie
     {
-        nMoles          1;
         molWeight       91.22;
     }
     thermodynamics
@@ -12428,7 +11653,6 @@ C3HCl2*1,1-Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       107.947;
     }
     thermodynamics
@@ -12444,7 +11668,6 @@ PbI2
 {
     specie
     {
-        nMoles          1;
         molWeight       460.999;
     }
     thermodynamics
@@ -12460,7 +11683,6 @@ NCN-
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0251;
     }
     thermodynamics
@@ -12476,7 +11698,6 @@ C14H9_1-Antryl_R
 {
     specie
     {
-        nMoles          1;
         molWeight       177.228;
     }
     thermodynamics
@@ -12492,7 +11713,6 @@ P(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       30.9738;
     }
     thermodynamics
@@ -12508,7 +11728,6 @@ CH3OO+__cation
 {
     specie
     {
-        nMoles          1;
         molWeight       47.0333;
     }
     thermodynamics
@@ -12524,7 +11743,6 @@ C18H12_Triphenyle
 {
     specie
     {
-        nMoles          1;
         molWeight       228.296;
     }
     thermodynamics
@@ -12540,7 +11758,6 @@ C5H9OH__Cyclopen
 {
     specie
     {
-        nMoles          1;
         molWeight       86.1349;
     }
     thermodynamics
@@ -12556,7 +11773,6 @@ CH3NH2+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0572;
     }
     thermodynamics
@@ -12572,7 +11788,6 @@ o-C6H4ClO_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       127.551;
     }
     thermodynamics
@@ -12588,7 +11803,6 @@ C16H34_Hexadecan
 {
     specie
     {
-        nMoles          1;
         molWeight       226.449;
     }
     thermodynamics
@@ -12604,7 +11818,6 @@ Sb2
 {
     specie
     {
-        nMoles          1;
         molWeight       243.5;
     }
     thermodynamics
@@ -12620,7 +11833,6 @@ Si(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       28.086;
     }
     thermodynamics
@@ -12636,7 +11848,6 @@ C6H14O_3-Hexanol
 {
     specie
     {
-        nMoles          1;
         molWeight       102.178;
     }
     thermodynamics
@@ -12652,7 +11863,6 @@ C4H6O2_Diacetyl
 {
     specie
     {
-        nMoles          1;
         molWeight       86.0912;
     }
     thermodynamics
@@ -12668,7 +11878,6 @@ Al2O2
 {
     specie
     {
-        nMoles          1;
         molWeight       85.9618;
     }
     thermodynamics
@@ -12684,7 +11893,6 @@ C4H8O__Methyl_Al
 {
     specie
     {
-        nMoles          1;
         molWeight       72.1078;
     }
     thermodynamics
@@ -12700,7 +11908,6 @@ C7H7+_C5H4*CH=CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       91.1333;
     }
     thermodynamics
@@ -12716,7 +11923,6 @@ Fe2(SO4)3(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       399.879;
     }
     thermodynamics
@@ -12732,7 +11938,6 @@ BrF5
 {
     specie
     {
-        nMoles          1;
         molWeight       174.893;
     }
     thermodynamics
@@ -12748,7 +11953,6 @@ Cr(OH)6
 {
     specie
     {
-        nMoles          1;
         molWeight       154.04;
     }
     thermodynamics
@@ -12764,7 +11968,6 @@ MgCl+
 {
     specie
     {
-        nMoles          1;
         molWeight       59.7645;
     }
     thermodynamics
@@ -12780,7 +11983,6 @@ C8H16,1-octene
 {
     specie
     {
-        nMoles          1;
         molWeight       112.217;
     }
     thermodynamics
@@ -12796,7 +11998,6 @@ NiO(cr)B
 {
     specie
     {
-        nMoles          1;
         molWeight       74.7094;
     }
     thermodynamics
@@ -12812,7 +12013,6 @@ C2H2O__Oxyrene
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0376;
     }
     thermodynamics
@@ -12828,7 +12028,6 @@ C3H3_allenyl
 {
     specie
     {
-        nMoles          1;
         molWeight       39.0574;
     }
     thermodynamics
@@ -12844,7 +12043,6 @@ C5H9_1buten3m4yl
 {
     specie
     {
-        nMoles          1;
         molWeight       69.1275;
     }
     thermodynamics
@@ -12860,7 +12058,6 @@ SbCl_singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       157.203;
     }
     thermodynamics
@@ -12876,7 +12073,6 @@ C2HBr4_1,1,1,2
 {
     specie
     {
-        nMoles          1;
         molWeight       344.634;
     }
     thermodynamics
@@ -12892,7 +12088,6 @@ C6H6O__2,4-cyclo
 {
     specie
     {
-        nMoles          1;
         molWeight       94.1141;
     }
     thermodynamics
@@ -12908,7 +12103,6 @@ N4_tetrahedral
 {
     specie
     {
-        nMoles          1;
         molWeight       56.0268;
     }
     thermodynamics
@@ -12924,7 +12118,6 @@ IO3
 {
     specie
     {
-        nMoles          1;
         molWeight       174.903;
     }
     thermodynamics
@@ -12940,7 +12133,6 @@ C2H4O-__Acetalde
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0541;
     }
     thermodynamics
@@ -12956,7 +12148,6 @@ C9H4__C(CCH)4
 {
     specie
     {
-        nMoles          1;
         molWeight       112.132;
     }
     thermodynamics
@@ -12972,7 +12163,6 @@ C2H5O-__Ethoxy_a
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0621;
     }
     thermodynamics
@@ -12988,7 +12178,6 @@ C12H4Cl5O2_2p,4,
 {
     specie
     {
-        nMoles          1;
         molWeight       357.429;
     }
     thermodynamics
@@ -13004,7 +12193,6 @@ BiCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       315.339;
     }
     thermodynamics
@@ -13020,7 +12208,6 @@ C3H2(1)CyPropen
 {
     specie
     {
-        nMoles          1;
         molWeight       38.0494;
     }
     thermodynamics
@@ -13036,7 +12223,6 @@ BBr2
 {
     specie
     {
-        nMoles          1;
         molWeight       170.613;
     }
     thermodynamics
@@ -13052,7 +12238,6 @@ C6H8__1,4-Cycloh
 {
     specie
     {
-        nMoles          1;
         molWeight       80.1307;
     }
     thermodynamics
@@ -13068,7 +12253,6 @@ H2O(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -13084,7 +12268,6 @@ Fe+
 {
     specie
     {
-        nMoles          1;
         molWeight       55.8465;
     }
     thermodynamics
@@ -13100,7 +12283,6 @@ C4H5_1-Butayn-3yl
 {
     specie
     {
-        nMoles          1;
         molWeight       53.0845;
     }
     thermodynamics
@@ -13116,7 +12298,6 @@ s-(CH3)2N-NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       90.0823;
     }
     thermodynamics
@@ -13132,7 +12313,6 @@ C5H11,t-pentyl
 {
     specie
     {
-        nMoles          1;
         molWeight       71.1434;
     }
     thermodynamics
@@ -13148,7 +12328,6 @@ PCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       101.88;
     }
     thermodynamics
@@ -13164,7 +12343,6 @@ C10H9_2-hydro_Rad
 {
     specie
     {
-        nMoles          1;
         molWeight       129.183;
     }
     thermodynamics
@@ -13180,7 +12358,6 @@ PbI4
 {
     specie
     {
-        nMoles          1;
         molWeight       714.808;
     }
     thermodynamics
@@ -13196,7 +12373,6 @@ C7H16(L)_n-Heptan
 {
     specie
     {
-        nMoles          1;
         molWeight       100.206;
     }
     thermodynamics
@@ -13212,7 +12388,6 @@ CrN
 {
     specie
     {
-        nMoles          1;
         molWeight       66.0027;
     }
     thermodynamics
@@ -13228,7 +12403,6 @@ C3H5OH__Propenol
 {
     specie
     {
-        nMoles          1;
         molWeight       58.0807;
     }
     thermodynamics
@@ -13244,7 +12418,6 @@ C3H3-_CH2=C=CH*-
 {
     specie
     {
-        nMoles          1;
         molWeight       39.0579;
     }
     thermodynamics
@@ -13260,7 +12433,6 @@ C2HBr5
 {
     specie
     {
-        nMoles          1;
         molWeight       424.535;
     }
     thermodynamics
@@ -13276,7 +12448,6 @@ C6H14_2,2-DMButan
 {
     specie
     {
-        nMoles          1;
         molWeight       86.1785;
     }
     thermodynamics
@@ -13292,7 +12463,6 @@ s-1-C10H7CHO
 {
     specie
     {
-        nMoles          1;
         molWeight       156.186;
     }
     thermodynamics
@@ -13308,7 +12478,6 @@ S2-
 {
     specie
     {
-        nMoles          1;
         molWeight       64.1285;
     }
     thermodynamics
@@ -13324,7 +12493,6 @@ C6H10_CyC5H7-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       82.1466;
     }
     thermodynamics
@@ -13340,7 +12508,6 @@ C3H3__Propargyl
 {
     specie
     {
-        nMoles          1;
         molWeight       39.0574;
     }
     thermodynamics
@@ -13356,7 +12523,6 @@ C4H7__2-me-allyl
 {
     specie
     {
-        nMoles          1;
         molWeight       55.1004;
     }
     thermodynamics
@@ -13372,7 +12538,6 @@ SiF2
 {
     specie
     {
-        nMoles          1;
         molWeight       66.0828;
     }
     thermodynamics
@@ -13388,7 +12553,6 @@ C5H3Cl3O_1-hydro
 {
     specie
     {
-        nMoles          1;
         molWeight       185.438;
     }
     thermodynamics
@@ -13404,7 +12568,6 @@ s-(CH2I)2_DiIodoet
 {
     specie
     {
-        nMoles          1;
         molWeight       281.863;
     }
     thermodynamics
@@ -13420,7 +12583,6 @@ C6H5O_phenyox_ra
 {
     specie
     {
-        nMoles          1;
         molWeight       93.1061;
     }
     thermodynamics
@@ -13436,7 +12598,6 @@ C10H7I__1-Iodona
 {
     specie
     {
-        nMoles          1;
         molWeight       254.072;
     }
     thermodynamics
@@ -13452,7 +12613,6 @@ C6H
 {
     specie
     {
-        nMoles          1;
         molWeight       73.0749;
     }
     thermodynamics
@@ -13468,7 +12628,6 @@ C2Cl3_RAD
 {
     specie
     {
-        nMoles          1;
         molWeight       130.381;
     }
     thermodynamics
@@ -13484,7 +12643,6 @@ C5F6___CycloPerF
 {
     specie
     {
-        nMoles          1;
         molWeight       174.046;
     }
     thermodynamics
@@ -13500,7 +12658,6 @@ CH2Br-CH2Br
 {
     specie
     {
-        nMoles          1;
         molWeight       187.856;
     }
     thermodynamics
@@ -13516,7 +12673,6 @@ AlH2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9974;
     }
     thermodynamics
@@ -13532,7 +12688,6 @@ HNNH-__cis____HF
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0299;
     }
     thermodynamics
@@ -13548,7 +12703,6 @@ HCO3-__gas
 {
     specie
     {
-        nMoles          1;
         molWeight       61.0179;
     }
     thermodynamics
@@ -13564,7 +12718,6 @@ CF3I_TrifluoroIo
 {
     specie
     {
-        nMoles          1;
         molWeight       195.911;
     }
     thermodynamics
@@ -13580,7 +12733,6 @@ CH2N2_H2C=N=N
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0405;
     }
     thermodynamics
@@ -13596,7 +12748,6 @@ Cu2
 {
     specie
     {
-        nMoles          1;
         molWeight       127.08;
     }
     thermodynamics
@@ -13612,7 +12763,6 @@ C6H8_CY_C5H5-1-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       80.1307;
     }
     thermodynamics
@@ -13628,7 +12778,6 @@ C4H5O2_2MeAcrylat
 {
     specie
     {
-        nMoles          1;
         molWeight       85.0833;
     }
     thermodynamics
@@ -13644,7 +12793,6 @@ C5H12O_MTBE
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1508;
     }
     thermodynamics
@@ -13660,7 +12808,6 @@ Ca(a)
 {
     specie
     {
-        nMoles          1;
         molWeight       40.08;
     }
     thermodynamics
@@ -13676,7 +12823,6 @@ Bi2___GAS
 {
     specie
     {
-        nMoles          1;
         molWeight       417.96;
     }
     thermodynamics
@@ -13692,7 +12838,6 @@ CFBr3
 {
     specie
     {
-        nMoles          1;
         molWeight       270.712;
     }
     thermodynamics
@@ -13708,7 +12853,6 @@ C5H7_Cy-1en-4-yl
 {
     specie
     {
-        nMoles          1;
         molWeight       67.1115;
     }
     thermodynamics
@@ -13724,7 +12868,6 @@ C2H5O2_HOCH2CH2O
 {
     specie
     {
-        nMoles          1;
         molWeight       61.061;
     }
     thermodynamics
@@ -13740,7 +12883,6 @@ ZrF________GAS
 {
     specie
     {
-        nMoles          1;
         molWeight       110.218;
     }
     thermodynamics
@@ -13756,7 +12898,6 @@ PbF3
 {
     specie
     {
-        nMoles          1;
         molWeight       264.185;
     }
     thermodynamics
@@ -13772,7 +12913,6 @@ C2H3__Vinyl_Radi
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0462;
     }
     thermodynamics
@@ -13788,7 +12928,6 @@ C3H8
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0972;
     }
     thermodynamics
@@ -13804,7 +12943,6 @@ C3H5NO2_NitroCy
 {
     specie
     {
-        nMoles          1;
         molWeight       87.0788;
     }
     thermodynamics
@@ -13820,7 +12958,6 @@ C6H13__2M-5yl
 {
     specie
     {
-        nMoles          1;
         molWeight       85.1705;
     }
     thermodynamics
@@ -13836,7 +12973,6 @@ Po_Polonium_(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       210;
     }
     thermodynamics
@@ -13852,7 +12988,6 @@ NITROGLICERINE
 {
     specie
     {
-        nMoles          1;
         molWeight       227.088;
     }
     thermodynamics
@@ -13868,7 +13003,6 @@ BiF3
 {
     specie
     {
-        nMoles          1;
         molWeight       265.975;
     }
     thermodynamics
@@ -13884,7 +13018,6 @@ C4H9_s-butyl
 {
     specie
     {
-        nMoles          1;
         molWeight       57.1163;
     }
     thermodynamics
@@ -13900,7 +13033,6 @@ C2F3
 {
     specie
     {
-        nMoles          1;
         molWeight       81.0175;
     }
     thermodynamics
@@ -13916,7 +13048,6 @@ C3HCl2*__Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       107.947;
     }
     thermodynamics
@@ -13932,7 +13063,6 @@ Pd(g)__Paladium
 {
     specie
     {
-        nMoles          1;
         molWeight       106.4;
     }
     thermodynamics
@@ -13948,7 +13078,6 @@ C2H5F
 {
     specie
     {
-        nMoles          1;
         molWeight       48.0606;
     }
     thermodynamics
@@ -13964,7 +13093,6 @@ C9H7N_QUINOLINE
 {
     specie
     {
-        nMoles          1;
         molWeight       129.163;
     }
     thermodynamics
@@ -13980,7 +13108,6 @@ C6H6_Fulvene
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -13996,7 +13123,6 @@ Fe(a)
 {
     specie
     {
-        nMoles          1;
         molWeight       55.847;
     }
     thermodynamics
@@ -14012,7 +13138,6 @@ Fe-
 {
     specie
     {
-        nMoles          1;
         molWeight       55.8475;
     }
     thermodynamics
@@ -14028,7 +13153,6 @@ C2(NO2)4_NO_HF
 {
     specie
     {
-        nMoles          1;
         molWeight       208.044;
     }
     thermodynamics
@@ -14044,7 +13168,6 @@ FSSF_Difluorodis
 {
     specie
     {
-        nMoles          1;
         molWeight       102.125;
     }
     thermodynamics
@@ -14060,7 +13183,6 @@ PbO
 {
     specie
     {
-        nMoles          1;
         molWeight       223.189;
     }
     thermodynamics
@@ -14076,7 +13198,6 @@ CH3CH__singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0542;
     }
     thermodynamics
@@ -14092,7 +13213,6 @@ C5H4_1,2_diene4yne
 {
     specie
     {
-        nMoles          1;
         molWeight       64.0876;
     }
     thermodynamics
@@ -14108,7 +13228,6 @@ C7H15__NEOPENTYL-2
 {
     specie
     {
-        nMoles          1;
         molWeight       99.1976;
     }
     thermodynamics
@@ -14124,7 +13243,6 @@ MgSO4(II)
 {
     specie
     {
-        nMoles          1;
         molWeight       120.374;
     }
     thermodynamics
@@ -14140,7 +13258,6 @@ Ni+
 {
     specie
     {
-        nMoles          1;
         molWeight       58.7095;
     }
     thermodynamics
@@ -14156,7 +13273,6 @@ N2O_cyclo_O(NN)
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0128;
     }
     thermodynamics
@@ -14172,7 +13288,6 @@ C2H3O_Oxyrane_Rad
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0456;
     }
     thermodynamics
@@ -14188,7 +13303,6 @@ S2Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       99.581;
     }
     thermodynamics
@@ -14204,7 +13318,6 @@ SnH4
 {
     specie
     {
-        nMoles          1;
         molWeight       122.722;
     }
     thermodynamics
@@ -14220,7 +13333,6 @@ NOH+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0135;
     }
     thermodynamics
@@ -14236,7 +13348,6 @@ C3H2Cl2__1,2_Dic
 {
     specie
     {
-        nMoles          1;
         molWeight       108.955;
     }
     thermodynamics
@@ -14252,7 +13363,6 @@ O_singlet_(excite)
 {
     specie
     {
-        nMoles          1;
         molWeight       15.9994;
     }
     thermodynamics
@@ -14268,7 +13378,6 @@ C3H4O__Acrolein
 {
     specie
     {
-        nMoles          1;
         molWeight       56.0647;
     }
     thermodynamics
@@ -14284,7 +13393,6 @@ C6H13_n-hexyl
 {
     specie
     {
-        nMoles          1;
         molWeight       85.1705;
     }
     thermodynamics
@@ -14300,7 +13408,6 @@ C2Cl3F3_FC-113
 {
     specie
     {
-        nMoles          1;
         molWeight       187.377;
     }
     thermodynamics
@@ -14316,7 +13423,6 @@ HI
 {
     specie
     {
-        nMoles          1;
         molWeight       127.912;
     }
     thermodynamics
@@ -14332,7 +13438,6 @@ C2HF2__CHF=CF(E)
 {
     specie
     {
-        nMoles          1;
         molWeight       63.0271;
     }
     thermodynamics
@@ -14348,7 +13453,6 @@ Al2O3(a)
 {
     specie
     {
-        nMoles          1;
         molWeight       101.961;
     }
     thermodynamics
@@ -14364,7 +13468,6 @@ CD
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0252;
     }
     thermodynamics
@@ -14380,7 +13483,6 @@ N2O+_O(NN)+_cycl
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0123;
     }
     thermodynamics
@@ -14396,7 +13498,6 @@ C4H6S_2,5-dihydro
 {
     specie
     {
-        nMoles          1;
         molWeight       86.1564;
     }
     thermodynamics
@@ -14412,7 +13513,6 @@ Pt
 {
     specie
     {
-        nMoles          1;
         molWeight       195.09;
     }
     thermodynamics
@@ -14428,7 +13528,6 @@ C3H6O2_Hydroaceto
 {
     specie
     {
-        nMoles          1;
         molWeight       74.0801;
     }
     thermodynamics
@@ -14444,7 +13543,6 @@ C2H4O2+_CH3COOH+
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0524;
     }
     thermodynamics
@@ -14460,7 +13558,6 @@ C12H8S_DiBenzoTh
 {
     specie
     {
-        nMoles          1;
         molWeight       184.262;
     }
     thermodynamics
@@ -14476,7 +13573,6 @@ W(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       183.85;
     }
     thermodynamics
@@ -14492,7 +13588,6 @@ BH2
 {
     specie
     {
-        nMoles          1;
         molWeight       12.8269;
     }
     thermodynamics
@@ -14508,7 +13603,6 @@ H3PO4(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       97.9953;
     }
     thermodynamics
@@ -14524,7 +13618,6 @@ Mg2TiO4(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       160.522;
     }
     thermodynamics
@@ -14540,7 +13633,6 @@ Br2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       159.802;
     }
     thermodynamics
@@ -14556,7 +13648,6 @@ C13H9N_PHENANTHRI
 {
     specie
     {
-        nMoles          1;
         molWeight       179.223;
     }
     thermodynamics
@@ -14572,7 +13663,6 @@ NiS(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       90.774;
     }
     thermodynamics
@@ -14588,7 +13678,6 @@ CH2-_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0276;
     }
     thermodynamics
@@ -14604,7 +13693,6 @@ C5H2_*HC=C=C=C=C
 {
     specie
     {
-        nMoles          1;
         molWeight       62.0717;
     }
     thermodynamics
@@ -14620,7 +13708,6 @@ S-OH
 {
     specie
     {
-        nMoles          1;
         molWeight       49.0714;
     }
     thermodynamics
@@ -14636,7 +13723,6 @@ C5H9O2_MeButyratC3
 {
     specie
     {
-        nMoles          1;
         molWeight       101.126;
     }
     thermodynamics
@@ -14652,7 +13738,6 @@ C16H9_1-Pyrenyl
 {
     specie
     {
-        nMoles          1;
         molWeight       201.25;
     }
     thermodynamics
@@ -14668,7 +13753,6 @@ C7H10N2O2_BiCyclo
 {
     specie
     {
-        nMoles          1;
         molWeight       154.17;
     }
     thermodynamics
@@ -14684,7 +13768,6 @@ NO3+
 {
     specie
     {
-        nMoles          1;
         molWeight       62.0044;
     }
     thermodynamics
@@ -14700,7 +13783,6 @@ HFCO
 {
     specie
     {
-        nMoles          1;
         molWeight       48.0169;
     }
     thermodynamics
@@ -14716,7 +13798,6 @@ CrO2Cl2
 {
     specie
     {
-        nMoles          1;
         molWeight       154.901;
     }
     thermodynamics
@@ -14732,7 +13813,6 @@ FeS(b)
 {
     specie
     {
-        nMoles          1;
         molWeight       87.911;
     }
     thermodynamics
@@ -14748,7 +13828,6 @@ C5H5+_1yne3ene5yl
 {
     specie
     {
-        nMoles          1;
         molWeight       65.0951;
     }
     thermodynamics
@@ -14764,7 +13843,6 @@ Fe
 {
     specie
     {
-        nMoles          1;
         molWeight       55.847;
     }
     thermodynamics
@@ -14780,7 +13858,6 @@ C2Br
 {
     specie
     {
-        nMoles          1;
         molWeight       103.923;
     }
     thermodynamics
@@ -14796,7 +13873,6 @@ HNCO+
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -14812,7 +13888,6 @@ C6H11__1en-2M4yl
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1546;
     }
     thermodynamics
@@ -14828,7 +13903,6 @@ C3H4N4O6_1,3,3-
 {
     specie
     {
-        nMoles          1;
         molWeight       192.089;
     }
     thermodynamics
@@ -14844,7 +13918,6 @@ CH3SH_methyl_mer
 {
     specie
     {
-        nMoles          1;
         molWeight       48.107;
     }
     thermodynamics
@@ -14860,7 +13933,6 @@ C7H8__Toluene
 {
     specie
     {
-        nMoles          1;
         molWeight       92.1418;
     }
     thermodynamics
@@ -14876,7 +13948,6 @@ C6H2Cl3O3_Sym_BiCy
 {
     specie
     {
-        nMoles          1;
         molWeight       228.44;
     }
     thermodynamics
@@ -14892,7 +13963,6 @@ s-1,5-C6H4__trans
 {
     specie
     {
-        nMoles          1;
         molWeight       76.0988;
     }
     thermodynamics
@@ -14908,7 +13978,6 @@ CHBr
 {
     specie
     {
-        nMoles          1;
         molWeight       92.92;
     }
     thermodynamics
@@ -14924,7 +13993,6 @@ C6H6_1,2,4,5
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -14940,7 +14008,6 @@ CH2CO__ketene
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0376;
     }
     thermodynamics
@@ -14956,7 +14023,6 @@ C3H4__cyPropene
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0653;
     }
     thermodynamics
@@ -14972,7 +14038,6 @@ KNO3(G)
 {
     specie
     {
-        nMoles          1;
         molWeight       101.107;
     }
     thermodynamics
@@ -14988,7 +14053,6 @@ C8H7N__Indole
 {
     specie
     {
-        nMoles          1;
         molWeight       117.152;
     }
     thermodynamics
@@ -15004,7 +14068,6 @@ C(cr)_Diamond
 {
     specie
     {
-        nMoles          1;
         molWeight       12.0112;
     }
     thermodynamics
@@ -15020,7 +14083,6 @@ C7F16
 {
     specie
     {
-        nMoles          1;
         molWeight       388.052;
     }
     thermodynamics
@@ -15036,7 +14098,6 @@ PO3
 {
     specie
     {
-        nMoles          1;
         molWeight       78.972;
     }
     thermodynamics
@@ -15052,7 +14113,6 @@ PF4Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       142.42;
     }
     thermodynamics
@@ -15068,7 +14128,6 @@ C5H6O_3-Me_Furan
 {
     specie
     {
-        nMoles          1;
         molWeight       82.103;
     }
     thermodynamics
@@ -15084,7 +14143,6 @@ H2O2
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0147;
     }
     thermodynamics
@@ -15100,7 +14158,6 @@ C13H10__Phenalene
 {
     specie
     {
-        nMoles          1;
         molWeight       166.225;
     }
     thermodynamics
@@ -15116,7 +14173,6 @@ W(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       183.85;
     }
     thermodynamics
@@ -15132,7 +14188,6 @@ CS2
 {
     specie
     {
-        nMoles          1;
         molWeight       76.1392;
     }
     thermodynamics
@@ -15148,7 +14203,6 @@ H2-
 {
     specie
     {
-        nMoles          1;
         molWeight       2.01648;
     }
     thermodynamics
@@ -15164,7 +14218,6 @@ C3H3F2_*CF2CH=CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       77.0542;
     }
     thermodynamics
@@ -15180,7 +14233,6 @@ N2H3+__Hydrazine
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0368;
     }
     thermodynamics
@@ -15196,7 +14248,6 @@ PH
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9818;
     }
     thermodynamics
@@ -15212,7 +14263,6 @@ C10H19__1-deceny
 {
     specie
     {
-        nMoles          1;
         molWeight       139.263;
     }
     thermodynamics
@@ -15228,7 +14278,6 @@ NF
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0051;
     }
     thermodynamics
@@ -15244,7 +14293,6 @@ C3H6O_Acetone
 {
     specie
     {
-        nMoles          1;
         molWeight       58.0807;
     }
     thermodynamics
@@ -15260,7 +14308,6 @@ MoO2
 {
     specie
     {
-        nMoles          1;
         molWeight       127.939;
     }
     thermodynamics
@@ -15276,7 +14323,6 @@ C32H13_OVALENYL
 {
     specie
     {
-        nMoles          1;
         molWeight       397.46;
     }
     thermodynamics
@@ -15292,7 +14338,6 @@ C2Cl2
 {
     specie
     {
-        nMoles          1;
         molWeight       94.9283;
     }
     thermodynamics
@@ -15308,7 +14353,6 @@ C6H14_2,3-DiMeth
 {
     specie
     {
-        nMoles          1;
         molWeight       86.1785;
     }
     thermodynamics
@@ -15324,7 +14368,6 @@ HO2
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0068;
     }
     thermodynamics
@@ -15340,7 +14383,6 @@ C5H6N2O2_Thymine
 {
     specie
     {
-        nMoles          1;
         molWeight       126.116;
     }
     thermodynamics
@@ -15356,7 +14398,6 @@ C7H10_25C5H4(CH3)2
 {
     specie
     {
-        nMoles          1;
         molWeight       94.1578;
     }
     thermodynamics
@@ -15372,7 +14413,6 @@ Zr(b)
 {
     specie
     {
-        nMoles          1;
         molWeight       91.22;
     }
     thermodynamics
@@ -15388,7 +14428,6 @@ SiF4
 {
     specie
     {
-        nMoles          1;
         molWeight       104.08;
     }
     thermodynamics
@@ -15404,7 +14443,6 @@ Br2_Dibromine
 {
     specie
     {
-        nMoles          1;
         molWeight       159.802;
     }
     thermodynamics
@@ -15420,7 +14458,6 @@ COF2
 {
     specie
     {
-        nMoles          1;
         molWeight       66.0074;
     }
     thermodynamics
@@ -15436,7 +14473,6 @@ Fe(OH)2
 {
     specie
     {
-        nMoles          1;
         molWeight       89.8617;
     }
     thermodynamics
@@ -15452,7 +14488,6 @@ C4H4_CYbutadiene
 {
     specie
     {
-        nMoles          1;
         molWeight       52.0765;
     }
     thermodynamics
@@ -15468,7 +14503,6 @@ C6T6_Benzene_T-6
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1515;
     }
     thermodynamics
@@ -15484,7 +14518,6 @@ C25H52__Pentacosa
 {
     specie
     {
-        nMoles          1;
         molWeight       352.693;
     }
     thermodynamics
@@ -15500,7 +14533,6 @@ C3_singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       36.0335;
     }
     thermodynamics
@@ -15516,7 +14548,6 @@ SF2-
 {
     specie
     {
-        nMoles          1;
         molWeight       70.0613;
     }
     thermodynamics
@@ -15532,7 +14563,6 @@ C5H4_1,3-diyne
 {
     specie
     {
-        nMoles          1;
         molWeight       64.0876;
     }
     thermodynamics
@@ -15548,7 +14578,6 @@ HNC
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0258;
     }
     thermodynamics
@@ -15564,7 +14593,6 @@ ClO3___Chlorate
 {
     specie
     {
-        nMoles          1;
         molWeight       83.4512;
     }
     thermodynamics
@@ -15580,7 +14608,6 @@ Al(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       26.9815;
     }
     thermodynamics
@@ -15596,7 +14623,6 @@ HNC+
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0253;
     }
     thermodynamics
@@ -15612,7 +14638,6 @@ Xe+
 {
     specie
     {
-        nMoles          1;
         molWeight       131.299;
     }
     thermodynamics
@@ -15628,7 +14653,6 @@ C6H7__1,4-CyDiEne
 {
     specie
     {
-        nMoles          1;
         molWeight       79.1227;
     }
     thermodynamics
@@ -15644,7 +14668,6 @@ Mo(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       95.94;
     }
     thermodynamics
@@ -15660,7 +14683,6 @@ Al2O2+
 {
     specie
     {
-        nMoles          1;
         molWeight       85.9613;
     }
     thermodynamics
@@ -15676,7 +14698,6 @@ NH3+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0301;
     }
     thermodynamics
@@ -15692,7 +14713,6 @@ NH2F
 {
     specie
     {
-        nMoles          1;
         molWeight       35.021;
     }
     thermodynamics
@@ -15708,7 +14728,6 @@ C2H4Cl_betaClEthyl
 {
     specie
     {
-        nMoles          1;
         molWeight       63.5072;
     }
     thermodynamics
@@ -15724,7 +14743,6 @@ C5H8__Isoprene
 {
     specie
     {
-        nMoles          1;
         molWeight       68.1195;
     }
     thermodynamics
@@ -15740,7 +14758,6 @@ Bi(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       208.98;
     }
     thermodynamics
@@ -15756,7 +14773,6 @@ C12H4Cl4O_2367
 {
     specie
     {
-        nMoles          1;
         molWeight       305.977;
     }
     thermodynamics
@@ -15772,7 +14788,6 @@ CO+
 {
     specie
     {
-        nMoles          1;
         molWeight       28.01;
     }
     thermodynamics
@@ -15788,7 +14803,6 @@ CH2Cl2
 {
     specie
     {
-        nMoles          1;
         molWeight       84.9331;
     }
     thermodynamics
@@ -15804,7 +14818,6 @@ C4H6,cyclo-
 {
     specie
     {
-        nMoles          1;
         molWeight       54.0924;
     }
     thermodynamics
@@ -15820,7 +14833,6 @@ MgTi2O5(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       200.109;
     }
     thermodynamics
@@ -15836,7 +14848,6 @@ C6H5Br_Bromobenz
 {
     specie
     {
-        nMoles          1;
         molWeight       157.008;
     }
     thermodynamics
@@ -15852,7 +14863,6 @@ C7H7O___C6H5CH2O
 {
     specie
     {
-        nMoles          1;
         molWeight       107.133;
     }
     thermodynamics
@@ -15868,7 +14878,6 @@ C2H5Br
 {
     specie
     {
-        nMoles          1;
         molWeight       108.963;
     }
     thermodynamics
@@ -15884,7 +14893,6 @@ C12H8O2
 {
     specie
     {
-        nMoles          1;
         molWeight       184.196;
     }
     thermodynamics
@@ -15900,7 +14908,6 @@ CBrF3_FREON_1301
 {
     specie
     {
-        nMoles          1;
         molWeight       148.907;
     }
     thermodynamics
@@ -15916,7 +14923,6 @@ PbS2
 {
     specie
     {
-        nMoles          1;
         molWeight       271.318;
     }
     thermodynamics
@@ -15932,7 +14938,6 @@ Zn
 {
     specie
     {
-        nMoles          1;
         molWeight       65.37;
     }
     thermodynamics
@@ -15948,7 +14953,6 @@ C19H32O2_meLinolen
 {
     specie
     {
-        nMoles          1;
         molWeight       292.466;
     }
     thermodynamics
@@ -15964,7 +14968,6 @@ C18H34_1-Octadecy
 {
     specie
     {
-        nMoles          1;
         molWeight       250.472;
     }
     thermodynamics
@@ -15980,7 +14983,6 @@ C2HCl
 {
     specie
     {
-        nMoles          1;
         molWeight       60.4833;
     }
     thermodynamics
@@ -15996,7 +14998,6 @@ C5H5O__1-oxy-1,3-
 {
     specie
     {
-        nMoles          1;
         molWeight       81.095;
     }
     thermodynamics
@@ -16012,7 +15013,6 @@ CH3NO_Nitrosomethy
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0412;
     }
     thermodynamics
@@ -16028,7 +15028,6 @@ MgOH
 {
     specie
     {
-        nMoles          1;
         molWeight       41.3194;
     }
     thermodynamics
@@ -16044,7 +15043,6 @@ C12H24_CyDoDecane
 {
     specie
     {
-        nMoles          1;
         molWeight       168.325;
     }
     thermodynamics
@@ -16060,7 +15058,6 @@ Na(g)
 {
     specie
     {
-        nMoles          1;
         molWeight       22.9898;
     }
     thermodynamics
@@ -16076,7 +15073,6 @@ H4F4
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0255;
     }
     thermodynamics
@@ -16092,7 +15088,6 @@ HO2-
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0073;
     }
     thermodynamics
@@ -16108,7 +15103,6 @@ C10H6_Naphtyne
 {
     specie
     {
-        nMoles          1;
         molWeight       126.159;
     }
     thermodynamics
@@ -16124,7 +15118,6 @@ Ge2
 {
     specie
     {
-        nMoles          1;
         molWeight       145.18;
     }
     thermodynamics
@@ -16140,7 +15133,6 @@ C2H4O2Cl2
 {
     specie
     {
-        nMoles          1;
         molWeight       130.959;
     }
     thermodynamics
@@ -16156,7 +15148,6 @@ MgF2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       62.3088;
     }
     thermodynamics
@@ -16172,7 +15163,6 @@ CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0351;
     }
     thermodynamics
@@ -16188,7 +15178,6 @@ C12H8Cl2O2_6,6-(
 {
     specie
     {
-        nMoles          1;
         molWeight       255.102;
     }
     thermodynamics
@@ -16204,7 +15193,6 @@ Al(OH)2
 {
     specie
     {
-        nMoles          1;
         molWeight       60.9962;
     }
     thermodynamics
@@ -16220,7 +15208,6 @@ CF2H-CClF2_FC-124A
 {
     specie
     {
-        nMoles          1;
         molWeight       136.477;
     }
     thermodynamics
@@ -16236,7 +15223,6 @@ C5H2Cl2O_3,4-Cyc
 {
     specie
     {
-        nMoles          1;
         molWeight       148.977;
     }
     thermodynamics
@@ -16252,7 +15238,6 @@ Mg(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       24.312;
     }
     thermodynamics
@@ -16268,7 +15253,6 @@ P4O6
 {
     specie
     {
-        nMoles          1;
         molWeight       219.892;
     }
     thermodynamics
@@ -16284,7 +15268,6 @@ C4H7O_2-Butanone
 {
     specie
     {
-        nMoles          1;
         molWeight       71.0998;
     }
     thermodynamics
@@ -16300,7 +15283,6 @@ C4H7N___PropylCN
 {
     specie
     {
-        nMoles          1;
         molWeight       69.1071;
     }
     thermodynamics
@@ -16316,7 +15298,6 @@ MnS___Liquid
 {
     specie
     {
-        nMoles          1;
         molWeight       87.002;
     }
     thermodynamics
@@ -16332,7 +15313,6 @@ C2H2F2__FC-1132A
 {
     specie
     {
-        nMoles          1;
         molWeight       64.035;
     }
     thermodynamics
@@ -16348,7 +15328,6 @@ C5H11N_Piperidine
 {
     specie
     {
-        nMoles          1;
         molWeight       85.1501;
     }
     thermodynamics
@@ -16364,7 +15343,6 @@ C13H9N__ACRIDINE
 {
     specie
     {
-        nMoles          1;
         molWeight       179.223;
     }
     thermodynamics
@@ -16380,7 +15358,6 @@ C4H7__trans-1-Bu
 {
     specie
     {
-        nMoles          1;
         molWeight       55.1004;
     }
     thermodynamics
@@ -16396,7 +15373,6 @@ C4H
 {
     specie
     {
-        nMoles          1;
         molWeight       49.0526;
     }
     thermodynamics
@@ -16412,7 +15388,6 @@ Cl2O
 {
     specie
     {
-        nMoles          1;
         molWeight       86.9054;
     }
     thermodynamics
@@ -16428,7 +15403,6 @@ CH3CBr3_111
 {
     specie
     {
-        nMoles          1;
         molWeight       266.749;
     }
     thermodynamics
@@ -16444,7 +15418,6 @@ n-C4H10O2_n-perox
 {
     specie
     {
-        nMoles          1;
         molWeight       90.1231;
     }
     thermodynamics
@@ -16460,7 +15433,6 @@ O3-
 {
     specie
     {
-        nMoles          1;
         molWeight       47.9987;
     }
     thermodynamics
@@ -16476,7 +15448,6 @@ C5H7_Cy-1en-3-yl
 {
     specie
     {
-        nMoles          1;
         molWeight       67.1115;
     }
     thermodynamics
@@ -16492,7 +15463,6 @@ C7H10_cyC5H9-CCH
 {
     specie
     {
-        nMoles          1;
         molWeight       94.1578;
     }
     thermodynamics
@@ -16508,7 +15478,6 @@ ClO2___OClO___HF
 {
     specie
     {
-        nMoles          1;
         molWeight       67.4518;
     }
     thermodynamics
@@ -16524,7 +15493,6 @@ NCCH2OOH
 {
     specie
     {
-        nMoles          1;
         molWeight       73.0517;
     }
     thermodynamics
@@ -16540,7 +15508,6 @@ HCNO_Fulminic_Acid
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -16556,7 +15523,6 @@ C8_linear_singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       96.0892;
     }
     thermodynamics
@@ -16572,7 +15538,6 @@ NH2OH+
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0295;
     }
     thermodynamics
@@ -16588,7 +15553,6 @@ MgCl
 {
     specie
     {
-        nMoles          1;
         molWeight       59.765;
     }
     thermodynamics
@@ -16604,7 +15568,6 @@ BO
 {
     specie
     {
-        nMoles          1;
         molWeight       26.8104;
     }
     thermodynamics
@@ -16620,7 +15583,6 @@ CH2O__CH**-OH
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0265;
     }
     thermodynamics
@@ -16636,7 +15598,6 @@ Sn-
 {
     specie
     {
-        nMoles          1;
         molWeight       118.691;
     }
     thermodynamics
@@ -16652,7 +15613,6 @@ C5Cl6___CycloPer
 {
     specie
     {
-        nMoles          1;
         molWeight       272.774;
     }
     thermodynamics
@@ -16668,7 +15628,6 @@ C2+
 {
     specie
     {
-        nMoles          1;
         molWeight       24.0218;
     }
     thermodynamics
@@ -16684,7 +15643,6 @@ MgSiO3(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       100.396;
     }
     thermodynamics
@@ -16700,7 +15658,6 @@ C3H7OO_PropylPer
 {
     specie
     {
-        nMoles          1;
         molWeight       75.088;
     }
     thermodynamics
@@ -16716,7 +15673,6 @@ C6H5-_phenyl_ani
 {
     specie
     {
-        nMoles          1;
         molWeight       77.1073;
     }
     thermodynamics
@@ -16732,7 +15688,6 @@ CH3N2__C*H2-N=NH
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0485;
     }
     thermodynamics
@@ -16748,7 +15703,6 @@ SiO2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0848;
     }
     thermodynamics
@@ -16764,7 +15718,6 @@ SF5
 {
     specie
     {
-        nMoles          1;
         molWeight       127.056;
     }
     thermodynamics
@@ -16780,7 +15733,6 @@ NH3_Anharmonic
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0306;
     }
     thermodynamics
@@ -16796,7 +15748,6 @@ C6H12O2_Butyric
 {
     specie
     {
-        nMoles          1;
         molWeight       116.161;
     }
     thermodynamics
@@ -16812,7 +15763,6 @@ PH+
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9818;
     }
     thermodynamics
@@ -16828,7 +15778,6 @@ C2HCl4_CHCl2-CCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       166.842;
     }
     thermodynamics
@@ -16844,7 +15793,6 @@ C5H5O_Cyclo-2,4-
 {
     specie
     {
-        nMoles          1;
         molWeight       81.095;
     }
     thermodynamics
@@ -16860,7 +15808,6 @@ BF
 {
     specie
     {
-        nMoles          1;
         molWeight       29.8094;
     }
     thermodynamics
@@ -16876,7 +15823,6 @@ C15H30O2_n-acid
 {
     specie
     {
-        nMoles          1;
         molWeight       242.405;
     }
     thermodynamics
@@ -16892,7 +15838,6 @@ C7H13_1-Heptyl-4en
 {
     specie
     {
-        nMoles          1;
         molWeight       97.1817;
     }
     thermodynamics
@@ -16908,7 +15853,6 @@ C22H44O2_Ethyl_E
 {
     specie
     {
-        nMoles          1;
         molWeight       340.595;
     }
     thermodynamics
@@ -16924,7 +15868,6 @@ NOH-
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0146;
     }
     thermodynamics
@@ -16940,7 +15883,6 @@ BiCl
 {
     specie
     {
-        nMoles          1;
         molWeight       244.433;
     }
     thermodynamics
@@ -16956,7 +15898,6 @@ N2O3+
 {
     specie
     {
-        nMoles          1;
         molWeight       76.0111;
     }
     thermodynamics
@@ -16972,7 +15913,6 @@ Ge(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       72.59;
     }
     thermodynamics
@@ -16988,7 +15928,6 @@ C4H10FO2P_SARIN
 {
     specie
     {
-        nMoles          1;
         molWeight       159.094;
     }
     thermodynamics
@@ -17004,7 +15943,6 @@ s-1-C10H7CH=CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       154.214;
     }
     thermodynamics
@@ -17020,7 +15958,6 @@ BF2-
 {
     specie
     {
-        nMoles          1;
         molWeight       48.8083;
     }
     thermodynamics
@@ -17036,7 +15973,6 @@ C4H9O_s-butoxy_r
 {
     specie
     {
-        nMoles          1;
         molWeight       73.1157;
     }
     thermodynamics
@@ -17052,7 +15988,6 @@ C2DH_Acetylene-D
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0444;
     }
     thermodynamics
@@ -17068,7 +16003,6 @@ HgBr2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       360.392;
     }
     thermodynamics
@@ -17084,7 +16018,6 @@ Cr2O3(Ip)
 {
     specie
     {
-        nMoles          1;
         molWeight       151.99;
     }
     thermodynamics
@@ -17100,7 +16033,6 @@ C2D6_Ethane-D6
 {
     specie
     {
-        nMoles          1;
         molWeight       36.1069;
     }
     thermodynamics
@@ -17116,7 +16048,6 @@ CH3O-_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       31.035;
     }
     thermodynamics
@@ -17132,7 +16063,6 @@ MgS
 {
     specie
     {
-        nMoles          1;
         molWeight       56.376;
     }
     thermodynamics
@@ -17148,7 +16078,6 @@ MoO2__Solid
 {
     specie
     {
-        nMoles          1;
         molWeight       127.939;
     }
     thermodynamics
@@ -17164,7 +16093,6 @@ N-C9H19_________N-
 {
     specie
     {
-        nMoles          1;
         molWeight       127.252;
     }
     thermodynamics
@@ -17180,7 +16108,6 @@ C10H9_1-methyl
 {
     specie
     {
-        nMoles          1;
         molWeight       129.183;
     }
     thermodynamics
@@ -17196,7 +16123,6 @@ C23H47_1-Tricosane
 {
     specie
     {
-        nMoles          1;
         molWeight       323.631;
     }
     thermodynamics
@@ -17212,7 +16138,6 @@ C4H6_1-butyne
 {
     specie
     {
-        nMoles          1;
         molWeight       54.0924;
     }
     thermodynamics
@@ -17228,7 +16153,6 @@ F-
 {
     specie
     {
-        nMoles          1;
         molWeight       18.9989;
     }
     thermodynamics
@@ -17244,7 +16168,6 @@ BF2
 {
     specie
     {
-        nMoles          1;
         molWeight       48.8078;
     }
     thermodynamics
@@ -17260,7 +16183,6 @@ NH4Cl(II)
 {
     specie
     {
-        nMoles          1;
         molWeight       53.4916;
     }
     thermodynamics
@@ -17276,7 +16198,6 @@ C5H3N_CyanoVinyl
 {
     specie
     {
-        nMoles          1;
         molWeight       77.0864;
     }
     thermodynamics
@@ -17292,7 +16213,6 @@ C7H5NO_Benzoxazole
 {
     specie
     {
-        nMoles          1;
         molWeight       119.124;
     }
     thermodynamics
@@ -17308,7 +16228,6 @@ Cu3Cl3
 {
     specie
     {
-        nMoles          1;
         molWeight       296.979;
     }
     thermodynamics
@@ -17324,7 +16243,6 @@ C7H7_QuadriShould
 {
     specie
     {
-        nMoles          1;
         molWeight       91.1338;
     }
     thermodynamics
@@ -17340,7 +16258,6 @@ CH3CH-__anion
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0547;
     }
     thermodynamics
@@ -17356,7 +16273,6 @@ Fe(OH)2(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       89.8617;
     }
     thermodynamics
@@ -17372,7 +16288,6 @@ HOCN_Cyanic_Acid
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -17388,7 +16303,6 @@ C5H10O_T.H.PYRAN
 {
     specie
     {
-        nMoles          1;
         molWeight       86.1349;
     }
     thermodynamics
@@ -17404,7 +16318,6 @@ GeH4
 {
     specie
     {
-        nMoles          1;
         molWeight       76.6219;
     }
     thermodynamics
@@ -17420,7 +16333,6 @@ NH3__RRHO
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0306;
     }
     thermodynamics
@@ -17436,7 +16348,6 @@ CH4N2O_Urea
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0558;
     }
     thermodynamics
@@ -17452,7 +16363,6 @@ C2H-
 {
     specie
     {
-        nMoles          1;
         molWeight       25.0308;
     }
     thermodynamics
@@ -17468,7 +16378,6 @@ Zr-
 {
     specie
     {
-        nMoles          1;
         molWeight       91.2205;
     }
     thermodynamics
@@ -17484,7 +16393,6 @@ N-UNDECANE
 {
     specie
     {
-        nMoles          1;
         molWeight       156.314;
     }
     thermodynamics
@@ -17500,7 +16408,6 @@ O3+
 {
     specie
     {
-        nMoles          1;
         molWeight       47.9977;
     }
     thermodynamics
@@ -17516,7 +16423,6 @@ CH3NC_Methyl-Iso
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0529;
     }
     thermodynamics
@@ -17532,7 +16438,6 @@ C4H4N2_PYRAZINE
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0899;
     }
     thermodynamics
@@ -17548,7 +16453,6 @@ PO2-
 {
     specie
     {
-        nMoles          1;
         molWeight       62.9731;
     }
     thermodynamics
@@ -17564,7 +16468,6 @@ C2H6S__(C2H5SH)
 {
     specie
     {
-        nMoles          1;
         molWeight       62.1341;
     }
     thermodynamics
@@ -17580,7 +16483,6 @@ C7H16O_n-heptanol
 {
     specie
     {
-        nMoles          1;
         molWeight       116.205;
     }
     thermodynamics
@@ -17596,7 +16498,6 @@ C7H10_23C5H4(CH3)2
 {
     specie
     {
-        nMoles          1;
         molWeight       94.1578;
     }
     thermodynamics
@@ -17612,7 +16513,6 @@ NCCH2OO_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       72.0437;
     }
     thermodynamics
@@ -17628,7 +16528,6 @@ HO3____HOOO
 {
     specie
     {
-        nMoles          1;
         molWeight       49.0062;
     }
     thermodynamics
@@ -17644,7 +16543,6 @@ Fe(c)
 {
     specie
     {
-        nMoles          1;
         molWeight       55.847;
     }
     thermodynamics
@@ -17660,7 +16558,6 @@ C2H5O2_HOCH2C*HO
 {
     specie
     {
-        nMoles          1;
         molWeight       61.061;
     }
     thermodynamics
@@ -17676,7 +16573,6 @@ CH5N__CH3NH2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0577;
     }
     thermodynamics
@@ -17692,7 +16588,6 @@ C7H8O__C6H5CH2OH
 {
     specie
     {
-        nMoles          1;
         molWeight       108.141;
     }
     thermodynamics
@@ -17708,7 +16603,6 @@ C4H5O__EtKetene-2
 {
     specie
     {
-        nMoles          1;
         molWeight       69.0838;
     }
     thermodynamics
@@ -17724,7 +16618,6 @@ CH3ONO2
 {
     specie
     {
-        nMoles          1;
         molWeight       77.04;
     }
     thermodynamics
@@ -17740,7 +16633,6 @@ C2H2(NO2)2
 {
     specie
     {
-        nMoles          1;
         molWeight       118.049;
     }
     thermodynamics
@@ -17756,7 +16648,6 @@ s-1,2,3-C6H4-5-yne
 {
     specie
     {
-        nMoles          1;
         molWeight       76.0988;
     }
     thermodynamics
@@ -17772,7 +16663,6 @@ Cr(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       51.996;
     }
     thermodynamics
@@ -17788,7 +16678,6 @@ C8H6__Benzocybuten
 {
     specie
     {
-        nMoles          1;
         molWeight       102.137;
     }
     thermodynamics
@@ -17804,7 +16693,6 @@ C3H_Radical_HCCC
 {
     specie
     {
-        nMoles          1;
         molWeight       37.0414;
     }
     thermodynamics
@@ -17820,7 +16708,6 @@ MgBr
 {
     specie
     {
-        nMoles          1;
         molWeight       104.213;
     }
     thermodynamics
@@ -17836,7 +16723,6 @@ C2-
 {
     specie
     {
-        nMoles          1;
         molWeight       24.0228;
     }
     thermodynamics
@@ -17852,7 +16738,6 @@ N4_cyclo
 {
     specie
     {
-        nMoles          1;
         molWeight       56.0268;
     }
     thermodynamics
@@ -17868,7 +16753,6 @@ SF3
 {
     specie
     {
-        nMoles          1;
         molWeight       89.0592;
     }
     thermodynamics
@@ -17884,7 +16768,6 @@ Kr
 {
     specie
     {
-        nMoles          1;
         molWeight       83.8;
     }
     thermodynamics
@@ -17900,7 +16783,6 @@ Bi___GAS
 {
     specie
     {
-        nMoles          1;
         molWeight       208.98;
     }
     thermodynamics
@@ -17916,7 +16798,6 @@ C3H3ON_Oxazole
 {
     specie
     {
-        nMoles          1;
         molWeight       69.0635;
     }
     thermodynamics
@@ -17932,7 +16813,6 @@ C10H10_3-meIndene
 {
     specie
     {
-        nMoles          1;
         molWeight       130.191;
     }
     thermodynamics
@@ -17948,7 +16828,6 @@ C2H5ClO2
 {
     specie
     {
-        nMoles          1;
         molWeight       96.514;
     }
     thermodynamics
@@ -17964,7 +16843,6 @@ BrNC_BrIsocyanogen
 {
     specie
     {
-        nMoles          1;
         molWeight       105.919;
     }
     thermodynamics
@@ -17980,7 +16858,6 @@ C6F6
 {
     specie
     {
-        nMoles          1;
         molWeight       186.057;
     }
     thermodynamics
@@ -17996,7 +16873,6 @@ C2H5-_Ethyl_anio
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0627;
     }
     thermodynamics
@@ -18012,7 +16888,6 @@ C5H5OH_Cyclo-1,3
 {
     specie
     {
-        nMoles          1;
         molWeight       82.103;
     }
     thermodynamics
@@ -18028,7 +16903,6 @@ HSO
 {
     specie
     {
-        nMoles          1;
         molWeight       49.0714;
     }
     thermodynamics
@@ -18044,7 +16918,6 @@ O-
 {
     specie
     {
-        nMoles          1;
         molWeight       15.9999;
     }
     thermodynamics
@@ -18060,7 +16933,6 @@ Fe3C_(S)_Solid-A
 {
     specie
     {
-        nMoles          1;
         molWeight       179.552;
     }
     thermodynamics
@@ -18076,7 +16948,6 @@ C4H8O2_MePropionat
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1072;
     }
     thermodynamics
@@ -18092,7 +16963,6 @@ HDO
 {
     specie
     {
-        nMoles          1;
         molWeight       19.0215;
     }
     thermodynamics
@@ -18108,7 +16978,6 @@ MgO(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       40.3114;
     }
     thermodynamics
@@ -18124,7 +16993,6 @@ C3H3Cl_CH2Cl-CCH
 {
     specie
     {
-        nMoles          1;
         molWeight       74.5104;
     }
     thermodynamics
@@ -18140,7 +17008,6 @@ CD3OD_Methanol_d4
 {
     specie
     {
-        nMoles          1;
         molWeight       36.0669;
     }
     thermodynamics
@@ -18156,7 +17023,6 @@ C8H18(L)_n-octane
 {
     specie
     {
-        nMoles          1;
         molWeight       114.233;
     }
     thermodynamics
@@ -18172,7 +17038,6 @@ CBr4
 {
     specie
     {
-        nMoles          1;
         molWeight       331.615;
     }
     thermodynamics
@@ -18188,7 +17053,6 @@ BaO(G)
 {
     specie
     {
-        nMoles          1;
         molWeight       153.339;
     }
     thermodynamics
@@ -18204,7 +17068,6 @@ MgI2(s)
 {
     specie
     {
-        nMoles          1;
         molWeight       278.121;
     }
     thermodynamics
@@ -18220,7 +17083,6 @@ C6HCl5_5-ClBenzen
 {
     specie
     {
-        nMoles          1;
         molWeight       250.34;
     }
     thermodynamics
@@ -18236,7 +17098,6 @@ C4N2
 {
     specie
     {
-        nMoles          1;
         molWeight       76.058;
     }
     thermodynamics
@@ -18252,7 +17113,6 @@ CH2F2___FC-32
 {
     specie
     {
-        nMoles          1;
         molWeight       52.0239;
     }
     thermodynamics
@@ -18268,7 +17128,6 @@ HCC-OH__Ethynol
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0376;
     }
     thermodynamics
@@ -18284,7 +17143,6 @@ C5H5N_PYRIDINE_Cy
 {
     specie
     {
-        nMoles          1;
         molWeight       79.1023;
     }
     thermodynamics
@@ -18300,7 +17158,6 @@ MgF2(cr)II
 {
     specie
     {
-        nMoles          1;
         molWeight       62.3088;
     }
     thermodynamics
@@ -18316,7 +17173,6 @@ NITROPROPYLENE_C
 {
     specie
     {
-        nMoles          1;
         molWeight       87.0788;
     }
     thermodynamics
@@ -18332,7 +17188,6 @@ BCl
 {
     specie
     {
-        nMoles          1;
         molWeight       46.264;
     }
     thermodynamics
@@ -18348,7 +17203,6 @@ Po_Polonium_(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       210;
     }
     thermodynamics
@@ -18364,7 +17218,6 @@ C5H3
 {
     specie
     {
-        nMoles          1;
         molWeight       63.0797;
     }
     thermodynamics
@@ -18380,7 +17233,6 @@ Bi(OH)3
 {
     specie
     {
-        nMoles          1;
         molWeight       260.002;
     }
     thermodynamics
@@ -18396,7 +17248,6 @@ C10H10_1,1p(C5H5)2
 {
     specie
     {
-        nMoles          1;
         molWeight       130.191;
     }
     thermodynamics
@@ -18412,7 +17263,6 @@ C6H14O_2-hexanol
 {
     specie
     {
-        nMoles          1;
         molWeight       102.178;
     }
     thermodynamics
@@ -18428,7 +17278,6 @@ CH2N2O2_H2C=NNO2
 {
     specie
     {
-        nMoles          1;
         molWeight       74.0393;
     }
     thermodynamics
@@ -18444,7 +17293,6 @@ C4H10O2_t-perox
 {
     specie
     {
-        nMoles          1;
         molWeight       90.1231;
     }
     thermodynamics
@@ -18460,7 +17308,6 @@ CH3NO__HO-CH=NH
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0412;
     }
     thermodynamics
@@ -18476,7 +17323,6 @@ BiCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       279.886;
     }
     thermodynamics
@@ -18492,7 +17338,6 @@ Br2(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       159.802;
     }
     thermodynamics
@@ -18508,7 +17353,6 @@ ClO3F
 {
     specie
     {
-        nMoles          1;
         molWeight       102.45;
     }
     thermodynamics
@@ -18524,7 +17368,6 @@ Po+_Polonium_catio
 {
     specie
     {
-        nMoles          1;
         molWeight       209.999;
     }
     thermodynamics
@@ -18540,7 +17383,6 @@ BrO-
 {
     specie
     {
-        nMoles          1;
         molWeight       95.9008;
     }
     thermodynamics
@@ -18556,7 +17398,6 @@ Fe.947O(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       71.8464;
     }
     thermodynamics
@@ -18572,7 +17413,6 @@ s-(CH3COOH)2
 {
     specie
     {
-        nMoles          1;
         molWeight       120.106;
     }
     thermodynamics
@@ -18588,7 +17428,6 @@ SF4-
 {
     specie
     {
-        nMoles          1;
         molWeight       108.058;
     }
     thermodynamics
@@ -18604,7 +17443,6 @@ SF5Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       162.509;
     }
     thermodynamics
@@ -18620,7 +17458,6 @@ T_Tritium__(g)
 {
     specie
     {
-        nMoles          1;
         molWeight       3.016;
     }
     thermodynamics
@@ -18636,7 +17473,6 @@ NH4ClO4(I)
 {
     specie
     {
-        nMoles          1;
         molWeight       117.489;
     }
     thermodynamics
@@ -18652,7 +17488,6 @@ SO2-
 {
     specie
     {
-        nMoles          1;
         molWeight       64.0633;
     }
     thermodynamics
@@ -18668,7 +17503,6 @@ s-1-C10H7-CC*
 {
     specie
     {
-        nMoles          1;
         molWeight       151.19;
     }
     thermodynamics
@@ -18684,7 +17518,6 @@ CNN+
 {
     specie
     {
-        nMoles          1;
         molWeight       40.024;
     }
     thermodynamics
@@ -18700,7 +17533,6 @@ C4Cl6_Butadiene
 {
     specie
     {
-        nMoles          1;
         molWeight       260.763;
     }
     thermodynamics
@@ -18716,7 +17548,6 @@ Pb(G)
 {
     specie
     {
-        nMoles          1;
         molWeight       207.19;
     }
     thermodynamics
@@ -18732,7 +17563,6 @@ TBr_Tritium_Brom
 {
     specie
     {
-        nMoles          1;
         molWeight       127.801;
     }
     thermodynamics
@@ -18748,7 +17578,6 @@ CH5N2__CH2*NHNH2
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0644;
     }
     thermodynamics
@@ -18764,7 +17593,6 @@ PF2Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       104.424;
     }
     thermodynamics
@@ -18780,7 +17608,6 @@ N2O_NON
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0128;
     }
     thermodynamics
@@ -18796,7 +17623,6 @@ P3
 {
     specie
     {
-        nMoles          1;
         molWeight       92.9214;
     }
     thermodynamics
@@ -18812,7 +17638,6 @@ C14H10O_Phenantrol
 {
     specie
     {
-        nMoles          1;
         molWeight       194.235;
     }
     thermodynamics
@@ -18828,7 +17653,6 @@ C3H9N__(CH3)3N
 {
     specie
     {
-        nMoles          1;
         molWeight       59.1119;
     }
     thermodynamics
@@ -18844,7 +17668,6 @@ N2O4__ONONO2
 {
     specie
     {
-        nMoles          1;
         molWeight       92.011;
     }
     thermodynamics
@@ -18860,7 +17683,6 @@ F2
 {
     specie
     {
-        nMoles          1;
         molWeight       37.9968;
     }
     thermodynamics
@@ -18876,7 +17698,6 @@ C2N-__C-CN-
 {
     specie
     {
-        nMoles          1;
         molWeight       38.0295;
     }
     thermodynamics
@@ -18892,7 +17713,6 @@ CH+
 {
     specie
     {
-        nMoles          1;
         molWeight       13.0186;
     }
     thermodynamics
@@ -18908,7 +17728,6 @@ MgF2(cr)I
 {
     specie
     {
-        nMoles          1;
         molWeight       62.3088;
     }
     thermodynamics
@@ -18924,7 +17743,6 @@ C6H5Cl+_Chlorobe
 {
     specie
     {
-        nMoles          1;
         molWeight       112.559;
     }
     thermodynamics
@@ -18940,7 +17758,6 @@ C16H9_2-Pyrenyl
 {
     specie
     {
-        nMoles          1;
         molWeight       201.25;
     }
     thermodynamics
@@ -18956,7 +17773,6 @@ CH-
 {
     specie
     {
-        nMoles          1;
         molWeight       13.0197;
     }
     thermodynamics
@@ -18972,7 +17788,6 @@ NHF2
 {
     specie
     {
-        nMoles          1;
         molWeight       53.0115;
     }
     thermodynamics
@@ -18988,7 +17803,6 @@ C8H14_Bicyclooctan
 {
     specie
     {
-        nMoles          1;
         molWeight       110.201;
     }
     thermodynamics
@@ -19004,7 +17818,6 @@ HNOH_trans_&_Equ
 {
     specie
     {
-        nMoles          1;
         molWeight       32.022;
     }
     thermodynamics
@@ -19020,7 +17833,6 @@ C2HO__HCC=O-
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0302;
     }
     thermodynamics
@@ -19036,7 +17848,6 @@ C4H9O2_n-Butyl_P
 {
     specie
     {
-        nMoles          1;
         molWeight       89.1151;
     }
     thermodynamics
@@ -19052,7 +17863,6 @@ CD4__ANHARMONIC
 {
     specie
     {
-        nMoles          1;
         molWeight       20.0676;
     }
     thermodynamics
@@ -19068,7 +17878,6 @@ CH2=CH-NO2_Nitroe
 {
     specie
     {
-        nMoles          1;
         molWeight       73.0517;
     }
     thermodynamics
@@ -19084,7 +17893,6 @@ C3HCl3__TriClAllen
 {
     specie
     {
-        nMoles          1;
         molWeight       143.4;
     }
     thermodynamics
@@ -19100,7 +17908,6 @@ C2H4Cl2_1,1-Dich
 {
     specie
     {
-        nMoles          1;
         molWeight       98.9602;
     }
     thermodynamics
@@ -19116,7 +17923,6 @@ CH3-CO-O-O-CO-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       118.09;
     }
     thermodynamics
@@ -19132,7 +17938,6 @@ C3H8O_1propanol
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0966;
     }
     thermodynamics
@@ -19148,7 +17953,6 @@ C13H28_TriDecane
 {
     specie
     {
-        nMoles          1;
         molWeight       184.368;
     }
     thermodynamics
@@ -19164,7 +17968,6 @@ C4H8O2_EtAcetate
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1072;
     }
     thermodynamics
@@ -19180,7 +17983,6 @@ BrF
 {
     specie
     {
-        nMoles          1;
         molWeight       98.8993;
     }
     thermodynamics
@@ -19196,7 +17998,6 @@ C5H9_1buten3m1yl
 {
     specie
     {
-        nMoles          1;
         molWeight       69.1275;
     }
     thermodynamics
@@ -19212,7 +18013,6 @@ C30H62_Triacotane
 {
     specie
     {
-        nMoles          1;
         molWeight       422.829;
     }
     thermodynamics
@@ -19228,7 +18028,6 @@ Kr+
 {
     specie
     {
-        nMoles          1;
         molWeight       83.7995;
     }
     thermodynamics
@@ -19244,7 +18043,6 @@ C4H6O_H3CCH2CH=C
 {
     specie
     {
-        nMoles          1;
         molWeight       70.0918;
     }
     thermodynamics
@@ -19260,7 +18058,6 @@ SCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       102.97;
     }
     thermodynamics
@@ -19276,7 +18073,6 @@ CCl3OH
 {
     specie
     {
-        nMoles          1;
         molWeight       135.378;
     }
     thermodynamics
@@ -19292,7 +18088,6 @@ C8H10_C6H5C2H5
 {
     specie
     {
-        nMoles          1;
         molWeight       106.169;
     }
     thermodynamics
@@ -19308,7 +18103,6 @@ C3H2F3_CF3-C*=CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       95.0446;
     }
     thermodynamics
@@ -19324,7 +18118,6 @@ CH3CCl3_1,1,1-
 {
     specie
     {
-        nMoles          1;
         molWeight       133.405;
     }
     thermodynamics
@@ -19340,7 +18133,6 @@ DNO-
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0207;
     }
     thermodynamics
@@ -19356,7 +18148,6 @@ C5H9O2_Valeryl
 {
     specie
     {
-        nMoles          1;
         molWeight       101.126;
     }
     thermodynamics
@@ -19372,7 +18163,6 @@ C8H17_n-octyl
 {
     specie
     {
-        nMoles          1;
         molWeight       113.225;
     }
     thermodynamics
@@ -19388,7 +18178,6 @@ C4H8O_2-Butanone
 {
     specie
     {
-        nMoles          1;
         molWeight       72.1078;
     }
     thermodynamics
@@ -19404,7 +18193,6 @@ C2H4Cl_alfaClEthyl
 {
     specie
     {
-        nMoles          1;
         molWeight       63.5072;
     }
     thermodynamics
@@ -19420,7 +18208,6 @@ C3H5_SYMMETRIC
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0733;
     }
     thermodynamics
@@ -19436,7 +18223,6 @@ HCOO__Formyloxy
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0179;
     }
     thermodynamics
@@ -19452,7 +18238,6 @@ C3H6O3_Lactic_Ac
 {
     specie
     {
-        nMoles          1;
         molWeight       90.0795;
     }
     thermodynamics
@@ -19468,7 +18253,6 @@ MgBr2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       184.114;
     }
     thermodynamics
@@ -19484,7 +18268,6 @@ BCl+
 {
     specie
     {
-        nMoles          1;
         molWeight       46.2635;
     }
     thermodynamics
@@ -19500,7 +18283,6 @@ CHNH2-__anion__H
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0423;
     }
     thermodynamics
@@ -19516,7 +18298,6 @@ CHBrCl2__FC-20B1
 {
     specie
     {
-        nMoles          1;
         molWeight       163.826;
     }
     thermodynamics
@@ -19532,7 +18313,6 @@ Cu(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       63.54;
     }
     thermodynamics
@@ -19548,7 +18328,6 @@ CH2N-__H*C=NH_cis
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0343;
     }
     thermodynamics
@@ -19564,7 +18343,6 @@ C4H7__1-meth-allyl
 {
     specie
     {
-        nMoles          1;
         molWeight       55.1004;
     }
     thermodynamics
@@ -19580,7 +18358,6 @@ PH-
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9818;
     }
     thermodynamics
@@ -19596,7 +18373,6 @@ SF6
 {
     specie
     {
-        nMoles          1;
         molWeight       146.054;
     }
     thermodynamics
@@ -19612,7 +18388,6 @@ CH3N__(H2C=NH)
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0418;
     }
     thermodynamics
@@ -19628,7 +18403,6 @@ HAlO2
 {
     specie
     {
-        nMoles          1;
         molWeight       59.9883;
     }
     thermodynamics
@@ -19644,7 +18418,6 @@ HCN
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0258;
     }
     thermodynamics
@@ -19660,7 +18433,6 @@ AlO2
 {
     specie
     {
-        nMoles          1;
         molWeight       58.9803;
     }
     thermodynamics
@@ -19676,7 +18448,6 @@ HOCl
 {
     specie
     {
-        nMoles          1;
         molWeight       52.4604;
     }
     thermodynamics
@@ -19692,7 +18463,6 @@ Na2O2
 {
     specie
     {
-        nMoles          1;
         molWeight       77.9784;
     }
     thermodynamics
@@ -19708,7 +18478,6 @@ C12D10_Biphenyl
 {
     specie
     {
-        nMoles          1;
         molWeight       164.275;
     }
     thermodynamics
@@ -19724,7 +18493,6 @@ C4H7O2_MePropionat
 {
     specie
     {
-        nMoles          1;
         molWeight       87.0992;
     }
     thermodynamics
@@ -19740,7 +18508,6 @@ C6H11I_IodocyHexan
 {
     specie
     {
-        nMoles          1;
         molWeight       210.059;
     }
     thermodynamics
@@ -19756,7 +18523,6 @@ Cl-
 {
     specie
     {
-        nMoles          1;
         molWeight       35.4535;
     }
     thermodynamics
@@ -19772,7 +18538,6 @@ CF+
 {
     specie
     {
-        nMoles          1;
         molWeight       31.009;
     }
     thermodynamics
@@ -19788,7 +18553,6 @@ FeS(G)
 {
     specie
     {
-        nMoles          1;
         molWeight       87.911;
     }
     thermodynamics
@@ -19804,7 +18568,6 @@ Bi(CH3)2___HF298
 {
     specie
     {
-        nMoles          1;
         molWeight       239.05;
     }
     thermodynamics
@@ -19820,7 +18583,6 @@ C7H7_Quadri_Base
 {
     specie
     {
-        nMoles          1;
         molWeight       91.1338;
     }
     thermodynamics
@@ -19836,7 +18598,6 @@ CBrCl3_Bromotric
 {
     specie
     {
-        nMoles          1;
         molWeight       198.271;
     }
     thermodynamics
@@ -19852,7 +18613,6 @@ CCl3F___FC-11
 {
     specie
     {
-        nMoles          1;
         molWeight       137.369;
     }
     thermodynamics
@@ -19868,7 +18628,6 @@ MnS___Solid
 {
     specie
     {
-        nMoles          1;
         molWeight       87.002;
     }
     thermodynamics
@@ -19884,7 +18643,6 @@ BrF3
 {
     specie
     {
-        nMoles          1;
         molWeight       136.896;
     }
     thermodynamics
@@ -19900,7 +18658,6 @@ HNCO_Isocyanic_Aci
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -19916,7 +18673,6 @@ NT_Tritium_Nitro
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0306;
     }
     thermodynamics
@@ -19932,7 +18688,6 @@ B(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       10.811;
     }
     thermodynamics
@@ -19948,7 +18703,6 @@ C4H2__butadiyne
 {
     specie
     {
-        nMoles          1;
         molWeight       50.0605;
     }
     thermodynamics
@@ -19964,7 +18718,6 @@ P3O6
 {
     specie
     {
-        nMoles          1;
         molWeight       188.918;
     }
     thermodynamics
@@ -19980,7 +18733,6 @@ P4O10
 {
     specie
     {
-        nMoles          1;
         molWeight       283.889;
     }
     thermodynamics
@@ -19996,7 +18748,6 @@ FeSO4(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       151.909;
     }
     thermodynamics
@@ -20012,7 +18763,6 @@ C2Br4
 {
     specie
     {
-        nMoles          1;
         molWeight       343.626;
     }
     thermodynamics
@@ -20028,7 +18778,6 @@ MnS2_(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       119.066;
     }
     thermodynamics
@@ -20044,7 +18793,6 @@ CH3-NH-NH-CH3_Sy
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0995;
     }
     thermodynamics
@@ -20060,7 +18808,6 @@ DOBr
 {
     specie
     {
-        nMoles          1;
         molWeight       97.9144;
     }
     thermodynamics
@@ -20076,7 +18823,6 @@ P4O10(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       283.889;
     }
     thermodynamics
@@ -20092,7 +18838,6 @@ C3H6O_MeOxyrane
 {
     specie
     {
-        nMoles          1;
         molWeight       58.0807;
     }
     thermodynamics
@@ -20108,7 +18853,6 @@ C4__triplet
 {
     specie
     {
-        nMoles          1;
         molWeight       48.0446;
     }
     thermodynamics
@@ -20124,7 +18868,6 @@ Si2H6__Disilane
 {
     specie
     {
-        nMoles          1;
         molWeight       62.2198;
     }
     thermodynamics
@@ -20140,7 +18883,6 @@ FeO
 {
     specie
     {
-        nMoles          1;
         molWeight       71.8464;
     }
     thermodynamics
@@ -20156,7 +18898,6 @@ C3H2F3_CF3-CH=CH*
 {
     specie
     {
-        nMoles          1;
         molWeight       95.0446;
     }
     thermodynamics
@@ -20172,7 +18913,6 @@ Cl2
 {
     specie
     {
-        nMoles          1;
         molWeight       70.906;
     }
     thermodynamics
@@ -20188,7 +18928,6 @@ Al2O+
 {
     specie
     {
-        nMoles          1;
         molWeight       69.9619;
     }
     thermodynamics
@@ -20204,7 +18943,6 @@ NOH
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0141;
     }
     thermodynamics
@@ -20220,7 +18958,6 @@ OH+
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0068;
     }
     thermodynamics
@@ -20236,7 +18973,6 @@ N3H
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0281;
     }
     thermodynamics
@@ -20252,7 +18988,6 @@ COH
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0185;
     }
     thermodynamics
@@ -20268,7 +19003,6 @@ C4Cl2
 {
     specie
     {
-        nMoles          1;
         molWeight       118.951;
     }
     thermodynamics
@@ -20284,7 +19018,6 @@ s-1,2,3,4-C6H2Cl4
 {
     specie
     {
-        nMoles          1;
         molWeight       215.895;
     }
     thermodynamics
@@ -20300,7 +19033,6 @@ NITROETHYLENE
 {
     specie
     {
-        nMoles          1;
         molWeight       73.0517;
     }
     thermodynamics
@@ -20316,7 +19048,6 @@ C5H10,cyclo-
 {
     specie
     {
-        nMoles          1;
         molWeight       70.1355;
     }
     thermodynamics
@@ -20332,7 +19063,6 @@ DOCl
 {
     specie
     {
-        nMoles          1;
         molWeight       53.4665;
     }
     thermodynamics
@@ -20348,7 +19078,6 @@ PO2
 {
     specie
     {
-        nMoles          1;
         molWeight       62.9726;
     }
     thermodynamics
@@ -20364,7 +19093,6 @@ NH2D
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0367;
     }
     thermodynamics
@@ -20380,7 +19108,6 @@ C4H4O_Vin-KETENE
 {
     specie
     {
-        nMoles          1;
         molWeight       68.0759;
     }
     thermodynamics
@@ -20396,7 +19123,6 @@ NO
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0061;
     }
     thermodynamics
@@ -20412,7 +19138,6 @@ NO2Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       81.4585;
     }
     thermodynamics
@@ -20428,7 +19153,6 @@ C5H7_1,4-diene-3yl
 {
     specie
     {
-        nMoles          1;
         molWeight       67.1115;
     }
     thermodynamics
@@ -20444,7 +19168,6 @@ MgBr2(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       184.114;
     }
     thermodynamics
@@ -20460,7 +19183,6 @@ FO
 {
     specie
     {
-        nMoles          1;
         molWeight       34.9978;
     }
     thermodynamics
@@ -20476,7 +19198,6 @@ C6H9I-3-iodo
 {
     specie
     {
-        nMoles          1;
         molWeight       208.043;
     }
     thermodynamics
@@ -20492,7 +19213,6 @@ FeCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       162.206;
     }
     thermodynamics
@@ -20508,7 +19228,6 @@ NO3F
 {
     specie
     {
-        nMoles          1;
         molWeight       81.0033;
     }
     thermodynamics
@@ -20524,7 +19243,6 @@ C22H18_(C10H7CH2)2
 {
     specie
     {
-        nMoles          1;
         molWeight       282.389;
     }
     thermodynamics
@@ -20540,7 +19258,6 @@ C2HCl5
 {
     specie
     {
-        nMoles          1;
         molWeight       202.295;
     }
     thermodynamics
@@ -20556,7 +19273,6 @@ C3H3+_CH2=C=CH+
 {
     specie
     {
-        nMoles          1;
         molWeight       39.0568;
     }
     thermodynamics
@@ -20572,7 +19288,6 @@ CCl4
 {
     specie
     {
-        nMoles          1;
         molWeight       153.823;
     }
     thermodynamics
@@ -20588,7 +19303,6 @@ C2HBr
 {
     specie
     {
-        nMoles          1;
         molWeight       104.931;
     }
     thermodynamics
@@ -20604,7 +19318,6 @@ N2H4_HYDRAZINE
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0453;
     }
     thermodynamics
@@ -20620,7 +19333,6 @@ RDX_135_Triazine
 {
     specie
     {
-        nMoles          1;
         molWeight       222.118;
     }
     thermodynamics
@@ -20636,7 +19348,6 @@ C2H4O3_HOCH2COOH
 {
     specie
     {
-        nMoles          1;
         molWeight       76.0524;
     }
     thermodynamics
@@ -20652,7 +19363,6 @@ C14H9_1-Phenantr
 {
     specie
     {
-        nMoles          1;
         molWeight       177.228;
     }
     thermodynamics
@@ -20668,7 +19378,6 @@ HFCO+
 {
     specie
     {
-        nMoles          1;
         molWeight       48.0169;
     }
     thermodynamics
@@ -20684,7 +19393,6 @@ C4H8S2_1,3_Dithi
 {
     specie
     {
-        nMoles          1;
         molWeight       120.236;
     }
     thermodynamics
@@ -20700,7 +19408,6 @@ ZnCO3_solid
 {
     specie
     {
-        nMoles          1;
         molWeight       125.379;
     }
     thermodynamics
@@ -20716,7 +19423,6 @@ IO2__O-I-O
 {
     specie
     {
-        nMoles          1;
         molWeight       158.903;
     }
     thermodynamics
@@ -20732,7 +19438,6 @@ CH2_SINGLET
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0271;
     }
     thermodynamics
@@ -20748,7 +19453,6 @@ CHON3_FormilAzide
 {
     specie
     {
-        nMoles          1;
         molWeight       71.0386;
     }
     thermodynamics
@@ -20764,7 +19468,6 @@ C12H26O_1-dodeca
 {
     specie
     {
-        nMoles          1;
         molWeight       186.34;
     }
     thermodynamics
@@ -20780,7 +19483,6 @@ KO
 {
     specie
     {
-        nMoles          1;
         molWeight       55.1014;
     }
     thermodynamics
@@ -20796,7 +19498,6 @@ Mn
 {
     specie
     {
-        nMoles          1;
         molWeight       54.938;
     }
     thermodynamics
@@ -20812,7 +19513,6 @@ C10H20_1-Decene
 {
     specie
     {
-        nMoles          1;
         molWeight       140.271;
     }
     thermodynamics
@@ -20828,7 +19528,6 @@ ZrN(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       105.227;
     }
     thermodynamics
@@ -20844,7 +19543,6 @@ AlF
 {
     specie
     {
-        nMoles          1;
         molWeight       45.9799;
     }
     thermodynamics
@@ -20860,7 +19558,6 @@ CF3O2_CF3O-O*
 {
     specie
     {
-        nMoles          1;
         molWeight       101.005;
     }
     thermodynamics
@@ -20876,7 +19573,6 @@ C4H7__tt-1buten-
 {
     specie
     {
-        nMoles          1;
         molWeight       55.1004;
     }
     thermodynamics
@@ -20892,7 +19588,6 @@ C15H30O2_memyrist
 {
     specie
     {
-        nMoles          1;
         molWeight       242.405;
     }
     thermodynamics
@@ -20908,7 +19603,6 @@ CD2O_Deutherofor
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0388;
     }
     thermodynamics
@@ -20924,7 +19618,6 @@ MgI2
 {
     specie
     {
-        nMoles          1;
         molWeight       278.121;
     }
     thermodynamics
@@ -20940,7 +19633,6 @@ C2Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       59.4753;
     }
     thermodynamics
@@ -20956,7 +19648,6 @@ C10H20_CycloDecan
 {
     specie
     {
-        nMoles          1;
         molWeight       140.271;
     }
     thermodynamics
@@ -20972,7 +19663,6 @@ CHI3__IODOFORM
 {
     specie
     {
-        nMoles          1;
         molWeight       393.732;
     }
     thermodynamics
@@ -20988,7 +19678,6 @@ Mn3O4__Solid-A
 {
     specie
     {
-        nMoles          1;
         molWeight       228.812;
     }
     thermodynamics
@@ -21004,7 +19693,6 @@ Bi2O3
 {
     specie
     {
-        nMoles          1;
         molWeight       465.958;
     }
     thermodynamics
@@ -21020,7 +19708,6 @@ C5H4N__linear_Ra
 {
     specie
     {
-        nMoles          1;
         molWeight       78.0943;
     }
     thermodynamics
@@ -21036,7 +19723,6 @@ P(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       30.9738;
     }
     thermodynamics
@@ -21052,7 +19738,6 @@ C20H34O2_EtLinolen
 {
     specie
     {
-        nMoles          1;
         molWeight       306.493;
     }
     thermodynamics
@@ -21068,7 +19753,6 @@ C4F6_1,3-Butadiene
 {
     specie
     {
-        nMoles          1;
         molWeight       162.035;
     }
     thermodynamics
@@ -21084,7 +19768,6 @@ NCN+
 {
     specie
     {
-        nMoles          1;
         molWeight       40.024;
     }
     thermodynamics
@@ -21100,7 +19783,6 @@ MgOH+
 {
     specie
     {
-        nMoles          1;
         molWeight       41.3188;
     }
     thermodynamics
@@ -21116,7 +19798,6 @@ Zn3N2_solid
 {
     specie
     {
-        nMoles          1;
         molWeight       224.123;
     }
     thermodynamics
@@ -21132,7 +19813,6 @@ BO2-
 {
     specie
     {
-        nMoles          1;
         molWeight       42.8103;
     }
     thermodynamics
@@ -21148,7 +19828,6 @@ O2+
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9983;
     }
     thermodynamics
@@ -21164,7 +19843,6 @@ C22H14_Pentafene
 {
     specie
     {
-        nMoles          1;
         molWeight       278.357;
     }
     thermodynamics
@@ -21180,7 +19858,6 @@ Cr2FeO4
 {
     specie
     {
-        nMoles          1;
         molWeight       223.837;
     }
     thermodynamics
@@ -21196,7 +19873,6 @@ ND2H
 {
     specie
     {
-        nMoles          1;
         molWeight       19.0429;
     }
     thermodynamics
@@ -21212,7 +19888,6 @@ C3H3_CH2(CH=C*)
 {
     specie
     {
-        nMoles          1;
         molWeight       39.0574;
     }
     thermodynamics
@@ -21228,7 +19903,6 @@ CF-
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0101;
     }
     thermodynamics
@@ -21244,7 +19918,6 @@ C5H8Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       103.573;
     }
     thermodynamics
@@ -21260,7 +19933,6 @@ s-1,2,3,C6H3Cl3_1,
 {
     specie
     {
-        nMoles          1;
         molWeight       181.45;
     }
     thermodynamics
@@ -21276,7 +19948,6 @@ HCOOH_FORMIC_ACID
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0259;
     }
     thermodynamics
@@ -21292,7 +19963,6 @@ GeS2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       136.718;
     }
     thermodynamics
@@ -21308,7 +19978,6 @@ I2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       253.809;
     }
     thermodynamics
@@ -21324,7 +19993,6 @@ C6H12O2_Caproic_ac
 {
     specie
     {
-        nMoles          1;
         molWeight       116.161;
     }
     thermodynamics
@@ -21340,7 +20008,6 @@ K(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       39.102;
     }
     thermodynamics
@@ -21356,7 +20023,6 @@ AlO2-
 {
     specie
     {
-        nMoles          1;
         molWeight       58.9808;
     }
     thermodynamics
@@ -21372,7 +20038,6 @@ N3-_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0206;
     }
     thermodynamics
@@ -21388,7 +20053,6 @@ C6H14,n-hexane
 {
     specie
     {
-        nMoles          1;
         molWeight       86.1785;
     }
     thermodynamics
@@ -21404,7 +20068,6 @@ CH2O2-_CH2OO-
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0264;
     }
     thermodynamics
@@ -21420,7 +20083,6 @@ C13H26O2_Me-ester
 {
     specie
     {
-        nMoles          1;
         molWeight       214.351;
     }
     thermodynamics
@@ -21436,7 +20098,6 @@ Mg(OH)2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       58.3267;
     }
     thermodynamics
@@ -21452,7 +20113,6 @@ C3HN_Cyano-Acety
 {
     specie
     {
-        nMoles          1;
         molWeight       51.0481;
     }
     thermodynamics
@@ -21468,7 +20128,6 @@ TNT____Solid_Yin
 {
     specie
     {
-        nMoles          1;
         molWeight       227.134;
     }
     thermodynamics
@@ -21484,7 +20143,6 @@ C7H15__Neoheptyl-1
 {
     specie
     {
-        nMoles          1;
         molWeight       99.1976;
     }
     thermodynamics
@@ -21500,7 +20158,6 @@ C7H6O2_C6H5-COOH
 {
     specie
     {
-        nMoles          1;
         molWeight       122.125;
     }
     thermodynamics
@@ -21516,7 +20173,6 @@ ZrO2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       123.219;
     }
     thermodynamics
@@ -21532,7 +20188,6 @@ CH3NH_radical
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0497;
     }
     thermodynamics
@@ -21548,7 +20203,6 @@ C4H4N2_SUCCINONITR
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0899;
     }
     thermodynamics
@@ -21564,7 +20218,6 @@ C3HCl2OH
 {
     specie
     {
-        nMoles          1;
         molWeight       124.955;
     }
     thermodynamics
@@ -21580,7 +20233,6 @@ NOCl
 {
     specie
     {
-        nMoles          1;
         molWeight       65.4591;
     }
     thermodynamics
@@ -21596,7 +20248,6 @@ BI
 {
     specie
     {
-        nMoles          1;
         molWeight       137.715;
     }
     thermodynamics
@@ -21612,7 +20263,6 @@ C4H7O2_Butyrat
 {
     specie
     {
-        nMoles          1;
         molWeight       87.0992;
     }
     thermodynamics
@@ -21628,7 +20278,6 @@ Mg3N2(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       100.949;
     }
     thermodynamics
@@ -21644,7 +20293,6 @@ CBr3__Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       251.714;
     }
     thermodynamics
@@ -21660,7 +20308,6 @@ ClF5
 {
     specie
     {
-        nMoles          1;
         molWeight       130.445;
     }
     thermodynamics
@@ -21676,7 +20323,6 @@ C5F12__FC_41-12
 {
     specie
     {
-        nMoles          1;
         molWeight       288.037;
     }
     thermodynamics
@@ -21692,7 +20338,6 @@ C20H10__CORANNUL
 {
     specie
     {
-        nMoles          1;
         molWeight       250.303;
     }
     thermodynamics
@@ -21708,7 +20353,6 @@ C4H7O_2-butyralde
 {
     specie
     {
-        nMoles          1;
         molWeight       71.0998;
     }
     thermodynamics
@@ -21724,7 +20368,6 @@ Po_Polonium
 {
     specie
     {
-        nMoles          1;
         molWeight       210;
     }
     thermodynamics
@@ -21740,7 +20383,6 @@ D2
 {
     specie
     {
-        nMoles          1;
         molWeight       4.0282;
     }
     thermodynamics
@@ -21756,7 +20398,6 @@ COF2+__cation
 {
     specie
     {
-        nMoles          1;
         molWeight       66.0068;
     }
     thermodynamics
@@ -21772,7 +20413,6 @@ Mg
 {
     specie
     {
-        nMoles          1;
         molWeight       24.312;
     }
     thermodynamics
@@ -21788,7 +20428,6 @@ s-(CH3)2N-NH*
 {
     specie
     {
-        nMoles          1;
         molWeight       59.0915;
     }
     thermodynamics
@@ -21804,7 +20443,6 @@ C10H8_Naphthalene
 {
     specie
     {
-        nMoles          1;
         molWeight       128.175;
     }
     thermodynamics
@@ -21820,7 +20458,6 @@ IO
 {
     specie
     {
-        nMoles          1;
         molWeight       142.904;
     }
     thermodynamics
@@ -21836,7 +20473,6 @@ MgO(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       40.3114;
     }
     thermodynamics
@@ -21852,7 +20488,6 @@ Fe.947O(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       71.8464;
     }
     thermodynamics
@@ -21868,7 +20503,6 @@ HNO
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0141;
     }
     thermodynamics
@@ -21884,7 +20518,6 @@ N3+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0196;
     }
     thermodynamics
@@ -21900,7 +20533,6 @@ C2N2Hg_(CN)2Hg
 {
     specie
     {
-        nMoles          1;
         molWeight       252.626;
     }
     thermodynamics
@@ -21916,7 +20548,6 @@ C6H5F_Fluorobenz
 {
     specie
     {
-        nMoles          1;
         molWeight       96.1052;
     }
     thermodynamics
@@ -21932,7 +20563,6 @@ C18H34O2_EtPalmOle
 {
     specie
     {
-        nMoles          1;
         molWeight       282.47;
     }
     thermodynamics
@@ -21948,7 +20578,6 @@ NH4+
 {
     specie
     {
-        nMoles          1;
         molWeight       18.038;
     }
     thermodynamics
@@ -21964,7 +20593,6 @@ C12H_linear
 {
     specie
     {
-        nMoles          1;
         molWeight       145.142;
     }
     thermodynamics
@@ -21980,7 +20608,6 @@ CH3SS_radical
 {
     specie
     {
-        nMoles          1;
         molWeight       79.1631;
     }
     thermodynamics
@@ -21996,7 +20623,6 @@ Ni
 {
     specie
     {
-        nMoles          1;
         molWeight       58.71;
     }
     thermodynamics
@@ -22012,7 +20638,6 @@ CYCLOPENTADIENE
 {
     specie
     {
-        nMoles          1;
         molWeight       66.1036;
     }
     thermodynamics
@@ -22028,7 +20653,6 @@ ZrC(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       103.231;
     }
     thermodynamics
@@ -22044,7 +20668,6 @@ CCl2F
 {
     specie
     {
-        nMoles          1;
         molWeight       101.916;
     }
     thermodynamics
@@ -22060,7 +20683,6 @@ C7H__linear
 {
     specie
     {
-        nMoles          1;
         molWeight       85.086;
     }
     thermodynamics
@@ -22076,7 +20698,6 @@ C9H11_PropylBenzen
 {
     specie
     {
-        nMoles          1;
         molWeight       119.188;
     }
     thermodynamics
@@ -22092,7 +20713,6 @@ NH2+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0221;
     }
     thermodynamics
@@ -22108,7 +20728,6 @@ CH3-N*-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0768;
     }
     thermodynamics
@@ -22124,7 +20743,6 @@ S-C3H5_CH3CH=CH*
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0733;
     }
     thermodynamics
@@ -22140,7 +20758,6 @@ CH2NC_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0449;
     }
     thermodynamics
@@ -22156,7 +20773,6 @@ PF+
 {
     specie
     {
-        nMoles          1;
         molWeight       49.9717;
     }
     thermodynamics
@@ -22172,7 +20788,6 @@ H2O2+__cis
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0142;
     }
     thermodynamics
@@ -22188,7 +20803,6 @@ Sb(OH)3
 {
     specie
     {
-        nMoles          1;
         molWeight       172.772;
     }
     thermodynamics
@@ -22204,7 +20818,6 @@ CF4____FC-14
 {
     specie
     {
-        nMoles          1;
         molWeight       88.0048;
     }
     thermodynamics
@@ -22220,7 +20833,6 @@ IR_(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       192.2;
     }
     thermodynamics
@@ -22236,7 +20848,6 @@ C3HBr2O*__Radica
 {
     specie
     {
-        nMoles          1;
         molWeight       212.843;
     }
     thermodynamics
@@ -22252,7 +20863,6 @@ C3O2+_O=C=C=C=O+
 {
     specie
     {
-        nMoles          1;
         molWeight       68.0317;
     }
     thermodynamics
@@ -22268,7 +20878,6 @@ s-1-C10H7-CH=CH*
 {
     specie
     {
-        nMoles          1;
         molWeight       153.206;
     }
     thermodynamics
@@ -22284,7 +20893,6 @@ Fe3O4(S)_Solid-A
 {
     specie
     {
-        nMoles          1;
         molWeight       231.539;
     }
     thermodynamics
@@ -22300,7 +20908,6 @@ HCS_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0831;
     }
     thermodynamics
@@ -22316,7 +20923,6 @@ SN
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0707;
     }
     thermodynamics
@@ -22332,7 +20938,6 @@ HgCl_____Calomel
 {
     specie
     {
-        nMoles          1;
         molWeight       236.043;
     }
     thermodynamics
@@ -22348,7 +20953,6 @@ C8H20PB_PB(C2H5)4
 {
     specie
     {
-        nMoles          1;
         molWeight       323.439;
     }
     thermodynamics
@@ -22364,7 +20968,6 @@ I+
 {
     specie
     {
-        nMoles          1;
         molWeight       126.904;
     }
     thermodynamics
@@ -22380,7 +20983,6 @@ C3H4N__CH3-CH*-CN
 {
     specie
     {
-        nMoles          1;
         molWeight       54.072;
     }
     thermodynamics
@@ -22396,7 +20998,6 @@ PFCl
 {
     specie
     {
-        nMoles          1;
         molWeight       85.4252;
     }
     thermodynamics
@@ -22412,7 +21013,6 @@ C7H14O2_MeCaproate
 {
     specie
     {
-        nMoles          1;
         molWeight       130.188;
     }
     thermodynamics
@@ -22428,7 +21028,6 @@ C2H2O2_HOCH=C=O
 {
     specie
     {
-        nMoles          1;
         molWeight       58.037;
     }
     thermodynamics
@@ -22444,7 +21043,6 @@ CH3ONO
 {
     specie
     {
-        nMoles          1;
         molWeight       61.0406;
     }
     thermodynamics
@@ -22460,7 +21058,6 @@ CH2_TRIPLET
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0271;
     }
     thermodynamics
@@ -22476,7 +21073,6 @@ NH4NO3(III)
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0435;
     }
     thermodynamics
@@ -22492,7 +21088,6 @@ C7H7ON_AcetPyridin
 {
     specie
     {
-        nMoles          1;
         molWeight       121.14;
     }
     thermodynamics
@@ -22508,7 +21103,6 @@ C3H6O3_Trioxane
 {
     specie
     {
-        nMoles          1;
         molWeight       90.0795;
     }
     thermodynamics
@@ -22524,7 +21118,6 @@ AlH
 {
     specie
     {
-        nMoles          1;
         molWeight       27.9895;
     }
     thermodynamics
@@ -22540,7 +21133,6 @@ C2H2+_Acetylene+
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0377;
     }
     thermodynamics
@@ -22556,7 +21148,6 @@ C18H35O2_Stearyl
 {
     specie
     {
-        nMoles          1;
         molWeight       283.478;
     }
     thermodynamics
@@ -22572,7 +21163,6 @@ C10H16_Adamantane
 {
     specie
     {
-        nMoles          1;
         molWeight       136.239;
     }
     thermodynamics
@@ -22588,7 +21178,6 @@ C2H+
 {
     specie
     {
-        nMoles          1;
         molWeight       25.0297;
     }
     thermodynamics
@@ -22604,7 +21193,6 @@ s-*CH2(CH3)-N-NH2
 {
     specie
     {
-        nMoles          1;
         molWeight       59.0915;
     }
     thermodynamics
@@ -22620,7 +21208,6 @@ C6H6_1,3-Hexadiyn
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -22636,7 +21223,6 @@ C5H5N5__Adenine
 {
     specie
     {
-        nMoles          1;
         molWeight       135.129;
     }
     thermodynamics
@@ -22652,7 +21238,6 @@ C7H16_ISOHEPTANE
 {
     specie
     {
-        nMoles          1;
         molWeight       100.206;
     }
     thermodynamics
@@ -22668,7 +21253,6 @@ NHF
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0131;
     }
     thermodynamics
@@ -22684,7 +21268,6 @@ IC2H4OH
 {
     specie
     {
-        nMoles          1;
         molWeight       171.966;
     }
     thermodynamics
@@ -22700,7 +21283,6 @@ FCN
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0162;
     }
     thermodynamics
@@ -22716,7 +21298,6 @@ He
 {
     specie
     {
-        nMoles          1;
         molWeight       4.0026;
     }
     thermodynamics
@@ -22732,7 +21313,6 @@ C2H5O+__CH3C*HOH+
 {
     specie
     {
-        nMoles          1;
         molWeight       45.061;
     }
     thermodynamics
@@ -22748,7 +21328,6 @@ D
 {
     specie
     {
-        nMoles          1;
         molWeight       2.0141;
     }
     thermodynamics
@@ -22764,7 +21343,6 @@ C2Cl2F4_CF3CFCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       170.922;
     }
     thermodynamics
@@ -22780,7 +21358,6 @@ CH2O2_cycCH2(OO)
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0259;
     }
     thermodynamics
@@ -22796,7 +21373,6 @@ SbCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       192.656;
     }
     thermodynamics
@@ -22812,7 +21388,6 @@ Al2O3
 {
     specie
     {
-        nMoles          1;
         molWeight       101.961;
     }
     thermodynamics
@@ -22828,7 +21403,6 @@ C5H11__neopentyl
 {
     specie
     {
-        nMoles          1;
         molWeight       71.1434;
     }
     thermodynamics
@@ -22844,7 +21418,6 @@ C2F2
 {
     specie
     {
-        nMoles          1;
         molWeight       62.0191;
     }
     thermodynamics
@@ -22860,7 +21433,6 @@ ClHC=C=CCl(O*)
 {
     specie
     {
-        nMoles          1;
         molWeight       123.947;
     }
     thermodynamics
@@ -22876,7 +21448,6 @@ s-2,4-C6H4Cl2O_tr
 {
     specie
     {
-        nMoles          1;
         molWeight       163.004;
     }
     thermodynamics
@@ -22892,7 +21463,6 @@ CH5O+__OH2CH3+
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0499;
     }
     thermodynamics
@@ -22908,7 +21478,6 @@ OH
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0074;
     }
     thermodynamics
@@ -22924,7 +21493,6 @@ C3H6_propylene
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0813;
     }
     thermodynamics
@@ -22940,7 +21508,6 @@ FeCl3(s)
 {
     specie
     {
-        nMoles          1;
         molWeight       162.206;
     }
     thermodynamics
@@ -22956,7 +21523,6 @@ C4H7__3-buten-1-yl
 {
     specie
     {
-        nMoles          1;
         molWeight       55.1004;
     }
     thermodynamics
@@ -22972,7 +21538,6 @@ C7H15O_3,3-dimet
 {
     specie
     {
-        nMoles          1;
         molWeight       115.197;
     }
     thermodynamics
@@ -22988,7 +21553,6 @@ ZnSO4(a)
 {
     specie
     {
-        nMoles          1;
         molWeight       161.432;
     }
     thermodynamics
@@ -23004,7 +21568,6 @@ INO2_NitroIodine
 {
     specie
     {
-        nMoles          1;
         molWeight       172.91;
     }
     thermodynamics
@@ -23020,7 +21583,6 @@ C6H12O6__Glucose
 {
     specie
     {
-        nMoles          1;
         molWeight       180.159;
     }
     thermodynamics
@@ -23036,7 +21598,6 @@ NiS2(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       122.838;
     }
     thermodynamics
@@ -23052,7 +21613,6 @@ C7H5NO__Anthranil
 {
     specie
     {
-        nMoles          1;
         molWeight       119.124;
     }
     thermodynamics
@@ -23068,7 +21628,6 @@ CH2(NO2)2
 {
     specie
     {
-        nMoles          1;
         molWeight       106.038;
     }
     thermodynamics
@@ -23084,7 +21643,6 @@ HNNH-__trans
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0299;
     }
     thermodynamics
@@ -23100,7 +21658,6 @@ SbCl5
 {
     specie
     {
-        nMoles          1;
         molWeight       299.015;
     }
     thermodynamics
@@ -23116,7 +21673,6 @@ C19H34O2_meLinolei
 {
     specie
     {
-        nMoles          1;
         molWeight       294.482;
     }
     thermodynamics
@@ -23132,7 +21688,6 @@ SiH3__Silyl
 {
     specie
     {
-        nMoles          1;
         molWeight       31.1099;
     }
     thermodynamics
@@ -23148,7 +21703,6 @@ Hg
 {
     specie
     {
-        nMoles          1;
         molWeight       200.59;
     }
     thermodynamics
@@ -23164,7 +21718,6 @@ C6H5__FULVENYL_M
 {
     specie
     {
-        nMoles          1;
         molWeight       77.1068;
     }
     thermodynamics
@@ -23180,7 +21733,6 @@ S
 {
     specie
     {
-        nMoles          1;
         molWeight       32.064;
     }
     thermodynamics
@@ -23196,7 +21748,6 @@ BH4
 {
     specie
     {
-        nMoles          1;
         molWeight       14.8429;
     }
     thermodynamics
@@ -23212,7 +21763,6 @@ HF+
 {
     specie
     {
-        nMoles          1;
         molWeight       20.0058;
     }
     thermodynamics
@@ -23228,7 +21778,6 @@ C9H18O6_TATP
 {
     specie
     {
-        nMoles          1;
         molWeight       222.24;
     }
     thermodynamics
@@ -23244,7 +21793,6 @@ C12H5Cl4O2_RAD
 {
     specie
     {
-        nMoles          1;
         molWeight       322.984;
     }
     thermodynamics
@@ -23260,7 +21808,6 @@ CDH3
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0492;
     }
     thermodynamics
@@ -23276,7 +21823,6 @@ C17H32O2_mepalmOle
 {
     specie
     {
-        nMoles          1;
         molWeight       268.443;
     }
     thermodynamics
@@ -23292,7 +21838,6 @@ HNO2-_trans____H
 {
     specie
     {
-        nMoles          1;
         molWeight       47.014;
     }
     thermodynamics
@@ -23308,7 +21853,6 @@ JET-A(G)_C12H23
 {
     specie
     {
-        nMoles          1;
         molWeight       167.317;
     }
     thermodynamics
@@ -23324,7 +21868,6 @@ O3__cyclo__O(OO)
 {
     specie
     {
-        nMoles          1;
         molWeight       47.9982;
     }
     thermodynamics
@@ -23340,7 +21883,6 @@ H2O3+__HOOOH+
 {
     specie
     {
-        nMoles          1;
         molWeight       50.0136;
     }
     thermodynamics
@@ -23356,7 +21898,6 @@ C2H6O__CH3OCH3
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0695;
     }
     thermodynamics
@@ -23372,7 +21913,6 @@ C12H4Cl4O3_1368
 {
     specie
     {
-        nMoles          1;
         molWeight       337.976;
     }
     thermodynamics
@@ -23388,7 +21928,6 @@ E-_electron_gas
 {
     specie
     {
-        nMoles          1;
         molWeight       0.000545;
     }
     thermodynamics
@@ -23404,7 +21943,6 @@ NH2OH
 {
     specie
     {
-        nMoles          1;
         molWeight       33.03;
     }
     thermodynamics
@@ -23420,7 +21958,6 @@ Mn5N2(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       302.703;
     }
     thermodynamics
@@ -23436,7 +21973,6 @@ P2
 {
     specie
     {
-        nMoles          1;
         molWeight       61.9476;
     }
     thermodynamics
@@ -23452,7 +21988,6 @@ CBr3Cl__TriBromo
 {
     specie
     {
-        nMoles          1;
         molWeight       287.167;
     }
     thermodynamics
@@ -23468,7 +22003,6 @@ C6H3_CH2=C=C=C=C=C
 {
     specie
     {
-        nMoles          1;
         molWeight       75.0908;
     }
     thermodynamics
@@ -23484,7 +22018,6 @@ ClF3
 {
     specie
     {
-        nMoles          1;
         molWeight       92.4482;
     }
     thermodynamics
@@ -23500,7 +22033,6 @@ C18H36O4_9,10-di
 {
     specie
     {
-        nMoles          1;
         molWeight       316.485;
     }
     thermodynamics
@@ -23516,7 +22048,6 @@ SiHF3
 {
     specie
     {
-        nMoles          1;
         molWeight       86.0892;
     }
     thermodynamics
@@ -23532,7 +22063,6 @@ C5H12O(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1508;
     }
     thermodynamics
@@ -23548,7 +22078,6 @@ D2-
 {
     specie
     {
-        nMoles          1;
         molWeight       4.02874;
     }
     thermodynamics
@@ -23564,7 +22093,6 @@ ND2
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0349;
     }
     thermodynamics
@@ -23580,7 +22108,6 @@ C3H4O2_AcrylAcid
 {
     specie
     {
-        nMoles          1;
         molWeight       72.0641;
     }
     thermodynamics
@@ -23596,7 +22123,6 @@ CHFClBr
 {
     specie
     {
-        nMoles          1;
         molWeight       147.371;
     }
     thermodynamics
@@ -23612,7 +22138,6 @@ AlCl
 {
     specie
     {
-        nMoles          1;
         molWeight       62.4345;
     }
     thermodynamics
@@ -23628,7 +22153,6 @@ C3H6O__OXETANE
 {
     specie
     {
-        nMoles          1;
         molWeight       58.0807;
     }
     thermodynamics
@@ -23644,7 +22168,6 @@ PO-
 {
     specie
     {
-        nMoles          1;
         molWeight       46.9737;
     }
     thermodynamics
@@ -23660,7 +22183,6 @@ C4F2
 {
     specie
     {
-        nMoles          1;
         molWeight       86.0414;
     }
     thermodynamics
@@ -23676,7 +22198,6 @@ I2_gas
 {
     specie
     {
-        nMoles          1;
         molWeight       253.809;
     }
     thermodynamics
@@ -23692,7 +22213,6 @@ CH3C(CH3)2CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       72.1514;
     }
     thermodynamics
@@ -23708,7 +22228,6 @@ GeCl2____triplet
 {
     specie
     {
-        nMoles          1;
         molWeight       143.496;
     }
     thermodynamics
@@ -23724,7 +22243,6 @@ Cl2O7
 {
     specie
     {
-        nMoles          1;
         molWeight       182.902;
     }
     thermodynamics
@@ -23740,7 +22258,6 @@ BrBrO_Br-Br-O
 {
     specie
     {
-        nMoles          1;
         molWeight       175.801;
     }
     thermodynamics
@@ -23756,7 +22273,6 @@ C8H7N__o-ToluoNitr
 {
     specie
     {
-        nMoles          1;
         molWeight       117.152;
     }
     thermodynamics
@@ -23772,7 +22288,6 @@ ClNC_biradical
 {
     specie
     {
-        nMoles          1;
         molWeight       61.4709;
     }
     thermodynamics
@@ -23788,7 +22303,6 @@ C10H__linear
 {
     specie
     {
-        nMoles          1;
         molWeight       121.119;
     }
     thermodynamics
@@ -23804,7 +22318,6 @@ K2O2(g)
 {
     specie
     {
-        nMoles          1;
         molWeight       110.203;
     }
     thermodynamics
@@ -23820,7 +22333,6 @@ NITRO-PENTANE
 {
     specie
     {
-        nMoles          1;
         molWeight       117.149;
     }
     thermodynamics
@@ -23836,7 +22348,6 @@ Ar
 {
     specie
     {
-        nMoles          1;
         molWeight       39.948;
     }
     thermodynamics
@@ -23852,7 +22363,6 @@ I-
 {
     specie
     {
-        nMoles          1;
         molWeight       126.905;
     }
     thermodynamics
@@ -23868,7 +22378,6 @@ C4H9O2_tert-Buty
 {
     specie
     {
-        nMoles          1;
         molWeight       89.1151;
     }
     thermodynamics
@@ -23884,7 +22393,6 @@ C24H18__1,3,5_TPB
 {
     specie
     {
-        nMoles          1;
         molWeight       306.411;
     }
     thermodynamics
@@ -23900,7 +22408,6 @@ C<GR>
 {
     specie
     {
-        nMoles          1;
         molWeight       12.0112;
     }
     thermodynamics
@@ -23916,7 +22423,6 @@ Na2O(a)
 {
     specie
     {
-        nMoles          1;
         molWeight       61.979;
     }
     thermodynamics
@@ -23932,7 +22438,6 @@ FeCl2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       126.753;
     }
     thermodynamics
@@ -23948,7 +22453,6 @@ Na2O(c)
 {
     specie
     {
-        nMoles          1;
         molWeight       61.979;
     }
     thermodynamics
@@ -23964,7 +22468,6 @@ CF3-CHCl2__HF123
 {
     specie
     {
-        nMoles          1;
         molWeight       152.931;
     }
     thermodynamics
@@ -23980,7 +22483,6 @@ C5H5_cyPentadiene
 {
     specie
     {
-        nMoles          1;
         molWeight       65.0956;
     }
     thermodynamics
@@ -23996,7 +22498,6 @@ MgCO3(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       84.3213;
     }
     thermodynamics
@@ -24012,7 +22513,6 @@ C6H12O_Oxepane
 {
     specie
     {
-        nMoles          1;
         molWeight       100.162;
     }
     thermodynamics
@@ -24028,7 +22528,6 @@ C6D6
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1515;
     }
     thermodynamics
@@ -24044,7 +22543,6 @@ C2D2O_Ketene-D2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0499;
     }
     thermodynamics
@@ -24060,7 +22558,6 @@ Zn(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       65.37;
     }
     thermodynamics
@@ -24076,7 +22573,6 @@ C3H7_i-propyl
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0892;
     }
     thermodynamics
@@ -24092,7 +22588,6 @@ AlOH
 {
     specie
     {
-        nMoles          1;
         molWeight       43.9889;
     }
     thermodynamics
@@ -24108,7 +22603,6 @@ MgTiO3(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       120.21;
     }
     thermodynamics
@@ -24124,7 +22618,6 @@ H3PO
 {
     specie
     {
-        nMoles          1;
         molWeight       49.9971;
     }
     thermodynamics
@@ -24140,7 +22633,6 @@ Pt-_Platinum_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       195.091;
     }
     thermodynamics
@@ -24156,7 +22648,6 @@ CH2BrI
 {
     specie
     {
-        nMoles          1;
         molWeight       220.832;
     }
     thermodynamics
@@ -24172,7 +22663,6 @@ C6H11__1-ene-6-yl
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1546;
     }
     thermodynamics
@@ -24188,7 +22678,6 @@ SF5-
 {
     specie
     {
-        nMoles          1;
         molWeight       127.057;
     }
     thermodynamics
@@ -24204,7 +22693,6 @@ C4H6O_2.5-DHFuran
 {
     specie
     {
-        nMoles          1;
         molWeight       70.0918;
     }
     thermodynamics
@@ -24220,7 +22708,6 @@ C5H3+_CyPentTriene
 {
     specie
     {
-        nMoles          1;
         molWeight       63.0791;
     }
     thermodynamics
@@ -24236,7 +22723,6 @@ Br2-
 {
     specie
     {
-        nMoles          1;
         molWeight       159.802;
     }
     thermodynamics
@@ -24252,7 +22738,6 @@ Fe3O4(L)_Liquid
 {
     specie
     {
-        nMoles          1;
         molWeight       231.539;
     }
     thermodynamics
@@ -24268,7 +22753,6 @@ C8H18,n-octane
 {
     specie
     {
-        nMoles          1;
         molWeight       114.233;
     }
     thermodynamics
@@ -24284,7 +22768,6 @@ C12H6Cl4O2
 {
     specie
     {
-        nMoles          1;
         molWeight       323.992;
     }
     thermodynamics
@@ -24300,7 +22783,6 @@ CF2+
 {
     specie
     {
-        nMoles          1;
         molWeight       50.0074;
     }
     thermodynamics
@@ -24316,7 +22798,6 @@ N-C10H22_DECANE
 {
     specie
     {
-        nMoles          1;
         molWeight       142.287;
     }
     thermodynamics
@@ -24332,7 +22813,6 @@ S(a)
 {
     specie
     {
-        nMoles          1;
         molWeight       32.064;
     }
     thermodynamics
@@ -24348,7 +22828,6 @@ Mo
 {
     specie
     {
-        nMoles          1;
         molWeight       95.94;
     }
     thermodynamics
@@ -24364,7 +22843,6 @@ C10H9_1-methylen
 {
     specie
     {
-        nMoles          1;
         molWeight       129.183;
     }
     thermodynamics
@@ -24380,7 +22858,6 @@ HCN+
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0253;
     }
     thermodynamics
@@ -24396,7 +22873,6 @@ C12H10_biphenyl
 {
     specie
     {
-        nMoles          1;
         molWeight       154.214;
     }
     thermodynamics
@@ -24412,7 +22888,6 @@ NH4Cl(III)
 {
     specie
     {
-        nMoles          1;
         molWeight       53.4916;
     }
     thermodynamics
@@ -24428,7 +22903,6 @@ SO2FCl
 {
     specie
     {
-        nMoles          1;
         molWeight       118.514;
     }
     thermodynamics
@@ -24444,7 +22918,6 @@ CH3N2_cy(-CH2N=N*-
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0485;
     }
     thermodynamics
@@ -24460,7 +22933,6 @@ C3H5O__CH3C(O)CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       57.0727;
     }
     thermodynamics
@@ -24476,7 +22948,6 @@ C(NO2)4
 {
     specie
     {
-        nMoles          1;
         molWeight       196.033;
     }
     thermodynamics
@@ -24492,7 +22963,6 @@ NH2NO2_NITRAMIDE
 {
     specie
     {
-        nMoles          1;
         molWeight       62.0281;
     }
     thermodynamics
@@ -24508,7 +22978,6 @@ FO2+___F-O-O+
 {
     specie
     {
-        nMoles          1;
         molWeight       50.9967;
     }
     thermodynamics
@@ -24524,7 +22993,6 @@ HNCN_Cyanamide
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0325;
     }
     thermodynamics
@@ -24540,7 +23008,6 @@ C5H12O_2-Pentanol
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1508;
     }
     thermodynamics
@@ -24556,7 +23023,6 @@ ZrCl4________GAS
 {
     specie
     {
-        nMoles          1;
         molWeight       233.032;
     }
     thermodynamics
@@ -24572,7 +23038,6 @@ C5H8_1,3_Pentadi
 {
     specie
     {
-        nMoles          1;
         molWeight       68.1195;
     }
     thermodynamics
@@ -24588,7 +23053,6 @@ o-C6H4I_radical
 {
     specie
     {
-        nMoles          1;
         molWeight       203.003;
     }
     thermodynamics
@@ -24604,7 +23068,6 @@ C10H22(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       142.287;
     }
     thermodynamics
@@ -24620,7 +23083,6 @@ C7H5(NO2)3_(TNT)
 {
     specie
     {
-        nMoles          1;
         molWeight       227.134;
     }
     thermodynamics
@@ -24636,7 +23098,6 @@ C2H5Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       64.5152;
     }
     thermodynamics
@@ -24652,7 +23113,6 @@ CH3O__METHOXY_RAD
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0345;
     }
     thermodynamics
@@ -24668,7 +23128,6 @@ C20H12_Benzopyrene
 {
     specie
     {
-        nMoles          1;
         molWeight       252.319;
     }
     thermodynamics
@@ -24684,7 +23143,6 @@ CH3C
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0462;
     }
     thermodynamics
@@ -24700,7 +23158,6 @@ CH2Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       49.4801;
     }
     thermodynamics
@@ -24716,7 +23173,6 @@ N2F4
 {
     specie
     {
-        nMoles          1;
         molWeight       104.007;
     }
     thermodynamics
@@ -24732,7 +23188,6 @@ C6H8__1,3-Cycloh
 {
     specie
     {
-        nMoles          1;
         molWeight       80.1307;
     }
     thermodynamics
@@ -24748,7 +23203,6 @@ C6H3N3O7_Picricaci
 {
     specie
     {
-        nMoles          1;
         molWeight       229.107;
     }
     thermodynamics
@@ -24764,7 +23218,6 @@ C20H40O2_methyna
 {
     specie
     {
-        nMoles          1;
         molWeight       312.541;
     }
     thermodynamics
@@ -24780,7 +23233,6 @@ N3H+
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0275;
     }
     thermodynamics
@@ -24796,7 +23248,6 @@ BH3
 {
     specie
     {
-        nMoles          1;
         molWeight       13.8349;
     }
     thermodynamics
@@ -24812,7 +23263,6 @@ CH2NO__H2C=N-O*
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0332;
     }
     thermodynamics
@@ -24828,7 +23278,6 @@ CI3
 {
     specie
     {
-        nMoles          1;
         molWeight       392.724;
     }
     thermodynamics
@@ -24844,7 +23293,6 @@ NCN
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0246;
     }
     thermodynamics
@@ -24860,7 +23308,6 @@ CHBr2
 {
     specie
     {
-        nMoles          1;
         molWeight       172.821;
     }
     thermodynamics
@@ -24876,7 +23323,6 @@ CHO2-_Formyloxy
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0185;
     }
     thermodynamics
@@ -24892,7 +23338,6 @@ CH3-_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0356;
     }
     thermodynamics
@@ -24908,7 +23353,6 @@ MgAl2O4(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       142.273;
     }
     thermodynamics
@@ -24924,7 +23368,6 @@ C20H12_Perylene
 {
     specie
     {
-        nMoles          1;
         molWeight       252.319;
     }
     thermodynamics
@@ -24940,7 +23383,6 @@ HDO2
 {
     specie
     {
-        nMoles          1;
         molWeight       35.0209;
     }
     thermodynamics
@@ -24956,7 +23398,6 @@ CH5N3_guanidin
 {
     specie
     {
-        nMoles          1;
         molWeight       59.0711;
     }
     thermodynamics
@@ -24972,7 +23413,6 @@ C6H9_Cy_C5H7-4CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       81.1386;
     }
     thermodynamics
@@ -24988,7 +23428,6 @@ C12H24O2_n-acid
 {
     specie
     {
-        nMoles          1;
         molWeight       200.324;
     }
     thermodynamics
@@ -25004,7 +23443,6 @@ C6H9_Cy_C5H6-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       81.1386;
     }
     thermodynamics
@@ -25020,7 +23458,6 @@ CrO2
 {
     specie
     {
-        nMoles          1;
         molWeight       83.9948;
     }
     thermodynamics
@@ -25036,7 +23473,6 @@ C7H14,1-heptene
 {
     specie
     {
-        nMoles          1;
         molWeight       98.1896;
     }
     thermodynamics
@@ -25052,7 +23488,6 @@ MUSTARD_S(CH2CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       159.078;
     }
     thermodynamics
@@ -25068,7 +23503,6 @@ C6H11_3-ene-6yl
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1546;
     }
     thermodynamics
@@ -25084,7 +23518,6 @@ C12H9,o-bipheny
 {
     specie
     {
-        nMoles          1;
         molWeight       153.206;
     }
     thermodynamics
@@ -25100,7 +23533,6 @@ ClF
 {
     specie
     {
-        nMoles          1;
         molWeight       54.4514;
     }
     thermodynamics
@@ -25116,7 +23548,6 @@ D+
 {
     specie
     {
-        nMoles          1;
         molWeight       2.01356;
     }
     thermodynamics
@@ -25132,7 +23563,6 @@ HOCl+_Hypochloro
 {
     specie
     {
-        nMoles          1;
         molWeight       52.4598;
     }
     thermodynamics
@@ -25148,7 +23578,6 @@ N2O+
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0123;
     }
     thermodynamics
@@ -25164,7 +23593,6 @@ ClCN
 {
     specie
     {
-        nMoles          1;
         molWeight       61.4709;
     }
     thermodynamics
@@ -25180,7 +23608,6 @@ SO2
 {
     specie
     {
-        nMoles          1;
         molWeight       64.0628;
     }
     thermodynamics
@@ -25196,7 +23623,6 @@ ClC3H4
 {
     specie
     {
-        nMoles          1;
         molWeight       75.5183;
     }
     thermodynamics
@@ -25212,7 +23638,6 @@ C14H9_3-Phenantr
 {
     specie
     {
-        nMoles          1;
         molWeight       177.228;
     }
     thermodynamics
@@ -25228,7 +23653,6 @@ BiI
 {
     specie
     {
-        nMoles          1;
         molWeight       335.884;
     }
     thermodynamics
@@ -25244,7 +23668,6 @@ C6H6_3,4-Dimethy
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -25260,7 +23683,6 @@ CBr2O
 {
     specie
     {
-        nMoles          1;
         molWeight       187.812;
     }
     thermodynamics
@@ -25276,7 +23698,6 @@ CH_quartet
 {
     specie
     {
-        nMoles          1;
         molWeight       13.0191;
     }
     thermodynamics
@@ -25292,7 +23713,6 @@ C7H7_Quadricy_Ap.
 {
     specie
     {
-        nMoles          1;
         molWeight       91.1338;
     }
     thermodynamics
@@ -25308,7 +23728,6 @@ C7H16_NeoHeptane
 {
     specie
     {
-        nMoles          1;
         molWeight       100.206;
     }
     thermodynamics
@@ -25324,7 +23743,6 @@ C3H3I_HCC-CH2I
 {
     specie
     {
-        nMoles          1;
         molWeight       165.962;
     }
     thermodynamics
@@ -25340,7 +23758,6 @@ C6H6___Benzvalen
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -25356,7 +23773,6 @@ C6H8_DIHYDROBENZVA
 {
     specie
     {
-        nMoles          1;
         molWeight       80.1307;
     }
     thermodynamics
@@ -25372,7 +23788,6 @@ C3F___Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       55.0319;
     }
     thermodynamics
@@ -25388,7 +23803,6 @@ C2HF3__CHF=CF2
 {
     specie
     {
-        nMoles          1;
         molWeight       82.0255;
     }
     thermodynamics
@@ -25404,7 +23818,6 @@ D2+
 {
     specie
     {
-        nMoles          1;
         molWeight       4.02766;
     }
     thermodynamics
@@ -25420,7 +23833,6 @@ FCO__(CFObyCOF)
 {
     specie
     {
-        nMoles          1;
         molWeight       47.0089;
     }
     thermodynamics
@@ -25436,7 +23848,6 @@ HBr+_Hydrogen_Br
 {
     specie
     {
-        nMoles          1;
         molWeight       80.9083;
     }
     thermodynamics
@@ -25452,7 +23863,6 @@ NOF
 {
     specie
     {
-        nMoles          1;
         molWeight       49.0045;
     }
     thermodynamics
@@ -25468,7 +23878,6 @@ S-
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0645;
     }
     thermodynamics
@@ -25484,7 +23893,6 @@ C5H3_1,4DIYNE3YL
 {
     specie
     {
-        nMoles          1;
         molWeight       63.0797;
     }
     thermodynamics
@@ -25500,7 +23908,6 @@ C2HF5
 {
     specie
     {
-        nMoles          1;
         molWeight       120.022;
     }
     thermodynamics
@@ -25516,7 +23923,6 @@ CFO-
 {
     specie
     {
-        nMoles          1;
         molWeight       47.0095;
     }
     thermodynamics
@@ -25532,7 +23938,6 @@ C20H38O2_Gondoicac
 {
     specie
     {
-        nMoles          1;
         molWeight       310.525;
     }
     thermodynamics
@@ -25548,7 +23953,6 @@ PbI
 {
     specie
     {
-        nMoles          1;
         molWeight       334.094;
     }
     thermodynamics
@@ -25564,7 +23968,6 @@ DO2
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0129;
     }
     thermodynamics
@@ -25580,7 +23983,6 @@ CH3I+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       141.939;
     }
     thermodynamics
@@ -25596,7 +23998,6 @@ B2O2
 {
     specie
     {
-        nMoles          1;
         molWeight       53.6208;
     }
     thermodynamics
@@ -25612,7 +24013,6 @@ C2H5NO2_NitroEth
 {
     specie
     {
-        nMoles          1;
         molWeight       75.0677;
     }
     thermodynamics
@@ -25628,7 +24028,6 @@ DBr
 {
     specie
     {
-        nMoles          1;
         molWeight       81.915;
     }
     thermodynamics
@@ -25644,7 +24043,6 @@ SnH3
 {
     specie
     {
-        nMoles          1;
         molWeight       121.714;
     }
     thermodynamics
@@ -25660,7 +24058,6 @@ NO-
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0066;
     }
     thermodynamics
@@ -25676,7 +24073,6 @@ C3H3Cl_Chloro-Al
 {
     specie
     {
-        nMoles          1;
         molWeight       74.5104;
     }
     thermodynamics
@@ -25692,7 +24088,6 @@ BFCl
 {
     specie
     {
-        nMoles          1;
         molWeight       65.2624;
     }
     thermodynamics
@@ -25708,7 +24103,6 @@ C8H6__C6H5CCH
 {
     specie
     {
-        nMoles          1;
         molWeight       102.137;
     }
     thermodynamics
@@ -25724,7 +24118,6 @@ H2CN2_cy(-CH2N=N-)
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0405;
     }
     thermodynamics
@@ -25740,7 +24133,6 @@ CHD3_Methane-D3
 {
     specie
     {
-        nMoles          1;
         molWeight       19.0614;
     }
     thermodynamics
@@ -25756,7 +24148,6 @@ H3PO4
 {
     specie
     {
-        nMoles          1;
         molWeight       97.9953;
     }
     thermodynamics
@@ -25772,7 +24163,6 @@ C2HO__HCC=O+
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0291;
     }
     thermodynamics
@@ -25788,7 +24178,6 @@ C6H5OOH_hydroper
 {
     specie
     {
-        nMoles          1;
         molWeight       110.114;
     }
     thermodynamics
@@ -25804,7 +24193,6 @@ C7H8__CyTriEne
 {
     specie
     {
-        nMoles          1;
         molWeight       92.1418;
     }
     thermodynamics
@@ -25820,7 +24208,6 @@ C16H9_4-Pyrenyl
 {
     specie
     {
-        nMoles          1;
         molWeight       201.25;
     }
     thermodynamics
@@ -25836,7 +24223,6 @@ C5H5N__1-Cyano
 {
     specie
     {
-        nMoles          1;
         molWeight       79.1023;
     }
     thermodynamics
@@ -25852,7 +24238,6 @@ CH3CN_Methyl-Cya
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0529;
     }
     thermodynamics
@@ -25868,7 +24253,6 @@ T-C4H10O_T-Butan
 {
     specie
     {
-        nMoles          1;
         molWeight       74.1237;
     }
     thermodynamics
@@ -25884,7 +24268,6 @@ C2H6
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0701;
     }
     thermodynamics
@@ -25900,7 +24283,6 @@ C12H22O11_Cellobi
 {
     specie
     {
-        nMoles          1;
         molWeight       342.303;
     }
     thermodynamics
@@ -25916,7 +24298,6 @@ s-1-2-C10H10
 {
     specie
     {
-        nMoles          1;
         molWeight       130.191;
     }
     thermodynamics
@@ -25932,7 +24313,6 @@ NOF3
 {
     specie
     {
-        nMoles          1;
         molWeight       87.0013;
     }
     thermodynamics
@@ -25948,7 +24328,6 @@ C2H4F_beta-Fluor
 {
     specie
     {
-        nMoles          1;
         molWeight       47.0526;
     }
     thermodynamics
@@ -25964,7 +24343,6 @@ Al(OH)3
 {
     specie
     {
-        nMoles          1;
         molWeight       78.0036;
     }
     thermodynamics
@@ -25980,7 +24358,6 @@ NCCH2OH
 {
     specie
     {
-        nMoles          1;
         molWeight       57.0523;
     }
     thermodynamics
@@ -25996,7 +24373,6 @@ C9H10_Methyl_styre
 {
     specie
     {
-        nMoles          1;
         molWeight       118.18;
     }
     thermodynamics
@@ -26012,7 +24388,6 @@ H6F6
 {
     specie
     {
-        nMoles          1;
         molWeight       120.038;
     }
     thermodynamics
@@ -26028,7 +24403,6 @@ GeCl2____singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       143.496;
     }
     thermodynamics
@@ -26044,7 +24418,6 @@ C3H6_cyclo-
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0813;
     }
     thermodynamics
@@ -26060,7 +24433,6 @@ AlO+
 {
     specie
     {
-        nMoles          1;
         molWeight       42.9804;
     }
     thermodynamics
@@ -26076,7 +24448,6 @@ SF2
 {
     specie
     {
-        nMoles          1;
         molWeight       70.0608;
     }
     thermodynamics
@@ -26092,7 +24463,6 @@ NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0055;
     }
     thermodynamics
@@ -26108,7 +24478,6 @@ C3H5N_Propionitryl
 {
     specie
     {
-        nMoles          1;
         molWeight       55.08;
     }
     thermodynamics
@@ -26124,7 +24493,6 @@ BBr3
 {
     specie
     {
-        nMoles          1;
         molWeight       250.514;
     }
     thermodynamics
@@ -26140,7 +24508,6 @@ C14H28O2_Ethyl_D
 {
     specie
     {
-        nMoles          1;
         molWeight       228.378;
     }
     thermodynamics
@@ -26156,7 +24523,6 @@ NaO2(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       54.9886;
     }
     thermodynamics
@@ -26172,7 +24538,6 @@ HOF
 {
     specie
     {
-        nMoles          1;
         molWeight       36.0058;
     }
     thermodynamics
@@ -26188,7 +24553,6 @@ C4H8O_DiMethylOxyr
 {
     specie
     {
-        nMoles          1;
         molWeight       72.1078;
     }
     thermodynamics
@@ -26204,7 +24568,6 @@ C5H9_1Buten3M3yl
 {
     specie
     {
-        nMoles          1;
         molWeight       69.1275;
     }
     thermodynamics
@@ -26220,7 +24583,6 @@ C(NO)_cy
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0173;
     }
     thermodynamics
@@ -26236,7 +24598,6 @@ C10D8__Naphthale
 {
     specie
     {
-        nMoles          1;
         molWeight       136.224;
     }
     thermodynamics
@@ -26252,7 +24613,6 @@ H2O(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -26268,7 +24628,6 @@ CBr2ClF___11B3
 {
     specie
     {
-        nMoles          1;
         molWeight       226.264;
     }
     thermodynamics
@@ -26284,7 +24643,6 @@ CH3N2*___CH3-N=N
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0485;
     }
     thermodynamics
@@ -26300,7 +24658,6 @@ C2N___N(CC)_cy
 {
     specie
     {
-        nMoles          1;
         molWeight       38.029;
     }
     thermodynamics
@@ -26316,7 +24673,6 @@ C3H2N_CH=CHCN
 {
     specie
     {
-        nMoles          1;
         molWeight       52.0561;
     }
     thermodynamics
@@ -26332,7 +24688,6 @@ CH3O2_Methyl_Per
 {
     specie
     {
-        nMoles          1;
         molWeight       47.0339;
     }
     thermodynamics
@@ -26348,7 +24703,6 @@ C14H28_Cy4Decane
 {
     specie
     {
-        nMoles          1;
         molWeight       196.379;
     }
     thermodynamics
@@ -26364,7 +24718,6 @@ CH2OOCH3
 {
     specie
     {
-        nMoles          1;
         molWeight       62.0689;
     }
     thermodynamics
@@ -26380,7 +24733,6 @@ HNOH+_trans_&_Eq
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0215;
     }
     thermodynamics
@@ -26396,7 +24748,6 @@ Bi(CH3)3
 {
     specie
     {
-        nMoles          1;
         molWeight       254.085;
     }
     thermodynamics
@@ -26412,7 +24763,6 @@ C23H46_1-Tricosen
 {
     specie
     {
-        nMoles          1;
         molWeight       322.623;
     }
     thermodynamics
@@ -26428,7 +24778,6 @@ C3H2(3)_*HC=C=CH*
 {
     specie
     {
-        nMoles          1;
         molWeight       38.0494;
     }
     thermodynamics
@@ -26444,7 +24793,6 @@ FC2H4OH__ATcT_C
 {
     specie
     {
-        nMoles          1;
         molWeight       64.06;
     }
     thermodynamics
@@ -26460,7 +24808,6 @@ CH3F+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0329;
     }
     thermodynamics
@@ -26476,7 +24823,6 @@ Ge-
 {
     specie
     {
-        nMoles          1;
         molWeight       72.5905;
     }
     thermodynamics
@@ -26492,7 +24838,6 @@ C6H2Cl3OOH__Cy
 {
     specie
     {
-        nMoles          1;
         molWeight       213.449;
     }
     thermodynamics
@@ -26508,7 +24853,6 @@ N2O3
 {
     specie
     {
-        nMoles          1;
         molWeight       76.0116;
     }
     thermodynamics
@@ -26524,7 +24868,6 @@ Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       35.453;
     }
     thermodynamics
@@ -26540,7 +24883,6 @@ Cl2C=C=CCl(O*)
 {
     specie
     {
-        nMoles          1;
         molWeight       158.392;
     }
     thermodynamics
@@ -26556,7 +24898,6 @@ NO3-
 {
     specie
     {
-        nMoles          1;
         molWeight       62.0054;
     }
     thermodynamics
@@ -26572,7 +24913,6 @@ CrO
 {
     specie
     {
-        nMoles          1;
         molWeight       67.9954;
     }
     thermodynamics
@@ -26588,7 +24928,6 @@ AlCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       133.341;
     }
     thermodynamics
@@ -26604,7 +24943,6 @@ C4H3_E-1yl_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       51.0685;
     }
     thermodynamics
@@ -26620,7 +24958,6 @@ COCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       98.9166;
     }
     thermodynamics
@@ -26636,7 +24973,6 @@ Pd(liq)
 {
     specie
     {
-        nMoles          1;
         molWeight       106.4;
     }
     thermodynamics
@@ -26652,7 +24988,6 @@ C10H13_C5H7-C5H6*
 {
     specie
     {
-        nMoles          1;
         molWeight       133.215;
     }
     thermodynamics
@@ -26668,7 +25003,6 @@ C10H19_1-decenyl
 {
     specie
     {
-        nMoles          1;
         molWeight       139.263;
     }
     thermodynamics
@@ -26684,7 +25018,6 @@ C3H6O_Propionald
 {
     specie
     {
-        nMoles          1;
         molWeight       58.0807;
     }
     thermodynamics
@@ -26700,7 +25033,6 @@ CH3N_Rad_Triplet
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0418;
     }
     thermodynamics
@@ -26716,7 +25048,6 @@ C5H4_1,4-DIYNE
 {
     specie
     {
-        nMoles          1;
         molWeight       64.0876;
     }
     thermodynamics
@@ -26732,7 +25063,6 @@ F2O___F-O-F
 {
     specie
     {
-        nMoles          1;
         molWeight       53.9962;
     }
     thermodynamics
@@ -26748,7 +25078,6 @@ C30H10_Half-Buck
 {
     specie
     {
-        nMoles          1;
         molWeight       370.414;
     }
     thermodynamics
@@ -26764,7 +25093,6 @@ C3H3F3_CF3-CH=CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       96.0526;
     }
     thermodynamics
@@ -26780,7 +25108,6 @@ FCN+___ATcT_C
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0157;
     }
     thermodynamics
@@ -26796,7 +25123,6 @@ C5H4O_Cy_CPD-ONE
 {
     specie
     {
-        nMoles          1;
         molWeight       80.087;
     }
     thermodynamics
@@ -26812,7 +25138,6 @@ C10H7_C6H4*-CH=CCH
 {
     specie
     {
-        nMoles          1;
         molWeight       127.167;
     }
     thermodynamics
@@ -26828,7 +25153,6 @@ BrO+
 {
     specie
     {
-        nMoles          1;
         molWeight       95.8998;
     }
     thermodynamics
@@ -26844,7 +25168,6 @@ C4H4S_Thiophene
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1405;
     }
     thermodynamics
@@ -26860,7 +25183,6 @@ PbBr2
 {
     specie
     {
-        nMoles          1;
         molWeight       366.992;
     }
     thermodynamics
@@ -26876,7 +25198,6 @@ H3+_TRIHYDROGEN
 {
     specie
     {
-        nMoles          1;
         molWeight       3.02337;
     }
     thermodynamics
@@ -26892,7 +25213,6 @@ C10H20_2-decene-
 {
     specie
     {
-        nMoles          1;
         molWeight       140.271;
     }
     thermodynamics
@@ -26908,7 +25228,6 @@ s-1,2-C2H4(NO2)2
 {
     specie
     {
-        nMoles          1;
         molWeight       120.065;
     }
     thermodynamics
@@ -26924,7 +25243,6 @@ PT+_Platinum_cati
 {
     specie
     {
-        nMoles          1;
         molWeight       195.089;
     }
     thermodynamics
@@ -26940,7 +25258,6 @@ H2S
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0799;
     }
     thermodynamics
@@ -26956,7 +25273,6 @@ C3H5O__CH3CH2*CO
 {
     specie
     {
-        nMoles          1;
         molWeight       57.0727;
     }
     thermodynamics
@@ -26972,7 +25288,6 @@ CH2OH_RADICAL
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0345;
     }
     thermodynamics
@@ -26988,7 +25303,6 @@ NiS2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       122.838;
     }
     thermodynamics
@@ -27004,7 +25318,6 @@ Mg2SiO4(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       140.708;
     }
     thermodynamics
@@ -27020,7 +25333,6 @@ N-C9H20_NONANE
 {
     specie
     {
-        nMoles          1;
         molWeight       128.26;
     }
     thermodynamics
@@ -27036,7 +25348,6 @@ C2H2Cl3_1,1,1-Tr
 {
     specie
     {
-        nMoles          1;
         molWeight       132.397;
     }
     thermodynamics
@@ -27052,7 +25363,6 @@ NiS(b)
 {
     specie
     {
-        nMoles          1;
         molWeight       90.774;
     }
     thermodynamics
@@ -27068,7 +25378,6 @@ HO2+
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0062;
     }
     thermodynamics
@@ -27084,7 +25393,6 @@ SO
 {
     specie
     {
-        nMoles          1;
         molWeight       48.0634;
     }
     thermodynamics
@@ -27100,7 +25408,6 @@ CCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       82.9172;
     }
     thermodynamics
@@ -27116,7 +25423,6 @@ BrC2H4OH__ATcT_C
 {
     specie
     {
-        nMoles          1;
         molWeight       124.962;
     }
     thermodynamics
@@ -27132,7 +25438,6 @@ C8H9_DiMethylPh_R
 {
     specie
     {
-        nMoles          1;
         molWeight       105.161;
     }
     thermodynamics
@@ -27148,7 +25453,6 @@ CH2O-__CH**-OH
 {
     specie
     {
-        nMoles          1;
         molWeight       30.027;
     }
     thermodynamics
@@ -27164,7 +25468,6 @@ BiF
 {
     specie
     {
-        nMoles          1;
         molWeight       227.978;
     }
     thermodynamics
@@ -27180,7 +25483,6 @@ CrN(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       66.0027;
     }
     thermodynamics
@@ -27196,7 +25498,6 @@ MgI2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       278.121;
     }
     thermodynamics
@@ -27212,7 +25513,6 @@ s-1-C10H7-CH*-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       155.221;
     }
     thermodynamics
@@ -27228,7 +25528,6 @@ CuF2
 {
     specie
     {
-        nMoles          1;
         molWeight       101.537;
     }
     thermodynamics
@@ -27244,7 +25543,6 @@ CH3NO__O=CH-NH2
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0412;
     }
     thermodynamics
@@ -27260,7 +25558,6 @@ C4H5__1,3-Butadi
 {
     specie
     {
-        nMoles          1;
         molWeight       53.0845;
     }
     thermodynamics
@@ -27276,7 +25573,6 @@ MgCl2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       95.218;
     }
     thermodynamics
@@ -27292,7 +25588,6 @@ C2H3-
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0468;
     }
     thermodynamics
@@ -27308,7 +25603,6 @@ CH3+
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0345;
     }
     thermodynamics
@@ -27324,7 +25618,6 @@ AlBr3
 {
     specie
     {
-        nMoles          1;
         molWeight       266.684;
     }
     thermodynamics
@@ -27340,7 +25633,6 @@ C3H6O__CyC3H5-OH
 {
     specie
     {
-        nMoles          1;
         molWeight       58.0807;
     }
     thermodynamics
@@ -27356,7 +25648,6 @@ C11H24O_1-undeca
 {
     specie
     {
-        nMoles          1;
         molWeight       172.313;
     }
     thermodynamics
@@ -27372,7 +25663,6 @@ C16H31O2_palmita
 {
     specie
     {
-        nMoles          1;
         molWeight       255.424;
     }
     thermodynamics
@@ -27388,7 +25678,6 @@ C6F14__FC_51-14
 {
     specie
     {
-        nMoles          1;
         molWeight       338.044;
     }
     thermodynamics
@@ -27404,7 +25693,6 @@ C12_linear_Triplet
 {
     specie
     {
-        nMoles          1;
         molWeight       144.134;
     }
     thermodynamics
@@ -27420,7 +25708,6 @@ C22H46___docosane
 {
     specie
     {
-        nMoles          1;
         molWeight       310.612;
     }
     thermodynamics
@@ -27436,7 +25723,6 @@ HPO
 {
     specie
     {
-        nMoles          1;
         molWeight       47.9812;
     }
     thermodynamics
@@ -27452,7 +25738,6 @@ FeOCl(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       107.299;
     }
     thermodynamics
@@ -27468,7 +25753,6 @@ C5_singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0558;
     }
     thermodynamics
@@ -27484,7 +25768,6 @@ Cl2C=C=CH(O*)
 {
     specie
     {
-        nMoles          1;
         molWeight       123.947;
     }
     thermodynamics
@@ -27500,7 +25783,6 @@ P2O3
 {
     specie
     {
-        nMoles          1;
         molWeight       109.946;
     }
     thermodynamics
@@ -27516,7 +25798,6 @@ C10H7_Naphtyl_rad
 {
     specie
     {
-        nMoles          1;
         molWeight       127.167;
     }
     thermodynamics
@@ -27532,7 +25813,6 @@ CHF-
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0181;
     }
     thermodynamics
@@ -27548,7 +25828,6 @@ C10H21_2-decyl
 {
     specie
     {
-        nMoles          1;
         molWeight       141.279;
     }
     thermodynamics
@@ -27564,7 +25843,6 @@ O3
 {
     specie
     {
-        nMoles          1;
         molWeight       47.9982;
     }
     thermodynamics
@@ -27580,7 +25858,6 @@ NOO
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0055;
     }
     thermodynamics
@@ -27596,7 +25873,6 @@ PO
 {
     specie
     {
-        nMoles          1;
         molWeight       46.9732;
     }
     thermodynamics
@@ -27612,7 +25888,6 @@ BF3
 {
     specie
     {
-        nMoles          1;
         molWeight       67.8062;
     }
     thermodynamics
@@ -27628,7 +25903,6 @@ C3H8O3_Glycerol
 {
     specie
     {
-        nMoles          1;
         molWeight       92.0954;
     }
     thermodynamics
@@ -27644,7 +25918,6 @@ T2O__(3H2O)
 {
     specie
     {
-        nMoles          1;
         molWeight       111.799;
     }
     thermodynamics
@@ -27660,7 +25933,6 @@ o-C6H3I_Cy
 {
     specie
     {
-        nMoles          1;
         molWeight       201.995;
     }
     thermodynamics
@@ -27676,7 +25948,6 @@ CH3NH2-_anion__H
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0582;
     }
     thermodynamics
@@ -27692,7 +25963,6 @@ CHF2
 {
     specie
     {
-        nMoles          1;
         molWeight       51.0159;
     }
     thermodynamics
@@ -27708,7 +25978,6 @@ SbH3
 {
     specie
     {
-        nMoles          1;
         molWeight       124.774;
     }
     thermodynamics
@@ -27724,7 +25993,6 @@ C19H38O2_Stearate
 {
     specie
     {
-        nMoles          1;
         molWeight       298.514;
     }
     thermodynamics
@@ -27740,7 +26008,6 @@ Fe(CO)5(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       195.9;
     }
     thermodynamics
@@ -27756,7 +26023,6 @@ C5H6O__4H-Pyran
 {
     specie
     {
-        nMoles          1;
         molWeight       82.103;
     }
     thermodynamics
@@ -27772,7 +26038,6 @@ CrO3
 {
     specie
     {
-        nMoles          1;
         molWeight       99.9942;
     }
     thermodynamics
@@ -27788,7 +26053,6 @@ BOCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       97.7164;
     }
     thermodynamics
@@ -27804,7 +26068,6 @@ Fe2Cl4
 {
     specie
     {
-        nMoles          1;
         molWeight       253.506;
     }
     thermodynamics
@@ -27820,7 +26083,6 @@ C3H7_n-propyl
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0892;
     }
     thermodynamics
@@ -27836,7 +26098,6 @@ CH2D2_Methane-D2
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0553;
     }
     thermodynamics
@@ -27852,7 +26113,6 @@ C7H12__Cy-heptene
 {
     specie
     {
-        nMoles          1;
         molWeight       96.1737;
     }
     thermodynamics
@@ -27868,7 +26128,6 @@ FeS(c)
 {
     specie
     {
-        nMoles          1;
         molWeight       87.911;
     }
     thermodynamics
@@ -27884,7 +26143,6 @@ CH_excited_B2Sig
 {
     specie
     {
-        nMoles          1;
         molWeight       13.0191;
     }
     thermodynamics
@@ -27900,7 +26158,6 @@ C3H7I_2-IodoProp
 {
     specie
     {
-        nMoles          1;
         molWeight       169.994;
     }
     thermodynamics
@@ -27916,7 +26173,6 @@ PD3_Phosphine-D3
 {
     specie
     {
-        nMoles          1;
         molWeight       37.0161;
     }
     thermodynamics
@@ -27932,7 +26188,6 @@ C14H9_2-Phenantr
 {
     specie
     {
-        nMoles          1;
         molWeight       177.228;
     }
     thermodynamics
@@ -27948,7 +26203,6 @@ CH2-NH-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0768;
     }
     thermodynamics
@@ -27964,7 +26218,6 @@ C4F10
 {
     specie
     {
-        nMoles          1;
         molWeight       238.029;
     }
     thermodynamics
@@ -27980,7 +26233,6 @@ C2H4ClF_1,1-Chlo
 {
     specie
     {
-        nMoles          1;
         molWeight       82.5056;
     }
     thermodynamics
@@ -27996,7 +26248,6 @@ C18H29O2_Linolenat
 {
     specie
     {
-        nMoles          1;
         molWeight       277.431;
     }
     thermodynamics
@@ -28012,7 +26263,6 @@ N2+
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0129;
     }
     thermodynamics
@@ -28028,7 +26278,6 @@ He+
 {
     specie
     {
-        nMoles          1;
         molWeight       4.00206;
     }
     thermodynamics
@@ -28044,7 +26293,6 @@ C16H32O2_Palmitiac
 {
     specie
     {
-        nMoles          1;
         molWeight       256.432;
     }
     thermodynamics
@@ -28060,7 +26308,6 @@ SO2F2
 {
     specie
     {
-        nMoles          1;
         molWeight       102.06;
     }
     thermodynamics
@@ -28076,7 +26323,6 @@ P4O10(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       283.889;
     }
     thermodynamics
@@ -28092,7 +26338,6 @@ C2Cl6
 {
     specie
     {
-        nMoles          1;
         molWeight       236.74;
     }
     thermodynamics
@@ -28108,7 +26353,6 @@ C4H6Cl2_3,4-DiCl
 {
     specie
     {
-        nMoles          1;
         molWeight       124.998;
     }
     thermodynamics
@@ -28124,7 +26368,6 @@ N2O+_NON+
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0123;
     }
     thermodynamics
@@ -28140,7 +26383,6 @@ m-CHLOROPHENYL
 {
     specie
     {
-        nMoles          1;
         molWeight       111.552;
     }
     thermodynamics
@@ -28156,7 +26398,6 @@ C2H5_ethyl_radic
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0622;
     }
     thermodynamics
@@ -28172,7 +26413,6 @@ C4H8O__CyButanol
 {
     specie
     {
-        nMoles          1;
         molWeight       72.1078;
     }
     thermodynamics
@@ -28188,7 +26428,6 @@ C8H2_linear
 {
     specie
     {
-        nMoles          1;
         molWeight       98.1051;
     }
     thermodynamics
@@ -28204,7 +26443,6 @@ C2F4__FC-1114
 {
     specie
     {
-        nMoles          1;
         molWeight       100.016;
     }
     thermodynamics
@@ -28220,7 +26458,6 @@ C2HClF2_cis
 {
     specie
     {
-        nMoles          1;
         molWeight       98.4801;
     }
     thermodynamics
@@ -28236,7 +26473,6 @@ C18H36_1-Octadece
 {
     specie
     {
-        nMoles          1;
         molWeight       252.488;
     }
     thermodynamics
@@ -28252,7 +26488,6 @@ MnO2(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       86.9368;
     }
     thermodynamics
@@ -28268,7 +26503,6 @@ C6H7__C5H5-1-CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       79.1227;
     }
     thermodynamics
@@ -28284,7 +26518,6 @@ Cr(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       51.996;
     }
     thermodynamics
@@ -28300,7 +26533,6 @@ P4_tetrahedral
 {
     specie
     {
-        nMoles          1;
         molWeight       123.895;
     }
     thermodynamics
@@ -28316,7 +26548,6 @@ ZrF4
 {
     specie
     {
-        nMoles          1;
         molWeight       167.214;
     }
     thermodynamics
@@ -28332,7 +26563,6 @@ CD2_Deutherometh
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0393;
     }
     thermodynamics
@@ -28348,7 +26578,6 @@ C2H2Cl2_1,1-
 {
     specie
     {
-        nMoles          1;
         molWeight       96.9442;
     }
     thermodynamics
@@ -28364,7 +26593,6 @@ BFCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       100.715;
     }
     thermodynamics
@@ -28380,7 +26608,6 @@ C6H9_a
 {
     specie
     {
-        nMoles          1;
         molWeight       81.1386;
     }
     thermodynamics
@@ -28396,7 +26623,6 @@ CH2N2_Carbodiimi
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0405;
     }
     thermodynamics
@@ -28412,7 +26638,6 @@ CH3CHO_Acetaldehy
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0536;
     }
     thermodynamics
@@ -28428,7 +26653,6 @@ s-2,4-C6H4Cl2O_cis
 {
     specie
     {
-        nMoles          1;
         molWeight       163.004;
     }
     thermodynamics
@@ -28444,7 +26668,6 @@ C7H14O2_Enanthic
 {
     specie
     {
-        nMoles          1;
         molWeight       130.188;
     }
     thermodynamics
@@ -28460,7 +26683,6 @@ C6H13__2-Hexyl
 {
     specie
     {
-        nMoles          1;
         molWeight       85.1705;
     }
     thermodynamics
@@ -28476,7 +26698,6 @@ s-1,3,5-C6H3Cl3
 {
     specie
     {
-        nMoles          1;
         molWeight       181.45;
     }
     thermodynamics
@@ -28492,7 +26713,6 @@ C3H2(1)_HCC-CH**
 {
     specie
     {
-        nMoles          1;
         molWeight       38.0494;
     }
     thermodynamics
@@ -28508,7 +26728,6 @@ HAlO
 {
     specie
     {
-        nMoles          1;
         molWeight       43.9889;
     }
     thermodynamics
@@ -28524,7 +26743,6 @@ C6H11_1ene2M-yl
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1546;
     }
     thermodynamics
@@ -28540,7 +26758,6 @@ H2N2O__H2NN=O
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0287;
     }
     thermodynamics
@@ -28556,7 +26773,6 @@ S5
 {
     specie
     {
-        nMoles          1;
         molWeight       160.32;
     }
     thermodynamics
@@ -28572,7 +26788,6 @@ CH6N+__CH3NH3+
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0651;
     }
     thermodynamics
@@ -28588,7 +26803,6 @@ C7H4__CH(CCH)3
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1099;
     }
     thermodynamics
@@ -28604,7 +26818,6 @@ CrCl6
 {
     specie
     {
-        nMoles          1;
         molWeight       264.714;
     }
     thermodynamics
@@ -28620,7 +26833,6 @@ PH2+
 {
     specie
     {
-        nMoles          1;
         molWeight       32.9897;
     }
     thermodynamics
@@ -28636,7 +26848,6 @@ C5H6O_2-Me_Furan
 {
     specie
     {
-        nMoles          1;
         molWeight       82.103;
     }
     thermodynamics
@@ -28652,7 +26863,6 @@ CH2ClBr
 {
     specie
     {
-        nMoles          1;
         molWeight       129.381;
     }
     thermodynamics
@@ -28668,7 +26878,6 @@ CT4__methane_T-4
 {
     specie
     {
-        nMoles          1;
         molWeight       203.611;
     }
     thermodynamics
@@ -28684,7 +26893,6 @@ C3H8O2_C3H7O-OH
 {
     specie
     {
-        nMoles          1;
         molWeight       76.096;
     }
     thermodynamics
@@ -28700,7 +26908,6 @@ SB(CH3)3
 {
     specie
     {
-        nMoles          1;
         molWeight       166.855;
     }
     thermodynamics
@@ -28716,7 +26923,6 @@ FeS2(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       119.975;
     }
     thermodynamics
@@ -28732,7 +26938,6 @@ C2O_(CCO)
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0217;
     }
     thermodynamics
@@ -28748,7 +26953,6 @@ C2H6N2_Azomethan
 {
     specie
     {
-        nMoles          1;
         molWeight       58.0835;
     }
     thermodynamics
@@ -28764,7 +26968,6 @@ C6H7_1,3,5_Linear
 {
     specie
     {
-        nMoles          1;
         molWeight       79.1227;
     }
     thermodynamics
@@ -28780,7 +26983,6 @@ HClO4
 {
     specie
     {
-        nMoles          1;
         molWeight       100.459;
     }
     thermodynamics
@@ -28796,7 +26998,6 @@ C2N+___C-CN
 {
     specie
     {
-        nMoles          1;
         molWeight       38.0285;
     }
     thermodynamics
@@ -28812,7 +27013,6 @@ C6_linear_triplet
 {
     specie
     {
-        nMoles          1;
         molWeight       72.0669;
     }
     thermodynamics
@@ -28828,7 +27028,6 @@ CH2DNO2
 {
     specie
     {
-        nMoles          1;
         molWeight       62.0467;
     }
     thermodynamics
@@ -28844,7 +27043,6 @@ Pb+
 {
     specie
     {
-        nMoles          1;
         molWeight       207.189;
     }
     thermodynamics
@@ -28860,7 +27058,6 @@ N2-
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0139;
     }
     thermodynamics
@@ -28876,7 +27073,6 @@ BCl2+
 {
     specie
     {
-        nMoles          1;
         molWeight       81.7165;
     }
     thermodynamics
@@ -28892,7 +27088,6 @@ BHF2
 {
     specie
     {
-        nMoles          1;
         molWeight       49.8158;
     }
     thermodynamics
@@ -28908,7 +27103,6 @@ C6H7O5(NO2)3__NC
 {
     specie
     {
-        nMoles          1;
         molWeight       297.136;
     }
     thermodynamics
@@ -28924,7 +27118,6 @@ HC(OO)_cyclo_rad
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0179;
     }
     thermodynamics
@@ -28940,7 +27133,6 @@ CH4N2_cyc(-CH2-N
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0564;
     }
     thermodynamics
@@ -28956,7 +27148,6 @@ K20(g)
 {
     specie
     {
-        nMoles          1;
         molWeight       94.2034;
     }
     thermodynamics
@@ -28972,7 +27163,6 @@ CH2Br2
 {
     specie
     {
-        nMoles          1;
         molWeight       173.829;
     }
     thermodynamics
@@ -28988,7 +27178,6 @@ ClONO2_Clnitrat
 {
     specie
     {
-        nMoles          1;
         molWeight       97.4579;
     }
     thermodynamics
@@ -29004,7 +27193,6 @@ NH4NO3_gas
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0435;
     }
     thermodynamics
@@ -29020,7 +27208,6 @@ Cl+
 {
     specie
     {
-        nMoles          1;
         molWeight       35.4525;
     }
     thermodynamics
@@ -29036,7 +27223,6 @@ CF2
 {
     specie
     {
-        nMoles          1;
         molWeight       50.008;
     }
     thermodynamics
@@ -29052,7 +27238,6 @@ CH2N-_H*C=NH_trans
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0343;
     }
     thermodynamics
@@ -29068,7 +27253,6 @@ C4H9O_N-Butoxy_R
 {
     specie
     {
-        nMoles          1;
         molWeight       73.1157;
     }
     thermodynamics
@@ -29084,7 +27268,6 @@ s-*CH2ONO2
 {
     specie
     {
-        nMoles          1;
         molWeight       76.032;
     }
     thermodynamics
@@ -29100,7 +27283,6 @@ NH2O__RADICAL
 {
     specie
     {
-        nMoles          1;
         molWeight       32.022;
     }
     thermodynamics
@@ -29116,7 +27298,6 @@ F2O+__FOF+
 {
     specie
     {
-        nMoles          1;
         molWeight       53.9957;
     }
     thermodynamics
@@ -29132,7 +27313,6 @@ AlF2-
 {
     specie
     {
-        nMoles          1;
         molWeight       64.9788;
     }
     thermodynamics
@@ -29148,7 +27328,6 @@ O4+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       63.9971;
     }
     thermodynamics
@@ -29164,7 +27343,6 @@ Na2O2(b)
 {
     specie
     {
-        nMoles          1;
         molWeight       77.9784;
     }
     thermodynamics
@@ -29180,7 +27358,6 @@ Ag+
 {
     specie
     {
-        nMoles          1;
         molWeight       107.869;
     }
     thermodynamics
@@ -29196,7 +27373,6 @@ C6H14(L)_n-hexa
 {
     specie
     {
-        nMoles          1;
         molWeight       86.1785;
     }
     thermodynamics
@@ -29212,7 +27388,6 @@ C18H38_n-Octadeca
 {
     specie
     {
-        nMoles          1;
         molWeight       254.504;
     }
     thermodynamics
@@ -29228,7 +27403,6 @@ C10H4Cl4_2,3,6,7
 {
     specie
     {
-        nMoles          1;
         molWeight       265.955;
     }
     thermodynamics
@@ -29244,7 +27418,6 @@ C2H3O2_COOCH3
 {
     specie
     {
-        nMoles          1;
         molWeight       59.045;
     }
     thermodynamics
@@ -29260,7 +27433,6 @@ C2H5NH2__Et-amin
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0848;
     }
     thermodynamics
@@ -29276,7 +27448,6 @@ C6H5Br+__Cation
 {
     specie
     {
-        nMoles          1;
         molWeight       157.007;
     }
     thermodynamics
@@ -29292,7 +27463,6 @@ C6H4__Pentaene
 {
     specie
     {
-        nMoles          1;
         molWeight       76.0988;
     }
     thermodynamics
@@ -29308,7 +27478,6 @@ C10H8O__Naphtol
 {
     specie
     {
-        nMoles          1;
         molWeight       144.175;
     }
     thermodynamics
@@ -29324,7 +27493,6 @@ AlH3
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0054;
     }
     thermodynamics
@@ -29340,7 +27508,6 @@ ZrN
 {
     specie
     {
-        nMoles          1;
         molWeight       105.227;
     }
     thermodynamics
@@ -29356,7 +27523,6 @@ C3HBr3_BromoAllene
 {
     specie
     {
-        nMoles          1;
         molWeight       276.744;
     }
     thermodynamics
@@ -29372,7 +27538,6 @@ s-1,2,3,5-C6H2Cl4
 {
     specie
     {
-        nMoles          1;
         molWeight       215.895;
     }
     thermodynamics
@@ -29388,7 +27553,6 @@ CCl2F2_FREON-12
 {
     specie
     {
-        nMoles          1;
         molWeight       120.914;
     }
     thermodynamics
@@ -29404,7 +27568,6 @@ CH2=S
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0911;
     }
     thermodynamics
@@ -29420,7 +27583,6 @@ C5H12,i-pentane
 {
     specie
     {
-        nMoles          1;
         molWeight       72.1514;
     }
     thermodynamics
@@ -29436,7 +27598,6 @@ C2H3O2_HOCH2C=O
 {
     specie
     {
-        nMoles          1;
         molWeight       59.045;
     }
     thermodynamics
@@ -29452,7 +27613,6 @@ C5H6N2_Cyclo_2-A
 {
     specie
     {
-        nMoles          1;
         molWeight       94.117;
     }
     thermodynamics
@@ -29468,7 +27628,6 @@ MgH
 {
     specie
     {
-        nMoles          1;
         molWeight       25.32;
     }
     thermodynamics
@@ -29484,7 +27643,6 @@ C4H7O_CH3CH2CH2CO
 {
     specie
     {
-        nMoles          1;
         molWeight       71.0998;
     }
     thermodynamics
@@ -29500,7 +27658,6 @@ C8H16_CyOctane
 {
     specie
     {
-        nMoles          1;
         molWeight       112.217;
     }
     thermodynamics
@@ -29516,7 +27673,6 @@ NF2
 {
     specie
     {
-        nMoles          1;
         molWeight       52.0035;
     }
     thermodynamics
@@ -29532,7 +27688,6 @@ C17H36_HeptaDecan
 {
     specie
     {
-        nMoles          1;
         molWeight       240.476;
     }
     thermodynamics
@@ -29548,7 +27703,6 @@ HNOH+_cis
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0215;
     }
     thermodynamics
@@ -29564,7 +27718,6 @@ N-
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0072;
     }
     thermodynamics
@@ -29580,7 +27733,6 @@ Ag-
 {
     specie
     {
-        nMoles          1;
         molWeight       107.871;
     }
     thermodynamics
@@ -29596,7 +27748,6 @@ C7H7_Benzyl_rad
 {
     specie
     {
-        nMoles          1;
         molWeight       91.1338;
     }
     thermodynamics
@@ -29612,7 +27763,6 @@ CrO3-
 {
     specie
     {
-        nMoles          1;
         molWeight       99.9947;
     }
     thermodynamics
@@ -29628,7 +27778,6 @@ C3Br4_PerBrAllene
 {
     specie
     {
-        nMoles          1;
         molWeight       355.637;
     }
     thermodynamics
@@ -29644,7 +27793,6 @@ m-C6H4I2
 {
     specie
     {
-        nMoles          1;
         molWeight       329.908;
     }
     thermodynamics
@@ -29660,7 +27808,6 @@ C5H3_CycloPentat
 {
     specie
     {
-        nMoles          1;
         molWeight       63.0797;
     }
     thermodynamics
@@ -29676,7 +27823,6 @@ CNH2+_triradical
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0332;
     }
     thermodynamics
@@ -29692,7 +27838,6 @@ CH3S_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       47.0991;
     }
     thermodynamics
@@ -29708,7 +27853,6 @@ CHFCl2___FC-21
 {
     specie
     {
-        nMoles          1;
         molWeight       102.924;
     }
     thermodynamics
@@ -29724,7 +27868,6 @@ C4H9O_DiEthyl_Beta
 {
     specie
     {
-        nMoles          1;
         molWeight       73.1157;
     }
     thermodynamics
@@ -29740,7 +27883,6 @@ Rn+
 {
     specie
     {
-        nMoles          1;
         molWeight       221.999;
     }
     thermodynamics
@@ -29756,7 +27898,6 @@ ICN
 {
     specie
     {
-        nMoles          1;
         molWeight       152.922;
     }
     thermodynamics
@@ -29772,7 +27913,6 @@ C8H9_C6H5CH2CH2*
 {
     specie
     {
-        nMoles          1;
         molWeight       105.161;
     }
     thermodynamics
@@ -29788,7 +27928,6 @@ C2H4F_alfa-Fluor
 {
     specie
     {
-        nMoles          1;
         molWeight       47.0526;
     }
     thermodynamics
@@ -29804,7 +27943,6 @@ H2NC=O__H2N-C*=O
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0332;
     }
     thermodynamics
@@ -29820,7 +27958,6 @@ MgN
 {
     specie
     {
-        nMoles          1;
         molWeight       38.3187;
     }
     thermodynamics
@@ -29836,7 +27973,6 @@ NCCHO
 {
     specie
     {
-        nMoles          1;
         molWeight       55.0364;
     }
     thermodynamics
@@ -29852,7 +27988,6 @@ C2_singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       24.0223;
     }
     thermodynamics
@@ -29868,7 +28003,6 @@ OT_Tritium_Hydro
 {
     specie
     {
-        nMoles          1;
         molWeight       63.8994;
     }
     thermodynamics
@@ -29884,7 +28018,6 @@ Si3N4(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       140.285;
     }
     thermodynamics
@@ -29900,7 +28033,6 @@ C6H4Cl2_o-Clbenzen
 {
     specie
     {
-        nMoles          1;
         molWeight       147.005;
     }
     thermodynamics
@@ -29916,7 +28048,6 @@ Cu(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       63.54;
     }
     thermodynamics
@@ -29932,7 +28063,6 @@ C6H5_phenyl_radi
 {
     specie
     {
-        nMoles          1;
         molWeight       77.1068;
     }
     thermodynamics
@@ -29948,7 +28078,6 @@ C3H4N2__Imidogen
 {
     specie
     {
-        nMoles          1;
         molWeight       68.0787;
     }
     thermodynamics
@@ -29964,7 +28093,6 @@ PbBr
 {
     specie
     {
-        nMoles          1;
         molWeight       287.091;
     }
     thermodynamics
@@ -29980,7 +28108,6 @@ CuF
 {
     specie
     {
-        nMoles          1;
         molWeight       82.5384;
     }
     thermodynamics
@@ -29996,7 +28123,6 @@ SF4
 {
     specie
     {
-        nMoles          1;
         molWeight       108.058;
     }
     thermodynamics
@@ -30012,7 +28138,6 @@ HOBr+___ATcT_C
 {
     specie
     {
-        nMoles          1;
         molWeight       96.9077;
     }
     thermodynamics
@@ -30028,7 +28153,6 @@ H4C3_PROPYNE
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0653;
     }
     thermodynamics
@@ -30044,7 +28168,6 @@ C4H9_n-butyl
 {
     specie
     {
-        nMoles          1;
         molWeight       57.1163;
     }
     thermodynamics
@@ -30060,7 +28183,6 @@ C5H8O2_2-Pentenoic
 {
     specie
     {
-        nMoles          1;
         molWeight       100.118;
     }
     thermodynamics
@@ -30076,7 +28198,6 @@ O-C12D9_Biphenyl
 {
     specie
     {
-        nMoles          1;
         molWeight       162.261;
     }
     thermodynamics
@@ -30092,7 +28213,6 @@ C4__singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       48.0446;
     }
     thermodynamics
@@ -30108,7 +28228,6 @@ C4H8O_EthylOxyran
 {
     specie
     {
-        nMoles          1;
         molWeight       72.1078;
     }
     thermodynamics
@@ -30124,7 +28243,6 @@ BI3
 {
     specie
     {
-        nMoles          1;
         molWeight       391.524;
     }
     thermodynamics
@@ -30140,7 +28258,6 @@ C6H5ClO__2,4-cyc
 {
     specie
     {
-        nMoles          1;
         molWeight       128.559;
     }
     thermodynamics
@@ -30156,7 +28273,6 @@ N2F2
 {
     specie
     {
-        nMoles          1;
         molWeight       66.0102;
     }
     thermodynamics
@@ -30172,7 +28288,6 @@ C8H6__Pentalene
 {
     specie
     {
-        nMoles          1;
         molWeight       102.137;
     }
     thermodynamics
@@ -30188,7 +28303,6 @@ C2H2Br2_trans
 {
     specie
     {
-        nMoles          1;
         molWeight       185.84;
     }
     thermodynamics
@@ -30204,7 +28318,6 @@ SiCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       98.992;
     }
     thermodynamics
@@ -30220,7 +28333,6 @@ C5H10__2MB-2-ene
 {
     specie
     {
-        nMoles          1;
         molWeight       70.1355;
     }
     thermodynamics
@@ -30236,7 +28348,6 @@ N-DODECANE
 {
     specie
     {
-        nMoles          1;
         molWeight       170.341;
     }
     thermodynamics
@@ -30252,7 +28363,6 @@ HCCN_Triplet
 {
     specie
     {
-        nMoles          1;
         molWeight       39.037;
     }
     thermodynamics
@@ -30268,7 +28378,6 @@ S2F2__(S=SF2)
 {
     specie
     {
-        nMoles          1;
         molWeight       102.125;
     }
     thermodynamics
@@ -30284,7 +28393,6 @@ C4H4O2_1,4-Dioxin
 {
     specie
     {
-        nMoles          1;
         molWeight       84.0753;
     }
     thermodynamics
@@ -30300,7 +28408,6 @@ Cr2O3(I)
 {
     specie
     {
-        nMoles          1;
         molWeight       151.99;
     }
     thermodynamics
@@ -30316,7 +28423,6 @@ OS(g)__Osmium
 {
     specie
     {
-        nMoles          1;
         molWeight       190.2;
     }
     thermodynamics
@@ -30332,7 +28438,6 @@ C4H10N2_1,4-PIPE
 {
     specie
     {
-        nMoles          1;
         molWeight       86.1377;
     }
     thermodynamics
@@ -30348,7 +28453,6 @@ C3H7O_Propoxy_rad
 {
     specie
     {
-        nMoles          1;
         molWeight       59.0886;
     }
     thermodynamics
@@ -30364,7 +28468,6 @@ C3H5NH2_Cyclopro
 {
     specie
     {
-        nMoles          1;
         molWeight       57.0959;
     }
     thermodynamics
@@ -30380,7 +28483,6 @@ ClCN+___ATcT_C
 {
     specie
     {
-        nMoles          1;
         molWeight       61.4703;
     }
     thermodynamics
@@ -30396,7 +28498,6 @@ C6H11__2-ene-6-yl
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1546;
     }
     thermodynamics
@@ -30412,7 +28513,6 @@ WC(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       195.861;
     }
     thermodynamics
@@ -30428,7 +28528,6 @@ C4F8_CY
 {
     specie
     {
-        nMoles          1;
         molWeight       200.032;
     }
     thermodynamics
@@ -30444,7 +28543,6 @@ CHCl3_Chloroform
 {
     specie
     {
-        nMoles          1;
         molWeight       119.378;
     }
     thermodynamics
@@ -30460,7 +28558,6 @@ C5H5_1yne3ene5yl
 {
     specie
     {
-        nMoles          1;
         molWeight       65.0956;
     }
     thermodynamics
@@ -30476,7 +28573,6 @@ H3PO3__[P(OH)3]
 {
     specie
     {
-        nMoles          1;
         molWeight       81.9959;
     }
     thermodynamics
@@ -30492,7 +28588,6 @@ ZnSO4(b)
 {
     specie
     {
-        nMoles          1;
         molWeight       161.432;
     }
     thermodynamics
@@ -30508,7 +28603,6 @@ CH3CO_ACETYL_RAD
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0456;
     }
     thermodynamics
@@ -30524,7 +28618,6 @@ N2H2_Isodiazene
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0293;
     }
     thermodynamics
@@ -30540,7 +28633,6 @@ HSO3__HO-SO2
 {
     specie
     {
-        nMoles          1;
         molWeight       81.0702;
     }
     thermodynamics
@@ -30556,7 +28648,6 @@ NOO+___cation
 {
     specie
     {
-        nMoles          1;
         molWeight       46.005;
     }
     thermodynamics
@@ -30572,7 +28663,6 @@ CH3-NH-NH2
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0724;
     }
     thermodynamics
@@ -30588,7 +28678,6 @@ SCl
 {
     specie
     {
-        nMoles          1;
         molWeight       67.517;
     }
     thermodynamics
@@ -30604,7 +28693,6 @@ H5F5
 {
     specie
     {
-        nMoles          1;
         molWeight       100.032;
     }
     thermodynamics
@@ -30620,7 +28708,6 @@ CH2O2+__CH2(OO)+
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0253;
     }
     thermodynamics
@@ -30636,7 +28723,6 @@ F2O2+
 {
     specie
     {
-        nMoles          1;
         molWeight       69.9951;
     }
     thermodynamics
@@ -30652,7 +28738,6 @@ C3Cl3_123Cy-Radic
 {
     specie
     {
-        nMoles          1;
         molWeight       142.392;
     }
     thermodynamics
@@ -30668,7 +28753,6 @@ N2H4+__Hydrazine
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0447;
     }
     thermodynamics
@@ -30684,7 +28768,6 @@ Mg2TiO4(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       160.522;
     }
     thermodynamics
@@ -30700,7 +28783,6 @@ C5H12O2_n-Pentyl
 {
     specie
     {
-        nMoles          1;
         molWeight       104.15;
     }
     thermodynamics
@@ -30716,7 +28798,6 @@ C6H5+_phenyl_cat
 {
     specie
     {
-        nMoles          1;
         molWeight       77.1062;
     }
     thermodynamics
@@ -30732,7 +28813,6 @@ CH3-NH-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0848;
     }
     thermodynamics
@@ -30748,7 +28828,6 @@ Fe3C_(L)_Liquid
 {
     specie
     {
-        nMoles          1;
         molWeight       179.552;
     }
     thermodynamics
@@ -30764,7 +28843,6 @@ C4H4N2O2_Uracil
 {
     specie
     {
-        nMoles          1;
         molWeight       112.089;
     }
     thermodynamics
@@ -30780,7 +28858,6 @@ CT_Tritium_Carbon
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0351;
     }
     thermodynamics
@@ -30796,7 +28873,6 @@ Si2N2O(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       100.185;
     }
     thermodynamics
@@ -30812,7 +28888,6 @@ Pb(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       207.19;
     }
     thermodynamics
@@ -30828,7 +28903,6 @@ C10H16_endo
 {
     specie
     {
-        nMoles          1;
         molWeight       136.239;
     }
     thermodynamics
@@ -30844,7 +28918,6 @@ C6H11__2M2EN4YL
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1546;
     }
     thermodynamics
@@ -30860,7 +28933,6 @@ MgF2
 {
     specie
     {
-        nMoles          1;
         molWeight       62.3088;
     }
     thermodynamics
@@ -30876,7 +28948,6 @@ C2H5OH
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0695;
     }
     thermodynamics
@@ -30892,7 +28963,6 @@ C8H8___2,3,5,7_Cy
 {
     specie
     {
-        nMoles          1;
         molWeight       104.153;
     }
     thermodynamics
@@ -30908,7 +28978,6 @@ SF3-
 {
     specie
     {
-        nMoles          1;
         molWeight       89.0597;
     }
     thermodynamics
@@ -30924,7 +28993,6 @@ C17H32O2_Margarole
 {
     specie
     {
-        nMoles          1;
         molWeight       268.443;
     }
     thermodynamics
@@ -30940,7 +29008,6 @@ C20H39O2_Archidi
 {
     specie
     {
-        nMoles          1;
         molWeight       311.533;
     }
     thermodynamics
@@ -30956,7 +29023,6 @@ C(NN)__Cyclo
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0246;
     }
     thermodynamics
@@ -30972,7 +29038,6 @@ Br2+
 {
     specie
     {
-        nMoles          1;
         molWeight       159.801;
     }
     thermodynamics
@@ -30988,7 +29053,6 @@ Fe3C_(S)_Solid-B
 {
     specie
     {
-        nMoles          1;
         molWeight       179.552;
     }
     thermodynamics
@@ -31004,7 +29068,6 @@ CH3-O-CH2-O-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       76.096;
     }
     thermodynamics
@@ -31020,7 +29083,6 @@ C6H6O__Oxepin
 {
     specie
     {
-        nMoles          1;
         molWeight       94.1141;
     }
     thermodynamics
@@ -31036,7 +29098,6 @@ Cr2N(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       117.999;
     }
     thermodynamics
@@ -31052,7 +29113,6 @@ CH3F__FC-41_-236
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0335;
     }
     thermodynamics
@@ -31068,7 +29128,6 @@ o-C6H5BrO_cis(Z)
 {
     specie
     {
-        nMoles          1;
         molWeight       173.007;
     }
     thermodynamics
@@ -31084,7 +29143,6 @@ C3Br2_BrC*=C=CBr*
 {
     specie
     {
-        nMoles          1;
         molWeight       195.835;
     }
     thermodynamics
@@ -31100,7 +29158,6 @@ C2N+___C-N=C
 {
     specie
     {
-        nMoles          1;
         molWeight       38.0285;
     }
     thermodynamics
@@ -31116,7 +29173,6 @@ s-2-C4H10O_2-Butan
 {
     specie
     {
-        nMoles          1;
         molWeight       74.1237;
     }
     thermodynamics
@@ -31132,7 +29188,6 @@ C17H34O2_n-Marga
 {
     specie
     {
-        nMoles          1;
         molWeight       270.459;
     }
     thermodynamics
@@ -31148,7 +29203,6 @@ C2H2F2_equil
 {
     specie
     {
-        nMoles          1;
         molWeight       64.035;
     }
     thermodynamics
@@ -31164,7 +29218,6 @@ C8H8__Styrene
 {
     specie
     {
-        nMoles          1;
         molWeight       104.153;
     }
     thermodynamics
@@ -31180,7 +29233,6 @@ C12H2_linear
 {
     specie
     {
-        nMoles          1;
         molWeight       146.15;
     }
     thermodynamics
@@ -31196,7 +29248,6 @@ CH4+__CATION
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0425;
     }
     thermodynamics
@@ -31212,7 +29263,6 @@ C24H17
 {
     specie
     {
-        nMoles          1;
         molWeight       305.403;
     }
     thermodynamics
@@ -31228,7 +29278,6 @@ BCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       81.717;
     }
     thermodynamics
@@ -31244,7 +29293,6 @@ ClC*=C=CCl*_birad
 {
     specie
     {
-        nMoles          1;
         molWeight       106.939;
     }
     thermodynamics
@@ -31260,7 +29308,6 @@ Ge2S2
 {
     specie
     {
-        nMoles          1;
         molWeight       209.308;
     }
     thermodynamics
@@ -31276,7 +29323,6 @@ C5H9_Cyclopentyl
 {
     specie
     {
-        nMoles          1;
         molWeight       69.1275;
     }
     thermodynamics
@@ -31292,7 +29338,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -31308,7 +29353,6 @@ CH3CD3
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0885;
     }
     thermodynamics
@@ -31324,7 +29368,6 @@ CI4
 {
     specie
     {
-        nMoles          1;
         molWeight       519.629;
     }
     thermodynamics
@@ -31340,7 +29383,6 @@ C6H11__2M4en3yl
 {
     specie
     {
-        nMoles          1;
         molWeight       83.1546;
     }
     thermodynamics
@@ -31356,7 +29398,6 @@ B2O3(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       69.6202;
     }
     thermodynamics
@@ -31372,7 +29413,6 @@ PbF2
 {
     specie
     {
-        nMoles          1;
         molWeight       245.187;
     }
     thermodynamics
@@ -31388,7 +29428,6 @@ C14H10__Phenanth
 {
     specie
     {
-        nMoles          1;
         molWeight       178.236;
     }
     thermodynamics
@@ -31404,7 +29443,6 @@ C9H7N_ISOQUINOLI
 {
     specie
     {
-        nMoles          1;
         molWeight       129.163;
     }
     thermodynamics
@@ -31420,7 +29458,6 @@ C5H10O2_Valeric_ac
 {
     specie
     {
-        nMoles          1;
         molWeight       102.134;
     }
     thermodynamics
@@ -31436,7 +29473,6 @@ SbF3
 {
     specie
     {
-        nMoles          1;
         molWeight       178.745;
     }
     thermodynamics
@@ -31452,7 +29488,6 @@ CI
 {
     specie
     {
-        nMoles          1;
         molWeight       138.916;
     }
     thermodynamics
@@ -31468,7 +29503,6 @@ C12H6Cl2O2
 {
     specie
     {
-        nMoles          1;
         molWeight       253.086;
     }
     thermodynamics
@@ -31484,7 +29518,6 @@ s-(HCOOH)2__DIMER
 {
     specie
     {
-        nMoles          1;
         molWeight       92.0518;
     }
     thermodynamics
@@ -31500,7 +29533,6 @@ C13H10O__Benzoph
 {
     specie
     {
-        nMoles          1;
         molWeight       182.224;
     }
     thermodynamics
@@ -31516,7 +29548,6 @@ C2H2Cl2_Equilibriu
 {
     specie
     {
-        nMoles          1;
         molWeight       96.9442;
     }
     thermodynamics
@@ -31532,7 +29563,6 @@ HNO2+_cis____HF2
 {
     specie
     {
-        nMoles          1;
         molWeight       47.0129;
     }
     thermodynamics
@@ -31548,7 +29578,6 @@ CBr
 {
     specie
     {
-        nMoles          1;
         molWeight       91.912;
     }
     thermodynamics
@@ -31564,7 +29593,6 @@ C2(NO2)2
 {
     specie
     {
-        nMoles          1;
         molWeight       116.033;
     }
     thermodynamics
@@ -31580,7 +29608,6 @@ CCN__Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       38.029;
     }
     thermodynamics
@@ -31596,7 +29623,6 @@ C10H15__c5h8*-c5
 {
     specie
     {
-        nMoles          1;
         molWeight       135.231;
     }
     thermodynamics
@@ -31612,7 +29638,6 @@ H2Sn(C2H5)2
 {
     specie
     {
-        nMoles          1;
         molWeight       178.83;
     }
     thermodynamics
@@ -31628,7 +29653,6 @@ Al2O3(b)
 {
     specie
     {
-        nMoles          1;
         molWeight       101.961;
     }
     thermodynamics
@@ -31644,7 +29668,6 @@ Cr
 {
     specie
     {
-        nMoles          1;
         molWeight       51.996;
     }
     thermodynamics
@@ -31660,7 +29683,6 @@ MgSiO3(III)
 {
     specie
     {
-        nMoles          1;
         molWeight       100.396;
     }
     thermodynamics
@@ -31676,7 +29698,6 @@ C5H7Cl2
 {
     specie
     {
-        nMoles          1;
         molWeight       138.018;
     }
     thermodynamics
@@ -31692,7 +29713,6 @@ C6H7+_1,4_cyDiEne
 {
     specie
     {
-        nMoles          1;
         molWeight       79.1221;
     }
     thermodynamics
@@ -31708,7 +29728,6 @@ Cu
 {
     specie
     {
-        nMoles          1;
         molWeight       63.54;
     }
     thermodynamics
@@ -31724,7 +29743,6 @@ HCCNO2
 {
     specie
     {
-        nMoles          1;
         molWeight       71.0358;
     }
     thermodynamics
@@ -31740,7 +29758,6 @@ S2Cl2
 {
     specie
     {
-        nMoles          1;
         molWeight       135.034;
     }
     thermodynamics
@@ -31756,7 +29773,6 @@ CHNH2+__cation
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0412;
     }
     thermodynamics
@@ -31772,7 +29788,6 @@ MgI
 {
     specie
     {
-        nMoles          1;
         molWeight       151.216;
     }
     thermodynamics
@@ -31788,7 +29803,6 @@ C25H20___TetraPh
 {
     specie
     {
-        nMoles          1;
         molWeight       320.438;
     }
     thermodynamics
@@ -31804,7 +29818,6 @@ C7H14O__MIAK
 {
     specie
     {
-        nMoles          1;
         molWeight       114.189;
     }
     thermodynamics
@@ -31820,7 +29833,6 @@ Mg+
 {
     specie
     {
-        nMoles          1;
         molWeight       24.3115;
     }
     thermodynamics
@@ -31836,7 +29848,6 @@ C5H8O_CYC5H8=O
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1189;
     }
     thermodynamics
@@ -31852,7 +29863,6 @@ Po2_DiPolonium
 {
     specie
     {
-        nMoles          1;
         molWeight       420;
     }
     thermodynamics
@@ -31868,7 +29878,6 @@ Cr2O3(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       151.99;
     }
     thermodynamics
@@ -31884,7 +29893,6 @@ CN-
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0184;
     }
     thermodynamics
@@ -31900,7 +29908,6 @@ HD
 {
     specie
     {
-        nMoles          1;
         molWeight       3.02207;
     }
     thermodynamics
@@ -31916,7 +29923,6 @@ o-C6H5ClO_cis(Z)
 {
     specie
     {
-        nMoles          1;
         molWeight       163.004;
     }
     thermodynamics
@@ -31932,7 +29938,6 @@ C4H9O_DiEthyl_Et
 {
     specie
     {
-        nMoles          1;
         molWeight       73.1157;
     }
     thermodynamics
@@ -31948,7 +29953,6 @@ C2Br6
 {
     specie
     {
-        nMoles          1;
         molWeight       503.428;
     }
     thermodynamics
@@ -31964,7 +29968,6 @@ HBr
 {
     specie
     {
-        nMoles          1;
         molWeight       80.9089;
     }
     thermodynamics
@@ -31980,7 +29983,6 @@ NCCH2O_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       56.0443;
     }
     thermodynamics
@@ -31996,7 +29998,6 @@ Sn+
 {
     specie
     {
-        nMoles          1;
         molWeight       118.689;
     }
     thermodynamics
@@ -32012,7 +30013,6 @@ CH2Cl-CH2Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       98.9602;
     }
     thermodynamics
@@ -32028,7 +30028,6 @@ C2H2F4_1,1,1,2
 {
     specie
     {
-        nMoles          1;
         molWeight       102.032;
     }
     thermodynamics
@@ -32044,7 +30043,6 @@ C18H33O2_Oleatoxy
 {
     specie
     {
-        nMoles          1;
         molWeight       281.463;
     }
     thermodynamics
@@ -32060,7 +30058,6 @@ C24H20Pb__TetraP
 {
     specie
     {
-        nMoles          1;
         molWeight       515.617;
     }
     thermodynamics
@@ -32076,7 +30073,6 @@ HOCO+__radical_c
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0174;
     }
     thermodynamics
@@ -32092,7 +30088,6 @@ D2S
 {
     specie
     {
-        nMoles          1;
         molWeight       36.0922;
     }
     thermodynamics
@@ -32108,7 +30103,6 @@ C3H3_*CH(CH=CH)
 {
     specie
     {
-        nMoles          1;
         molWeight       39.0574;
     }
     thermodynamics
@@ -32124,7 +30118,6 @@ C18H34O2_Oleic_ac
 {
     specie
     {
-        nMoles          1;
         molWeight       282.47;
     }
     thermodynamics
@@ -32140,7 +30133,6 @@ PF2
 {
     specie
     {
-        nMoles          1;
         molWeight       68.9706;
     }
     thermodynamics
@@ -32156,7 +30148,6 @@ C6H8_3-CH3-1,3C5H5
 {
     specie
     {
-        nMoles          1;
         molWeight       80.1307;
     }
     thermodynamics
@@ -32172,7 +30163,6 @@ C(NO)+_cy
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0167;
     }
     thermodynamics
@@ -32188,7 +30178,6 @@ Ca
 {
     specie
     {
-        nMoles          1;
         molWeight       40.08;
     }
     thermodynamics
@@ -32204,7 +30193,6 @@ C5H12__n-pentane
 {
     specie
     {
-        nMoles          1;
         molWeight       72.1514;
     }
     thermodynamics
@@ -32220,7 +30208,6 @@ C8H8__Cubane
 {
     specie
     {
-        nMoles          1;
         molWeight       104.153;
     }
     thermodynamics
@@ -32236,7 +30223,6 @@ C4H8O2_DIOXANE
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1072;
     }
     thermodynamics
@@ -32252,7 +30238,6 @@ AlO
 {
     specie
     {
-        nMoles          1;
         molWeight       42.9809;
     }
     thermodynamics
@@ -32268,7 +30253,6 @@ Mo2C(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       203.891;
     }
     thermodynamics
@@ -32284,7 +30268,6 @@ C3H7S_2-PropylThio
 {
     specie
     {
-        nMoles          1;
         molWeight       75.1532;
     }
     thermodynamics
@@ -32300,7 +30283,6 @@ C8H16O2_cis-acid
 {
     specie
     {
-        nMoles          1;
         molWeight       144.216;
     }
     thermodynamics
@@ -32316,7 +30298,6 @@ SF5Br
 {
     specie
     {
-        nMoles          1;
         molWeight       206.957;
     }
     thermodynamics
@@ -32332,7 +30313,6 @@ Mo(s)
 {
     specie
     {
-        nMoles          1;
         molWeight       95.94;
     }
     thermodynamics
@@ -32348,7 +30328,6 @@ C3H6O2_C2H5COOH
 {
     specie
     {
-        nMoles          1;
         molWeight       74.0801;
     }
     thermodynamics
@@ -32364,7 +30343,6 @@ cy-C5H5+__cycation
 {
     specie
     {
-        nMoles          1;
         molWeight       65.0951;
     }
     thermodynamics
@@ -32380,7 +30358,6 @@ NO2-
 {
     specie
     {
-        nMoles          1;
         molWeight       46.006;
     }
     thermodynamics
@@ -32396,7 +30373,6 @@ C2HBr4_1,1,2,2
 {
     specie
     {
-        nMoles          1;
         molWeight       344.634;
     }
     thermodynamics
@@ -32412,7 +30388,6 @@ F2+
 {
     specie
     {
-        nMoles          1;
         molWeight       37.9963;
     }
     thermodynamics
@@ -32428,7 +30403,6 @@ CF2Cl-CHClF_123a
 {
     specie
     {
-        nMoles          1;
         molWeight       152.931;
     }
     thermodynamics
@@ -32444,7 +30418,6 @@ COOH
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0179;
     }
     thermodynamics
@@ -32460,7 +30433,6 @@ CH3COCl_Acetyl-Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       78.4986;
     }
     thermodynamics
@@ -32476,7 +30448,6 @@ Ne
 {
     specie
     {
-        nMoles          1;
         molWeight       20.183;
     }
     thermodynamics
@@ -32492,7 +30463,6 @@ HgCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       271.496;
     }
     thermodynamics
@@ -32508,7 +30478,6 @@ H-
 {
     specie
     {
-        nMoles          1;
         molWeight       1.00852;
     }
     thermodynamics
@@ -32524,7 +30493,6 @@ HCCN_singlet
 {
     specie
     {
-        nMoles          1;
         molWeight       39.037;
     }
     thermodynamics
@@ -32540,7 +30508,6 @@ C6H5-CH=CHCH=CH*
 {
     specie
     {
-        nMoles          1;
         molWeight       127.167;
     }
     thermodynamics
@@ -32556,7 +30523,6 @@ C2H6O2_Peroxyeth
 {
     specie
     {
-        nMoles          1;
         molWeight       62.0689;
     }
     thermodynamics
@@ -32572,7 +30538,6 @@ COS
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0746;
     }
     thermodynamics
@@ -32588,7 +30553,6 @@ C7H12__Norbornane
 {
     specie
     {
-        nMoles          1;
         molWeight       96.1737;
     }
     thermodynamics
@@ -32604,7 +30568,6 @@ Pd(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       106.4;
     }
     thermodynamics
@@ -32620,7 +30583,6 @@ C14H9_2-Antryl_R
 {
     specie
     {
-        nMoles          1;
         molWeight       177.228;
     }
     thermodynamics
@@ -32636,7 +30598,6 @@ SbCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       228.109;
     }
     thermodynamics
@@ -32652,7 +30613,6 @@ C4H9O2_s-Butyl_P
 {
     specie
     {
-        nMoles          1;
         molWeight       89.1151;
     }
     thermodynamics
@@ -32668,7 +30628,6 @@ C4H10O_DEE_DiEth
 {
     specie
     {
-        nMoles          1;
         molWeight       74.1237;
     }
     thermodynamics
@@ -32684,7 +30643,6 @@ SiS2__Liquid
 {
     specie
     {
-        nMoles          1;
         molWeight       92.214;
     }
     thermodynamics
@@ -32700,7 +30658,6 @@ C6H7__C5H5-3-CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       79.1227;
     }
     thermodynamics
@@ -32716,7 +30673,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -32732,7 +30688,6 @@ C5H4_TETRAENE
 {
     specie
     {
-        nMoles          1;
         molWeight       64.0876;
     }
     thermodynamics
@@ -32748,7 +30703,6 @@ s-1-C10H7-CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       142.202;
     }
     thermodynamics
@@ -32764,7 +30718,6 @@ C3H7S_PropylThiol
 {
     specie
     {
-        nMoles          1;
         molWeight       75.1532;
     }
     thermodynamics
@@ -32780,7 +30733,6 @@ C2H6O2_1,2-diOl
 {
     specie
     {
-        nMoles          1;
         molWeight       62.0689;
     }
     thermodynamics
@@ -32796,7 +30748,6 @@ Sb________GAS
 {
     specie
     {
-        nMoles          1;
         molWeight       121.75;
     }
     thermodynamics
@@ -32812,7 +30763,6 @@ C12H8O_DiBenzoFu
 {
     specie
     {
-        nMoles          1;
         molWeight       168.197;
     }
     thermodynamics
@@ -32828,7 +30778,6 @@ C2N2+__NC-CN+__H
 {
     specie
     {
-        nMoles          1;
         molWeight       52.0352;
     }
     thermodynamics
@@ -32844,7 +30793,6 @@ CH3OH(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0424;
     }
     thermodynamics
@@ -32860,7 +30808,6 @@ KNO3(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       101.107;
     }
     thermodynamics
@@ -32876,7 +30823,6 @@ s-1,2-C2H2F2-trans
 {
     specie
     {
-        nMoles          1;
         molWeight       64.035;
     }
     thermodynamics
@@ -32892,7 +30838,6 @@ C5H8N4O12_PETN
 {
     specie
     {
-        nMoles          1;
         molWeight       316.139;
     }
     thermodynamics
@@ -32908,7 +30853,6 @@ N-NITRO-AZETIDIN
 {
     specie
     {
-        nMoles          1;
         molWeight       102.093;
     }
     thermodynamics
@@ -32924,7 +30868,6 @@ PF3
 {
     specie
     {
-        nMoles          1;
         molWeight       87.969;
     }
     thermodynamics
@@ -32940,7 +30883,6 @@ H2PO__HPOH
 {
     specie
     {
-        nMoles          1;
         molWeight       48.9891;
     }
     thermodynamics
@@ -32956,7 +30898,6 @@ Ni(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       58.71;
     }
     thermodynamics
@@ -32972,7 +30913,6 @@ C4H10O_n-butanol
 {
     specie
     {
-        nMoles          1;
         molWeight       74.1237;
     }
     thermodynamics
@@ -32988,7 +30928,6 @@ H2O2+__trans
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0142;
     }
     thermodynamics
@@ -33004,7 +30943,6 @@ C5H5OH_Cyclo-2,4
 {
     specie
     {
-        nMoles          1;
         molWeight       82.103;
     }
     thermodynamics
@@ -33020,7 +30958,6 @@ s-1,4-C6H4_BENZYNE
 {
     specie
     {
-        nMoles          1;
         molWeight       76.0988;
     }
     thermodynamics
@@ -33036,7 +30973,6 @@ C2H5O-__CH3C*HOH-
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0621;
     }
     thermodynamics
@@ -33052,7 +30988,6 @@ C12H4Cl6O2__tric
 {
     specie
     {
-        nMoles          1;
         molWeight       392.882;
     }
     thermodynamics
@@ -33068,7 +31003,6 @@ COCl
 {
     specie
     {
-        nMoles          1;
         molWeight       63.4636;
     }
     thermodynamics
@@ -33084,7 +31018,6 @@ C6H8O5(NO2)2
 {
     specie
     {
-        nMoles          1;
         molWeight       252.139;
     }
     thermodynamics
@@ -33100,7 +31033,6 @@ C2D6N2_Azomethan
 {
     specie
     {
-        nMoles          1;
         molWeight       64.1203;
     }
     thermodynamics
@@ -33116,7 +31048,6 @@ CBr2F2
 {
     specie
     {
-        nMoles          1;
         molWeight       209.81;
     }
     thermodynamics
@@ -33132,7 +31063,6 @@ Zr(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       91.22;
     }
     thermodynamics
@@ -33148,7 +31078,6 @@ C4H7O2_Peroxy_Rad
 {
     specie
     {
-        nMoles          1;
         molWeight       87.0992;
     }
     thermodynamics
@@ -33164,7 +31093,6 @@ C10H9+_protonazule
 {
     specie
     {
-        nMoles          1;
         molWeight       129.183;
     }
     thermodynamics
@@ -33180,7 +31108,6 @@ GeBr4
 {
     specie
     {
-        nMoles          1;
         molWeight       392.194;
     }
     thermodynamics
@@ -33196,7 +31123,6 @@ C2H6+_Ethane_cat
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0696;
     }
     thermodynamics
@@ -33212,7 +31138,6 @@ C9H12__1-2-4-TMB
 {
     specie
     {
-        nMoles          1;
         molWeight       120.196;
     }
     thermodynamics
@@ -33228,7 +31153,6 @@ ZrO2(II)
 {
     specie
     {
-        nMoles          1;
         molWeight       123.219;
     }
     thermodynamics
@@ -33244,7 +31168,6 @@ CH2CN_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0449;
     }
     thermodynamics
@@ -33260,7 +31183,6 @@ CH2N__H*C=NH_Trans
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0338;
     }
     thermodynamics
@@ -33276,7 +31198,6 @@ P4O7
 {
     specie
     {
-        nMoles          1;
         molWeight       235.891;
     }
     thermodynamics
@@ -33292,7 +31213,6 @@ C5H5O__1-oxy-1,4-
 {
     specie
     {
-        nMoles          1;
         molWeight       81.095;
     }
     thermodynamics
@@ -33308,7 +31228,6 @@ C6H12O2_MeValere
 {
     specie
     {
-        nMoles          1;
         molWeight       116.161;
     }
     thermodynamics
@@ -33324,7 +31243,6 @@ C7H8_Quadricyclen
 {
     specie
     {
-        nMoles          1;
         molWeight       92.1418;
     }
     thermodynamics
@@ -33340,7 +31258,6 @@ C2H5I
 {
     specie
     {
-        nMoles          1;
         molWeight       155.967;
     }
     thermodynamics
@@ -33356,7 +31273,6 @@ CH3OH_Metanol
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0424;
     }
     thermodynamics
@@ -33372,7 +31288,6 @@ S+
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0635;
     }
     thermodynamics
@@ -33388,7 +31303,6 @@ C4H10_isobutane
 {
     specie
     {
-        nMoles          1;
         molWeight       58.1243;
     }
     thermodynamics
@@ -33404,7 +31318,6 @@ C12H5Cl5O2_PD
 {
     specie
     {
-        nMoles          1;
         molWeight       358.437;
     }
     thermodynamics
@@ -33420,7 +31333,6 @@ C16H30O2_acid
 {
     specie
     {
-        nMoles          1;
         molWeight       254.416;
     }
     thermodynamics
@@ -33436,7 +31348,6 @@ MgH2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       26.3279;
     }
     thermodynamics
@@ -33452,7 +31363,6 @@ C3H4Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       75.5183;
     }
     thermodynamics
@@ -33468,7 +31378,6 @@ C3F6__CF2=CF-CF3
 {
     specie
     {
-        nMoles          1;
         molWeight       150.024;
     }
     thermodynamics
@@ -33484,7 +31393,6 @@ s-(NH2)2C=N-NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       104.069;
     }
     thermodynamics
@@ -33500,7 +31408,6 @@ C3H3O_*CH2-CH=CO
 {
     specie
     {
-        nMoles          1;
         molWeight       55.0568;
     }
     thermodynamics
@@ -33516,7 +31423,6 @@ CNN
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0246;
     }
     thermodynamics
@@ -33532,7 +31438,6 @@ C2H3F2_Radical
 {
     specie
     {
-        nMoles          1;
         molWeight       65.043;
     }
     thermodynamics
@@ -33548,7 +31453,6 @@ C2D2_Acetylene-D
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0505;
     }
     thermodynamics
@@ -33564,7 +31468,6 @@ Br-
 {
     specie
     {
-        nMoles          1;
         molWeight       79.9014;
     }
     thermodynamics
@@ -33580,7 +31483,6 @@ MgSO4(I)
 {
     specie
     {
-        nMoles          1;
         molWeight       120.374;
     }
     thermodynamics
@@ -33596,7 +31498,6 @@ C2HFCl2_equilibr
 {
     specie
     {
-        nMoles          1;
         molWeight       114.935;
     }
     thermodynamics
@@ -33612,7 +31513,6 @@ NiS(a)
 {
     specie
     {
-        nMoles          1;
         molWeight       90.774;
     }
     thermodynamics
@@ -33628,7 +31528,6 @@ H3PO4(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       97.9953;
     }
     thermodynamics
@@ -33644,7 +31543,6 @@ Na2O(b)
 {
     specie
     {
-        nMoles          1;
         molWeight       61.979;
     }
     thermodynamics
@@ -33660,7 +31558,6 @@ CH3C(O)O-ONO2
 {
     specie
     {
-        nMoles          1;
         molWeight       121.05;
     }
     thermodynamics
@@ -33676,7 +31573,6 @@ C3H3Cl_1-Cl-1Prop
 {
     specie
     {
-        nMoles          1;
         molWeight       74.5104;
     }
     thermodynamics
@@ -33692,7 +31588,6 @@ C2H
 {
     specie
     {
-        nMoles          1;
         molWeight       25.0303;
     }
     thermodynamics
@@ -33708,7 +31603,6 @@ ZnSO4(ap)
 {
     specie
     {
-        nMoles          1;
         molWeight       161.432;
     }
     thermodynamics
@@ -33724,7 +31618,6 @@ CH3NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       61.0406;
     }
     thermodynamics
@@ -33740,7 +31633,6 @@ NH2OH__cis
 {
     specie
     {
-        nMoles          1;
         molWeight       33.03;
     }
     thermodynamics
@@ -33756,7 +31648,6 @@ HgBr2
 {
     specie
     {
-        nMoles          1;
         molWeight       360.392;
     }
     thermodynamics
@@ -33772,7 +31663,6 @@ C4H7OOH__Peroxyb
 {
     specie
     {
-        nMoles          1;
         molWeight       88.1072;
     }
     thermodynamics
@@ -33788,7 +31678,6 @@ C18H36O2_etPalmita
 {
     specie
     {
-        nMoles          1;
         molWeight       284.486;
     }
     thermodynamics
@@ -33804,7 +31693,6 @@ COFCl
 {
     specie
     {
-        nMoles          1;
         molWeight       82.462;
     }
     thermodynamics
@@ -33820,7 +31708,6 @@ NHD
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0288;
     }
     thermodynamics
@@ -33836,7 +31723,6 @@ C12H23O2__1,12
 {
     specie
     {
-        nMoles          1;
         molWeight       199.316;
     }
     thermodynamics
@@ -33852,7 +31738,6 @@ CH3SnH3
 {
     specie
     {
-        nMoles          1;
         molWeight       136.749;
     }
     thermodynamics
@@ -33868,7 +31753,6 @@ C5H9_2-en-5yl
 {
     specie
     {
-        nMoles          1;
         molWeight       69.1275;
     }
     thermodynamics
@@ -33884,7 +31768,6 @@ C6H6+_Benzene_ion
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1142;
     }
     thermodynamics
@@ -33900,7 +31783,6 @@ BrCN
 {
     specie
     {
-        nMoles          1;
         molWeight       105.919;
     }
     thermodynamics
@@ -33916,7 +31798,6 @@ C2HClF2_trans
 {
     specie
     {
-        nMoles          1;
         molWeight       98.4801;
     }
     thermodynamics
@@ -33932,7 +31813,6 @@ SF
 {
     specie
     {
-        nMoles          1;
         molWeight       51.0624;
     }
     thermodynamics
@@ -33948,7 +31828,6 @@ HgO(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       216.589;
     }
     thermodynamics
@@ -33964,7 +31843,6 @@ C8H7___i-styryl
 {
     specie
     {
-        nMoles          1;
         molWeight       103.145;
     }
     thermodynamics
@@ -33980,7 +31858,6 @@ GeCl
 {
     specie
     {
-        nMoles          1;
         molWeight       108.043;
     }
     thermodynamics
@@ -33996,7 +31873,6 @@ CHClF2__HCFC-22
 {
     specie
     {
-        nMoles          1;
         molWeight       86.4689;
     }
     thermodynamics
@@ -34012,7 +31888,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -34028,7 +31903,6 @@ S2
 {
     specie
     {
-        nMoles          1;
         molWeight       64.128;
     }
     thermodynamics
@@ -34044,7 +31918,6 @@ C7H10__Norbornene
 {
     specie
     {
-        nMoles          1;
         molWeight       94.1578;
     }
     thermodynamics
@@ -34060,7 +31933,6 @@ CHF__triplet
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0175;
     }
     thermodynamics
@@ -34076,7 +31948,6 @@ CH2O+__CH**-OH
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0259;
     }
     thermodynamics
@@ -34092,7 +31963,6 @@ Si(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       28.086;
     }
     thermodynamics
@@ -34108,7 +31978,6 @@ FO2____F-O-O
 {
     specie
     {
-        nMoles          1;
         molWeight       50.9972;
     }
     thermodynamics
@@ -34124,7 +31993,6 @@ C4H8__Isobuten
 {
     specie
     {
-        nMoles          1;
         molWeight       56.1084;
     }
     thermodynamics
@@ -34140,7 +32008,6 @@ C2HF
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0287;
     }
     thermodynamics
@@ -34156,7 +32023,6 @@ CH5+_cation
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0505;
     }
     thermodynamics
@@ -34172,7 +32038,6 @@ C13H26O2_n-acide
 {
     specie
     {
-        nMoles          1;
         molWeight       214.351;
     }
     thermodynamics
@@ -34188,7 +32053,6 @@ NiO(cr)C
 {
     specie
     {
-        nMoles          1;
         molWeight       74.7094;
     }
     thermodynamics
@@ -34204,7 +32068,6 @@ SiC2
 {
     specie
     {
-        nMoles          1;
         molWeight       52.1083;
     }
     thermodynamics
@@ -34220,7 +32083,6 @@ C20H38O2_EtOleate
 {
     specie
     {
-        nMoles          1;
         molWeight       310.525;
     }
     thermodynamics
@@ -34236,7 +32098,6 @@ beta_HMX__198-54
 {
     specie
     {
-        nMoles          1;
         molWeight       296.157;
     }
     thermodynamics
@@ -34252,7 +32113,6 @@ Rn
 {
     specie
     {
-        nMoles          1;
         molWeight       222;
     }
     thermodynamics
@@ -34268,7 +32128,6 @@ NH4NO3(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       80.0435;
     }
     thermodynamics
@@ -34284,7 +32143,6 @@ CH2O2-__CH2(OO)-
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0264;
     }
     thermodynamics
@@ -34300,7 +32158,6 @@ C7H8(L)_Toluene
 {
     specie
     {
-        nMoles          1;
         molWeight       92.1418;
     }
     thermodynamics
@@ -34316,7 +32173,6 @@ CrCl
 {
     specie
     {
-        nMoles          1;
         molWeight       87.449;
     }
     thermodynamics
@@ -34332,7 +32188,6 @@ Jet-A(L)_C12H23
 {
     specie
     {
-        nMoles          1;
         molWeight       167.317;
     }
     thermodynamics
@@ -34348,7 +32203,6 @@ OS(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       190.2;
     }
     thermodynamics
@@ -34364,7 +32218,6 @@ C15H32_n-PentaDe
 {
     specie
     {
-        nMoles          1;
         molWeight       198.395;
     }
     thermodynamics
@@ -34380,7 +32233,6 @@ PO-_Polonium_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       210.001;
     }
     thermodynamics
@@ -34396,7 +32248,6 @@ Br2S
 {
     specie
     {
-        nMoles          1;
         molWeight       191.866;
     }
     thermodynamics
@@ -34412,7 +32263,6 @@ O-C12D9_________O-
 {
     specie
     {
-        nMoles          1;
         molWeight       162.261;
     }
     thermodynamics
@@ -34428,7 +32278,6 @@ GeBr
 {
     specie
     {
-        nMoles          1;
         molWeight       152.491;
     }
     thermodynamics
@@ -34444,7 +32293,6 @@ C6H6(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -34460,7 +32308,6 @@ C4H7__trans-2-Bu
 {
     specie
     {
-        nMoles          1;
         molWeight       55.1004;
     }
     thermodynamics
@@ -34476,7 +32323,6 @@ Ni3S2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       240.258;
     }
     thermodynamics
@@ -34492,7 +32338,6 @@ N2O3-_ONONO-
 {
     specie
     {
-        nMoles          1;
         molWeight       76.0121;
     }
     thermodynamics
@@ -34508,7 +32353,6 @@ C5H5O2__2-Penten
 {
     specie
     {
-        nMoles          1;
         molWeight       97.0944;
     }
     thermodynamics
@@ -34524,7 +32368,6 @@ C2H5O2__C2H5OO
 {
     specie
     {
-        nMoles          1;
         molWeight       61.061;
     }
     thermodynamics
@@ -34540,7 +32383,6 @@ C6H4(C2H)CH=CH*
 {
     specie
     {
-        nMoles          1;
         molWeight       127.167;
     }
     thermodynamics
@@ -34556,7 +32398,6 @@ CF3+
 {
     specie
     {
-        nMoles          1;
         molWeight       69.0058;
     }
     thermodynamics
@@ -34572,7 +32413,6 @@ O(CH)2O_Glyoxal
 {
     specie
     {
-        nMoles          1;
         molWeight       58.037;
     }
     thermodynamics
@@ -34588,7 +32428,6 @@ Fe(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       55.847;
     }
     thermodynamics
@@ -34604,7 +32443,6 @@ W
 {
     specie
     {
-        nMoles          1;
         molWeight       183.85;
     }
     thermodynamics
@@ -34620,7 +32458,6 @@ C19H36O2_meOleic
 {
     specie
     {
-        nMoles          1;
         molWeight       296.498;
     }
     thermodynamics
@@ -34636,7 +32473,6 @@ MgCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       95.218;
     }
     thermodynamics
@@ -34652,7 +32488,6 @@ C10H15_JP10_RAD.
 {
     specie
     {
-        nMoles          1;
         molWeight       135.231;
     }
     thermodynamics
@@ -34668,7 +32503,6 @@ B2F4
 {
     specie
     {
-        nMoles          1;
         molWeight       97.6156;
     }
     thermodynamics
@@ -34684,7 +32518,6 @@ C6H6_1,3-Butadie
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -34700,7 +32533,6 @@ MgCl2(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       95.218;
     }
     thermodynamics
@@ -34716,7 +32548,6 @@ Xe
 {
     specie
     {
-        nMoles          1;
         molWeight       131.3;
     }
     thermodynamics
@@ -34732,7 +32563,6 @@ GeS2(II)(s)
 {
     specie
     {
-        nMoles          1;
         molWeight       136.718;
     }
     thermodynamics
@@ -34748,7 +32578,6 @@ Al2O
 {
     specie
     {
-        nMoles          1;
         molWeight       69.9624;
     }
     thermodynamics
@@ -34764,7 +32593,6 @@ CuO
 {
     specie
     {
-        nMoles          1;
         molWeight       79.5394;
     }
     thermodynamics
@@ -34780,7 +32608,6 @@ Mg2SiO4(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       140.708;
     }
     thermodynamics
@@ -34796,7 +32623,6 @@ SCl2+
 {
     specie
     {
-        nMoles          1;
         molWeight       102.969;
     }
     thermodynamics
@@ -34812,7 +32638,6 @@ C20H32O2_Arachid
 {
     specie
     {
-        nMoles          1;
         molWeight       304.477;
     }
     thermodynamics
@@ -34828,7 +32653,6 @@ Sb4__tetrahedron
 {
     specie
     {
-        nMoles          1;
         molWeight       487;
     }
     thermodynamics
@@ -34844,7 +32668,6 @@ CH4___ANHARMONIC
 {
     specie
     {
-        nMoles          1;
         molWeight       16.043;
     }
     thermodynamics
@@ -34860,7 +32683,6 @@ B2H2
 {
     specie
     {
-        nMoles          1;
         molWeight       23.6379;
     }
     thermodynamics
@@ -34876,7 +32698,6 @@ C2Cl5___Pentachl
 {
     specie
     {
-        nMoles          1;
         molWeight       201.287;
     }
     thermodynamics
@@ -34892,7 +32713,6 @@ C2Br3
 {
     specie
     {
-        nMoles          1;
         molWeight       263.725;
     }
     thermodynamics
@@ -34908,7 +32728,6 @@ C4H6_Dime_acetylen
 {
     specie
     {
-        nMoles          1;
         molWeight       54.0924;
     }
     thermodynamics
@@ -34924,7 +32743,6 @@ CHF2Br_HBFC-22B1
 {
     specie
     {
-        nMoles          1;
         molWeight       130.917;
     }
     thermodynamics
@@ -34940,7 +32758,6 @@ CNN-
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0251;
     }
     thermodynamics
@@ -34956,7 +32773,6 @@ CH2=CHO*__Vinyl-
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0456;
     }
     thermodynamics
@@ -34972,7 +32788,6 @@ p-C6H4I2
 {
     specie
     {
-        nMoles          1;
         molWeight       329.908;
     }
     thermodynamics
@@ -34988,7 +32803,6 @@ C9H12__propylben
 {
     specie
     {
-        nMoles          1;
         molWeight       120.196;
     }
     thermodynamics
@@ -35004,7 +32818,6 @@ ClO
 {
     specie
     {
-        nMoles          1;
         molWeight       51.4524;
     }
     thermodynamics
@@ -35020,7 +32833,6 @@ C18H15N__Triphamin
 {
     specie
     {
-        nMoles          1;
         molWeight       245.327;
     }
     thermodynamics
@@ -35036,7 +32848,6 @@ C8H7___1,3,5,7_Cy
 {
     specie
     {
-        nMoles          1;
         molWeight       103.145;
     }
     thermodynamics
@@ -35052,7 +32863,6 @@ PbS(cr)__GALENA
 {
     specie
     {
-        nMoles          1;
         molWeight       239.254;
     }
     thermodynamics
@@ -35068,7 +32878,6 @@ MgBr2
 {
     specie
     {
-        nMoles          1;
         molWeight       184.114;
     }
     thermodynamics
@@ -35084,7 +32893,6 @@ C4H2+__DiAcetyle
 {
     specie
     {
-        nMoles          1;
         molWeight       50.06;
     }
     thermodynamics
@@ -35100,7 +32908,6 @@ KNO3(a)_Rhombic
 {
     specie
     {
-        nMoles          1;
         molWeight       101.107;
     }
     thermodynamics
@@ -35116,7 +32923,6 @@ C2HCl3
 {
     specie
     {
-        nMoles          1;
         molWeight       165.834;
     }
     thermodynamics
@@ -35132,7 +32938,6 @@ C5H5N5O__Guanine
 {
     specie
     {
-        nMoles          1;
         molWeight       151.129;
     }
     thermodynamics
@@ -35148,7 +32953,6 @@ s-1-C10H7-CH2*
 {
     specie
     {
-        nMoles          1;
         molWeight       141.194;
     }
     thermodynamics
@@ -35164,7 +32968,6 @@ C16H320O2_etMyrist
 {
     specie
     {
-        nMoles          1;
         molWeight       256.432;
     }
     thermodynamics
@@ -35180,7 +32983,6 @@ PH3_RRHO
 {
     specie
     {
-        nMoles          1;
         molWeight       33.9977;
     }
     thermodynamics
@@ -35196,7 +32998,6 @@ C4H6Cl2_1,4-DiCl
 {
     specie
     {
-        nMoles          1;
         molWeight       124.998;
     }
     thermodynamics
@@ -35212,7 +33013,6 @@ CHBr2Cl
 {
     specie
     {
-        nMoles          1;
         molWeight       208.274;
     }
     thermodynamics
@@ -35228,7 +33028,6 @@ HNO2-_cis____HF2
 {
     specie
     {
-        nMoles          1;
         molWeight       47.014;
     }
     thermodynamics
@@ -35244,7 +33043,6 @@ C2F6____FC-116
 {
     specie
     {
-        nMoles          1;
         molWeight       138.013;
     }
     thermodynamics
@@ -35260,7 +33058,6 @@ ClC2H4OH__ATcT_C
 {
     specie
     {
-        nMoles          1;
         molWeight       80.5146;
     }
     thermodynamics
@@ -35276,7 +33073,6 @@ AlBr
 {
     specie
     {
-        nMoles          1;
         molWeight       106.882;
     }
     thermodynamics
@@ -35292,7 +33088,6 @@ C6Cr23
 {
     specie
     {
-        nMoles          1;
         molWeight       1267.97;
     }
     thermodynamics
@@ -35308,7 +33103,6 @@ C6H6_1,3-Hexadie
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -35324,7 +33118,6 @@ Na2O
 {
     specie
     {
-        nMoles          1;
         molWeight       61.979;
     }
     thermodynamics
@@ -35340,7 +33133,6 @@ CHCl
 {
     specie
     {
-        nMoles          1;
         molWeight       48.4721;
     }
     thermodynamics
@@ -35356,7 +33148,6 @@ CH4____RRHO
 {
     specie
     {
-        nMoles          1;
         molWeight       16.043;
     }
     thermodynamics
@@ -35372,7 +33163,6 @@ C4H10_n-butane
 {
     specie
     {
-        nMoles          1;
         molWeight       58.1243;
     }
     thermodynamics
@@ -35388,7 +33178,6 @@ ClI__Iodine_Chlo
 {
     specie
     {
-        nMoles          1;
         molWeight       162.357;
     }
     thermodynamics
@@ -35404,7 +33193,6 @@ C4F6_CycloButene
 {
     specie
     {
-        nMoles          1;
         molWeight       162.035;
     }
     thermodynamics
@@ -35420,7 +33208,6 @@ C24Cl12_Coronene
 {
     specie
     {
-        nMoles          1;
         molWeight       713.704;
     }
     thermodynamics
@@ -35436,7 +33223,6 @@ O2-
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9993;
     }
     thermodynamics
@@ -35452,7 +33238,6 @@ SD
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0781;
     }
     thermodynamics
@@ -35468,7 +33253,6 @@ C3H2F4_CF3-CF=CF3
 {
     specie
     {
-        nMoles          1;
         molWeight       114.043;
     }
     thermodynamics
@@ -35484,7 +33268,6 @@ BF4-
 {
     specie
     {
-        nMoles          1;
         molWeight       86.8051;
     }
     thermodynamics
@@ -35500,7 +33283,6 @@ NO2HCCNO2_radical
 {
     specie
     {
-        nMoles          1;
         molWeight       117.041;
     }
     thermodynamics
@@ -35516,7 +33298,6 @@ C4H5O2_E-Crotoat
 {
     specie
     {
-        nMoles          1;
         molWeight       85.0833;
     }
     thermodynamics
@@ -35532,7 +33313,6 @@ MgF2+
 {
     specie
     {
-        nMoles          1;
         molWeight       62.3083;
     }
     thermodynamics
@@ -35548,7 +33328,6 @@ C14H30_Tetradecan
 {
     specie
     {
-        nMoles          1;
         molWeight       198.395;
     }
     thermodynamics
@@ -35564,7 +33343,6 @@ SF3+
 {
     specie
     {
-        nMoles          1;
         molWeight       89.0587;
     }
     thermodynamics
@@ -35580,7 +33358,6 @@ H2+
 {
     specie
     {
-        nMoles          1;
         molWeight       2.0154;
     }
     thermodynamics
@@ -35596,7 +33373,6 @@ C3H8O_2propanol
 {
     specie
     {
-        nMoles          1;
         molWeight       60.0966;
     }
     thermodynamics
@@ -35612,7 +33388,6 @@ BrO2__Br-O-O
 {
     specie
     {
-        nMoles          1;
         molWeight       111.9;
     }
     thermodynamics
@@ -35628,7 +33403,6 @@ NH+
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0141;
     }
     thermodynamics
@@ -35644,7 +33418,6 @@ C6H5ClO__2,5-cyc
 {
     specie
     {
-        nMoles          1;
         molWeight       128.559;
     }
     thermodynamics
@@ -35660,7 +33433,6 @@ C7H8__1,6-diyne
 {
     specie
     {
-        nMoles          1;
         molWeight       92.1418;
     }
     thermodynamics
@@ -35676,7 +33448,6 @@ CHCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       83.9251;
     }
     thermodynamics
@@ -35692,7 +33463,6 @@ C2H3I_Iodoethyle
 {
     specie
     {
-        nMoles          1;
         molWeight       153.951;
     }
     thermodynamics
@@ -35708,7 +33478,6 @@ CH2N__H*C=NH__cis
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0338;
     }
     thermodynamics
@@ -35724,7 +33493,6 @@ Na(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       22.9898;
     }
     thermodynamics
@@ -35740,7 +33508,6 @@ B(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       10.811;
     }
     thermodynamics
@@ -35756,7 +33523,6 @@ C10H2__linear
 {
     specie
     {
-        nMoles          1;
         molWeight       122.127;
     }
     thermodynamics
@@ -35772,7 +33538,6 @@ B3O3F3
 {
     specie
     {
-        nMoles          1;
         molWeight       137.426;
     }
     thermodynamics
@@ -35788,7 +33553,6 @@ PbCl
 {
     specie
     {
-        nMoles          1;
         molWeight       242.643;
     }
     thermodynamics
@@ -35804,7 +33568,6 @@ C2H5OH(L)_McBrid
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0695;
     }
     thermodynamics
@@ -35820,7 +33583,6 @@ C10_linear_triple
 {
     specie
     {
-        nMoles          1;
         molWeight       120.112;
     }
     thermodynamics
@@ -35836,7 +33598,6 @@ C2Cl2F4__FC-114
 {
     specie
     {
-        nMoles          1;
         molWeight       170.922;
     }
     thermodynamics
@@ -35852,7 +33613,6 @@ H2S2__H-S-S-H
 {
     specie
     {
-        nMoles          1;
         molWeight       66.1439;
     }
     thermodynamics
@@ -35868,7 +33628,6 @@ MgO
 {
     specie
     {
-        nMoles          1;
         molWeight       40.3114;
     }
     thermodynamics
@@ -35884,7 +33643,6 @@ C4H8,cis2-buten
 {
     specie
     {
-        nMoles          1;
         molWeight       56.1084;
     }
     thermodynamics
@@ -35900,7 +33658,6 @@ Si
 {
     specie
     {
-        nMoles          1;
         molWeight       28.086;
     }
     thermodynamics
@@ -35916,7 +33673,6 @@ C7H5NS_Benzothiaz
 {
     specie
     {
-        nMoles          1;
         molWeight       135.189;
     }
     thermodynamics
@@ -35932,7 +33688,6 @@ AlCl2
 {
     specie
     {
-        nMoles          1;
         molWeight       97.8875;
     }
     thermodynamics
@@ -35948,7 +33703,6 @@ s-(CH3)3COOC(CH3)
 {
     specie
     {
-        nMoles          1;
         molWeight       146.231;
     }
     thermodynamics
@@ -35964,7 +33718,6 @@ H7F7
 {
     specie
     {
-        nMoles          1;
         molWeight       140.045;
     }
     thermodynamics
@@ -35980,7 +33733,6 @@ C2H3F
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0446;
     }
     thermodynamics
@@ -35996,7 +33748,6 @@ C3H5_Cyclopropyl
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0733;
     }
     thermodynamics
@@ -36012,7 +33763,6 @@ NSC3H3_IsoThiazole
 {
     specie
     {
-        nMoles          1;
         molWeight       85.1281;
     }
     thermodynamics
@@ -36028,7 +33778,6 @@ PbS(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       239.254;
     }
     thermodynamics
@@ -36044,7 +33793,6 @@ COF2-_anion
 {
     specie
     {
-        nMoles          1;
         molWeight       66.0079;
     }
     thermodynamics
@@ -36060,7 +33808,6 @@ CN
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0179;
     }
     thermodynamics
@@ -36076,7 +33823,6 @@ C3H6O2_Meacetate
 {
     specie
     {
-        nMoles          1;
         molWeight       74.0801;
     }
     thermodynamics
@@ -36092,7 +33838,6 @@ C6H9__C5H7-3-CH2*
 {
     specie
     {
-        nMoles          1;
         molWeight       81.1386;
     }
     thermodynamics
@@ -36108,7 +33853,6 @@ IO2__I-O-O
 {
     specie
     {
-        nMoles          1;
         molWeight       158.903;
     }
     thermodynamics
@@ -36124,7 +33868,6 @@ C2H3+__Vinylium
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0457;
     }
     thermodynamics
@@ -36140,7 +33883,6 @@ K
 {
     specie
     {
-        nMoles          1;
         molWeight       39.102;
     }
     thermodynamics
@@ -36156,7 +33898,6 @@ ZrO2
 {
     specie
     {
-        nMoles          1;
         molWeight       123.219;
     }
     thermodynamics
@@ -36172,7 +33913,6 @@ D-
 {
     specie
     {
-        nMoles          1;
         molWeight       2.01464;
     }
     thermodynamics
@@ -36188,7 +33928,6 @@ HNO3+
 {
     specie
     {
-        nMoles          1;
         molWeight       63.0123;
     }
     thermodynamics
@@ -36204,7 +33943,6 @@ CClF
 {
     specie
     {
-        nMoles          1;
         molWeight       66.4626;
     }
     thermodynamics
@@ -36220,7 +33958,6 @@ C6H12,cyclo-
 {
     specie
     {
-        nMoles          1;
         molWeight       84.1625;
     }
     thermodynamics
@@ -36236,7 +33973,6 @@ s-(-ClC=C=CCl-)_cy
 {
     specie
     {
-        nMoles          1;
         molWeight       106.939;
     }
     thermodynamics
@@ -36252,7 +33988,6 @@ CN+
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0173;
     }
     thermodynamics
@@ -36268,7 +34003,6 @@ S2O
 {
     specie
     {
-        nMoles          1;
         molWeight       80.1274;
     }
     thermodynamics
@@ -36284,7 +34018,6 @@ Hg(cr)
 {
     specie
     {
-        nMoles          1;
         molWeight       200.59;
     }
     thermodynamics
@@ -36300,7 +34033,6 @@ GeS(s)
 {
     specie
     {
-        nMoles          1;
         molWeight       104.654;
     }
     thermodynamics
@@ -36316,7 +34048,6 @@ D2O
 {
     specie
     {
-        nMoles          1;
         molWeight       20.0276;
     }
     thermodynamics
@@ -36332,7 +34063,6 @@ DOT__Water-DT
 {
     specie
     {
-        nMoles          1;
         molWeight       65.9135;
     }
     thermodynamics
@@ -36348,7 +34078,6 @@ B2H6
 {
     specie
     {
-        nMoles          1;
         molWeight       27.6698;
     }
     thermodynamics
@@ -36364,7 +34093,6 @@ TRI-NITRO_BENZEN
 {
     specie
     {
-        nMoles          1;
         molWeight       213.107;
     }
     thermodynamics
@@ -36380,7 +34108,6 @@ SiF3
 {
     specie
     {
-        nMoles          1;
         molWeight       85.0812;
     }
     thermodynamics
@@ -36396,7 +34123,6 @@ C3H7NO3_NPN
 {
     specie
     {
-        nMoles          1;
         molWeight       105.094;
     }
     thermodynamics
@@ -36412,7 +34138,6 @@ air
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9644;
     }
     thermodynamics
@@ -36428,7 +34153,6 @@ C6H5I_Iodobenzen
 {
     specie
     {
-        nMoles          1;
         molWeight       204.011;
     }
     thermodynamics
@@ -36444,7 +34168,6 @@ o-C6H5ClO_trans(E)
 {
     specie
     {
-        nMoles          1;
         molWeight       163.004;
     }
     thermodynamics
@@ -36460,7 +34183,6 @@ C4H5N3O__Cytosine
 {
     specie
     {
-        nMoles          1;
         molWeight       111.104;
     }
     thermodynamics
@@ -36476,7 +34198,6 @@ HOF+_Hypoflorous
 {
     specie
     {
-        nMoles          1;
         molWeight       36.0052;
     }
     thermodynamics
@@ -36492,7 +34213,6 @@ BOF
 {
     specie
     {
-        nMoles          1;
         molWeight       45.8088;
     }
     thermodynamics
@@ -36508,7 +34228,6 @@ C4H8O4_Tetraoxocan
 {
     specie
     {
-        nMoles          1;
         molWeight       120.106;
     }
     thermodynamics
@@ -36524,7 +34243,6 @@ HNO+
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0135;
     }
     thermodynamics
@@ -36540,7 +34258,6 @@ Fe2O3(S)_Solid-A
 {
     specie
     {
-        nMoles          1;
         molWeight       159.692;
     }
     thermodynamics
@@ -36556,7 +34273,6 @@ CH3NO__CH2=N-OH
 {
     specie
     {
-        nMoles          1;
         molWeight       45.0412;
     }
     thermodynamics
@@ -36572,7 +34288,6 @@ C10H15_RADICAL
 {
     specie
     {
-        nMoles          1;
         molWeight       135.231;
     }
     thermodynamics
@@ -36588,7 +34303,6 @@ C5H4OH_Cyclo-2,4
 {
     specie
     {
-        nMoles          1;
         molWeight       81.095;
     }
     thermodynamics
@@ -36604,7 +34318,6 @@ C6H13__2M-1yl
 {
     specie
     {
-        nMoles          1;
         molWeight       85.1705;
     }
     thermodynamics
@@ -36620,7 +34333,6 @@ N2H3-_Hydrazine
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0379;
     }
     thermodynamics
@@ -36636,7 +34348,6 @@ C3H2(3)_H2C*-CC*
 {
     specie
     {
-        nMoles          1;
         molWeight       38.0494;
     }
     thermodynamics
@@ -36652,7 +34363,6 @@ CH_excited_A2DEL
 {
     specie
     {
-        nMoles          1;
         molWeight       13.0191;
     }
     thermodynamics
@@ -36668,7 +34378,6 @@ C4H5N_Cy-C3H5-CN
 {
     specie
     {
-        nMoles          1;
         molWeight       67.0911;
     }
     thermodynamics
@@ -36684,7 +34393,6 @@ K2CO3
 {
     specie
     {
-        nMoles          1;
         molWeight       138.213;
     }
     thermodynamics
@@ -36700,7 +34408,6 @@ C6Cl6_Hexachloro
 {
     specie
     {
-        nMoles          1;
         molWeight       284.785;
     }
     thermodynamics
@@ -36716,7 +34423,6 @@ BrO3
 {
     specie
     {
-        nMoles          1;
         molWeight       127.899;
     }
     thermodynamics
@@ -36732,7 +34438,6 @@ C8H10_1,4-dimeth
 {
     specie
     {
-        nMoles          1;
         molWeight       106.169;
     }
     thermodynamics
@@ -36748,7 +34453,6 @@ HO3+_equil__HOOO
 {
     specie
     {
-        nMoles          1;
         molWeight       49.0056;
     }
     thermodynamics
@@ -36764,7 +34468,6 @@ OH-
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0079;
     }
     thermodynamics
@@ -36780,7 +34483,6 @@ C6H5NH2(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       93.1294;
     }
     thermodynamics
@@ -36796,7 +34498,6 @@ CH2O+_Fornald_cati
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0259;
     }
     thermodynamics
@@ -36812,7 +34513,6 @@ C12H6Cl2O
 {
     specie
     {
-        nMoles          1;
         molWeight       237.087;
     }
     thermodynamics
@@ -36828,7 +34528,6 @@ CD3NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       64.0589;
     }
     thermodynamics
@@ -36844,7 +34543,6 @@ DF
 {
     specie
     {
-        nMoles          1;
         molWeight       21.0125;
     }
     thermodynamics
@@ -36860,7 +34558,6 @@ C4H4O_Furan
 {
     specie
     {
-        nMoles          1;
         molWeight       68.0759;
     }
     thermodynamics
@@ -36876,7 +34573,6 @@ C3H4_ALLENE
 {
     specie
     {
-        nMoles          1;
         molWeight       40.0653;
     }
     thermodynamics
@@ -36892,7 +34588,6 @@ C2H6S_(CH3SCH3)
 {
     specie
     {
-        nMoles          1;
         molWeight       62.1341;
     }
     thermodynamics
@@ -36908,7 +34603,6 @@ CNO__(NCO)
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0173;
     }
     thermodynamics
@@ -36924,7 +34618,6 @@ NT3__Tritium_Amo
 {
     specie
     {
-        nMoles          1;
         molWeight       157.707;
     }
     thermodynamics
@@ -36940,7 +34633,6 @@ Na2O(L)
 {
     specie
     {
-        nMoles          1;
         molWeight       61.979;
     }
     thermodynamics
@@ -36956,7 +34648,6 @@ CH2BrCOOH
 {
     specie
     {
-        nMoles          1;
         molWeight       138.946;
     }
     thermodynamics
@@ -36972,7 +34663,6 @@ N2O4__O2NNO2
 {
     specie
     {
-        nMoles          1;
         molWeight       92.011;
     }
     thermodynamics
@@ -36988,7 +34678,6 @@ C7H9__C5H4(CH3)=
 {
     specie
     {
-        nMoles          1;
         molWeight       93.1498;
     }
     thermodynamics
@@ -37004,7 +34693,6 @@ NO2+_cyclo_N(OO)
 {
     specie
     {
-        nMoles          1;
         molWeight       46.005;
     }
     thermodynamics
@@ -37020,7 +34708,6 @@ HNO2+_trans_&_eq
 {
     specie
     {
-        nMoles          1;
         molWeight       47.0129;
     }
     thermodynamics
@@ -37036,7 +34723,6 @@ C3H3_1-propynyl
 {
     specie
     {
-        nMoles          1;
         molWeight       39.0574;
     }
     thermodynamics
@@ -37052,7 +34738,6 @@ C6H6__1,2-Hexadi
 {
     specie
     {
-        nMoles          1;
         molWeight       78.1147;
     }
     thermodynamics
@@ -37068,7 +34753,6 @@ PbI3
 {
     specie
     {
-        nMoles          1;
         molWeight       587.903;
     }
     thermodynamics
@@ -37084,7 +34768,6 @@ C5H10O2_Butyrate
 {
     specie
     {
-        nMoles          1;
         molWeight       102.134;
     }
     thermodynamics
@@ -37100,7 +34783,6 @@ N4+_cyclo
 {
     specie
     {
-        nMoles          1;
         molWeight       56.0263;
     }
     thermodynamics
@@ -37116,7 +34798,6 @@ C8H7___2,3,5,7_Cy
 {
     specie
     {
-        nMoles          1;
         molWeight       103.145;
     }
     thermodynamics
@@ -37132,7 +34813,6 @@ ZrO2(III)
 {
     specie
     {
-        nMoles          1;
         molWeight       123.219;
     }
     thermodynamics
@@ -37148,7 +34828,6 @@ C6H13__2M-4yl
 {
     specie
     {
-        nMoles          1;
         molWeight       85.1705;
     }
     thermodynamics
@@ -37164,7 +34843,6 @@ C2H5OH+_Ethanol+
 {
     specie
     {
-        nMoles          1;
         molWeight       46.069;
     }
     thermodynamics
@@ -37180,7 +34858,6 @@ C9H18_1-nonene
 {
     specie
     {
-        nMoles          1;
         molWeight       126.244;
     }
     thermodynamics
@@ -37196,7 +34873,6 @@ S(b)
 {
     specie
     {
-        nMoles          1;
         molWeight       32.064;
     }
     thermodynamics
@@ -37212,7 +34888,6 @@ Pd+__Paladium__C
 {
     specie
     {
-        nMoles          1;
         molWeight       106.399;
     }
     thermodynamics
@@ -37228,7 +34903,6 @@ C70_FOOTBALLENE
 {
     specie
     {
-        nMoles          1;
         molWeight       840.781;
     }
     thermodynamics
@@ -37244,7 +34918,6 @@ Mg(OH)2
 {
     specie
     {
-        nMoles          1;
         molWeight       58.3267;
     }
     thermodynamics
@@ -37260,7 +34933,6 @@ H+
 {
     specie
     {
-        nMoles          1;
         molWeight       1.00743;
     }
     thermodynamics
@@ -37276,7 +34948,6 @@ CH3Hg
 {
     specie
     {
-        nMoles          1;
         molWeight       215.625;
     }
     thermodynamics
@@ -37292,7 +34963,6 @@ C4H7O2_EtAcetat_R
 {
     specie
     {
-        nMoles          1;
         molWeight       87.0992;
     }
     thermodynamics
@@ -37308,7 +34978,6 @@ C2H6-_Ethane_ani
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0707;
     }
     thermodynamics
@@ -37324,7 +34993,6 @@ C3H5O2_Propionic
 {
     specie
     {
-        nMoles          1;
         molWeight       73.0721;
     }
     thermodynamics
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
index 23dedf0b07..af6c701bc7 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,6 @@ Usage
         // Solid thermo
         specie
         {
-            nMoles          1;
             molWeight       20;
         }
         transport
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 04b133ba05..10c855cf41 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -6,9 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@@ -31,9 +29,7 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index a5a3b3c8eb..e1ec44b4b6 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -5,9 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@@ -26,9 +24,7 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options
index 3b5a4e72e9..51974e3c99 100644
--- a/src/lagrangian/spray/Make/options
+++ b/src/lagrangian/spray/Make/options
@@ -7,9 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@@ -33,9 +31,7 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
diff --git a/src/lagrangian/turbulence/Make/options b/src/lagrangian/turbulence/Make/options
index 7b2fc4bea8..825da6fbb8 100644
--- a/src/lagrangian/turbulence/Make/options
+++ b/src/lagrangian/turbulence/Make/options
@@ -6,9 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
@@ -31,9 +29,7 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options
index 379349b045..90d6d183b0 100644
--- a/src/regionModels/regionCoupling/Make/options
+++ b/src/regionModels/regionCoupling/Make/options
@@ -7,9 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude\
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options
index a0eb4828ea..a5311a2cc8 100644
--- a/src/regionModels/surfaceFilmModels/Make/options
+++ b/src/regionModels/surfaceFilmModels/Make/options
@@ -3,9 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@@ -18,9 +16,7 @@ LIB_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -ldistributionModels \
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
index c736bdc826..8ea8ffa2e9 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
@@ -3,9 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
@@ -20,9 +18,7 @@ LIB_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -lliquidProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
-    -lsolidMixtureProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lturbulenceModels \
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
index 824dd5a203..6c511cc549 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -189,7 +189,7 @@ scalar liquidFilmThermo::kappa
     const scalar T
 ) const
 {
-    return liquidPtr_->K(p, T);
+    return liquidPtr_->kappa(p, T);
 }
 
 
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
index 0bb7a092ce..b29bab13a4 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,6 @@ Usage
         {
             specie
             {
-                nMoles          1;
                 molWeight       20;
             }
             transport
diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options
index c4f0b2a8a9..37e3533de0 100644
--- a/src/thermophysicalModels/SLGThermo/Make/options
+++ b/src/thermophysicalModels/SLGThermo/Make/options
@@ -3,9 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C
index 280b33999c..c06ffb75d7 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.C
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -456,11 +456,11 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::gamma
 ) const
 {
     tmp<scalarField> tgamma(new scalarField(T.size()));
-    scalarField& cpv = tgamma.ref();
+    scalarField& gamma = tgamma.ref();
 
     forAll(T, facei)
     {
-        cpv[facei] =
+        gamma[facei] =
             this->patchFaceMixture(patchi, facei).gamma(p[facei], T[facei]);
     }
 
@@ -531,11 +531,11 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::Cpv
 ) const
 {
     tmp<scalarField> tCpv(new scalarField(T.size()));
-    scalarField& cpv = tCpv.ref();
+    scalarField& Cpv = tCpv.ref();
 
     forAll(T, facei)
     {
-        cpv[facei] =
+        Cpv[facei] =
             this->patchFaceMixture(patchi, facei).Cpv(p[facei], T[facei]);
     }
 
@@ -567,21 +567,21 @@ Foam::heThermo<BasicThermo, MixtureType>::Cpv() const
         )
     );
 
-    volScalarField& cpv = tCpv.ref();
+    volScalarField& Cpv = tCpv.ref();
 
     forAll(this->T_, celli)
     {
-        cpv[celli] =
+        Cpv[celli] =
             this->cellMixture(celli).Cpv(this->p_[celli], this->T_[celli]);
     }
 
-    volScalarField::Boundary& cpvBf = cpv.boundaryFieldRef();
+    volScalarField::Boundary& CpvBf = Cpv.boundaryFieldRef();
 
-    forAll(cpvBf, patchi)
+    forAll(CpvBf, patchi)
     {
         const fvPatchScalarField& pp = this->p_.boundaryField()[patchi];
         const fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
-        fvPatchScalarField& pCpv = cpvBf[patchi];
+        fvPatchScalarField& pCpv = CpvBf[patchi];
 
         forAll(pT, facei)
         {
@@ -603,12 +603,12 @@ Foam::tmp<Foam::scalarField> Foam::heThermo<BasicThermo, MixtureType>::CpByCpv
 ) const
 {
     tmp<scalarField> tCpByCpv(new scalarField(T.size()));
-    scalarField& cpByCpv = tCpByCpv.ref();
+    scalarField& CpByCpv = tCpByCpv.ref();
 
     forAll(T, facei)
     {
-        cpByCpv[facei] =
-            this->patchFaceMixture(patchi, facei).cpBycpv(p[facei], T[facei]);
+        CpByCpv[facei] =
+            this->patchFaceMixture(patchi, facei).CpByCpv(p[facei], T[facei]);
     }
 
     return tCpByCpv;
@@ -639,29 +639,29 @@ Foam::heThermo<BasicThermo, MixtureType>::CpByCpv() const
         )
     );
 
-    volScalarField& cpByCpv = tCpByCpv.ref();
+    volScalarField& CpByCpv = tCpByCpv.ref();
 
     forAll(this->T_, celli)
     {
-        cpByCpv[celli] = this->cellMixture(celli).cpBycpv
+        CpByCpv[celli] = this->cellMixture(celli).CpByCpv
         (
             this->p_[celli],
             this->T_[celli]
         );
     }
 
-    volScalarField::Boundary& cpByCpvBf =
-        cpByCpv.boundaryFieldRef();
+    volScalarField::Boundary& CpByCpvBf =
+        CpByCpv.boundaryFieldRef();
 
-    forAll(cpByCpvBf, patchi)
+    forAll(CpByCpvBf, patchi)
     {
         const fvPatchScalarField& pp = this->p_.boundaryField()[patchi];
         const fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
-        fvPatchScalarField& pCpByCpv = cpByCpvBf[patchi];
+        fvPatchScalarField& pCpByCpv = CpByCpvBf[patchi];
 
         forAll(pT, facei)
         {
-            pCpByCpv[facei] = this->patchFaceMixture(patchi, facei).cpBycpv
+            pCpByCpv[facei] = this->patchFaceMixture(patchi, facei).CpByCpv
             (
                 pp[facei],
                 pT[facei]
diff --git a/src/thermophysicalModels/properties/Allwmake b/src/thermophysicalModels/properties/Allwmake
index 5ad45938fc..0837290b62 100755
--- a/src/thermophysicalModels/properties/Allwmake
+++ b/src/thermophysicalModels/properties/Allwmake
@@ -5,8 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 wmake $targetType liquidProperties
-wmake $targetType liquidMixtureProperties
 wmake $targetType solidProperties
-wmake $targetType solidMixtureProperties
 
 #------------------------------------------------------------------------------
diff --git a/src/thermophysicalModels/properties/liquidMixtureProperties/Make/files b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/files
deleted file mode 100644
index 4f0959cfc7..0000000000
--- a/src/thermophysicalModels/properties/liquidMixtureProperties/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-liquidMixtureProperties/liquidMixtureProperties.C
-
-LIB = $(FOAM_LIBBIN)/libliquidMixtureProperties
diff --git a/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options
deleted file mode 100644
index 6e1d19dbb6..0000000000
--- a/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options
+++ /dev/null
@@ -1,10 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
-
-LIB_LIBS = \
-    -lliquidProperties \
-    -lthermophysicalFunctions
diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
index 8c1b9e0447..8a4844a722 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
+++ b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,8 +78,8 @@ Foam::Ar::Ar()
     ),
     mu_(-8.868, 204.3, -0.3831, -1.3e-22, 10.0),
     mug_(8.386e-07, 0.6175, 75.377, -432.5),
-    K_(0.1819, -0.0003176, -4.11e-06, 0.0, 0.0, 0.0),
-    Kg_(0.0001236, 0.8262, -132.8, 16000),
+    kappa_(0.1819, -0.0003176, -4.11e-06, 0.0, 0.0, 0.0),
+    kappag_(0.0001236, 0.8262, -132.8, 16000),
     sigma_(150.86, 0.03823, 1.2927, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 39.948, 28) // note: Same as nHeptane
 {}
@@ -113,8 +113,8 @@ Foam::Ar::Ar
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -132,8 +132,8 @@ Foam::Ar::Ar(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -151,8 +151,8 @@ Foam::Ar::Ar(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -170,8 +170,8 @@ Foam::Ar::Ar(const Ar& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
index 40b76ae9a5..c26405a96b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
+++ b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class Ar
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H b/src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H
index 89100966ea..81b12e1189 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::Ar::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::Ar::K(scalar p, scalar T) const
+inline Foam::scalar Foam::Ar::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::Ar::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::Ar::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
index 853cb2fe2c..6358c3bd4c 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C10H22::C10H22()
     ),
     mu_(-16.468, 1533.5, 0.7511, 0.0, 0.0),
     mug_(2.64e-08, 0.9487, 71.0, 0.0),
-    K_(0.2063, -0.000254, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-668.4, 0.9323, -4071000000.0, 0.0),
+    kappa_(0.2063, -0.000254, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-668.4, 0.9323, -4071000000.0, 0.0),
     sigma_(617.70, 0.055435, 1.3095, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 142.285, 28.0) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C10H22::C10H22
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C10H22::C10H22(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C10H22::C10H22(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C10H22::C10H22(const C10H22& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
index da0272542f..bfa91a6a35 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C10H22
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H
index 558516478c..e6ea047fca 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C10H22::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C10H22::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C10H22::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C10H22::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C10H22::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
index 4e4c6cf95b..54a5124afb 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,8 +78,8 @@ Foam::C12H26::C12H26()
     ),
     mu_(-20.607, 1943, 1.3205, 0.0, 0.0),
     mug_(6.344e-08, 0.8287, 219.5, 0.0),
-    K_(0.2047, -0.0002326, 0.0, 0.0, 0.0, 0.0),
-    Kg_(5.719e-06, 1.4699, 579.4, 0.0),
+    kappa_(0.2047, -0.0002326, 0.0, 0.0, 0.0, 0.0),
+    kappag_(5.719e-06, 1.4699, 579.4, 0.0),
     sigma_(658.0, 0.055493, 1.3262, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 170.338, 28.0) // note: Same as nHeptane
 {}
@@ -113,8 +113,8 @@ Foam::C12H26::C12H26
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -132,8 +132,8 @@ Foam::C12H26::C12H26(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -151,8 +151,8 @@ Foam::C12H26::C12H26(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -170,8 +170,8 @@ Foam::C12H26::C12H26(const C12H26& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
index e8fc1a2bfa..c665f2678c 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C12H26
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H
index 0cb385206e..5a12631f14 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C12H26::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C12H26::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C12H26::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C12H26::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C12H26::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
index 566edd993e..1f9eb06b66 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C13H28::C13H28()
     ),
     mu_(-23.341, 2121.9, 1.7208, 0.0, 0.0),
     mug_(3.5585e-08, 0.8987, 165.3, 0.0),
-    K_(0.1981, -0.0002046, 0.0, 0.0, 0.0, 0.0),
-    Kg_(5.3701e-06, 1.4751, 599.09, 0.0),
+    kappa_(0.1981, -0.0002046, 0.0, 0.0, 0.0, 0.0),
+    kappag_(5.3701e-06, 1.4751, 599.09, 0.0),
     sigma_(675.80, 0.05561, 1.3361, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 184.365, 28.0) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C13H28::C13H28
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C13H28::C13H28(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C13H28::C13H28(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C13H28::C13H28(const C13H28& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
index de0a261a35..6962ea8a51 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C13H28
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H
index cafc579a87..7f66e5f8dd 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C13H28::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C13H28::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C13H28::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C13H28::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C13H28::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
index 3689c0d07e..5c0cd60c50 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C14H30::C14H30()
     ),
     mu_(-18.964, 2010.9, 1.0648, 0.0, 0.0),
     mug_(4.4565e-08, 0.8684, 228.16, -4347.2),
-    K_(0.1957, -0.0001993, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-0.000628, 0.944, -5490, 0.0),
+    kappa_(0.1957, -0.0001993, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-0.000628, 0.944, -5490, 0.0),
     sigma_(692.40, 0.056436, 1.3658, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 198.392, 28.0) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C14H30::C14H30
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C14H30::C14H30(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C14H30::C14H30(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C14H30::C14H30(const C14H30& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
index a3955f6e9d..f1ea7dff2e 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C14H30
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H
index f0f8a8db4d..9a2771e8e5 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C14H30::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C14H30::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C14H30::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C14H30::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C14H30::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
index 38640fd609..f583cc2716 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C16H34::C16H34()
     ),
     mu_(-18.388, 2056.8, 0.98681, 0.0, 0.0),
     mug_(1.2463e-07, 0.7322, 395.0, 6000.0),
-    K_(0.1963, -0.00019, 0.0, 0.0, 0.0, 0.0),
-    Kg_(3.075e-06, 1.552, 678.0, 0.0),
+    kappa_(0.1963, -0.00019, 0.0, 0.0, 0.0, 0.0),
+    kappag_(3.075e-06, 1.552, 678.0, 0.0),
     sigma_(720.60, 0.05699, 1.3929, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 226.446, 28.0) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C16H34::C16H34
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C16H34::C16H34(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C16H34::C16H34(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C16H34::C16H34(const C16H34& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
index ac328a82ee..e1c39b9a2e 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C16H34
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H
index 284638014b..bb2970d4bb 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C16H34::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C16H34::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C16H34::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C16H34::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C16H34::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
index 55a4e1920a..ad3a0b167b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C2H5OH::C2H5OH()
     ),
     mu_(8.049, 776, -3.068, 0.0, 0.0),
     mug_(1.0613e-07, 0.8066, 52.7, 0.0),
-    K_(0.253, -0.000281, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-3.12, 0.7152, -3550000.0, 0.0),
+    kappa_(0.253, -0.000281, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-3.12, 0.7152, -3550000.0, 0.0),
     sigma_(3.7640e-02, -2.1570e-05, -1.025e-07, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 46.069, 28) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C2H5OH::C2H5OH
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C2H5OH::C2H5OH(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C2H5OH::C2H5OH(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C2H5OH::C2H5OH(const C2H5OH& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
index 6a51c1f63b..526d7fe49c 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C2H5OH
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc0 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H
index 7fe083d645..968c5bfd67 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C2H5OH::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C2H5OH::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H5OH::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C2H5OH::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H5OH::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
index d755a01095..b118dc310d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,8 +77,8 @@ Foam::C2H6::C2H6()
     ),
     mu_(-3.4134, 197.05, -1.2193, -9.2023e-26, 10.0),
     mug_(2.5906e-07, 0.67988, 98.902, 0.0),
-    K_(0.35758, -0.0011458, 6.1866e-07, 0.0, 0.0, 0.0),
-    Kg_(7.3869e-05, 1.1689, 500.73, 0.0),
+    kappa_(0.35758, -0.0011458, 6.1866e-07, 0.0, 0.0, 0.0),
+    kappag_(7.3869e-05, 1.1689, 500.73, 0.0),
     sigma_(305.32, 0.048643, 1.1981, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 30.070, 28) // note: Same as nHeptane
 {}
@@ -112,8 +112,8 @@ Foam::C2H6::C2H6
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -131,8 +131,8 @@ Foam::C2H6::C2H6(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -150,8 +150,8 @@ Foam::C2H6::C2H6(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -169,8 +169,8 @@ Foam::C2H6::C2H6(const C2H6& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
index 9bfa5e9820..74b7f1a018 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C2H6
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H
index f2005a7fcf..62901b7829 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C2H6::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C2H6::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H6::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C2H6::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H6::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
index 475d6eccbe..1a9ba151a4 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C2H6O::C2H6O()
     ),
     mu_(-10.62, 448.99, 8.3967e-05, 0.0, 0.0),
     mug_(7.27, 0.1091, 440600000, 0.0),
-    K_(0.31276, -0.0005677, 0.0, 0.0, 0.0, 0.0),
-    Kg_(0.2247, 0.1026, 997.06, 1762900),
+    kappa_(0.31276, -0.0005677, 0.0, 0.0, 0.0, 0.0),
+    kappag_(0.2247, 0.1026, 997.06, 1762900),
     sigma_(400.10, 0.06096, 1.2286, 0, 0, 0),
     D_(147.18, 20.1, 46.069, 28) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C2H6O::C2H6O
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C2H6O::C2H6O(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C2H6O::C2H6O(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C2H6O::C2H6O(const C2H6O& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
index 0bb2131677..b85d7273ef 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C2H6O
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H
index 97e2e769e9..92ce3483fd 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C2H6O::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C2H6O::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H6O::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C2H6O::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C2H6O::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
index f100dbf2c4..d0e3a5c160 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C3H6O::C3H6O()
     ),
     mu_(-14.918, 1023.4, 0.5961, 0.0, 0.0),
     mug_(3.1005e-08, 0.9762, 23.139, 0.0),
-    K_(0.2502, -0.000298, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-26.8, 0.9098, -126500000, 0.0),
+    kappa_(0.2502, -0.000298, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-26.8, 0.9098, -126500000, 0.0),
     sigma_(508.20, 0.0622, 1.124, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 58.08, 28) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C3H6O::C3H6O
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C3H6O::C3H6O(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C3H6O::C3H6O(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C3H6O::C3H6O(const C3H6O& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
index 47d298f623..3e58a5fb09 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C3H6O
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H
index e99086a10e..2b025bb37b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,15 +76,15 @@ inline Foam::scalar Foam::C3H6O::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C3H6O::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C3H6O::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C3H6O::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C3H6O::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
index bb4b2a2839..669dd0056b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,8 +76,8 @@ Foam::C3H8::C3H8()
     ),
     mu_(-6.9281, 420.76, -0.63276, -1.713e-26, 10.0),
     mug_(2.4993e-07, 0.68612, 179.34, -8254.6),
-    K_(0.26755, -0.00066457, 2.774e-07, 0.0, 0.0, 0.0),
-    Kg_(-1.12, 0.10972, -9834.6, -7535800),
+    kappa_(0.26755, -0.00066457, 2.774e-07, 0.0, 0.0, 0.0),
+    kappag_(-1.12, 0.10972, -9834.6, -7535800),
     sigma_(369.83, 0.05092, 1.2197, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 44.096, 28) // note: Same as nHeptane
 {}
@@ -111,8 +111,8 @@ Foam::C3H8::C3H8
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -130,8 +130,8 @@ Foam::C3H8::C3H8(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -149,8 +149,8 @@ Foam::C3H8::C3H8(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -168,8 +168,8 @@ Foam::C3H8::C3H8(const C3H8& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
index 12a5c67ee9..ab345407e2 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C3H8
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H
index ce54b116eb..627ffee393 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C3H8::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C3H8::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C3H8::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C3H8::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C3H8::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
index 06cfa49be6..32e217cd4d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C4H10O::C4H10O()
     ),
     mu_(10.197, -63.8, -3.226, 0.0, 0.0),
     mug_(1.948e-06, 0.41, 495.8, 0.0),
-    K_(0.249, -0.0004005, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-0.0044894, 0.6155, -3266.3, 0.0),
+    kappa_(0.249, -0.0004005, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-0.0044894, 0.6155, -3266.3, 0.0),
     sigma_(466.70, 0.057356, 1.288, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 74.123, 28) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C4H10O::C4H10O
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C4H10O::C4H10O(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C4H10O::C4H10O(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C4H10O::C4H10O(const C4H10O& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
index 833377ae6b..c3e04909cd 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C4H10O
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H
index cccec3594f..29836f9ebd 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C4H10O::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C4H10O::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C4H10O::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C4H10O::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C4H10O::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
index 1dae3fe1b2..0aa12512fd 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C6H14::C6H14()
     ),
     mu_(-20.715, 1207.5, 1.4993, 0.0, 0.0),
     mug_(1.7514e-07, 0.70737, 157.14, 0.0),
-    K_(0.22492, -0.0003533, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-650.5, 0.8053, -1412100000, 0.0),
+    kappa_(0.22492, -0.0003533, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-650.5, 0.8053, -1412100000, 0.0),
     sigma_(507.60, 0.055003, 1.2674, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 86.177, 28) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C6H14::C6H14
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C6H14::C6H14(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C6H14::C6H14(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C6H14::C6H14(const C6H14& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
index 7034f06cb6..574b249b4d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C6H14
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H
index f9b89b4275..f88632998b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C6H14::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C6H14::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C6H14::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C6H14::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C6H14::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
index 4163583a3a..ff3e040ef0 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C6H6::C6H6()
     ),
     mu_(6.764, 336.4, -2.687, 0.0, 0.0),
     mug_(3.134e-08, 0.9676, 7.9, 0.0),
-    K_(0.2407, -0.0003202, 0.0, 0.0, 0.0, 0.0),
-    Kg_(1.652e-05, 1.3117, 491, 0.0),
+    kappa_(0.2407, -0.0003202, 0.0, 0.0, 0.0, 0.0),
+    kappag_(1.652e-05, 1.3117, 491, 0.0),
     sigma_(562.16, 0.07195, 1.2389, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 78.114, 28) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C6H6::C6H6
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C6H6::C6H6(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C6H6::C6H6(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C6H6::C6H6(const C6H6& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
index cc1302778e..8f682060c4 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C6H6
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H
index 982298a476..7bf345a1f7 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C6H6::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C6H6::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C6H6::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C6H6::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C6H6::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
index 349197194f..90651a711c 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,8 +85,8 @@ Foam::C7H16::C7H16()
     ),
     mu_(-24.451, 1533.1, 2.0087, 0.0, 0.0),
     mug_(6.672e-08, 0.82837, 85.752, 0.0),
-    K_(0.215, -0.000303, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-0.070028, 0.38068, -7049.9, -2400500.0),
+    kappa_(0.215, -0.000303, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-0.070028, 0.38068, -7049.9, -2400500.0),
     sigma_(540.20, 0.054143, 1.2512, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 100.204, 28.0)
 {}
@@ -120,8 +120,8 @@ Foam::C7H16::C7H16
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -139,8 +139,8 @@ Foam::C7H16::C7H16(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -158,8 +158,8 @@ Foam::C7H16::C7H16(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -177,8 +177,8 @@ Foam::C7H16::C7H16(const C7H16& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
index 0649b88d1f..b8032cd919 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C7H16
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H
index 9631cb4d7a..74b13a52ce 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C7H16::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C7H16::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C7H16::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C7H16::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C7H16::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
index 698b0acb3d..a9026f39de 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C7H8::C7H8()
     ),
     mu_(-13.362, 1183, 0.333, 0.0, 0.0),
     mug_(2.919e-08, 0.9648, 0.0, 0.0),
-    K_(0.2043, -0.000239, 0.0, 0.0, 0.0, 0.0),
-    Kg_(2.392e-05, 1.2694, 537, 0.0),
+    kappa_(0.2043, -0.000239, 0.0, 0.0, 0.0, 0.0),
+    kappag_(2.392e-05, 1.2694, 537, 0.0),
     sigma_(591.79, 0.06685, 1.2456, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 92.141, 28) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C7H8::C7H8
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C7H8::C7H8(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C7H8::C7H8(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C7H8::C7H8(const C7H8& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
index 7835aaca2a..7e01f058b0 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C7H8
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H
index 32359be9ef..b84974e28f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C7H8::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C7H8::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C7H8::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C7H8::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C7H8::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
index 09d76b8af0..8c8484270f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C8H10::C8H10()
     ),
     mu_(-10.452, 1048.4, -0.0715, 0.0, 0.0),
     mug_(1.2e-06, 0.4518, 439.0, 0.0),
-    K_(0.20149, -0.00023988, 0.0, 0.0, 0.0, 0.0),
-    Kg_(1.708e-05, 1.319, 565.6, 0.0),
+    kappa_(0.20149, -0.00023988, 0.0, 0.0, 0.0, 0.0),
+    kappag_(1.708e-05, 1.319, 565.6, 0.0),
     sigma_(617.17, 0.066, 1.268, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 106.167, 28.0) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C8H10::C8H10
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C8H10::C8H10(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C8H10::C8H10(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C8H10::C8H10(const C8H10& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
index 689959ed48..4e36b54294 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,8 +70,8 @@ class C8H10
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -152,10 +152,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -182,8 +182,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H
index 2c6a452291..1f2703b7bf 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C8H10::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C8H10::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C8H10::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C8H10::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C8H10::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
index 3493b9da1e..d50c15e0af 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C8H18::C8H18()
     ),
     mu_(-20.463, 1497.4, 1.379, 0.0, 0.0),
     mug_(3.1191e-08, 0.92925, 55.092, 0.0),
-    K_(0.2156, -0.00029483, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-8758, 0.8448, -27121000000.0, 0.0),
+    kappa_(0.2156, -0.00029483, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-8758, 0.8448, -27121000000.0, 0.0),
     sigma_(568.70, 0.052789, 1.2323, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 114.231, 28.0) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C8H18::C8H18
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C8H18::C8H18(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C8H18::C8H18(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C8H18::C8H18(const C8H18& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
index acdb0da423..8bd606d1e5 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C8H18
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H
index a59cc18b0e..c55f1d66d7 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C8H18::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C8H18::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C8H18::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C8H18::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C8H18::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
index aae2191b3e..4db12992a2 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::C9H20::C9H20()
     ),
     mu_(-21.149, 1658, 1.454, 0.0, 0.0),
     mug_(1.0344e-07, 0.77301, 220.47, 0.0),
-    K_(0.209, -0.000264, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-0.065771, 0.27198, -3482.3, -1580300.0),
+    kappa_(0.209, -0.000264, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-0.065771, 0.27198, -3482.3, -1580300.0),
     sigma_(594.60, 0.054975, 1.2897, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 128.258, 28.0) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::C9H20::C9H20
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::C9H20::C9H20(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::C9H20::C9H20(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::C9H20::C9H20(const C9H20& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
index b4caf6d135..7cd448be55 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class C9H20
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H
index 14ddb9a72c..f0bcc0b169 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::C9H20::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::C9H20::K(scalar p, scalar T) const
+inline Foam::scalar Foam::C9H20::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::C9H20::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::C9H20::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
index 3b5701c8e8..f656c0bc9f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
+++ b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::CH3OH::CH3OH()
     ),
     mu_(-7.288, 1065.3, -0.6657, 0.0, 0.0),
     mug_(3.0663e-07, 0.69655, 205.0, 0.0),
-    K_(0.2837, -0.000281, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-7.763, 1.0279, -74360000.0, 6770000000.0),
+    kappa_(0.2837, -0.000281, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-7.763, 1.0279, -74360000.0, 6770000000.0),
     sigma_(512.58, 0.056, -0.00014583, 1.08e-07, 0.0, 0.0),
     D_(147.18, 20.1, 32.042, 28.0) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::CH3OH::CH3OH
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::CH3OH::CH3OH(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::CH3OH::CH3OH(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::CH3OH::CH3OH(const CH3OH& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
index 50d2e75459..43d9b7acf7 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
+++ b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class CH3OH
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H
index bfe2eeaed4..2b2e3995cd 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::CH3OH::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::CH3OH::K(scalar p, scalar T) const
+inline Foam::scalar Foam::CH3OH::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::CH3OH::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::CH3OH::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
index e011b50d8d..0e271803ec 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,8 +70,8 @@ Foam::CH4N2O::CH4N2O()
     ),
     mu_(-51.964, 3670.6, 5.7331, -5.3495e-29, 10.0),
     mug_(2.6986e-06, 0.498, 1257.7, -19570.0),
-    K_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0.0, 0.0),
-    Kg_(6.977e-05, 1.1243, 844.9, -148850.0),
+    kappa_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0.0, 0.0),
+    kappag_(6.977e-05, 1.1243, 844.9, -148850.0),
     sigma_(705.0, 1.0, 0.0, 0.0, 0.0, 0.0), // note: set to constant
     D_(147.18, 20.1, 60.056, 28.0) // note: Same as nHeptane
 {}
@@ -105,8 +105,8 @@ Foam::CH4N2O::CH4N2O
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -124,8 +124,8 @@ Foam::CH4N2O::CH4N2O(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -143,8 +143,8 @@ Foam::CH4N2O::CH4N2O(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -162,8 +162,8 @@ Foam::CH4N2O::CH4N2O(const CH4N2O& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
index 10246da1cb..ceca9fc4eb 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,8 +72,8 @@ class CH4N2O
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H
index f5bf4cb864..89dc6fc672 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::CH4N2O::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::CH4N2O::K(scalar p, scalar T) const
+inline Foam::scalar Foam::CH4N2O::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::CH4N2O::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::CH4N2O::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
index 8c570a2a16..fc1c64a5c3 100644
--- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,8 +93,8 @@ Foam::H2O::H2O()
     ),
     mu_(-51.964, 3670.6, 5.7331, -5.3495e-29, 10),
     mug_(2.6986e-06, 0.498, 1257.7, -19570),
-    K_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
-    Kg_(6.977e-05, 1.1243, 844.9, -148850),
+    kappa_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
+    kappag_(6.977e-05, 1.1243, 844.9, -148850),
     sigma_(647.13, 0.18548, 2.717, -3.554, 2.047, 0),
     D_(15.0, 15.0, 18.015, 28)
 {}
@@ -128,8 +128,8 @@ Foam::H2O::H2O
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -147,29 +147,31 @@ Foam::H2O::H2O(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
 
 
 Foam::H2O::H2O(const dictionary& dict)
-:
-    liquidProperties(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"))
+    :
+    H2O()
+// :
+//     liquidProperties(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")),
+//     kappa_(dict.subDict("K")),
+//     kappag_(dict.subDict("kappag")),
+//     sigma_(dict.subDict("sigma")),
+//     D_(dict.subDict("D"))
 {}
 
 
@@ -185,8 +187,8 @@ Foam::H2O::H2O(const H2O& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
index 6852f315c2..2b599e1866 100644
--- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,8 +70,8 @@ class H2O
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -152,10 +152,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -182,8 +182,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H b/src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H
index a86d4094e1..f00d1b7a54 100644
--- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::H2O::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::H2O::K(scalar p, scalar T) const
+inline Foam::scalar Foam::H2O::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::H2O::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::H2O::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
index 76fa337dcd..fc793c8c74 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
+++ b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::IC8H18::IC8H18()
     ),
     mu_(-15.811, 1282.5, 0.67791, -3.8617e-28, 10.0),
     mug_(1.107e-07, 0.746, 72.4, 0.0),
-    K_(0.1508, -0.0001712, 0.0, 0.0, 0.0, 0.0),
-    Kg_(1.758e-05, 1.3114, 392.9, 0.0),
+    kappa_(0.1508, -0.0001712, 0.0, 0.0, 0.0, 0.0),
+    kappag_(1.758e-05, 1.3114, 392.9, 0.0),
     sigma_(543.96, 0.047434, 1.1975, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 114.231, 28.0) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::IC8H18::IC8H18
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::IC8H18::IC8H18(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::IC8H18::IC8H18(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::IC8H18::IC8H18(const IC8H18& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
index 79842a43c9..d044ccfaa9 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
+++ b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class IC8H18
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H
index a66fc479f4..1c7ce68d38 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::IC8H18::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::IC8H18::K(scalar p, scalar T) const
+inline Foam::scalar Foam::IC8H18::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::IC8H18::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::IC8H18::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
index aeaff10fa4..fc950df619 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
+++ b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,8 +92,8 @@ Foam::IDEA::IDEA()
     ),
     mu_(-6.9645853822e+01, 4.4390635942e+03, 8.4680722718e+00, 0.0, 0.0),
     mug_(4.2629382158e-08, 8.8144402122e-01, 9.6918097636e+01, 0.0),
-    K_(2.03684e-01, -2.3168e-04, 0.0, 0.0, 0.0, 0.0),
-    Kg_
+    kappa_(2.03684e-01, -2.3168e-04, 0.0, 0.0, 0.0, 0.0),
+    kappag_
     (
        -5.664925956707e+02,
         8.896721676320e-01,
@@ -141,8 +141,8 @@ Foam::IDEA::IDEA
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -160,8 +160,8 @@ Foam::IDEA::IDEA(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -179,8 +179,8 @@ Foam::IDEA::IDEA(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -198,8 +198,8 @@ Foam::IDEA::IDEA(const IDEA& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
index 9a68cbe168..ec19b10984 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
+++ b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,8 +93,8 @@ class IDEA
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -175,10 +175,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -204,8 +204,8 @@ public:
             Cpg_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H
index a5f457109b..f3f46378f1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::IDEA::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::IDEA::K(scalar p, scalar T) const
+inline Foam::scalar Foam::IDEA::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::IDEA::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::IDEA::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
index 3e336b3bac..f2cce3c18c 100644
--- a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
+++ b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,8 +70,8 @@ Foam::MB::MB()
     ),
     mu_(-12.206, 1141.7, 0.15014, 0.0, 0.0),
     mug_(3.733e-07, 0.6177, 256.5, 0.0),
-    K_(0.2298, -0.0003002, 0.0, 0.0, 0.0, 0.0),
-    Kg_(1333.1, 0.9962, 12317000000.0, 0.0),
+    kappa_(0.2298, -0.0003002, 0.0, 0.0, 0.0, 0.0),
+    kappag_(1333.1, 0.9962, 12317000000.0, 0.0),
     sigma_(554.5, 0.064084, 1.2418, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 102.133, 28.0) // note: Same as nHeptane
 {}
@@ -105,8 +105,8 @@ Foam::MB::MB
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -124,8 +124,8 @@ Foam::MB::MB(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -143,8 +143,8 @@ Foam::MB::MB(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -162,8 +162,8 @@ Foam::MB::MB(const MB& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H b/src/thermophysicalModels/properties/liquidProperties/MB/MB.H
index 2615511135..2d204bf851 100644
--- a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H
+++ b/src/thermophysicalModels/properties/liquidProperties/MB/MB.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class MB
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MBI.H b/src/thermophysicalModels/properties/liquidProperties/MB/MBI.H
index 9ee002bf22..d72c33e79e 100644
--- a/src/thermophysicalModels/properties/liquidProperties/MB/MBI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/MB/MBI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::MB::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::MB::K(scalar p, scalar T) const
+inline Foam::scalar Foam::MB::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::MB::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::MB::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/Make/files b/src/thermophysicalModels/properties/liquidProperties/Make/files
index 9b6347d83e..47f70772e8 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Make/files
+++ b/src/thermophysicalModels/properties/liquidProperties/Make/files
@@ -1,4 +1,6 @@
 liquidProperties/liquidProperties.C
+liquidMixtureProperties/liquidMixtureProperties.C
+
 H2O/H2O.C
 C7H16/C7H16.C
 C12H26/C12H26.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/Make/options b/src/thermophysicalModels/properties/liquidProperties/Make/options
index b964b61294..383322f7d4 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Make/options
+++ b/src/thermophysicalModels/properties/liquidProperties/Make/options
@@ -1,5 +1,7 @@
 EXE_INC = \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
 
 LIB_LIBS = \
+    -lspecie \
     -lthermophysicalFunctions
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
index e3f09d561b..3470173d97 100644
--- a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
+++ b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::N2::N2()
     ),
     mu_(32.165, 496.9, 3.9069, -1.08e-21, 10.0),
     mug_(7.632e-07, 0.58823, 67.75, 0.0),
-    K_(0.7259, -0.016728, 0.00016215, -5.7605e-07, 0.0, 0.0),
-    Kg_(0.000351, 0.7652, 25.767, 0.0),
+    kappa_(0.7259, -0.016728, 0.00016215, -5.7605e-07, 0.0, 0.0),
+    kappag_(0.000351, 0.7652, 25.767, 0.0),
     sigma_(126.10, 0.02898, 1.2457, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 28.014, 28.0) // note: Same as nHeptane
 {}
@@ -121,8 +121,8 @@ Foam::N2::N2
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::N2::N2(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::N2::N2(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::N2::N2(const N2& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H b/src/thermophysicalModels/properties/liquidProperties/N2/N2.H
index 82ac36b36f..77c155d58f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H
+++ b/src/thermophysicalModels/properties/liquidProperties/N2/N2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class N2
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2I.H b/src/thermophysicalModels/properties/liquidProperties/N2/N2I.H
index 49e8a3faad..bd3c4caf43 100644
--- a/src/thermophysicalModels/properties/liquidProperties/N2/N2I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/N2/N2I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::N2::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::N2::K(scalar p, scalar T) const
+inline Foam::scalar Foam::N2::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::N2::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::N2::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
index e8592ecffb..83e9e894f4 100644
--- a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
+++ b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,8 +78,8 @@ Foam::aC10H7CH3::aC10H7CH3()
     ),
     mu_(-93.6, 5784, 12, 0, 0),
     mug_(2.5672e-06, 0.3566, 825.54, 0),
-    K_(0.19758, -0.0001796, 0, 0, 0, 0),
-    Kg_(0.3911, -0.1051, -213.52, 2318300),
+    kappa_(0.19758, -0.0001796, 0, 0, 0, 0),
+    kappag_(0.3911, -0.1051, -213.52, 2318300),
     sigma_(772.04, 0.076, 1.33, 0, 0, 0),
     D_(147.18, 20.1, 142.2, 28) // note: Same as nHeptane
 {}
@@ -113,8 +113,8 @@ Foam::aC10H7CH3::aC10H7CH3
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -132,8 +132,8 @@ Foam::aC10H7CH3::aC10H7CH3(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -151,8 +151,8 @@ Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -170,8 +170,8 @@ Foam::aC10H7CH3::aC10H7CH3(const aC10H7CH3& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
index 171195d6a7..06a25fdca1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
+++ b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class aC10H7CH3
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H
index e652b54762..6d64a5e4bb 100644
--- a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::aC10H7CH3::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::aC10H7CH3::K(scalar p, scalar T) const
+inline Foam::scalar Foam::aC10H7CH3::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::aC10H7CH3::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::aC10H7CH3::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
index db118f4300..159b7c9de9 100644
--- a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
+++ b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,8 +78,8 @@ Foam::bC10H7CH3::bC10H7CH3()
     ),
     mu_(-63.276, 4219, 7.5549, 0.0, 0.0),
     mug_(2.1791e-06, 0.3717, 712.53, 0.0),
-    K_(0.1962, -0.00018414, 0.0, 0.0, 0.0, 0.0),
-    Kg_(0.4477, -0.1282, -345.89, 2340100),
+    kappa_(0.1962, -0.00018414, 0.0, 0.0, 0.0, 0.0),
+    kappag_(0.4477, -0.1282, -345.89, 2340100),
     sigma_(761.0, 0.066442, 1.2634, 0.0, 0.0, 0.0),
     D_(147.18, 20.1, 142.2, 28) // note: Same as nHeptane
 {}
@@ -113,8 +113,8 @@ Foam::bC10H7CH3::bC10H7CH3
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -132,8 +132,8 @@ Foam::bC10H7CH3::bC10H7CH3(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -151,8 +151,8 @@ Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -170,8 +170,8 @@ Foam::bC10H7CH3::bC10H7CH3(const bC10H7CH3& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
index 28dd844f84..7869b2db5d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
+++ b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -71,8 +71,8 @@ class bC10H7CH3
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc6 sigma_;
         APIdiffCoefFunc D_;
 
@@ -153,10 +153,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -183,8 +183,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H
index c982330727..1ff9ab1546 100644
--- a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H
+++ b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::bC10H7CH3::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::bC10H7CH3::K(scalar p, scalar T) const
+inline Foam::scalar Foam::bC10H7CH3::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::bC10H7CH3::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::bC10H7CH3::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
index 3e49256274..48d92becb1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::iC3H8O::iC3H8O()
     ),
     mu_(-8.23, 2282.2, -0.98495, 0.0, 0.0),
     mug_(1.993e-07, 0.7233, 178.0, 0.0),
-    K_(0.2029, -0.0002278, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-80.642, -1.4549, -604.42, 0.0),
+    kappa_(0.2029, -0.0002278, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-80.642, -1.4549, -604.42, 0.0),
     sigma_(0.03818, -3.818e-05, -6.51e-08, 0.0, 0.0, 0.0),
     D_(4.75e-10, 1.75, 0.0, 0.0, 0.0)
 {}
@@ -121,8 +121,8 @@ Foam::iC3H8O::iC3H8O
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::iC3H8O::iC3H8O(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::iC3H8O::iC3H8O(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::iC3H8O::iC3H8O(const iC3H8O& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
index ce7c439334..8ad465f512 100644
--- a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
@@ -70,8 +70,8 @@ class iC3H8O
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc0 sigma_;
         NSRDSfunc1 D_;
 
@@ -151,10 +151,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -182,8 +182,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H
index 9e488d871b..7f355196dd 100644
--- a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::iC3H8O::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::iC3H8O::K(scalar p, scalar T) const
+inline Foam::scalar Foam::iC3H8O::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::iC3H8O::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::iC3H8O::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
similarity index 97%
rename from src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
rename to src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
index 84c202b854..fd31415172 100644
--- a/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -438,7 +438,7 @@ Foam::scalar Foam::liquidMixtureProperties::mu
 }
 
 
-Foam::scalar Foam::liquidMixtureProperties::K
+Foam::scalar Foam::liquidMixtureProperties::kappa
 (
     const scalar p,
     const scalar T,
@@ -473,8 +473,8 @@ Foam::scalar Foam::liquidMixtureProperties::K
             scalar Kij =
                 2.0
                /(
-                    1.0/properties_[i].K(p, Ti)
-                  + 1.0/properties_[j].K(p, Tj)
+                    1.0/properties_[i].kappa(p, Ti)
+                  + 1.0/properties_[j].kappa(p, Tj)
                 );
             K += phii[i]*phii[j]*Kij;
         }
diff --git a/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H b/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
similarity index 98%
rename from src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H
rename to src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
index dd276a2547..09f37540a8 100644
--- a/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -226,7 +226,7 @@ public:
 
         //- Estimate thermal conductivity  [W/(m K)]
         //  Li's method, Eq. 10-12.27 - 10.12-19
-        scalar K
+        scalar kappa
         (
             const scalar p,
             const scalar T,
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
index 57f6e78955..7e0f43c7ef 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,50 +118,6 @@ Foam::liquidProperties::liquidProperties(const liquidProperties& liq)
 
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New(Istream& is)
-{
-    if (debug)
-    {
-        InfoInFunction << "Constructing liquidProperties" << endl;
-    }
-
-    const word liquidPropertiesType(is);
-    const word coeffs(is);
-
-    if (coeffs == "defaultCoeffs")
-    {
-        ConstructorTable::iterator cstrIter =
-            ConstructorTablePtr_->find(liquidPropertiesType);
-
-        if (cstrIter == ConstructorTablePtr_->end())
-        {
-            FatalErrorInFunction
-                << "Unknown liquidProperties type "
-                << liquidPropertiesType << nl << nl
-                << "Valid liquidProperties types are:" << nl
-                << ConstructorTablePtr_->sortedToc()
-                << abort(FatalError);
-        }
-
-        return autoPtr<liquidProperties>(cstrIter()());
-    }
-    else if (coeffs == "coeffs")
-    {
-        return autoPtr<liquidProperties>(new liquidProperties(is));
-    }
-    else
-    {
-        FatalErrorInFunction
-            << "liquidProperties type " << liquidPropertiesType
-            << ", option " << coeffs << " given"
-            << ", should be coeffs or defaultCoeffs"
-            << abort(FatalError);
-
-        return autoPtr<liquidProperties>(nullptr);
-    }
-}
-
-
 Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
 (
     const dictionary& dict
@@ -274,14 +230,14 @@ Foam::scalar Foam::liquidProperties::mug(scalar p, scalar T) const
 }
 
 
-Foam::scalar Foam::liquidProperties::K(scalar p, scalar T) const
+Foam::scalar Foam::liquidProperties::kappa(scalar p, scalar T) const
 {
     NotImplemented;
     return 0.0;
 }
 
 
-Foam::scalar Foam::liquidProperties::Kg(scalar p, scalar T) const
+Foam::scalar Foam::liquidProperties::kappag(scalar p, scalar T) const
 {
     NotImplemented;
     return 0.0;
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
index fa295c97c9..5cbfebf261 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ public:
     // Selectors
 
         //- Return a pointer to a new liquidProperties created from input
-        static autoPtr<liquidProperties> New(Istream& is);
+    // static autoPtr<liquidProperties> New(Istream& is);
 
         //- Return a pointer to a new liquidProperties created from dictionary
         static autoPtr<liquidProperties> New(const dictionary& dict);
@@ -179,6 +179,17 @@ public:
             //- Molecular weight [kg/kmol]
             inline scalar W() const;
 
+            //- No of moles of this species in mixture
+            //  Note Mixing of liquidProperties is not currently supported
+            //  so Y = 1
+            inline scalar Y() const;
+
+            //- Is the equation of state is incompressible i.e. rho != f(p)
+            static const bool incompressible = true;
+
+            //- Is the equation of state is isochoric i.e. rho = const
+            static const bool isochoric = false;
+
             //- Critical temperature [K]
             inline scalar Tc() const;
 
@@ -209,25 +220,55 @@ public:
             //- Solubility parameter [(J/m^3)^(1/2)]
             inline scalar delta() const;
 
+            //- Limit the temperature to be in the range Tlow_ to Thigh_
+            inline scalar limit(const scalar T) const;
 
-        // Physical property pure virtual functions
 
-            //- Liquid rho [kg/m^3]
+        // Fundamental equation of state properties
+
+            //- Liquid density [kg/m^3]
             virtual scalar rho(scalar p, scalar T) const;
 
+            //- Liquid compressibility rho/p [s^2/m^2]
+            //  Note: currently it is assumed the liquid is incompressible
+            inline scalar psi(scalar p, scalar T) const;
+
+            //- Return (Cp - Cv) [J/(kg K]
+            //  Note: currently it is assumed the liquid is incompressible
+            //  so CpMCv = 0
+            inline scalar CpMCv(scalar p, scalar T) const;
+
+
+        // Fundamental thermodynamic properties
+
+            //- Heat capacity at constant pressure [J/(kg K)]
+            virtual scalar Cp(const scalar p, const scalar T) const;
+
+            //- Absolute Enthalpy [J/kg]
+            inline scalar Ha(const scalar p, const scalar T) const;
+
+            //- Sensible enthalpy [J/kg]
+            inline scalar Hs(const scalar p, const scalar T) const;
+
+            //- Chemical enthalpy [J/kg]
+            inline scalar Hc() const;
+
+            // Entropy [J/(kg K)]
+            // inline scalar S(const scalar p, const scalar T) const;
+
+
+        // Physical properties
+
             //- Vapour pressure [Pa]
             virtual scalar pv(scalar p, scalar T) const;
 
             //- Heat of vapourisation [J/kg]
             virtual scalar hl(scalar p, scalar T) const;
 
-            //- Liquid heat capacity [J/(kg K)]
-            virtual scalar Cp(scalar p, scalar T) const;
-
             //- Liquid enthalpy [J/kg] - reference to 298.15 K
             virtual scalar h(scalar p, scalar T) const;
 
-            //- Ideal gas heat capacity [J/(kg K)]
+            //- Vapour heat capacity [J/(kg K)]
             virtual scalar Cpg(scalar p, scalar T) const;
 
             //- Liquid viscosity [Pa s]
@@ -237,10 +278,13 @@ public:
             virtual scalar mug(scalar p, scalar T) const;
 
             //- Liquid thermal conductivity  [W/(m K)]
-            virtual scalar K(scalar p, scalar T) const;
+            virtual scalar kappa(scalar p, scalar T) const;
+
+            //- Liquid thermal diffusivity of enthalpy [kg/ms]
+            inline scalar alphah(const scalar p, const scalar T) const;
 
             //- Vapour thermal conductivity  [W/(m K)]
-            virtual scalar Kg(scalar p, scalar T) const;
+            virtual scalar kappag(scalar p, scalar T) const;
 
             //- Surface tension [N/m]
             virtual scalar sigma(scalar p, scalar T) const;
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H
index 865035fe1a..61a0b8d5f9 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,12 +23,24 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+inline Foam::scalar Foam::liquidProperties::limit(const scalar T) const
+{
+    return T;
+}
+
+
 inline Foam::scalar Foam::liquidProperties::W() const
 {
     return W_;
 }
 
 
+inline Foam::scalar Foam::liquidProperties::Y() const
+{
+    return 1;
+}
+
+
 inline Foam::scalar Foam::liquidProperties::Tc() const
 {
     return Tc_;
@@ -89,4 +101,40 @@ inline Foam::scalar Foam::liquidProperties::delta() const
 }
 
 
+inline Foam::scalar Foam::liquidProperties::psi(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
+inline Foam::scalar Foam::liquidProperties::CpMCv(scalar p, scalar T) const
+{
+    return 0;
+}
+
+
+inline Foam::scalar Foam::liquidProperties::Ha(scalar p, scalar T) const
+{
+    return h(p, T);
+}
+
+
+inline Foam::scalar Foam::liquidProperties::Hs(scalar p, scalar T) const
+{
+    return h(p, T);
+}
+
+
+inline Foam::scalar Foam::liquidProperties::Hc() const
+{
+    return 0;
+}
+
+
+inline Foam::scalar Foam::liquidProperties::alphah(scalar p, scalar T) const
+{
+    return kappa(p, T)/Cp(p, T);
+}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
index cbbe7714ae..2369adffd0 100644
--- a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,8 +86,8 @@ Foam::nC3H8O::nC3H8O()
     ),
     mu_(0.571, 1521, -2.0894, 0.0, 0.0),
     mug_(7.942e-07, 0.5491, 415.8, 0.0),
-    K_(0.204, -0.000169, 0.0, 0.0, 0.0, 0.0),
-    Kg_(-613.84, 0.7927, -1157400000.0, 0.0),
+    kappa_(0.204, -0.000169, 0.0, 0.0, 0.0, 0.0),
+    kappag_(-613.84, 0.7927, -1157400000.0, 0.0),
     sigma_(0.04533, -6.88e-05, -1.6e-08, 0.0, 0.0, 0.0),
     D_(4.75e-10, 1.75, 0.0, 0.0, 0.0) // note: same as iC3H8O
 {}
@@ -121,8 +121,8 @@ Foam::nC3H8O::nC3H8O
     B_(secondVirialCoeff),
     mu_(dynamicViscosity),
     mug_(vapourDynamicViscosity),
-    K_(thermalConductivity),
-    Kg_(vapourThermalConductivity),
+    kappa_(thermalConductivity),
+    kappag_(vapourThermalConductivity),
     sigma_(surfaceTension),
     D_(vapourDiffussivity)
 {}
@@ -140,8 +140,8 @@ Foam::nC3H8O::nC3H8O(Istream& is)
     B_(is),
     mu_(is),
     mug_(is),
-    K_(is),
-    Kg_(is),
+    kappa_(is),
+    kappag_(is),
     sigma_(is),
     D_(is)
 {}
@@ -159,8 +159,8 @@ Foam::nC3H8O::nC3H8O(const dictionary& dict)
     B_(dict.subDict("B")),
     mu_(dict.subDict("mu")),
     mug_(dict.subDict("mug")),
-    K_(dict.subDict("K")),
-    Kg_(dict.subDict("Kg")),
+    kappa_(dict.subDict("K")),
+    kappag_(dict.subDict("kappag")),
     sigma_(dict.subDict("sigma")),
     D_(dict.subDict("D"))
 {}
@@ -178,8 +178,8 @@ Foam::nC3H8O::nC3H8O(const nC3H8O& liq)
     B_(liq.B_),
     mu_(liq.mu_),
     mug_(liq.mug_),
-    K_(liq.K_),
-    Kg_(liq.Kg_),
+    kappa_(liq.kappa_),
+    kappag_(liq.kappag_),
     sigma_(liq.sigma_),
     D_(liq.D_)
 {}
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
index 3f2fcfa992..a55a0e53ff 100644
--- a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
@@ -70,8 +70,8 @@ class nC3H8O
         NSRDSfunc4 B_;
         NSRDSfunc1 mu_;
         NSRDSfunc2 mug_;
-        NSRDSfunc0 K_;
-        NSRDSfunc2 Kg_;
+        NSRDSfunc0 kappa_;
+        NSRDSfunc2 kappag_;
         NSRDSfunc0 sigma_;
         NSRDSfunc1 D_;
 
@@ -151,10 +151,10 @@ public:
         inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity [W/(m K)]
-        inline scalar K(scalar p, scalar T) const;
+        inline scalar kappa(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity [W/(m K)]
-        inline scalar Kg(scalar p, scalar T) const;
+        inline scalar kappag(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
         inline scalar sigma(scalar p, scalar T) const;
@@ -182,8 +182,8 @@ public:
             B_.writeData(os); os << nl;
             mu_.writeData(os); os << nl;
             mug_.writeData(os); os << nl;
-            K_.writeData(os); os << nl;
-            Kg_.writeData(os); os << nl;
+            kappa_.writeData(os); os << nl;
+            kappag_.writeData(os); os << nl;
             sigma_.writeData(os); os << nl;
             D_.writeData(os); os << endl;
         }
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H
index 32f1379fd4..89cd732c55 100644
--- a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H
+++ b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H
@@ -77,15 +77,15 @@ inline Foam::scalar Foam::nC3H8O::mug(scalar p, scalar T) const
 }
 
 
-inline Foam::scalar Foam::nC3H8O::K(scalar p, scalar T) const
+inline Foam::scalar Foam::nC3H8O::kappa(scalar p, scalar T) const
 {
-    return K_.f(p, T);
+    return kappa_.f(p, T);
 }
 
 
-inline Foam::scalar Foam::nC3H8O::Kg(scalar p, scalar T) const
+inline Foam::scalar Foam::nC3H8O::kappag(scalar p, scalar T) const
 {
-    return Kg_.f(p, T);
+    return kappag_.f(p, T);
 }
 
 
diff --git a/src/thermophysicalModels/properties/solidMixtureProperties/Make/files b/src/thermophysicalModels/properties/solidMixtureProperties/Make/files
deleted file mode 100644
index e31412ed1d..0000000000
--- a/src/thermophysicalModels/properties/solidMixtureProperties/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-solidMixtureProperties/solidMixtureProperties.C
-
-LIB = $(FOAM_LIBBIN)/libsolidMixtureProperties
diff --git a/src/thermophysicalModels/properties/solidMixtureProperties/Make/options b/src/thermophysicalModels/properties/solidMixtureProperties/Make/options
deleted file mode 100644
index f2d8f809d5..0000000000
--- a/src/thermophysicalModels/properties/solidMixtureProperties/Make/options
+++ /dev/null
@@ -1,3 +0,0 @@
-EXE_INC = \
-    -I${LIB_SRC}/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
diff --git a/src/thermophysicalModels/properties/solidProperties/Make/files b/src/thermophysicalModels/properties/solidProperties/Make/files
index 694c379453..fdd25a7a6b 100644
--- a/src/thermophysicalModels/properties/solidProperties/Make/files
+++ b/src/thermophysicalModels/properties/solidProperties/Make/files
@@ -1,5 +1,6 @@
 solidProperties/solidProperties.C
 solidProperties/solidPropertiesNew.C
+solidMixtureProperties/solidMixtureProperties.C
 
 ash/ash.C
 C/C.C
diff --git a/src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C b/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
similarity index 97%
rename from src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C
rename to src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
index ee37311f57..ea6c0efbc7 100644
--- a/src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H b/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
similarity index 98%
rename from src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H
rename to src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
index ed0aad5bfa..2d34f771b8 100644
--- a/src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H
+++ b/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
index 7d889fe707..9151ff5da7 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Foam::solidProperties::solidProperties
 :
     rho_(rho),
     Cp_(Cp),
-    K_(K),
+    kappa_(K),
     Hf_(Hf),
     emissivity_(emissivity)
 {}
@@ -58,7 +58,7 @@ Foam::solidProperties::solidProperties(Istream& is)
 :
     rho_(readScalar(is)),
     Cp_(readScalar(is)),
-    K_(readScalar(is)),
+    kappa_(readScalar(is)),
     Hf_(readScalar(is)),
     emissivity_(readScalar(is))
 {}
@@ -68,7 +68,7 @@ Foam::solidProperties::solidProperties(const dictionary& dict)
 :
     rho_(readScalar(dict.lookup("rho"))),
     Cp_(readScalar(dict.lookup("Cp"))),
-    K_(readScalar(dict.lookup("K"))),
+    kappa_(readScalar(dict.lookup("K"))),
     Hf_(readScalar(dict.lookup("Hf"))),
     emissivity_(readScalar(dict.lookup("emissivity")))
 {}
@@ -78,7 +78,7 @@ Foam::solidProperties::solidProperties(const solidProperties& s)
 :
     rho_(s.rho_),
     Cp_(s.Cp_),
-    K_(s.K_),
+    kappa_(s.kappa_),
     Hf_(s.Hf_),
     emissivity_(s.emissivity_)
 {}
@@ -90,7 +90,7 @@ void Foam::solidProperties::writeData(Ostream& os) const
 {
     os  << rho_ << token::SPACE
         << Cp_ << token::SPACE
-        << K_ << token::SPACE
+        << kappa_ << token::SPACE
         << Hf_ << token::SPACE
         << emissivity_;
 }
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
index 6ae416d8c8..c0acae07ed 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ class solidProperties
         scalar Cp_;
 
         //- Thermal conductivity [W/(m.K)]
-        scalar K_;
+        scalar kappa_;
 
         //- Heat of formation [J/kg]
         scalar Hf_;
@@ -168,7 +168,7 @@ public:
             inline scalar Cp() const;
 
             //- Thermal conductivity [W/(m.K)]
-            inline scalar K() const;
+            inline scalar kappa() const;
 
             //- Heat of formation [J/kg]
             inline scalar Hf() const;
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
index 3910a4f37f..e1f3d0f190 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,9 +39,9 @@ inline Foam::scalar Foam::solidProperties::Cp() const
 }
 
 
-inline Foam::scalar Foam::solidProperties::K() const
+inline Foam::scalar Foam::solidProperties::kappa() const
 {
-    return K_;
+    return kappa_;
 }
 
 
diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiation/Make/options
index 726b76e764..3cc7218bdd 100644
--- a/src/thermophysicalModels/radiation/Make/options
+++ b/src/thermophysicalModels/radiation/Make/options
@@ -5,9 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
@@ -18,8 +16,6 @@ LIB_LIBS = \
     -lspecie \
     -lsolidThermo \
     -lSLGThermo \
-    -lsolidMixtureProperties \
-    -lliquidMixtureProperties \
     -lsolidProperties \
     -lliquidProperties \
     -lfiniteVolume \
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index bf5e9ac83c..5bbf9f0e40 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,7 +121,7 @@ startIsotopeMolW      {space}"/"{space}
 isotopeMolW           {space}{floatNum}{space}"/"{space}
 
 specieName            {space}[A-Za-z](([A-Za-z0-9)*+-])|("("[^+]))*{space}
-nMoles                {space}{floatNum}{space}
+Y                {space}{floatNum}{space}
 
 thermoTemp            .{10}
 
@@ -640,7 +640,8 @@ bool finishReaction = false;
                     currentHighT,
                     currentCommonT,
                     highCpCoeffs,
-                    lowCpCoeffs
+                    lowCpCoeffs,
+                    true
                 ),
                 transportDict_.subDict(currentSpecieName)
             )
@@ -687,7 +688,7 @@ bool finishReaction = false;
         BEGIN(readReactionKeyword);
     }
 
-<readReactionKeyword>{nMoles} {
+<readReactionKeyword>{Y} {
         currentSpecieCoeff.stoichCoeff = atof(YYText());
         currentSpecieCoeff.exponent = currentSpecieCoeff.stoichCoeff;
     }
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C
index f69cbeca54..4cb6b0eb29 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,16 +48,6 @@ Foam::SpecieMixture<MixtureType>::SpecieMixture
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class MixtureType>
-Foam::scalar Foam::SpecieMixture<MixtureType>::nMoles
-(
-    const label speciei
-) const
-{
-    return this->getLocalThermo(speciei).nMoles();
-}
-
-
 template<class MixtureType>
 Foam::scalar Foam::SpecieMixture<MixtureType>::W
 (
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
index 24f95915ab..759f8b6920 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/SpecieMixture/SpecieMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,9 +75,6 @@ public:
 
         // Per specie properties
 
-            //- Number of moles of the given specie []
-            virtual scalar nMoles(const label speciei) const;
-
             //- Molecular weight of the given specie [kg/kmol]
             virtual scalar W(const label speciei) const;
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.H
index e814154a9c..e23639498e 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicSpecieMixture/basicSpecieMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,9 +82,6 @@ public:
 
         // Per specie properties
 
-            //- Number of moles of the given specie []
-            virtual scalar nMoles(const label speciei) const = 0;
-
             //- Molecular weight of the given specie [kg/kmol]
             virtual scalar W(const label speciei) const = 0;
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
index 7c52bea5d0..d5e368ca9f 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,9 +89,9 @@ const ThermoType& Foam::egrMixture<ThermoType>::mixture
 
         scalar pr = 1 - fu - ox;
 
-        mixture_ = fu/fuel_.W()*fuel_;
-        mixture_ += ox/oxidant_.W()*oxidant_;
-        mixture_ += pr/products_.W()*products_;
+        mixture_ = fu*fuel_;
+        mixture_ += ox*oxidant_;
+        mixture_ += pr*products_;
 
         return mixture_;
     }
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
index 7bf2f11abd..4ae9bc10bd 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,8 +75,8 @@ const ThermoType& Foam::homogeneousMixture<ThermoType>::mixture
     }
     else
     {
-        mixture_ = b/reactants_.W()*reactants_;
-        mixture_ += (1 - b)/products_.W()*products_;
+        mixture_ = b*reactants_;
+        mixture_ += (1 - b)*products_;
 
         return mixture_;
     }
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
index 15220cab18..ef7d739f51 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,9 +86,9 @@ const ThermoType& Foam::inhomogeneousMixture<ThermoType>::mixture
         scalar ox = 1 - ft - (ft - fu)*stoicRatio().value();
         scalar pr = 1 - fu - ox;
 
-        mixture_ = fu/fuel_.W()*fuel_;
-        mixture_ += ox/oxidant_.W()*oxidant_;
-        mixture_ += pr/products_.W()*products_;
+        mixture_ = fu*fuel_;
+        mixture_ += ox*oxidant_;
+        mixture_ += pr*products_;
 
         return mixture_;
     }
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index ba651a2b51..bb6d4e0414 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,11 +132,11 @@ const ThermoType& Foam::multiComponentMixture<ThermoType>::cellMixture
     const label celli
 ) const
 {
-    mixture_ = Y_[0][celli]/speciesData_[0].W()*speciesData_[0];
+    mixture_ = Y_[0][celli]*speciesData_[0];
 
     for (label n=1; n<Y_.size(); n++)
     {
-        mixture_ += Y_[n][celli]/speciesData_[n].W()*speciesData_[n];
+        mixture_ += Y_[n][celli]*speciesData_[n];
     }
 
     return mixture_;
@@ -150,15 +150,11 @@ const ThermoType& Foam::multiComponentMixture<ThermoType>::patchFaceMixture
     const label facei
 ) const
 {
-    mixture_ =
-        Y_[0].boundaryField()[patchi][facei]
-       /speciesData_[0].W()*speciesData_[0];
+    mixture_ = Y_[0].boundaryField()[patchi][facei]*speciesData_[0];
 
     for (label n=1; n<Y_.size(); n++)
     {
-        mixture_ +=
-            Y_[n].boundaryField()[patchi][facei]
-           /speciesData_[n].W()*speciesData_[n];
+        mixture_ += Y_[n].boundaryField()[patchi][facei]*speciesData_[n];
     }
 
     return mixture_;
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
index 663b79ce68..28d71d5f86 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,9 +87,9 @@ const ThermoType& Foam::veryInhomogeneousMixture<ThermoType>::mixture
         scalar ox = 1 - ft - (ft - fu)*stoicRatio().value();
         scalar pr = 1 - fu - ox;
 
-        mixture_ = fu/fuel_.W()*fuel_;
-        mixture_ += ox/oxidant_.W()*oxidant_;
-        mixture_ += pr/products_.W()*products_;
+        mixture_ = fu*fuel_;
+        mixture_ += ox*oxidant_;
+        mixture_ += pr*products_;
 
         return mixture_;
     }
diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C
index 49c462d383..4e9173530d 100644
--- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/psiuReactionThermos.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,6 +107,19 @@ makeReactionThermo
 );
 
 
+makeReactionThermo
+(
+    psiThermo,
+    psiuReactionThermo,
+    heheuPsiThermo,
+    homogeneousMixture,
+    constTransport,
+    absoluteEnthalpy,
+    janafThermo,
+    perfectGas,
+    specie
+);
+
 makeReactionThermo
 (
     psiThermo,
diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C
index 27bc73d75f..a7431ca200 100644
--- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C
+++ b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -261,7 +261,7 @@ makeReactionMixtureThermo
 );
 
 
-    // Multi-component reaction thermo
+// Multi-component reaction thermo
 
 makeReactionMixtureThermo
 (
@@ -318,8 +318,6 @@ makeReactionMixtureThermo
 );
 
 
-
-
 // Multi-component thermo for sensible enthalpy
 
 makeReactionMixtureThermo
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H
index d7b388ccd6..3b75b4ebe6 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,9 +135,9 @@ public:
 
         inline void operator=(const constAnIsoSolidTransport&);
         inline void operator+=(const constAnIsoSolidTransport&);
-        inline void operator-=(const constAnIsoSolidTransport&);
 
-         // Friend operators
+
+    // Friend operators
 
         friend constAnIsoSolidTransport operator* <Thermo>
         (
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
index fabc997a8d..60e06fbb4e 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,27 +113,12 @@ inline void Foam::constAnIsoSolidTransport<Thermo>::operator+=
     const constAnIsoSolidTransport<Thermo>& ct
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
+    Y1 /= this->Y();
+    scalar Y2 = ct.Y()/this->Y();
 
-    kappa_ = molr1*kappa_ + molr2*ct.kappa_;
-}
-
-
-template<class Thermo>
-inline void Foam::constAnIsoSolidTransport<Thermo>::operator-=
-(
-    const constAnIsoSolidTransport<Thermo>& ct
-)
-{
-    scalar molr1 = this->nMoles();
-
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
-
-    kappa_ = molr1*kappa_ - molr2*ct.kappa_;
+    kappa_ = Y1*kappa_ + Y2*ct.kappa_;
 }
 
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
index 4439a279fa..f290b4288d 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -136,7 +136,6 @@ public:
 
         inline void operator=(const constIsoSolidTransport&);
         inline void operator+=(const constIsoSolidTransport&);
-        inline void operator-=(const constIsoSolidTransport&);
 
 
     // Friend operators
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
index 7ee8ee618e..45b5f4d296 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -114,32 +114,16 @@ inline void Foam::constIsoSolidTransport<thermo>::operator+=
     const constIsoSolidTransport<thermo>& ct
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
     thermo::operator+=(ct);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
+    Y1 /= this->Y();
+    scalar Y2 = ct.Y()/this->Y();
 
-    kappa_ = molr1*kappa_ + molr2*ct.kappa_;
+    kappa_ = Y1*kappa_ + Y2*ct.kappa_;
 }
 
 
-template<class thermo>
-inline void Foam::constIsoSolidTransport<thermo>::operator-=
-(
-    const constIsoSolidTransport<thermo>& ct
-)
-{
-    scalar molr1 = this->nMoles();
-
-    thermo::operator-=(ct);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
-
-    kappa_ = molr1*kappa_ - molr2*ct.kappa_;
-}
-
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H
index f8c8267644..1d69fdefad 100644
--- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -144,7 +144,6 @@ public:
 
         inline void operator=(const exponentialSolidTransport&);
         inline void operator+=(const exponentialSolidTransport&);
-        inline void operator-=(const exponentialSolidTransport&);
 
 
     // Friend operators
diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
index 909106e5db..ec80965b8a 100644
--- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -128,31 +128,14 @@ inline void Foam::exponentialSolidTransport<Thermo>::operator+=
     const exponentialSolidTransport<Thermo>& ct
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
+    Y1 /= this->Y();
+    scalar Y2 = ct.Y()/this->Y();
 
-    kappa0_ = molr1*kappa0_ + molr2*ct.kappa0_;
-    n0_ = (molr1*n0_ + molr2*ct.n0_);
-    Tref_ = (molr1*Tref_ + molr2*ct.Tref_);
-}
-
-
-template<class Thermo>
-inline void Foam::exponentialSolidTransport<Thermo>::operator-=
-(
-    const exponentialSolidTransport<Thermo>& ct
-)
-{
-    scalar molr1 = this->nMoles();
-
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
-
-    kappa0_ = (molr1*kappa0_ - molr2*ct.kappa0_);
-    n0_ = (molr1*n0_ - molr2*ct.n0_);
-    Tref_ = (molr1*Tref_ - molr2*ct.Tref_);
+    kappa0_ = Y1*kappa0_ + Y2*ct.kappa0_;
+    n0_ = (Y1*n0_ + Y2*ct.n0_);
+    Tref_ = (Y1*Tref_ + Y2*ct.Tref_);
 }
 
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
index d55a3c6733..716284cb1b 100644
--- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,13 +82,6 @@ inline polynomialSolidTransport<Thermo, PolySize> operator+
     const polynomialSolidTransport<Thermo, PolySize>&
 );
 
-template<class Thermo, int PolySize>
-inline polynomialSolidTransport<Thermo, PolySize> operator-
-(
-    const polynomialSolidTransport<Thermo, PolySize>&,
-    const polynomialSolidTransport<Thermo, PolySize>&
-);
-
 template<class Thermo, int PolySize>
 inline polynomialSolidTransport<Thermo, PolySize> operator*
 (
@@ -96,13 +89,6 @@ inline polynomialSolidTransport<Thermo, PolySize> operator*
     const polynomialSolidTransport<Thermo, PolySize>&
 );
 
-template<class Thermo, int PolySize>
-inline polynomialSolidTransport<Thermo, PolySize> operator==
-(
-    const polynomialSolidTransport<Thermo, PolySize>&,
-    const polynomialSolidTransport<Thermo, PolySize>&
-);
-
 template<class Thermo, int PolySize>
 Ostream& operator<<
 (
@@ -202,7 +188,6 @@ public:
 
         inline void operator=(const polynomialSolidTransport&);
         inline void operator+=(const polynomialSolidTransport&);
-        inline void operator-=(const polynomialSolidTransport&);
         inline void operator*=(const scalar);
 
 
@@ -214,24 +199,12 @@ public:
             const polynomialSolidTransport&
         );
 
-        friend polynomialSolidTransport operator- <Thermo, PolySize>
-        (
-            const polynomialSolidTransport&,
-            const polynomialSolidTransport&
-        );
-
         friend polynomialSolidTransport operator* <Thermo, PolySize>
         (
             const scalar,
             const polynomialSolidTransport&
         );
 
-        friend polynomialSolidTransport operator== <Thermo, PolySize>
-        (
-            const polynomialSolidTransport&,
-            const polynomialSolidTransport&
-        );
-
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
index 45d4e95f49..1a923d490f 100644
--- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -165,31 +165,14 @@ inline void Foam::polynomialSolidTransport<Thermo, PolySize>::operator+=
     const polynomialSolidTransport<Thermo, PolySize>& pt
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
     Thermo::operator+=(pt);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = pt.nMoles()/this->nMoles();
+    Y1 /= this->Y();
+    scalar Y2 = pt.Y()/this->Y();
 
-    kappaCoeffs_ = molr1*kappaCoeffs_ + molr2*pt.kappaCoeffs_;
-}
-
-
-template<class Thermo, int PolySize>
-inline void Foam::polynomialSolidTransport<Thermo, PolySize>::operator-=
-(
-    const polynomialSolidTransport<Thermo, PolySize>& pt
-)
-{
-    scalar molr1 = this->nMoles();
-
-    Thermo::operator-=(pt);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = pt.nMoles()/this->nMoles();
-
-    kappaCoeffs_ = molr1*kappaCoeffs_ - molr2*pt.kappaCoeffs_;
+    kappaCoeffs_ = Y1*kappaCoeffs_ + Y2*pt.kappaCoeffs_;
 }
 
 
@@ -217,36 +200,13 @@ inline Foam::polynomialSolidTransport<Thermo, PolySize> Foam::operator+
         static_cast<const Thermo&>(pt1) + static_cast<const Thermo&>(pt2)
     );
 
-    scalar molr1 = pt1.nMoles()/t.nMoles();
-    scalar molr2 = pt2.nMoles()/t.nMoles();
+    scalar Y1 = pt1.Y()/t.Y();
+    scalar Y2 = pt2.Y()/t.Y();
 
     return polynomialSolidTransport<Thermo, PolySize>
     (
         t,
-        molr1*pt1.kappaCoeffs_ + molr2*pt2.kappaCoeffs_
-    );
-}
-
-
-template<class Thermo, int PolySize>
-inline Foam::polynomialSolidTransport<Thermo, PolySize> Foam::operator-
-(
-    const polynomialSolidTransport<Thermo, PolySize>& pt1,
-    const polynomialSolidTransport<Thermo, PolySize>& pt2
-)
-{
-    Thermo t
-    (
-        static_cast<const Thermo&>(pt1) - static_cast<const Thermo&>(pt2)
-    );
-
-    scalar molr1 = pt1.nMoles()/t.nMoles();
-    scalar molr2 = pt2.nMoles()/t.nMoles();
-
-    return polynomialSolidTransport<Thermo, PolySize>
-    (
-        t,
-        molr1*pt1.kappaCoeffs_ - molr2*pt2.kappaCoeffs_
+        Y1*pt1.kappaCoeffs_ + Y2*pt2.kappaCoeffs_
     );
 }
 
@@ -266,15 +226,4 @@ inline Foam::polynomialSolidTransport<Thermo, PolySize> Foam::operator*
 }
 
 
-template<class Thermo, int PolySize>
-inline Foam::polynomialSolidTransport<Thermo, PolySize> Foam::operator==
-(
-    const polynomialSolidTransport<Thermo, PolySize>& pt1,
-    const polynomialSolidTransport<Thermo, PolySize>& pt2
-)
-{
-    return pt2 - pt1;
-}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
index b37ec2f9d0..12286d13f6 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
index a388cbddc0..720483c07e 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,13 +59,6 @@ inline Boussinesq<Specie> operator+
     const Boussinesq<Specie>&
 );
 
-template<class Specie>
-inline Boussinesq<Specie> operator-
-(
-    const Boussinesq<Specie>&,
-    const Boussinesq<Specie>&
-);
-
 template<class Specie>
 inline Boussinesq<Specie> operator*
 (
@@ -173,14 +166,14 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
-            //- Return enthalpy departure [J/kmol]
-            inline scalar h(const scalar p, const scalar T) const;
+            //- Return enthalpy departure [J/kg]
+            inline scalar H(const scalar p, const scalar T) const;
 
-            //- Return cp departure [J/(kmol K]
-            inline scalar cp(scalar p, scalar T) const;
+            //- Return Cp departure [J/(kg K]
+            inline scalar Cp(scalar p, scalar T) const;
 
-            //- Return entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Return entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
             //- Return compressibility rho/p [s^2/m^2]
             inline scalar psi(scalar p, scalar T) const;
@@ -188,8 +181,8 @@ public:
             //- Return compression factor []
             inline scalar Z(scalar p, scalar T) const;
 
-            //- Return (cp - cv) [J/(kmol K]
-            inline scalar cpMcv(scalar p, scalar T) const;
+            //- Return (Cp - Cv) [J/(kg K]
+            inline scalar CpMCv(scalar p, scalar T) const;
 
 
         // IO
@@ -202,8 +195,6 @@ public:
 
         inline void operator=(const Boussinesq&);
         inline void operator+=(const Boussinesq&);
-        inline void operator-=(const Boussinesq&);
-
         inline void operator*=(const scalar);
 
 
@@ -215,12 +206,6 @@ public:
             const Boussinesq&
         );
 
-        friend Boussinesq operator- <Specie>
-        (
-            const Boussinesq&,
-            const Boussinesq&
-        );
-
         friend Boussinesq operator* <Specie>
         (
             const scalar s,
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
index 2d68984738..45b9d58cfe 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -121,21 +121,21 @@ inline Foam::scalar Foam::Boussinesq<Specie>::rho
 
 
 template<class Specie>
-inline Foam::scalar Foam::Boussinesq<Specie>::h(scalar p, scalar T) const
+inline Foam::scalar Foam::Boussinesq<Specie>::H(scalar p, scalar T) const
 {
     return 0;
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::Boussinesq<Specie>::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::Boussinesq<Specie>::Cp(scalar p, scalar T) const
 {
     return 0;
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::Boussinesq<Specie>::s
+inline Foam::scalar Foam::Boussinesq<Specie>::S
 (
     scalar p,
     scalar T
@@ -168,13 +168,13 @@ inline Foam::scalar Foam::Boussinesq<Specie>::Z
 
 
 template<class Specie>
-inline Foam::scalar Foam::Boussinesq<Specie>::cpMcv
+inline Foam::scalar Foam::Boussinesq<Specie>::CpMCv
 (
     scalar p,
     scalar T
 ) const
 {
-    return RR;
+    return this->R();
 }
 
 
@@ -200,27 +200,18 @@ inline void Foam::Boussinesq<Specie>::operator+=
     const Boussinesq<Specie>& b
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
     Specie::operator+=(b);
-    molr1 /= this->nMoles();
-    scalar molr2 = b.nMoles()/this->nMoles();
 
-    rho0_ = molr1*rho0_ + molr2*b.rho0_;
-    T0_ = molr1*T0_ + molr2*b.T0_;
-    beta_ = molr1*beta_ + molr2*b.beta_;
-}
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = b.Y()/this->Y();
 
-
-template<class Specie>
-inline void Foam::Boussinesq<Specie>::operator-=
-(
-    const Boussinesq<Specie>& b
-)
-{
-    Specie::operator-=(b);
-    rho0_ = b.rho0_;
-    T0_ = b.T0_;
-    beta_ = b.beta_;
+        rho0_ = Y1*rho0_ + Y2*b.rho0_;
+        T0_ = Y1*T0_ + Y2*b.T0_;
+        beta_ = Y1*beta_ + Y2*b.beta_;
+    }
 }
 
 
@@ -240,36 +231,31 @@ inline Foam::Boussinesq<Specie> Foam::operator+
     const Boussinesq<Specie>& b2
 )
 {
-    scalar nMoles = b1.nMoles() + b2.nMoles();
-    scalar molr1 = b1.nMoles()/nMoles;
-    scalar molr2 = b2.nMoles()/nMoles;
+    Specie sp(static_cast<const Specie&>(b1) + static_cast<const Specie&>(b2));
 
-    return Boussinesq<Specie>
-    (
-        static_cast<const Specie&>(b1)
-      + static_cast<const Specie&>(b2),
-        molr1*b1.rho0_ + molr2*b2.rho0_,
-        molr1*b1.T0_ + molr2*b2.T0_,
-        molr1*b1.beta_ + molr2*b2.beta_
-    );
-}
+    if (mag(sp.Y()) < SMALL)
+    {
+        return Boussinesq<Specie>
+        (
+            sp,
+            b1.rho0_,
+            b1.T0_,
+            b1.beta_
+        );
+    }
+    else
+    {
+        const scalar Y1 = b1.Y()/sp.Y();
+        const scalar Y2 = b2.Y()/sp.Y();
 
-
-template<class Specie>
-inline Foam::Boussinesq<Specie> Foam::operator-
-(
-    const Boussinesq<Specie>& b1,
-    const Boussinesq<Specie>& b2
-)
-{
-    return Boussinesq<Specie>
-    (
-        static_cast<const Specie&>(b1)
-      - static_cast<const Specie&>(b2),
-        b1.rho0_ - b2.rho0_,
-        b1.T0_ - b2.T0_,
-        b1.beta_ - b2.beta_
-    );
+        return Boussinesq<Specie>
+        (
+            sp,
+            Y1*b1.rho0_ + Y2*b2.rho0_,
+            Y1*b1.T0_ + Y2*b2.T0_,
+            Y1*b1.beta_ + Y2*b2.beta_
+        );
+    }
 }
 
 
@@ -293,11 +279,22 @@ inline Foam::Boussinesq<Specie> Foam::operator*
 template<class Specie>
 inline Foam::Boussinesq<Specie> Foam::operator==
 (
-    const Boussinesq<Specie>& pg1,
-    const Boussinesq<Specie>& pg2
+    const Boussinesq<Specie>& b1,
+    const Boussinesq<Specie>& b2
 )
 {
-    return pg2 - pg1;
+    Specie sp(static_cast<const Specie&>(b1) == static_cast<const Specie&>(b2));
+
+    const scalar Y1 = b1.Y()/sp.Y();
+    const scalar Y2 = b2.Y()/sp.Y();
+
+    return Boussinesq<Specie>
+    (
+        sp,
+        Y2*b2.rho0_ - Y1*b1.rho0_,
+        Y2*b2.T0_   - Y1*b1.T0_,
+        Y2*b2.beta_ - Y1*b1.beta_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
index a36766ade8..eeaa0a2cea 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
index 49e1445c45..3f0498bb5e 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,13 +54,6 @@ inline PengRobinsonGas<Specie> operator+
     const PengRobinsonGas<Specie>&
 );
 
-template<class Specie>
-inline PengRobinsonGas<Specie> operator-
-(
-    const PengRobinsonGas<Specie>&,
-    const PengRobinsonGas<Specie>&
-);
-
 template<class Specie>
 inline PengRobinsonGas<Specie> operator*
 (
@@ -168,23 +161,23 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
-            //- Return enthalpy departure [J/kmol]
-            inline scalar h(const scalar p, const scalar T) const;
+            //- Return enthalpy departure [J/kg]
+            inline scalar H(const scalar p, const scalar T) const;
 
-            //- Return cp departure [J/(kmol K]
-            inline scalar cp(scalar p, scalar T) const;
+            //- Return Cp departure [J/(kg K]
+            inline scalar Cp(scalar p, scalar T) const;
 
-            //- Return entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Return entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
             //- Return compressibility rho/p [s^2/m^2]
             inline scalar psi(scalar p, scalar T) const;
 
-            //- Return compression factor [-]
+            //- Return compression factor []
             inline scalar Z(scalar p, scalar T) const;
 
-            //- Return (cp - cv) [J/(kmol K]
-            inline scalar cpMcv(scalar p, scalar T) const;
+            //- Return (Cp - Cv) [J/(kg K]
+            inline scalar CpMCv(scalar p, scalar T) const;
 
 
     // IO
@@ -195,8 +188,6 @@ public:
     // Member operators
 
         inline void operator+=(const PengRobinsonGas&);
-        inline void operator-=(const PengRobinsonGas&);
-
         inline void operator*=(const scalar);
 
 
@@ -208,12 +199,6 @@ public:
             const PengRobinsonGas&
         );
 
-        friend PengRobinsonGas operator- <Specie>
-        (
-            const PengRobinsonGas&,
-            const PengRobinsonGas&
-        );
-
         friend PengRobinsonGas operator* <Specie>
         (
             const scalar s,
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
index dc2ed305b4..d4553eb380 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,24 +111,25 @@ inline Foam::scalar Foam::PengRobinsonGas<Specie>::rho
     scalar T
 ) const
 {
-    scalar Z = this->Z(p, T);
+    const scalar Z = this->Z(p, T);
     return p/(Z*this->R()*T);
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::PengRobinsonGas<Specie>::h(scalar p, scalar T) const
+inline Foam::scalar Foam::PengRobinsonGas<Specie>::H(scalar p, scalar T) const
 {
-    scalar Pr = p/Pc_;
-    scalar Tr = T/Tc_;
-    scalar B = 0.07780*Pr/Tr;
-    scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
-    scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
+    const scalar Pr = p/Pc_;
+    const scalar Tr = T/Tc_;
+    const scalar B = 0.07780*Pr/Tr;
+    const scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
+    const scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
 
-    scalar Z = this->Z(p, T);
+    const scalar Z = this->Z(p, T);
 
     return
-        RR*Tc_
+        this->R()
+       *Tc_
        *(
            Tr*(Z - 1)
          - 2.078*(1 + kappa)*sqrt(alpha)
@@ -138,55 +139,59 @@ inline Foam::scalar Foam::PengRobinsonGas<Specie>::h(scalar p, scalar T) const
 
 
 template<class Specie>
-inline Foam::scalar Foam::PengRobinsonGas<Specie>::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::PengRobinsonGas<Specie>::Cp(scalar p, scalar T) const
 {
-    scalar Tr = T/Tc_;
-    scalar a = 0.45724*sqr(RR*Tc_)/Pc_;
-    scalar b = 0.07780*RR*Tc_/Pc_;
-    scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
-    scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
+    const scalar Tr = T/Tc_;
+    const scalar a = 0.45724*sqr(RR*Tc_)/Pc_;
+    const scalar b = 0.07780*RR*Tc_/Pc_;
+    const scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
+    const scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
 
-    scalar A = a*alpha*p/sqr(RR*T);
-    scalar B = b*p/(RR*T);
+    const scalar A = a*alpha*p/sqr(RR*T);
+    const scalar B = b*p/(RR*T);
 
-    scalar Z = this->Z(p, T);
+    const scalar Z = this->Z(p, T);
 
-    scalar ap = kappa*a*(kappa/Tc_ - (1 + kappa)/sqrt(T*Tc_));
-    scalar app = kappa*a*(1 + kappa)/(2*sqrt(pow3(T)*Tc_));
+    const scalar ap = kappa*a*(kappa/Tc_ - (1 + kappa)/sqrt(T*Tc_));
+    const scalar app = kappa*a*(1 + kappa)/(2*sqrt(pow3(T)*Tc_));
 
-    scalar M = (sqr(Z) + 2*B*Z - sqr(B))/(Z - B);
-    scalar N = ap*B/(b*RR);
+    const scalar M = (sqr(Z) + 2*B*Z - sqr(B))/(Z - B);
+    const scalar N = ap*B/(b*RR);
 
     const scalar root2 = sqrt(2.0);
 
     return
+    (
         app*(T/(2*root2*b))*log((Z + (root2 + 1)*B)/(Z - (root2 - 1)*B))
       + RR*sqr(M - N)/(sqr(M) - 2*A*(Z + B))
-      - RR;
+      - RR
+    )/this->W();
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::PengRobinsonGas<Specie>::s
+inline Foam::scalar Foam::PengRobinsonGas<Specie>::S
 (
     scalar p,
     scalar T
 ) const
 {
-    scalar Pr = p/Pc_;
-    scalar Tr = T/Tc_;
-    scalar B = 0.07780*Pr/Tr;
-    scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
+    const scalar Pr = p/Pc_;
+    const scalar Tr = T/Tc_;
+    const scalar B = 0.07780*Pr/Tr;
+    const scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
 
-    scalar Z = this->Z(p, T);
+    const scalar Z = this->Z(p, T);
 
     return
-      - RR*log(p/Pstd)
-      + RR
+        this->R()
        *(
-           log(Z - B)
-         - 2.078*kappa*((1 + kappa)/sqrt(Tr) - kappa)
-          *log((Z + 2.414*B)/(Z - 0.414*B))
+          - log(p/Pstd)
+          + (
+                log(Z - B)
+              - 2.078*kappa*((1 + kappa)/sqrt(Tr) - kappa)
+               *log((Z + 2.414*B)/(Z - 0.414*B))
+            )
         );
 }
 
@@ -198,7 +203,7 @@ inline Foam::scalar Foam::PengRobinsonGas<Specie>::psi
     scalar T
 ) const
 {
-    scalar Z = this->Z(p, T);
+    const scalar Z = this->Z(p, T);
 
     return 1.0/(Z*this->R()*T);
 }
@@ -211,42 +216,44 @@ inline Foam::scalar Foam::PengRobinsonGas<Specie>::Z
     scalar T
 ) const
 {
-    scalar Tr = T/Tc_;
-    scalar a = 0.45724*sqr(RR*Tc_)/Pc_;
-    scalar b = 0.07780*RR*Tc_/Pc_;
-    scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
-    scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
+    const scalar Tr = T/Tc_;
+    const scalar a = 0.45724*sqr(RR*Tc_)/Pc_;
+    const scalar b = 0.07780*RR*Tc_/Pc_;
+    const scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
+    const scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
 
-    scalar A = a*alpha*p/sqr(RR*T);
-    scalar B = b*p/(RR*T);
+    const scalar A = a*alpha*p/sqr(RR*T);
+    const scalar B = b*p/(RR*T);
 
-    scalar a2 = B - 1;
-    scalar a1 = A - 2*B - 3*sqr(B);
-    scalar a0 = -A*B + sqr(B) + pow3(B);
+    const scalar a2 = B - 1;
+    const scalar a1 = A - 2*B - 3*sqr(B);
+    const scalar a0 = -A*B + sqr(B) + pow3(B);
 
-    scalar Q = (3*a1 - a2*a2)/9.0;
-    scalar Rl = (9*a2*a1 - 27*a0 - 2*a2*a2*a2)/54.0;
+    const scalar Q = (3*a1 - a2*a2)/9.0;
+    const scalar Rl = (9*a2*a1 - 27*a0 - 2*a2*a2*a2)/54.0;
 
-    scalar Q3 = Q*Q*Q;
-    scalar D = Q3 + Rl*Rl;
+    const scalar Q3 = Q*Q*Q;
+    const scalar D = Q3 + Rl*Rl;
 
     scalar root = -1;
 
     if (D <= 0)
     {
-        scalar th = ::acos(Rl/sqrt(-Q3));
-        scalar qm = 2*sqrt(-Q);
-        scalar r1 = qm*cos(th/3.0) - a2/3.0;
-        scalar r2 = qm*cos((th + 2*constant::mathematical::pi)/3.0) - a2/3.0;
-        scalar r3 = qm*cos((th + 4*constant::mathematical::pi)/3.0) - a2/3.0;
+        const scalar th = ::acos(Rl/sqrt(-Q3));
+        const scalar qm = 2*sqrt(-Q);
+        const scalar r1 = qm*cos(th/3.0) - a2/3.0;
+        const scalar r2 =
+            qm*cos((th + 2*constant::mathematical::pi)/3.0) - a2/3.0;
+        const scalar r3 =
+            qm*cos((th + 4*constant::mathematical::pi)/3.0) - a2/3.0;
 
         root = max(r1, max(r2, r3));
     }
     else
     {
         // One root is real
-        scalar D05 = sqrt(D);
-        scalar S = pow(Rl + D05, 1.0/3.0);
+        const scalar D05 = sqrt(D);
+        const scalar S = pow(Rl + D05, 1.0/3.0);
         scalar Tl = 0;
         if (D05 > Rl)
         {
@@ -265,28 +272,28 @@ inline Foam::scalar Foam::PengRobinsonGas<Specie>::Z
 
 
 template<class Specie>
-inline Foam::scalar Foam::PengRobinsonGas<Specie>::cpMcv
+inline Foam::scalar Foam::PengRobinsonGas<Specie>::CpMCv
 (
     scalar p,
     scalar T
 ) const
 {
-    scalar Tr = T/Tc_;
-    scalar a = 0.45724*sqr(RR*Tc_)/Pc_;
-    scalar b = 0.07780*RR*Tc_/Pc_;
-    scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
-    scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
+    const scalar Tr = T/Tc_;
+    const scalar a = 0.45724*sqr(RR*Tc_)/Pc_;
+    const scalar b = 0.07780*RR*Tc_/Pc_;
+    const scalar kappa = 0.37464 + 1.54226*omega_ - 0.26992*sqr(omega_);
+    const scalar alpha = sqr(1 + kappa*(1 - sqrt(Tr)));
 
-    scalar A = alpha*a*p/sqr(RR*T);
-    scalar B = b*p/(RR*T);
+    const scalar A = alpha*a*p/sqr(RR*T);
+    const scalar B = b*p/(RR*T);
 
-    scalar Z = this->Z(p, T);
+    const scalar Z = this->Z(p, T);
 
-    scalar ap = kappa*a*(kappa/Tc_ - (1 + kappa)/sqrt(T*Tc_));
-    scalar M = (sqr(Z) + 2*B*Z - sqr(B))/(Z - B);
-    scalar N = ap*B/(b*RR);
+    const scalar ap = kappa*a*(kappa/Tc_ - (1 + kappa)/sqrt(T*Tc_));
+    const scalar M = (sqr(Z) + 2*B*Z - sqr(B))/(Z - B);
+    const scalar N = ap*B/(b*RR);
 
-    return RR*sqr(M - N)/(sqr(M) - 2*A*(Z + B));
+    return this->R()*sqr(M - N)/(sqr(M) - 2*A*(Z + B));
 }
 
 
@@ -298,38 +305,20 @@ inline void Foam::PengRobinsonGas<Specie>::operator+=
     const PengRobinsonGas<Specie>& pg
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
     Specie::operator+=(pg);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = pg.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = pg.Y()/this->Y();
 
-    Tc_ = molr1*Tc_ + molr2*pg.Tc_;
-    Vc_ = molr1*Vc_ + molr2*pg.Vc_;
-    Zc_ = molr1*Zc_ + molr2*pg.Zc_;
-    Pc_ = RR*Zc_*Tc_/Vc_;
-    omega_ = molr1*omega_ + molr2*pg.omega_;
-}
-
-
-template<class Specie>
-inline void Foam::PengRobinsonGas<Specie>::operator-=
-(
-    const PengRobinsonGas<Specie>& pg
-)
-{
-    scalar molr1 = this->nMoles();
-
-    Specie::operator-=(pg);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = pg.nMoles()/this->nMoles();
-
-    Tc_ = molr1*Tc_ - molr2*pg.Tc_;
-    Vc_ = molr1*Vc_ - molr2*pg.Vc_;
-    Zc_ = molr1*Zc_ - molr2*pg.Zc_;
-    Pc_ = RR*Zc_*Tc_/Vc_;
-    omega_ = molr1*omega_ - molr2*pg.omega_;
+        Tc_ = Y1*Tc_ + Y2*pg.Tc_;
+        Vc_ = Y1*Vc_ + Y2*pg.Vc_;
+        Zc_ = Y1*Zc_ + Y2*pg.Zc_;
+        Pc_ = RR*Zc_*Tc_/Vc_;
+        omega_ = Y1*omega_ + Y2*pg.omega_;
+    }
 }
 
 
@@ -350,52 +339,43 @@ Foam::PengRobinsonGas<Specie> Foam::operator+
     const PengRobinsonGas<Specie>& pg2
 )
 {
-    scalar nMoles = pg1.nMoles() + pg2.nMoles();
-    scalar molr1 = pg1.nMoles()/nMoles;
-    scalar molr2 = pg2.nMoles()/nMoles;
-
-    const scalar Tc = molr1*pg1.Tc_ + molr2*pg2.Tc_;
-    const scalar Vc = molr1*pg1.Vc_ + molr2*pg2.Vc_;
-    const scalar Zc = molr1*pg1.Zc_ + molr2*pg2.Zc_;
-
-    return PengRobinsonGas<Specie>
+    Specie sp
     (
         static_cast<const Specie&>(pg1)
-      + static_cast<const Specie&>(pg2),
-        Tc,
-        Vc,
-        Zc,
-        RR*Zc*Tc/Vc,
-        molr1*pg1.omega_ + molr2*pg2.omega_
+      + static_cast<const Specie&>(pg2)
     );
-}
 
+    if (mag(sp.Y()) < SMALL)
+    {
+        return PengRobinsonGas<Specie>
+        (
+            sp,
+            pg1.Tc_,
+            pg1.Vc_,
+            pg1.Zc_,
+            pg1.Pc_,
+            pg1.omega_
+        );
+    }
+    else
+    {
+        const scalar Y1 = pg1.Y()/sp.Y();
+        const scalar Y2 = pg2.Y()/sp.Y();
 
-template<class Specie>
-Foam::PengRobinsonGas<Specie> Foam::operator-
-(
-    const PengRobinsonGas<Specie>& pg1,
-    const PengRobinsonGas<Specie>& pg2
-)
-{
-    scalar nMoles = pg1.nMoles() + pg2.nMoles();
-    scalar molr1 = pg1.nMoles()/nMoles;
-    scalar molr2 = pg2.nMoles()/nMoles;
+        const scalar Tc = Y1*pg1.Tc_ + Y2*pg2.Tc_;
+        const scalar Vc = Y1*pg1.Vc_ + Y2*pg2.Vc_;
+        const scalar Zc = Y1*pg1.Zc_ + Y2*pg2.Zc_;
 
-    const scalar Tc = molr1*pg1.Tc_ + molr2*pg2.Tc_;
-    const scalar Vc = molr1*pg1.Vc_ + molr2*pg2.Vc_;
-    const scalar Zc = molr1*pg1.Zc_ + molr2*pg2.Zc_;
-
-    return PengRobinsonGas<Specie>
-    (
-        static_cast<const Specie&>(pg1)
-      - static_cast<const Specie&>(pg2),
-        Tc,
-        Vc,
-        Zc,
-        RR*Zc*Tc/Vc,
-        molr1*pg1.omega_ - molr2*pg2.omega_
-    );
+        return PengRobinsonGas<Specie>
+        (
+            sp,
+            Tc,
+            Vc,
+            Zc,
+            RR*Zc*Tc/Vc,
+            Y1*pg1.omega_ + Y2*pg2.omega_
+        );
+    }
 }
 
 
@@ -425,7 +405,28 @@ Foam::PengRobinsonGas<Specie> Foam::operator==
     const PengRobinsonGas<Specie>& pg2
 )
 {
-    return pg2 - pg1;
+    Specie sp
+    (
+        static_cast<const Specie&>(pg1)
+     == static_cast<const Specie&>(pg2)
+    );
+
+    const scalar Y1 = pg1.Y()/sp.Y();
+    const scalar Y2 = pg2.Y()/sp.Y();
+
+    const scalar Tc = Y2*pg2.Tc_ - Y1*pg1.Tc_;
+    const scalar Vc = Y2*pg2.Vc_ - Y1*pg1.Vc_;
+    const scalar Zc = Y2*pg2.Zc_ - Y1*pg1.Zc_;
+
+    return PengRobinsonGas<Specie>
+    (
+        sp,
+        Tc,
+        Vc,
+        Zc,
+        RR*Zc*Tc/Vc,
+        Y2*pg2.omega_ - Y1*pg1.omega_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
index 5d35425ccc..a8609cb7ad 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
index 342e6b3bb6..f22275cf91 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     Foam::adiabaticPerfectFluid
 
 Description
-    AdiabaticPerfect gas equation of state.
+    Adiabatic perfect fluid equation of state.
 
 SourceFiles
     adiabaticPerfectFluidI.H
@@ -54,13 +54,6 @@ inline adiabaticPerfectFluid<Specie> operator+
     const adiabaticPerfectFluid<Specie>&
 );
 
-template<class Specie>
-inline adiabaticPerfectFluid<Specie> operator-
-(
-    const adiabaticPerfectFluid<Specie>&,
-    const adiabaticPerfectFluid<Specie>&
-);
-
 template<class Specie>
 inline adiabaticPerfectFluid<Specie> operator*
 (
@@ -167,14 +160,14 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
-            //- Return enthalpy departure [J/kmol]
-            inline scalar h(const scalar p, const scalar T) const;
+            //- Return enthalpy departure [J/kg]
+            inline scalar H(const scalar p, const scalar T) const;
 
-            //- Return cp departure [J/(kmol K]
-            inline scalar cp(scalar p, scalar T) const;
+            //- Return Cp departure [J/(kg K]
+            inline scalar Cp(scalar p, scalar T) const;
 
-            //- Return entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Return entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
             //- Return compressibility rho/p [s^2/m^2]
             inline scalar psi(scalar p, scalar T) const;
@@ -182,8 +175,8 @@ public:
             //- Return compression factor []
             inline scalar Z(scalar p, scalar T) const;
 
-            //- Return (cp - cv) [J/(kmol K]
-            inline scalar cpMcv(scalar p, scalar T) const;
+            //- Return (Cp - Cv) [J/(kg K]
+            inline scalar CpMCv(scalar p, scalar T) const;
 
 
         // IO
@@ -195,8 +188,6 @@ public:
     // Member operators
 
         inline void operator+=(const adiabaticPerfectFluid&);
-        inline void operator-=(const adiabaticPerfectFluid&);
-
         inline void operator*=(const scalar);
 
 
@@ -208,12 +199,6 @@ public:
             const adiabaticPerfectFluid&
         );
 
-        friend adiabaticPerfectFluid operator- <Specie>
-        (
-            const adiabaticPerfectFluid&,
-            const adiabaticPerfectFluid&
-        );
-
         friend adiabaticPerfectFluid operator* <Specie>
         (
             const scalar s,
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
index 87adcdad2b..c6275c9900 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::rho
 
 
 template<class Specie>
-inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::h
+inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::H
 (
     scalar p,
     scalar T
@@ -123,7 +123,7 @@ inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::h
 
 
 template<class Specie>
-inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::cp
+inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::Cp
 (
     scalar p,
     scalar T
@@ -134,7 +134,7 @@ inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::cp
 
 
 template<class Specie>
-inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::s
+inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::S
 (
     scalar p,
     scalar T
@@ -168,7 +168,7 @@ inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::Z(scalar, scalar) const
 
 
 template<class Specie>
-inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::cpMcv
+inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::CpMCv
 (
     scalar p,
     scalar T
@@ -186,37 +186,19 @@ inline void Foam::adiabaticPerfectFluid<Specie>::operator+=
     const adiabaticPerfectFluid<Specie>& pf
 )
 {
-    scalar molr1 = this->nMoles();
-
+    scalar Y1 = this->Y();
     Specie::operator+=(pf);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = pf.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = pf.Y()/this->Y();
 
-    p0_ = molr1*p0_ + molr2*pf.p0_;
-    rho0_ = molr1*rho0_ + molr2*pf.rho0_;
-    gamma_ = molr1*gamma_ + molr2*pf.gamma_;
-    B_ = molr1*B_ + molr2*pf.B_;
-}
-
-
-template<class Specie>
-inline void Foam::adiabaticPerfectFluid<Specie>::operator-=
-(
-    const adiabaticPerfectFluid<Specie>& pf
-)
-{
-    scalar molr1 = this->nMoles();
-
-    Specie::operator-=(pf);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = pf.nMoles()/this->nMoles();
-
-    p0_ = molr1*p0_ - molr2*pf.p0_;
-    rho0_ = molr1*rho0_ - molr2*pf.rho0_;
-    gamma_ = molr1*gamma_ - molr2*pf.gamma_;
-    B_ = molr1*B_ - molr2*pf.B_;
+        p0_ = Y1*p0_ + Y2*pf.p0_;
+        rho0_ = Y1*rho0_ + Y2*pf.rho0_;
+        gamma_ = Y1*gamma_ + Y2*pf.gamma_;
+        B_ = Y1*B_ + Y2*pf.B_;
+    }
 }
 
 
@@ -236,42 +218,37 @@ inline Foam::adiabaticPerfectFluid<Specie> Foam::operator+
     const adiabaticPerfectFluid<Specie>& pf2
 )
 {
-    scalar nMoles = pf1.nMoles() + pf2.nMoles();
-    scalar molr1 = pf1.nMoles()/nMoles;
-    scalar molr2 = pf2.nMoles()/nMoles;
-
-    return rhoConst<Specie>
+    Specie sp
     (
         static_cast<const Specie&>(pf1)
-      + static_cast<const Specie&>(pf2),
-        molr1*pf1.p0_ + molr2*pf2.p0_,
-        molr1*pf1.rho0_ + molr2*pf2.rho0_,
-        molr1*pf1.gamma_ + molr2*pf2.gamma_,
-        molr1*pf1.B_ + molr2*pf2.B_
+      + static_cast<const Specie&>(pf2)
     );
-}
 
+    if (mag(sp.Y()) < SMALL)
+    {
+        return adiabaticPerfectFluid<Specie>
+        (
+            sp,
+            pf1.p0_,
+            pf1.rho0_,
+            pf1.gamma_,
+            pf1.B_
+        );
+    }
+    else
+    {
+        const scalar Y1 = pf1.Y()/sp.Y();
+        const scalar Y2 = pf2.Y()/sp.Y();
 
-template<class Specie>
-inline Foam::adiabaticPerfectFluid<Specie> Foam::operator-
-(
-    const adiabaticPerfectFluid<Specie>& pf1,
-    const adiabaticPerfectFluid<Specie>& pf2
-)
-{
-    scalar nMoles = pf1.nMoles() + pf2.nMoles();
-    scalar molr1 = pf1.nMoles()/nMoles;
-    scalar molr2 = pf2.nMoles()/nMoles;
-
-    return rhoConst<Specie>
-    (
-        static_cast<const Specie&>(pf1)
-      - static_cast<const Specie&>(pf2),
-        molr1*pf1.p0_ - molr2*pf2.p0_,
-        molr1*pf1.rho0_ - molr2*pf2.rho0_,
-        molr1*pf1.gamma_ - molr2*pf2.gamma_,
-        molr1*pf1.B_ - molr2*pf2.B_
-    );
+        return adiabaticPerfectFluid<Specie>
+        (
+            sp,
+            Y1*pf1.p0_ + Y2*pf2.p0_,
+            Y1*pf1.rho0_ + Y2*pf2.rho0_,
+            Y1*pf1.gamma_ + Y2*pf2.gamma_,
+            Y1*pf1.B_ + Y2*pf2.B_
+        );
+    }
 }
 
 
@@ -300,7 +277,23 @@ inline Foam::adiabaticPerfectFluid<Specie> Foam::operator==
     const adiabaticPerfectFluid<Specie>& pf2
 )
 {
-    return pf2 - pf1;
+    Specie sp
+    (
+        static_cast<const Specie&>(pf1)
+     == static_cast<const Specie&>(pf2)
+    );
+
+    const scalar Y1 = pf1.Y()/sp.Y();
+    const scalar Y2 = pf2.Y()/sp.Y();
+
+    return adiabaticPerfectFluid<Specie>
+    (
+        sp,
+        Y2*pf2.p0_    - Y1*pf1.p0_,
+        Y2*pf2.rho0_  - Y1*pf1.rho0_,
+        Y2*pf2.gamma_ - Y1*pf1.gamma_,
+        Y2*pf2.B_     - Y1*pf1.B_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
index 3550f8a1be..472ff3e5fe 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,9 +38,7 @@ icoPolynomial<Specie, PolySize>::icoPolynomial(Istream& is)
 :
     Specie(is),
     rhoCoeffs_("rhoCoeffs<" + Foam::name(PolySize) + '>', is)
-{
-    rhoCoeffs_ *= this->W();
-}
+{}
 
 
 template<class Specie, int PolySize>
@@ -54,9 +52,7 @@ icoPolynomial<Specie, PolySize>::icoPolynomial(const dictionary& dict)
         "rhoCoeffs<" + Foam::name(PolySize) + '>'
     )
 )
-{
-    rhoCoeffs_ *= this->W();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -70,7 +66,7 @@ void icoPolynomial<Specie, PolySize>::write(Ostream& os) const
     dict.add
     (
         word("rhoCoeffs<" + Foam::name(PolySize) + '>'),
-        rhoCoeffs_/this->W()
+        rhoCoeffs_
     );
 
     os  << indent << dict.dictName() << dict;
@@ -84,7 +80,7 @@ Ostream& operator<<(Ostream& os, const icoPolynomial<Specie, PolySize>& ip)
 {
     os  << static_cast<const Specie&>(ip) << tab
         << "rhoCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << ip.rhoCoeffs_/ip.W();
+        << ip.rhoCoeffs_;
 
     os.check
     (
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
index 80bf9e928a..2ba5425125 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,13 +83,6 @@ icoPolynomial<Specie, PolySize> operator+
     const icoPolynomial<Specie, PolySize>&
 );
 
-template<class Specie, int PolySize>
-icoPolynomial<Specie, PolySize> operator-
-(
-    const icoPolynomial<Specie, PolySize>&,
-    const icoPolynomial<Specie, PolySize>&
-);
-
 template<class Specie, int PolySize>
 icoPolynomial<Specie, PolySize> operator*
 (
@@ -180,14 +173,14 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
-            //- Return enthalpy departure [J/kmol]
-            inline scalar h(const scalar p, const scalar T) const;
+            //- Return enthalpy departure [J/kg]
+            inline scalar H(const scalar p, const scalar T) const;
 
-            //- Return cp departure [J/(kmol K]
-            inline scalar cp(scalar p, scalar T) const;
+            //- Return Cp departure [J/(kg K]
+            inline scalar Cp(scalar p, scalar T) const;
 
-            //- Return entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Return entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
             //- Return compressibility rho/p [s^2/m^2]
             inline scalar psi(scalar p, scalar T) const;
@@ -195,8 +188,8 @@ public:
             //- Return compression factor []
             inline scalar Z(scalar p, scalar T) const;
 
-            //- Return (cp - cv) [J/(kmol K]
-            inline scalar cpMcv(scalar p, scalar T) const;
+            //- Return (Cp - Cv) [J/(kg K]
+            inline scalar CpMCv(scalar p, scalar T) const;
 
 
         // IO
@@ -209,8 +202,6 @@ public:
 
         inline void operator=(const icoPolynomial&);
         inline void operator+=(const icoPolynomial&);
-        inline void operator-=(const icoPolynomial&);
-
         inline void operator*=(const scalar);
 
 
@@ -222,12 +213,6 @@ public:
             const icoPolynomial&
         );
 
-        friend icoPolynomial operator- <Specie, PolySize>
-        (
-            const icoPolynomial&,
-            const icoPolynomial&
-        );
-
         friend icoPolynomial operator* <Specie, PolySize>
         (
             const scalar s,
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
index 03d087c74f..5358f425e3 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,12 +106,12 @@ inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::rho
     scalar T
 ) const
 {
-    return rhoCoeffs_.value(T)/this->W();
+    return rhoCoeffs_.value(T);
 }
 
 
 template<class Specie, int PolySize>
-inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::h
+inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::H
 (
     scalar p,
     scalar T
@@ -122,7 +122,7 @@ inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::h
 
 
 template<class Specie, int PolySize>
-inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::cp
+inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::Cp
 (
     scalar p,
     scalar T
@@ -133,7 +133,7 @@ inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::cp
 
 
 template<class Specie, int PolySize>
-inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::s
+inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::S
 (
     scalar p,
     scalar T
@@ -166,7 +166,7 @@ inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::Z
 
 
 template<class Specie, int PolySize>
-inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::cpMcv
+inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::CpMCv
 (
     scalar p,
     scalar T
@@ -196,31 +196,16 @@ inline void Foam::icoPolynomial<Specie, PolySize>::operator+=
     const icoPolynomial<Specie, PolySize>& ip
 )
 {
-    scalar molr1 = this->nMoles();
-
+    scalar Y1 = this->Y();
     Specie::operator+=(ip);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = ip.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = ip.Y()/this->Y();
 
-    rhoCoeffs_ = molr1*rhoCoeffs_ + molr2*ip.rhoCoeffs_;
-}
-
-
-template<class Specie, int PolySize>
-inline void Foam::icoPolynomial<Specie, PolySize>::operator-=
-(
-    const icoPolynomial<Specie, PolySize>& ip
-)
-{
-    scalar molr1 = this->nMoles();
-
-    Specie::operator-=(ip);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = ip.nMoles()/this->nMoles();
-
-    rhoCoeffs_ = molr1*rhoCoeffs_ - molr2*ip.rhoCoeffs_;
+        rhoCoeffs_ = Y1*rhoCoeffs_ + Y2*ip.rhoCoeffs_;
+    }
 }
 
 
@@ -240,36 +225,31 @@ Foam::icoPolynomial<Specie, PolySize> Foam::operator+
     const icoPolynomial<Specie, PolySize>& ip2
 )
 {
-    scalar nMoles = ip1.nMoles() + ip2.nMoles();
-    scalar molr1 = ip1.nMoles()/nMoles;
-    scalar molr2 = ip2.nMoles()/nMoles;
-
-    return icoPolynomial<Specie, PolySize>
+    Specie sp
     (
         static_cast<const Specie&>(ip1)
-      + static_cast<const Specie&>(ip2),
-        molr1*ip1.rhoCoeffs_ + molr2*ip2.rhoCoeffs_
+      + static_cast<const Specie&>(ip2)
     );
-}
 
+    if (mag(sp.Y()) < SMALL)
+    {
+        return icoPolynomial<Specie, PolySize>
+        (
+            sp,
+            ip1.rhoCoeffs_
+        );
+    }
+    else
+    {
+        const scalar Y1 = ip1.Y()/sp.Y();
+        const scalar Y2 = ip2.Y()/sp.Y();
 
-template<class Specie, int PolySize>
-Foam::icoPolynomial<Specie, PolySize> Foam::operator-
-(
-    const icoPolynomial<Specie, PolySize>& ip1,
-    const icoPolynomial<Specie, PolySize>& ip2
-)
-{
-    scalar nMoles = ip1.nMoles() + ip2.nMoles();
-    scalar molr1 = ip1.nMoles()/nMoles;
-    scalar molr2 = ip2.nMoles()/nMoles;
-
-    return icoPolynomial<Specie, PolySize>
-    (
-        static_cast<const Specie&>(ip1)
-      - static_cast<const Specie&>(ip2),
-        molr1*ip1.rhoCoeffs_ - molr2*ip2.rhoCoeffs_
-    );
+        return icoPolynomial<Specie, PolySize>
+        (
+            sp,
+            Y1*ip1.rhoCoeffs_ + Y2*ip2.rhoCoeffs_
+        );
+    }
 }
 
 
@@ -295,7 +275,20 @@ Foam::icoPolynomial<Specie, PolySize> Foam::operator==
     const icoPolynomial<Specie, PolySize>& ip2
 )
 {
-    return ip2 - ip1;
+    Specie sp
+    (
+        static_cast<const Specie&>(ip1)
+     == static_cast<const Specie&>(ip2)
+    );
+
+    const scalar Y1 = ip1.Y()/sp.Y();
+    const scalar Y2 = ip2.Y()/sp.Y();
+
+    return icoPolynomial<Specie, PolySize>
+    (
+        sp,
+        Y2*ip2.rhoCoeffs_ - Y1*ip1.rhoCoeffs_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C
index 4f957aafed..02955422ba 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
index 67adc188c2..cf0c73dbf1 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,13 +56,6 @@ inline incompressiblePerfectGas<Specie> operator+
     const incompressiblePerfectGas<Specie>&
 );
 
-template<class Specie>
-inline incompressiblePerfectGas<Specie> operator-
-(
-    const incompressiblePerfectGas<Specie>&,
-    const incompressiblePerfectGas<Specie>&
-);
-
 template<class Specie>
 inline incompressiblePerfectGas<Specie> operator*
 (
@@ -158,14 +151,14 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
-            //- Return enthalpy departure [J/kmol]
-            inline scalar h(const scalar p, const scalar T) const;
+            //- Return enthalpy departure [J/kg]
+            inline scalar H(const scalar p, const scalar T) const;
 
-            //- Return cp departure [J/(kmol K]
-            inline scalar cp(scalar p, scalar T) const;
+            //- Return Cp departure [J/(kg K]
+            inline scalar Cp(scalar p, scalar T) const;
 
-            //- Return entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Return entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
             //- Return compressibility rho/p [s^2/m^2]
             inline scalar psi(scalar p, scalar T) const;
@@ -173,8 +166,8 @@ public:
             //- Return compression factor []
             inline scalar Z(scalar p, scalar T) const;
 
-            //- Return (cp - cv) [J/(kmol K]
-            inline scalar cpMcv(scalar p, scalar T) const;
+            //- Return (Cp - Cv) [J/(kg K]
+            inline scalar CpMCv(scalar p, scalar T) const;
 
 
         // IO
@@ -187,8 +180,6 @@ public:
 
         inline void operator=(const incompressiblePerfectGas&);
         inline void operator+=(const incompressiblePerfectGas&);
-        inline void operator-=(const incompressiblePerfectGas&);
-
         inline void operator*=(const scalar);
 
 
@@ -200,12 +191,6 @@ public:
             const incompressiblePerfectGas&
         );
 
-        friend incompressiblePerfectGas operator- <Specie>
-        (
-            const incompressiblePerfectGas&,
-            const incompressiblePerfectGas&
-        );
-
         friend incompressiblePerfectGas operator* <Specie>
         (
             const scalar s,
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
index 8816c9f317..f1772442b5 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,7 +115,7 @@ inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::rho
 
 
 template<class Specie>
-inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::h
+inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::H
 (
     scalar p,
     scalar T
@@ -126,7 +126,7 @@ inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::h
 
 
 template<class Specie>
-inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::cp
+inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::Cp
 (
     scalar p,
     scalar T
@@ -137,7 +137,7 @@ inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::cp
 
 
 template<class Specie>
-inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::s
+inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::S
 (
     scalar p,
     scalar T
@@ -170,13 +170,13 @@ inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::Z
 
 
 template<class Specie>
-inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::cpMcv
+inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::CpMCv
 (
     scalar p,
     scalar T
 ) const
 {
-    return RR;
+    return this->R();
 }
 
 
@@ -199,23 +199,16 @@ inline void Foam::incompressiblePerfectGas<Specie>::operator+=
     const incompressiblePerfectGas<Specie>& ipg
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
     Specie::operator+=(ipg);
-    molr1 /= this->nMoles();
-    scalar molr2 = ipg.nMoles()/this->nMoles();
 
-    pRef_ = molr1*pRef_ + molr2*ipg.pRef_;
-}
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = ipg.Y()/this->Y();
 
-
-template<class Specie>
-inline void Foam::incompressiblePerfectGas<Specie>::operator-=
-(
-    const incompressiblePerfectGas<Specie>& ipg
-)
-{
-    Specie::operator-=(ipg);
-    pRef_ = ipg.pRef_;
+        pRef_ = Y1*pRef_ + Y2*ipg.pRef_;
+    }
 }
 
 
@@ -235,32 +228,31 @@ inline Foam::incompressiblePerfectGas<Specie> Foam::operator+
     const incompressiblePerfectGas<Specie>& ipg2
 )
 {
-    scalar nMoles = ipg1.nMoles() + ipg2.nMoles();
-    scalar molr1 = ipg1.nMoles()/nMoles;
-    scalar molr2 = ipg2.nMoles()/nMoles;
-
-    return incompressiblePerfectGas<Specie>
+    Specie sp
     (
         static_cast<const Specie&>(ipg1)
-      + static_cast<const Specie&>(ipg2),
-        molr1*ipg1.pRef_ + molr2*ipg2.pRef_
+      + static_cast<const Specie&>(ipg2)
     );
-}
 
+    if (mag(sp.Y()) < SMALL)
+    {
+        return incompressiblePerfectGas<Specie>
+        (
+            sp,
+            ipg1.pRef_
+        );
+    }
+    else
+    {
+        const scalar Y1 = ipg1.Y()/sp.Y();
+        const scalar Y2 = ipg2.Y()/sp.Y();
 
-template<class Specie>
-inline Foam::incompressiblePerfectGas<Specie> Foam::operator-
-(
-    const incompressiblePerfectGas<Specie>& ipg1,
-    const incompressiblePerfectGas<Specie>& ipg2
-)
-{
-    return incompressiblePerfectGas<Specie>
-    (
-        static_cast<const Specie&>(ipg1)
-      - static_cast<const Specie&>(ipg2),
-        ipg1.pRef_
-    );
+        return incompressiblePerfectGas<Specie>
+        (
+            sp,
+            Y1*ipg1.pRef_ + Y2*ipg2.pRef_
+        );
+    }
 }
 
 
@@ -282,11 +274,24 @@ inline Foam::incompressiblePerfectGas<Specie> Foam::operator*
 template<class Specie>
 inline Foam::incompressiblePerfectGas<Specie> Foam::operator==
 (
-    const incompressiblePerfectGas<Specie>& pg1,
-    const incompressiblePerfectGas<Specie>& pg2
+    const incompressiblePerfectGas<Specie>& ipg1,
+    const incompressiblePerfectGas<Specie>& ipg2
 )
 {
-    return pg2 - pg1;
+    Specie sp
+    (
+        static_cast<const Specie&>(ipg1)
+     == static_cast<const Specie&>(ipg2)
+    );
+
+    const scalar Y1 = ipg1.Y()/sp.Y();
+    const scalar Y2 = ipg2.Y()/sp.Y();
+
+    return incompressiblePerfectGas<Specie>
+    (
+        sp,
+        Y2*ipg2.pRef_ - Y1*ipg1.pRef_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.C b/src/thermophysicalModels/specie/equationOfState/linear/linear.C
index 562bdecf2b..6259930aea 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linear.C
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.H b/src/thermophysicalModels/specie/equationOfState/linear/linear.H
index 99d924632d..9bff7e46fa 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linear.H
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,13 +58,6 @@ inline linear<Specie> operator+
     const linear<Specie>&
 );
 
-template<class Specie>
-inline linear<Specie> operator-
-(
-    const linear<Specie>&,
-    const linear<Specie>&
-);
-
 template<class Specie>
 inline linear<Specie> operator*
 (
@@ -156,14 +149,14 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
-            //- Return enthalpy departure [J/kmol]
-            inline scalar h(const scalar p, const scalar T) const;
+            //- Return enthalpy departure [J/kg]
+            inline scalar H(const scalar p, const scalar T) const;
 
-            //- Return cp departure [J/(kmol K]
-            inline scalar cp(scalar p, scalar T) const;
+            //- Return Cp departure [J/(kg K]
+            inline scalar Cp(scalar p, scalar T) const;
 
-            //- Return entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Return entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
             //- Return compressibility rho/p [s^2/m^2]
             inline scalar psi(scalar p, scalar T) const;
@@ -171,8 +164,8 @@ public:
             //- Return compression factor []
             inline scalar Z(scalar p, scalar T) const;
 
-            //- Return (cp - cv) [J/(kmol K]
-            inline scalar cpMcv(scalar p, scalar T) const;
+            //- Return (Cp - Cv) [J/(kg K]
+            inline scalar CpMCv(scalar p, scalar T) const;
 
 
         // IO
@@ -184,8 +177,6 @@ public:
     // Member operators
 
         inline void operator+=(const linear&);
-        inline void operator-=(const linear&);
-
         inline void operator*=(const scalar);
 
 
@@ -197,12 +188,6 @@ public:
             const linear&
         );
 
-        friend linear operator- <Specie>
-        (
-            const linear&,
-            const linear&
-        );
-
         friend linear operator* <Specie>
         (
             const scalar s,
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
index 701ccc3c7c..951268eab9 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,21 +93,21 @@ inline Foam::scalar Foam::linear<Specie>::rho(scalar p, scalar T) const
 
 
 template<class Specie>
-inline Foam::scalar Foam::linear<Specie>::h(scalar p, scalar T) const
+inline Foam::scalar Foam::linear<Specie>::H(scalar p, scalar T) const
 {
     return 0;
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::linear<Specie>::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::linear<Specie>::Cp(scalar p, scalar T) const
 {
     return 0;
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::linear<Specie>::s(scalar p, scalar T) const
+inline Foam::scalar Foam::linear<Specie>::S(scalar p, scalar T) const
 {
     return -log((rho0_ + psi_*p)/(rho0_ + psi_*Pstd))/(T*psi_);
 }
@@ -128,7 +128,7 @@ inline Foam::scalar Foam::linear<Specie>::Z(scalar p, scalar T) const
 
 
 template<class Specie>
-inline Foam::scalar Foam::linear<Specie>::cpMcv(scalar p, scalar T) const
+inline Foam::scalar Foam::linear<Specie>::CpMCv(scalar p, scalar T) const
 {
     return 0;
 }
@@ -142,33 +142,17 @@ inline void Foam::linear<Specie>::operator+=
     const linear<Specie>& pf
 )
 {
-    scalar molr1 = this->nMoles();
-
+    scalar Y1 = this->Y();
     Specie::operator+=(pf);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = pf.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = pf.Y()/this->Y();
 
-    psi_ = molr1*psi_ + molr2*pf.psi_;
-    rho0_ = molr1*rho0_ + molr2*pf.rho0_;
-}
-
-
-template<class Specie>
-inline void Foam::linear<Specie>::operator-=
-(
-    const linear<Specie>& pf
-)
-{
-    scalar molr1 = this->nMoles();
-
-    Specie::operator-=(pf);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = pf.nMoles()/this->nMoles();
-
-    psi_ = molr1*psi_ - molr2*pf.psi_;
-    rho0_ = molr1*rho0_ - molr2*pf.rho0_;
+        psi_ = Y1*psi_ + Y2*pf.psi_;
+        rho0_ = Y1*rho0_ + Y2*pf.rho0_;
+    }
 }
 
 
@@ -188,38 +172,33 @@ inline Foam::linear<Specie> Foam::operator+
     const linear<Specie>& pf2
 )
 {
-    scalar nMoles = pf1.nMoles() + pf2.nMoles();
-    scalar molr1 = pf1.nMoles()/nMoles;
-    scalar molr2 = pf2.nMoles()/nMoles;
-
-    return rhoConst<Specie>
+    Specie sp
     (
         static_cast<const Specie&>(pf1)
-      + static_cast<const Specie&>(pf2),
-        molr1*pf1.psi_ + molr2*pf2.psi_,
-        molr1*pf1.rho0_ + molr2*pf2.rho0_
+      + static_cast<const Specie&>(pf2)
     );
-}
 
+    if (mag(sp.Y()) < SMALL)
+    {
+        return linear<Specie>
+        (
+            sp,
+            pf1.psi_,
+            pf1.rho0_
+        );
+    }
+    else
+    {
+        const scalar Y1 = pf1.Y()/sp.Y();
+        const scalar Y2 = pf2.Y()/sp.Y();
 
-template<class Specie>
-inline Foam::linear<Specie> Foam::operator-
-(
-    const linear<Specie>& pf1,
-    const linear<Specie>& pf2
-)
-{
-    scalar nMoles = pf1.nMoles() + pf2.nMoles();
-    scalar molr1 = pf1.nMoles()/nMoles;
-    scalar molr2 = pf2.nMoles()/nMoles;
-
-    return rhoConst<Specie>
-    (
-        static_cast<const Specie&>(pf1)
-      - static_cast<const Specie&>(pf2),
-        molr1*pf1.psi_ - molr2*pf2.psi_,
-        molr1*pf1.rho0_ - molr2*pf2.rho0_
-    );
+        return linear<Specie>
+        (
+            sp,
+            Y1*pf1.psi_ + Y2*pf2.psi_,
+            Y1*pf1.rho0_ + Y2*pf2.rho0_
+        );
+    }
 }
 
 
@@ -246,7 +225,21 @@ inline Foam::linear<Specie> Foam::operator==
     const linear<Specie>& pf2
 )
 {
-    return pf2 - pf1;
+    Specie sp
+    (
+        static_cast<const Specie&>(pf1)
+     == static_cast<const Specie&>(pf2)
+    );
+
+    const scalar Y1 = pf1.Y()/sp.Y();
+    const scalar Y2 = pf2.Y()/sp.Y();
+
+    return linear<Specie>
+    (
+        sp,
+        Y2*pf2.psi_  - Y1*pf1.psi_,
+        Y2*pf2.rho0_ - Y1*pf1.rho0_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C
index 612fc6f9eb..1857552c6b 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
index 1d0e993b4e..89fcab7873 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,13 +54,6 @@ inline perfectFluid<Specie> operator+
     const perfectFluid<Specie>&
 );
 
-template<class Specie>
-inline perfectFluid<Specie> operator-
-(
-    const perfectFluid<Specie>&,
-    const perfectFluid<Specie>&
-);
-
 template<class Specie>
 inline perfectFluid<Specie> operator*
 (
@@ -155,14 +148,14 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
-            //- Return enthalpy departure [J/kmol]
-            inline scalar h(const scalar p, const scalar T) const;
+            //- Return enthalpy departure [J/kg]
+            inline scalar H(const scalar p, const scalar T) const;
 
-            //- Return cp departure [J/(kmol K]
-            inline scalar cp(scalar p, scalar T) const;
+            //- Return Cp departure [J/(kg K]
+            inline scalar Cp(scalar p, scalar T) const;
 
-            //- Return entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Return entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
             //- Return compressibility rho/p [s^2/m^2]
             inline scalar psi(scalar p, scalar T) const;
@@ -170,8 +163,8 @@ public:
             //- Return compression factor []
             inline scalar Z(scalar p, scalar T) const;
 
-            //- Return (cp - cv) [J/(kmol K]
-            inline scalar cpMcv(scalar p, scalar T) const;
+            //- Return (Cp - Cv) [J/(kg K]
+            inline scalar CpMCv(scalar p, scalar T) const;
 
 
         // IO
@@ -183,8 +176,6 @@ public:
     // Member operators
 
         inline void operator+=(const perfectFluid&);
-        inline void operator-=(const perfectFluid&);
-
         inline void operator*=(const scalar);
 
 
@@ -196,12 +187,6 @@ public:
             const perfectFluid&
         );
 
-        friend perfectFluid operator- <Specie>
-        (
-            const perfectFluid&,
-            const perfectFluid&
-        );
-
         friend perfectFluid operator* <Specie>
         (
             const scalar s,
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
index f58bcaaed6..133902b871 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,23 +101,23 @@ inline Foam::scalar Foam::perfectFluid<Specie>::rho(scalar p, scalar T) const
 
 
 template<class Specie>
-inline Foam::scalar Foam::perfectFluid<Specie>::h(scalar p, scalar T) const
+inline Foam::scalar Foam::perfectFluid<Specie>::H(scalar p, scalar T) const
 {
     return 0;
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::perfectFluid<Specie>::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::perfectFluid<Specie>::Cp(scalar p, scalar T) const
 {
     return 0;
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::perfectFluid<Specie>::s(scalar p, scalar T) const
+inline Foam::scalar Foam::perfectFluid<Specie>::S(scalar p, scalar T) const
 {
-    return -RR*log(p/Pstd);
+    return -this->R()*log(p/Pstd);
 }
 
 
@@ -136,7 +136,7 @@ inline Foam::scalar Foam::perfectFluid<Specie>::Z(scalar p, scalar T) const
 
 
 template<class Specie>
-inline Foam::scalar Foam::perfectFluid<Specie>::cpMcv(scalar p, scalar T) const
+inline Foam::scalar Foam::perfectFluid<Specie>::CpMCv(scalar p, scalar T) const
 {
     return 0;
 }
@@ -150,33 +150,17 @@ inline void Foam::perfectFluid<Specie>::operator+=
     const perfectFluid<Specie>& pf
 )
 {
-    scalar molr1 = this->nMoles();
-
+    scalar Y1 = this->Y();
     Specie::operator+=(pf);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = pf.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = pf.Y()/this->Y();
 
-    R_ = 1.0/(molr1/R_ + molr2/pf.R_);
-    rho0_ = molr1*rho0_ + molr2*pf.rho0_;
-}
-
-
-template<class Specie>
-inline void Foam::perfectFluid<Specie>::operator-=
-(
-    const perfectFluid<Specie>& pf
-)
-{
-    scalar molr1 = this->nMoles();
-
-    Specie::operator-=(pf);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = pf.nMoles()/this->nMoles();
-
-    R_ = 1.0/(molr1/R_ - molr2/pf.R_);
-    rho0_ = molr1*rho0_ - molr2*pf.rho0_;
+        R_ = 1.0/(Y1/R_ + Y2/pf.R_);
+        rho0_ = Y1*rho0_ + Y2*pf.rho0_;
+    }
 }
 
 
@@ -196,38 +180,33 @@ inline Foam::perfectFluid<Specie> Foam::operator+
     const perfectFluid<Specie>& pf2
 )
 {
-    scalar nMoles = pf1.nMoles() + pf2.nMoles();
-    scalar molr1 = pf1.nMoles()/nMoles;
-    scalar molr2 = pf2.nMoles()/nMoles;
-
-    return perfectFluid<Specie>
+    Specie sp
     (
         static_cast<const Specie&>(pf1)
-      + static_cast<const Specie&>(pf2),
-        1.0/(molr1/pf1.R_ + molr2/pf2.R_),
-        molr1*pf1.rho0_ + molr2*pf2.rho0_
+      + static_cast<const Specie&>(pf2)
     );
-}
 
+    if (mag(sp.Y()) < SMALL)
+    {
+        return perfectFluid<Specie>
+        (
+            sp,
+            pf1.R_,
+            pf1.rho0_
+        );
+    }
+    else
+    {
+        const scalar Y1 = pf1.Y()/sp.Y();
+        const scalar Y2 = pf2.Y()/sp.Y();
 
-template<class Specie>
-inline Foam::perfectFluid<Specie> Foam::operator-
-(
-    const perfectFluid<Specie>& pf1,
-    const perfectFluid<Specie>& pf2
-)
-{
-    scalar nMoles = pf1.nMoles() + pf2.nMoles();
-    scalar molr1 = pf1.nMoles()/nMoles;
-    scalar molr2 = pf2.nMoles()/nMoles;
-
-    return perfectFluid<Specie>
-    (
-        static_cast<const Specie&>(pf1)
-      - static_cast<const Specie&>(pf2),
-        1.0/(molr1/pf1.R_ - molr2/pf2.R_),
-        molr1*pf1.rho0_ - molr2*pf2.rho0_
-    );
+        return perfectFluid<Specie>
+        (
+            sp,
+            1.0/(Y1/pf1.R_ + Y2/pf2.R_),
+            Y1*pf1.rho0_ + Y2*pf2.rho0_
+        );
+    }
 }
 
 
@@ -254,7 +233,21 @@ inline Foam::perfectFluid<Specie> Foam::operator==
     const perfectFluid<Specie>& pf2
 )
 {
-    return pf2 - pf1;
+    Specie sp
+    (
+        static_cast<const Specie&>(pf1)
+     == static_cast<const Specie&>(pf2)
+    );
+
+    const scalar Y1 = pf1.Y()/sp.Y();
+    const scalar Y2 = pf2.Y()/sp.Y();
+
+    return perfectFluid<Specie>
+    (
+        sp,
+        1.0/(Y2/pf2.R_ - Y1/pf1.R_),
+        Y2*pf2.rho0_ - Y1*pf1.rho0_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
index 115f7ae7cd..f63ffbbc63 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
index b3671e5b11..6d519c75c3 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,13 +54,6 @@ inline perfectGas<Specie> operator+
     const perfectGas<Specie>&
 );
 
-template<class Specie>
-inline perfectGas<Specie> operator-
-(
-    const perfectGas<Specie>&,
-    const perfectGas<Specie>&
-);
-
 template<class Specie>
 inline perfectGas<Specie> operator*
 (
@@ -139,14 +132,14 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
-            //- Return enthalpy departure [J/kmol]
-            inline scalar h(const scalar p, const scalar T) const;
+            //- Return enthalpy departure [J/kg]
+            inline scalar H(const scalar p, const scalar T) const;
 
-            //- Return cp departure [J/(kmol K]
-            inline scalar cp(scalar p, scalar T) const;
+            //- Return Cp departure [J/(kg K]
+            inline scalar Cp(scalar p, scalar T) const;
 
-            //- Return entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Return entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
             //- Return compressibility rho/p [s^2/m^2]
             inline scalar psi(scalar p, scalar T) const;
@@ -154,8 +147,8 @@ public:
             //- Return compression factor []
             inline scalar Z(scalar p, scalar T) const;
 
-            //- Return (cp - cv) [J/(kmol K]
-            inline scalar cpMcv(scalar p, scalar T) const;
+            //- Return (Cp - Cv) [J/(kg K]
+            inline scalar CpMCv(scalar p, scalar T) const;
 
 
         // IO
@@ -167,8 +160,6 @@ public:
     // Member operators
 
         inline void operator+=(const perfectGas&);
-        inline void operator-=(const perfectGas&);
-
         inline void operator*=(const scalar);
 
 
@@ -180,12 +171,6 @@ public:
             const perfectGas&
         );
 
-        friend perfectGas operator- <Specie>
-        (
-            const perfectGas&,
-            const perfectGas&
-        );
-
         friend perfectGas operator* <Specie>
         (
             const scalar s,
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
index 94e0c500ff..764a53dfef 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,23 +83,23 @@ inline Foam::scalar Foam::perfectGas<Specie>::rho(scalar p, scalar T) const
 
 
 template<class Specie>
-inline Foam::scalar Foam::perfectGas<Specie>::h(scalar p, scalar T) const
+inline Foam::scalar Foam::perfectGas<Specie>::H(scalar p, scalar T) const
 {
     return 0;
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::perfectGas<Specie>::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::perfectGas<Specie>::Cp(scalar p, scalar T) const
 {
     return 0;
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::perfectGas<Specie>::s(scalar p, scalar T) const
+inline Foam::scalar Foam::perfectGas<Specie>::S(scalar p, scalar T) const
 {
-    return -RR*log(p/Pstd);
+    return -this->R()*log(p/Pstd);
 }
 
 
@@ -118,9 +118,9 @@ inline Foam::scalar Foam::perfectGas<Specie>::Z(scalar p, scalar T) const
 
 
 template<class Specie>
-inline Foam::scalar Foam::perfectGas<Specie>::cpMcv(scalar p, scalar T) const
+inline Foam::scalar Foam::perfectGas<Specie>::CpMCv(scalar p, scalar T) const
 {
-    return RR;
+    return this->R();
 }
 
 
@@ -133,13 +133,6 @@ inline void Foam::perfectGas<Specie>::operator+=(const perfectGas<Specie>& pg)
 }
 
 
-template<class Specie>
-inline void Foam::perfectGas<Specie>::operator-=(const perfectGas<Specie>& pg)
-{
-    Specie::operator-=(pg);
-}
-
-
 template<class Specie>
 inline void Foam::perfectGas<Specie>::operator*=(const scalar s)
 {
@@ -158,23 +151,7 @@ inline Foam::perfectGas<Specie> Foam::operator+
 {
     return perfectGas<Specie>
     (
-        static_cast<const Specie&>(pg1)
-      + static_cast<const Specie&>(pg2)
-    );
-}
-
-
-template<class Specie>
-inline Foam::perfectGas<Specie> Foam::operator-
-(
-    const perfectGas<Specie>& pg1,
-    const perfectGas<Specie>& pg2
-)
-{
-    return perfectGas<Specie>
-    (
-        static_cast<const Specie&>(pg1)
-      - static_cast<const Specie&>(pg2)
+        static_cast<const Specie&>(pg1) + static_cast<const Specie&>(pg2)
     );
 }
 
@@ -197,7 +174,10 @@ inline Foam::perfectGas<Specie> Foam::operator==
     const perfectGas<Specie>& pg2
 )
 {
-    return pg2 - pg1;
+    return perfectGas<Specie>
+    (
+        static_cast<const Specie&>(pg1) == static_cast<const Specie&>(pg2)
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
index 160015a0f3..a60f52581d 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,13 +54,6 @@ inline rhoConst<Specie> operator+
     const rhoConst<Specie>&
 );
 
-template<class Specie>
-inline rhoConst<Specie> operator-
-(
-    const rhoConst<Specie>&,
-    const rhoConst<Specie>&
-);
-
 template<class Specie>
 inline rhoConst<Specie> operator*
 (
@@ -141,14 +134,14 @@ public:
             //- Return density [kg/m^3]
             inline scalar rho(scalar p, scalar T) const;
 
-            //- Return enthalpy departure [J/kmol]
-            inline scalar h(const scalar p, const scalar T) const;
+            //- Return enthalpy departure [J/kg]
+            inline scalar H(const scalar p, const scalar T) const;
 
-            //- Return cp departure [J/(kmol K]
-            inline scalar cp(scalar p, scalar T) const;
+            //- Return Cp departure [J/(kg K]
+            inline scalar Cp(scalar p, scalar T) const;
 
-            //- Return entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Return entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
             //- Return compressibility rho/p [s^2/m^2]
             inline scalar psi(scalar p, scalar T) const;
@@ -156,8 +149,8 @@ public:
             //- Return compression factor []
             inline scalar Z(scalar p, scalar T) const;
 
-            //- Return (cp - cv) [J/(kmol K]
-            inline scalar cpMcv(scalar p, scalar T) const;
+            //- Return (Cp - Cv) [J/(kg K]
+            inline scalar CpMCv(scalar p, scalar T) const;
 
 
         // IO
@@ -169,8 +162,6 @@ public:
     // Member operators
 
         inline void operator+=(const rhoConst&);
-        inline void operator-=(const rhoConst&);
-
         inline void operator*=(const scalar);
 
 
@@ -182,12 +173,6 @@ public:
             const rhoConst&
         );
 
-        friend rhoConst operator- <Specie>
-        (
-            const rhoConst&,
-            const rhoConst&
-        );
-
         friend rhoConst operator* <Specie>
         (
             const scalar s,
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
index 09f884b8b7..fb5e101248 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,21 +79,21 @@ inline Foam::scalar Foam::rhoConst<Specie>::rho(scalar p, scalar T) const
 
 
 template<class Specie>
-inline Foam::scalar Foam::rhoConst<Specie>::h(scalar p, scalar T) const
+inline Foam::scalar Foam::rhoConst<Specie>::H(scalar p, scalar T) const
 {
     return 0;
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::rhoConst<Specie>::cp(scalar p, scalar T) const
+inline Foam::scalar Foam::rhoConst<Specie>::Cp(scalar p, scalar T) const
 {
     return 0;
 }
 
 
 template<class Specie>
-inline Foam::scalar Foam::rhoConst<Specie>::s(scalar p, scalar T) const
+inline Foam::scalar Foam::rhoConst<Specie>::S(scalar p, scalar T) const
 {
     return 0;
 }
@@ -114,7 +114,7 @@ inline Foam::scalar Foam::rhoConst<Specie>::Z(scalar p, scalar T) const
 
 
 template<class Specie>
-inline Foam::scalar Foam::rhoConst<Specie>::cpMcv(scalar p, scalar T) const
+inline Foam::scalar Foam::rhoConst<Specie>::CpMCv(scalar p, scalar T) const
 {
     return 0;
 }
@@ -125,28 +125,16 @@ inline Foam::scalar Foam::rhoConst<Specie>::cpMcv(scalar p, scalar T) const
 template<class Specie>
 inline void Foam::rhoConst<Specie>::operator+=(const rhoConst<Specie>& ico)
 {
-    scalar molr1 = this->nMoles();
-
+    scalar Y1 = this->Y();
     Specie::operator+=(ico);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = ico.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = ico.Y()/this->Y();
 
-    rho_ = molr1*rho_ + molr2*ico.rho_;
-}
-
-
-template<class Specie>
-inline void Foam::rhoConst<Specie>::operator-=(const rhoConst<Specie>& ico)
-{
-    scalar molr1 = this->nMoles();
-
-    Specie::operator-=(ico);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = ico.nMoles()/this->nMoles();
-
-    rho_ = molr1*rho_ - molr2*ico.rho_;
+        rho_ = Y1*rho_ + Y2*ico.rho_;
+    }
 }
 
 
@@ -166,36 +154,31 @@ inline Foam::rhoConst<Specie> Foam::operator+
     const rhoConst<Specie>& ico2
 )
 {
-    scalar nMoles = ico1.nMoles() + ico2.nMoles();
-    scalar molr1 = ico1.nMoles()/nMoles;
-    scalar molr2 = ico2.nMoles()/nMoles;
-
-    return rhoConst<Specie>
+    Specie sp
     (
         static_cast<const Specie&>(ico1)
-      + static_cast<const Specie&>(ico2),
-        molr1*ico1.rho_ + molr2*ico2.rho_
+      + static_cast<const Specie&>(ico2)
     );
-}
 
+    if (mag(sp.Y()) < SMALL)
+    {
+        return rhoConst<Specie>
+        (
+            sp,
+            ico1.rho_
+        );
+    }
+    else
+    {
+        const scalar Y1 = ico1.Y()/sp.Y();
+        const scalar Y2 = ico2.Y()/sp.Y();
 
-template<class Specie>
-inline Foam::rhoConst<Specie> Foam::operator-
-(
-    const rhoConst<Specie>& ico1,
-    const rhoConst<Specie>& ico2
-)
-{
-    scalar nMoles = ico1.nMoles() + ico2.nMoles();
-    scalar molr1 = ico1.nMoles()/nMoles;
-    scalar molr2 = ico2.nMoles()/nMoles;
-
-    return rhoConst<Specie>
-    (
-        static_cast<const Specie&>(ico1)
-      - static_cast<const Specie&>(ico2),
-        molr1*ico1.rho_ - molr2*ico2.rho_
-    );
+        return rhoConst<Specie>
+        (
+            sp,
+            Y1*ico1.rho_ + Y2*ico2.rho_
+        );
+    }
 }
 
 
@@ -217,7 +200,20 @@ inline Foam::rhoConst<Specie> Foam::operator==
     const rhoConst<Specie>& ico2
 )
 {
-    return ico2 - ico1;
+    Specie sp
+    (
+        static_cast<const Specie&>(ico1)
+     == static_cast<const Specie&>(ico2)
+    );
+
+    const scalar Y1 = ico1.Y()/sp.Y();
+    const scalar Y2 = ico2.Y()/sp.Y();
+
+    return rhoConst<Specie>
+    (
+        sp,
+        Y2*ico2.rho_ - Y1*ico1.rho_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index 8dff4ef938..dc43975c46 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -111,29 +111,37 @@ void Foam::Reaction<ReactionThermo>::setThermo
     const HashPtrTable<ReactionThermo>& thermoDatabase
 )
 {
-    if (rhs_.size() > 0)
-    {
-        ReactionThermo::thermoType::operator=
-        (
-            rhs_[0].stoichCoeff*(*thermoDatabase[species_[rhs_[0].index]])
-        );
+    typename ReactionThermo::thermoType rhsThermo
+    (
+        rhs_[0].stoichCoeff
+       *(*thermoDatabase[species_[rhs_[0].index]]).W()
+       *(*thermoDatabase[species_[rhs_[0].index]])
+    );
 
-        for (label i=1; i<rhs_.size(); ++i)
-        {
-            this->operator+=
-            (
-                rhs_[i].stoichCoeff*(*thermoDatabase[species_[rhs_[i].index]])
-            );
-        }
+    for (label i=1; i<rhs_.size(); ++i)
+    {
+        rhsThermo +=
+            rhs_[i].stoichCoeff
+           *(*thermoDatabase[species_[rhs_[i].index]]).W()
+           *(*thermoDatabase[species_[rhs_[i].index]]);
     }
 
-    forAll(lhs_, i)
+    typename ReactionThermo::thermoType lhsThermo
+    (
+        lhs_[0].stoichCoeff
+       *(*thermoDatabase[species_[lhs_[0].index]]).W()
+       *(*thermoDatabase[species_[lhs_[0].index]])
+    );
+
+    for (label i=1; i<lhs_.size(); ++i)
     {
-        this->operator-=
-        (
-            lhs_[i].stoichCoeff*(*thermoDatabase[species_[lhs_[i].index]])
-        );
+        lhsThermo +=
+            lhs_[i].stoichCoeff
+           *(*thermoDatabase[species_[lhs_[i].index]]).W()
+           *(*thermoDatabase[species_[lhs_[i].index]]);
     }
+
+    ReactionThermo::thermoType::operator=(lhsThermo == rhsThermo);
 }
 
 
diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C
index 8a4f7612a6..b507212cd0 100644
--- a/src/thermophysicalModels/specie/specie/specie.C
+++ b/src/thermophysicalModels/specie/specie/specie.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ namespace Foam
 Foam::specie::specie(Istream& is)
 :
     name_(is),
-    nMoles_(readScalar(is)),
+    Y_(readScalar(is)),
     molWeight_(readScalar(is))
 {
     is.check("specie::specie(Istream& is)");
@@ -50,7 +50,7 @@ Foam::specie::specie(Istream& is)
 Foam::specie::specie(const dictionary& dict)
 :
     name_(dict.dictName()),
-    nMoles_(readScalar(dict.subDict("specie").lookup("nMoles"))),
+    Y_(dict.subDict("specie").lookupOrDefault("massFraction", 1.0)),
     molWeight_(readScalar(dict.subDict("specie").lookup("molWeight")))
 {}
 
@@ -60,7 +60,10 @@ Foam::specie::specie(const dictionary& dict)
 void Foam::specie::write(Ostream& os) const
 {
     dictionary dict("specie");
-    dict.add("nMoles", nMoles_);
+    if (Y_ != 1)
+    {
+        dict.add("massFraction", Y_);
+    }
     dict.add("molWeight", molWeight_);
     os  << indent << dict.dictName() << dict;
 }
@@ -71,7 +74,7 @@ void Foam::specie::write(Ostream& os) const
 Foam::Ostream& Foam::operator<<(Ostream& os, const specie& st)
 {
     os  << st.name_ << tab
-        << st.nMoles_ << tab
+        << st.Y_ << tab
         << st.molWeight_;
 
     os.check("Ostream& operator<<(Ostream& os, const specie& st)");
diff --git a/src/thermophysicalModels/specie/specie/specie.H b/src/thermophysicalModels/specie/specie/specie.H
index 28d7290818..52ebcbe13e 100644
--- a/src/thermophysicalModels/specie/specie/specie.H
+++ b/src/thermophysicalModels/specie/specie/specie.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,6 @@ namespace Foam
 class specie;
 
 inline specie operator+(const specie&, const specie&);
-inline specie operator-(const specie&, const specie&);
 inline specie operator*(const scalar, const specie&);
 inline specie operator==(const specie&, const specie&);
 
@@ -72,7 +71,7 @@ class specie
         word name_;
 
         //- Number of moles of this component in the mixture
-        scalar nMoles_;
+        scalar Y_;
 
         //- Molecular weight of specie [kg/kmol]
         scalar molWeight_;
@@ -86,15 +85,14 @@ public:
 
     // Constructors
 
-
         //- Construct from components without name
-        inline specie(const scalar nMoles, const scalar molWeight);
+        inline specie(const scalar Y, const scalar molWeight);
 
         //- Construct from components with name
         inline specie
         (
             const word& name,
-            const scalar nMoles,
+            const scalar Y,
             const scalar molWeight
         );
 
@@ -122,7 +120,7 @@ public:
             inline scalar W() const;
 
             //- No of moles of this species in mixture
-            inline scalar nMoles() const;
+            inline scalar Y() const;
 
             //- Gas constant [J/(kg K)]
             inline scalar R() const;
@@ -137,20 +135,14 @@ public:
     // Member operators
 
         inline void operator=(const specie&);
-
         inline void operator+=(const specie&);
-        inline void operator-=(const specie&);
-
         inline void operator*=(const scalar);
 
 
     // Friend operators
 
         inline friend specie operator+(const specie&, const specie&);
-        inline friend specie operator-(const specie&, const specie&);
-
         inline friend specie operator*(const scalar, const specie&);
-
         inline friend specie operator==(const specie&, const specie&);
 
 
diff --git a/src/thermophysicalModels/specie/specie/specieI.H b/src/thermophysicalModels/specie/specie/specieI.H
index 76d979b3c7..fb8255dbef 100644
--- a/src/thermophysicalModels/specie/specie/specieI.H
+++ b/src/thermophysicalModels/specie/specie/specieI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,23 +35,23 @@ namespace Foam
 inline specie::specie
 (
     const word& name,
-    const scalar nMoles,
+    const scalar Y,
     const scalar molWeight
 )
 :
     name_(name),
-    nMoles_(nMoles),
+    Y_(Y),
     molWeight_(molWeight)
 {}
 
 
 inline specie::specie
 (
-    const scalar nMoles,
+    const scalar Y,
     const scalar molWeight
 )
 :
-    nMoles_(nMoles),
+    Y_(Y),
     molWeight_(molWeight)
 {}
 
@@ -61,7 +61,7 @@ inline specie::specie
 inline specie::specie(const specie& st)
 :
     name_(st.name_),
-    nMoles_(st.nMoles_),
+    Y_(st.Y_),
     molWeight_(st.molWeight_)
 {}
 
@@ -69,7 +69,7 @@ inline specie::specie(const specie& st)
 inline specie::specie(const word& name, const specie& st)
 :
     name_(name),
-    nMoles_(st.nMoles_),
+    Y_(st.Y_),
     molWeight_(st.molWeight_)
 {}
 
@@ -88,9 +88,9 @@ inline scalar specie::W() const
 }
 
 
-inline scalar specie::nMoles() const
+inline scalar specie::Y() const
 {
-    return nMoles_;
+    return Y_;
 }
 
 
@@ -105,42 +105,26 @@ inline scalar specie::R() const
 inline void specie::operator=(const specie& st)
 {
     //name_ = st.name_;
-    nMoles_ = st.nMoles_;
+    Y_ = st.Y_;
     molWeight_ = st.molWeight_;
 }
 
 
 inline void specie::operator+=(const specie& st)
 {
-    scalar sumNmoles = max(nMoles_ + st.nMoles_, SMALL);
-
-    molWeight_ =
-        nMoles_/sumNmoles*molWeight_
-      + st.nMoles_/sumNmoles*st.molWeight_;
-
-    nMoles_ = sumNmoles;
-}
-
-
-inline void specie::operator-=(const specie& st)
-{
-    scalar diffnMoles = nMoles_ - st.nMoles_;
-    if (mag(diffnMoles) < SMALL)
+    const scalar sumY = Y_ + st.Y_;
+    if (mag(sumY) > SMALL)
     {
-        diffnMoles = SMALL;
+        molWeight_ = sumY/(Y_/molWeight_ + st.Y_/st.molWeight_);
     }
 
-    molWeight_ =
-        nMoles_/diffnMoles*molWeight_
-      - st.nMoles_/diffnMoles*st.molWeight_;
-
-    nMoles_ = diffnMoles;
+    Y_ = sumY;
 }
 
 
 inline void specie::operator*=(const scalar s)
 {
-    nMoles_ *= s;
+    Y_ *= s;
 }
 
 
@@ -148,31 +132,20 @@ inline void specie::operator*=(const scalar s)
 
 inline specie operator+(const specie& st1, const specie& st2)
 {
-    scalar sumNmoles = max(st1.nMoles_ + st2.nMoles_, SMALL);
+    const scalar sumY = max(st1.Y_ + st2.Y_, SMALL);
 
-    return specie
-    (
-        sumNmoles,
-        st1.nMoles_/sumNmoles*st1.molWeight_
-      + st2.nMoles_/sumNmoles*st2.molWeight_
-    );
-}
-
-
-inline specie operator-(const specie& st1, const specie& st2)
-{
-    scalar diffNmoles = st1.nMoles_ - st2.nMoles_;
-    if (mag(diffNmoles) < SMALL)
+    if (mag(sumY) > SMALL)
     {
-        diffNmoles = SMALL;
+        return specie
+        (
+            sumY,
+            sumY/(st1.Y_/st1.molWeight_ + st2.Y_/st2.molWeight_)
+        );
+    }
+    else
+    {
+        return st1;
     }
-
-    return specie
-    (
-        diffNmoles,
-        st1.nMoles_/diffNmoles*st1.molWeight_
-      - st2.nMoles_/diffNmoles*st2.molWeight_
-    );
 }
 
 
@@ -180,7 +153,7 @@ inline specie operator*(const scalar s, const specie& st)
 {
     return specie
     (
-        s*st.nMoles_,
+        s*st.Y_,
         st.molWeight_
     );
 }
@@ -188,7 +161,22 @@ inline specie operator*(const scalar s, const specie& st)
 
 inline specie operator==(const specie& st1, const specie& st2)
 {
-    return st2 - st1;
+    scalar diffY = st2.Y_ - st1.Y_;
+    if (mag(diffY) < SMALL)
+    {
+        diffY = SMALL;
+    }
+
+    const scalar diffRW =
+        st2.Y_/st2.molWeight_ - st1.Y_/st1.molWeight_;
+
+    scalar molWeight = GREAT;
+    if (mag(diffRW) > SMALL)
+    {
+        molWeight = diffY/diffRW;
+    }
+
+    return specie(diffY, molWeight);
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/absoluteEnthalpy/absoluteEnthalpy.H b/src/thermophysicalModels/specie/thermo/absoluteEnthalpy/absoluteEnthalpy.H
index 98bf51e03f..2130d60bc6 100644
--- a/src/thermophysicalModels/specie/thermo/absoluteEnthalpy/absoluteEnthalpy.H
+++ b/src/thermophysicalModels/specie/thermo/absoluteEnthalpy/absoluteEnthalpy.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,8 +25,7 @@ Class
     Foam::absoluteEnthalpy
 
 Description
-    Thermodynamics mapping class to expose the absolute enthalpy function
-    as the standard enthalpy function h(T).
+    Thermodynamics mapping class to expose the absolute enthalpy functions.
 
 \*---------------------------------------------------------------------------*/
 
@@ -70,30 +69,19 @@ public:
                 return "ha";
             }
 
-            // Absolute enthalpy [J/kmol]
-            scalar he
+            // Heat capacity at constant pressure [J/(kg K)]
+            scalar Cpv
             (
                 const Thermo& thermo,
                 const scalar p,
                 const scalar T
             ) const
             {
-                return thermo.ha(p, T);
+                return thermo.Cp(p, T);
             }
 
-            // Heat capacity at constant pressure [J/(kmol K)]
-            scalar cpv
-            (
-                const Thermo& thermo,
-                const scalar p,
-                const scalar T
-            ) const
-            {
-                return thermo.cp(p, T);
-            }
-
-            //- cp/cp []
-            scalar cpBycpv
+            //- Cp/Cp []
+            scalar CpByCpv
             (
                 const Thermo& thermo,
                 const scalar p,
diff --git a/src/thermophysicalModels/specie/thermo/absoluteInternalEnergy/absoluteInternalEnergy.H b/src/thermophysicalModels/specie/thermo/absoluteInternalEnergy/absoluteInternalEnergy.H
index 6ea5df7dc2..c78b61d50e 100644
--- a/src/thermophysicalModels/specie/thermo/absoluteInternalEnergy/absoluteInternalEnergy.H
+++ b/src/thermophysicalModels/specie/thermo/absoluteInternalEnergy/absoluteInternalEnergy.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,8 +25,8 @@ Class
     Foam::absoluteInternalEnergy
 
 Description
-    Thermodynamics mapping class to expose the absolute internal energy function
-    as the standard internal energy function e(T).
+    Thermodynamics mapping class to expose the absolute internal energy
+    functions.
 
 \*---------------------------------------------------------------------------*/
 
@@ -70,30 +70,19 @@ public:
                 return "ea";
             }
 
-            // Absolute internal energy [J/kmol]
-            scalar he
+            // Heat capacity at constant volume [J/(kg K)]
+            scalar Cpv
             (
                 const Thermo& thermo,
                 const scalar p,
                 const scalar T
             ) const
             {
-                return thermo.ea(p, T);
+                return thermo.Cv(p, T);
             }
 
-            // Heat capacity at constant volume [J/(kmol K)]
-            scalar cpv
-            (
-                const Thermo& thermo,
-                const scalar p,
-                const scalar T
-            ) const
-            {
-                return thermo.cv(p, T);
-            }
-
-            //- cp/cv []
-            scalar cpBycpv
+            //- Cp/Cv []
+            scalar CpByCpv
             (
                 const Thermo& thermo,
                 const scalar p,
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
index a004ed0e62..d38693c03f 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,9 +36,6 @@ Foam::eConstThermo<EquationOfState>::eConstThermo(Istream& is)
     Hf_(readScalar(is))
 {
     is.check("eConstThermo<EquationOfState>::eConstThermo(Istream&)");
-
-    Cv_ *= this->W();
-    Hf_ *= this->W();
 }
 
 
@@ -48,10 +45,7 @@ Foam::eConstThermo<EquationOfState>::eConstThermo(const dictionary& dict)
     EquationOfState(dict),
     Cv_(readScalar(dict.subDict("thermodynamics").lookup("Cv"))),
     Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf")))
-{
-    Cv_ *= this->W();
-    Hf_ *= this->W();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -62,8 +56,8 @@ void Foam::eConstThermo<EquationOfState>::write(Ostream& os) const
     EquationOfState::write(os);
 
     dictionary dict("thermodynamics");
-    dict.add("Cv", Cv_/this->W());
-    dict.add("Hf", Hf_/this->W());
+    dict.add("Cv", Cv_);
+    dict.add("Hf", Hf_);
     os  << indent << dict.dictName() << dict;
 }
 
@@ -78,7 +72,7 @@ Foam::Ostream& Foam::operator<<
 )
 {
     os  << static_cast<const EquationOfState&>(ct) << tab
-        << ct.Cv_/ct.W() << tab << ct.Hf_/ct.W();
+        << ct.Cv_ << tab << ct.Hf_;
 
     os.check("Ostream& operator<<(Ostream&, const eConstThermo&)");
     return os;
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
index 6a99ba435f..9f5354ca9c 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
@@ -1,8 +1,8 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,13 +55,6 @@ inline eConstThermo<EquationOfState> operator+
     const eConstThermo<EquationOfState>&
 );
 
-template<class EquationOfState>
-inline eConstThermo<EquationOfState> operator-
-(
-    const eConstThermo<EquationOfState>&,
-    const eConstThermo<EquationOfState>&
-);
-
 template<class EquationOfState>
 inline eConstThermo<EquationOfState> operator*
 (
@@ -152,20 +145,20 @@ public:
 
         // Fundamental properties
 
-            //- Heat capacity at constant pressure [J/(kmol K)]
-            inline scalar cp(const scalar p, const scalar T) const;
+            //- Heat capacity at constant pressure [J/(kg K)]
+            inline scalar Cp(const scalar p, const scalar T) const;
 
-            //- Absolute Enthalpy [J/kmol]
-            inline scalar ha(const scalar p, const scalar T) const;
+            //- Absolute Enthalpy [J/kg]
+            inline scalar Ha(const scalar p, const scalar T) const;
 
-            //- Sensible Enthalpy [J/kmol]
-            inline scalar hs(const scalar p, const scalar T) const;
+            //- Sensible enthalpy [J/kg]
+            inline scalar Hs(const scalar p, const scalar T) const;
 
-            //- Chemical enthalpy [J/kmol]
-            inline scalar hc() const;
+            //- Chemical enthalpy [J/kg]
+            inline scalar Hc() const;
 
-            //- Entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
 
         // I-O
@@ -177,7 +170,6 @@ public:
     // Member operators
 
         inline void operator+=(const eConstThermo&);
-        inline void operator-=(const eConstThermo&);
 
 
     // Friend operators
@@ -188,12 +180,6 @@ public:
             const eConstThermo&
         );
 
-        friend eConstThermo operator- <EquationOfState>
-        (
-            const eConstThermo&,
-            const eConstThermo&
-        );
-
         friend eConstThermo operator* <EquationOfState>
         (
             const scalar,
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
index ad21fcf456..e6c1b84afe 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
@@ -100,53 +100,53 @@ inline Foam::scalar Foam::eConstThermo<EquationOfState>::limit
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::eConstThermo<EquationOfState>::cp
+inline Foam::scalar Foam::eConstThermo<EquationOfState>::Cp
 (
     const scalar p,
     const scalar T
 ) const
 {
-    return Cv_ + this->cpMcv(p, T) + EquationOfState::cp(p, T);
+    return Cv_ + this->CpMCv(p, T) + EquationOfState::Cp(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::eConstThermo<EquationOfState>::ha
+inline Foam::scalar Foam::eConstThermo<EquationOfState>::Ha
 (
     const scalar p,
     const scalar T
 ) const
 {
-    return cp(p, T)*T + Hf_ + EquationOfState::h(p, T);
+    return Cp(p, T)*T + Hf_ + EquationOfState::H(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::eConstThermo<EquationOfState>::hs
+inline Foam::scalar Foam::eConstThermo<EquationOfState>::Hs
 (
     const scalar p,
     const scalar T
 ) const
 {
-    return cp(p, T)*T + EquationOfState::h(p, T);
+    return Cp(p, T)*T + EquationOfState::H(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::eConstThermo<EquationOfState>::hc() const
+inline Foam::scalar Foam::eConstThermo<EquationOfState>::Hc() const
 {
     return Hf_;
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::eConstThermo<EquationOfState>::s
+inline Foam::scalar Foam::eConstThermo<EquationOfState>::S
 (
     const scalar p,
     const scalar T
 ) const
 {
-    return cp(p, T)*log(T/Tstd) + EquationOfState::s(p, T);
+    return Cp(p, T)*log(T/Tstd) + EquationOfState::S(p, T);
 }
 
 
@@ -158,33 +158,18 @@ inline void Foam::eConstThermo<EquationOfState>::operator+=
     const eConstThermo<EquationOfState>& ct
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
     EquationOfState::operator+=(ct);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = ct.Y()/this->Y();
 
-    Cv_ = molr1*Cv_ + molr2*ct.Cv_;
-    Hf_ = molr1*Hf_ + molr2*ct.Hf_;
-}
-
-
-template<class EquationOfState>
-inline void Foam::eConstThermo<EquationOfState>::operator-=
-(
-    const eConstThermo<EquationOfState>& ct
-)
-{
-    scalar molr1 = this->nMoles();
-
-    EquationOfState::operator-=(ct);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
-
-    Cv_ = molr1*Cv_ - molr2*ct.Cv_;
-    Hf_ = molr1*Hf_ - molr2*ct.Hf_;
+        Cv_ = Y1*Cv_ + Y2*ct.Cv_;
+        Hf_ = Y1*Hf_ + Y2*ct.Hf_;
+    }
 }
 
 
@@ -203,38 +188,26 @@ inline Foam::eConstThermo<EquationOfState> Foam::operator+
       + static_cast<const EquationOfState&>(ct2)
     );
 
-    return eConstThermo<EquationOfState>
-    (
-        eofs,
-        ct1.nMoles()/eofs.nMoles()*ct1.Cv_
-      + ct2.nMoles()/eofs.nMoles()*ct2.Cv_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
-      + ct2.nMoles()/eofs.nMoles()*ct2.Hf_
-    );
-}
-
-
-template<class EquationOfState>
-inline Foam::eConstThermo<EquationOfState> Foam::operator-
-(
-    const eConstThermo<EquationOfState>& ct1,
-    const eConstThermo<EquationOfState>& ct2
-)
-{
-    EquationOfState eofs
-    (
-        static_cast<const EquationOfState&>(ct1)
-      - static_cast<const EquationOfState&>(ct2)
-    );
-
-    return eConstThermo<EquationOfState>
-    (
-        eofs,
-        ct1.nMoles()/eofs.nMoles()*ct1.Cv_
-      - ct2.nMoles()/eofs.nMoles()*ct2.Cv_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
-      - ct2.nMoles()/eofs.nMoles()*ct2.Hf_
-    );
+    if (mag(eofs.Y()) < SMALL)
+    {
+        return eConstThermo<EquationOfState>
+        (
+            eofs,
+            ct1.Cv_,
+            ct1.Hf_
+        );
+    }
+    else
+    {
+        return eConstThermo<EquationOfState>
+        (
+            eofs,
+            ct1.Y()/eofs.Y()*ct1.Cv_
+          + ct2.Y()/eofs.Y()*ct2.Cv_,
+            ct1.Y()/eofs.Y()*ct1.Hf_
+          + ct2.Y()/eofs.Y()*ct2.Hf_
+        );
+    }
 }
 
 
@@ -261,7 +234,20 @@ inline Foam::eConstThermo<EquationOfState> Foam::operator==
     const eConstThermo<EquationOfState>& ct2
 )
 {
-    return ct2 - ct1;
+    EquationOfState eofs
+    (
+        static_cast<const EquationOfState&>(ct1)
+     == static_cast<const EquationOfState&>(ct2)
+    );
+
+    return eConstThermo<EquationOfState>
+    (
+        eofs,
+        ct2.Y()/eofs.Y()*ct2.Cv_
+      - ct1.Y()/eofs.Y()*ct1.Cv_,
+        ct2.Y()/eofs.Y()*ct2.Hf_
+      - ct1.Y()/eofs.Y()*ct1.Hf_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
index e4c60c18d6..2f892cbbf6 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,9 +36,6 @@ Foam::hConstThermo<EquationOfState>::hConstThermo(Istream& is)
     Hf_(readScalar(is))
 {
     is.check("hConstThermo::hConstThermo(Istream& is)");
-
-    Cp_ *= this->W();
-    Hf_ *= this->W();
 }
 
 
@@ -48,10 +45,7 @@ Foam::hConstThermo<EquationOfState>::hConstThermo(const dictionary& dict)
     EquationOfState(dict),
     Cp_(readScalar(dict.subDict("thermodynamics").lookup("Cp"))),
     Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf")))
-{
-    Cp_ *= this->W();
-    Hf_ *= this->W();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -62,8 +56,8 @@ void Foam::hConstThermo<EquationOfState>::write(Ostream& os) const
     EquationOfState::write(os);
 
     dictionary dict("thermodynamics");
-    dict.add("Cp", Cp_/this->W());
-    dict.add("Hf", Hf_/this->W());
+    dict.add("Cp", Cp_);
+    dict.add("Hf", Hf_);
     os  << indent << dict.dictName() << dict;
 }
 
@@ -78,7 +72,7 @@ Foam::Ostream& Foam::operator<<
 )
 {
     os  << static_cast<const EquationOfState&>(ct) << tab
-        << ct.Cp_/ct.W() << tab << ct.Hf_/ct.W();
+        << ct.Cp_ << tab << ct.Hf_;
 
     os.check("Ostream& operator<<(Ostream& os, const hConstThermo& ct)");
     return os;
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
index a83346040b..7c04be81e3 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,13 +53,6 @@ inline hConstThermo<EquationOfState> operator+
     const hConstThermo<EquationOfState>&
 );
 
-template<class EquationOfState>
-inline hConstThermo<EquationOfState> operator-
-(
-    const hConstThermo<EquationOfState>&,
-    const hConstThermo<EquationOfState>&
-);
-
 template<class EquationOfState>
 inline hConstThermo<EquationOfState> operator*
 (
@@ -145,20 +138,20 @@ public:
 
         // Fundamental properties
 
-            //- Heat capacity at constant pressure [J/(kmol K)]
-            inline scalar cp(const scalar p, const scalar T) const;
+            //- Heat capacity at constant pressure [J/(kg K)]
+            inline scalar Cp(const scalar p, const scalar T) const;
 
-            //- Absolute Enthalpy [J/kmol]
-            inline scalar ha(const scalar p, const scalar T) const;
+            //- Absolute Enthalpy [J/kg]
+            inline scalar Ha(const scalar p, const scalar T) const;
 
-            //- Sensible enthalpy [J/kmol]
-            inline scalar hs(const scalar p, const scalar T) const;
+            //- Sensible enthalpy [J/kg]
+            inline scalar Hs(const scalar p, const scalar T) const;
 
-            //- Chemical enthalpy [J/kmol]
-            inline scalar hc() const;
+            //- Chemical enthalpy [J/kg]
+            inline scalar Hc() const;
 
-            //- Entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
 
         // I-O
@@ -170,7 +163,6 @@ public:
     // Member operators
 
         inline void operator+=(const hConstThermo&);
-        inline void operator-=(const hConstThermo&);
 
 
     // Friend operators
@@ -181,12 +173,6 @@ public:
             const hConstThermo&
         );
 
-        friend hConstThermo operator- <EquationOfState>
-        (
-            const hConstThermo&,
-            const hConstThermo&
-        );
-
         friend hConstThermo operator* <EquationOfState>
         (
             const scalar,
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
index 1367c7c426..ebed57e432 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,50 +100,50 @@ inline Foam::scalar Foam::hConstThermo<EquationOfState>::limit
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hConstThermo<EquationOfState>::cp
+inline Foam::scalar Foam::hConstThermo<EquationOfState>::Cp
 (
     const scalar p,
     const scalar T
 ) const
 {
-    return Cp_ + EquationOfState::cp(p, T);
+    return Cp_ + EquationOfState::Cp(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hConstThermo<EquationOfState>::ha
+inline Foam::scalar Foam::hConstThermo<EquationOfState>::Ha
 (
     const scalar p, const scalar T
 ) const
 {
-    return Cp_*T + Hf_ + EquationOfState::h(p, T);
+    return Cp_*T + Hf_ + EquationOfState::H(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hConstThermo<EquationOfState>::hs
+inline Foam::scalar Foam::hConstThermo<EquationOfState>::Hs
 (
     const scalar p, const scalar T
 ) const
 {
-    return Cp_*T + EquationOfState::h(p, T);
+    return Cp_*T + EquationOfState::H(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hConstThermo<EquationOfState>::hc() const
+inline Foam::scalar Foam::hConstThermo<EquationOfState>::Hc() const
 {
     return Hf_;
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hConstThermo<EquationOfState>::s
+inline Foam::scalar Foam::hConstThermo<EquationOfState>::S
 (
     const scalar p, const scalar T
 ) const
 {
-    return Cp_*log(T/Tstd) + EquationOfState::s(p, T);
+    return Cp_*log(T/Tstd) + EquationOfState::S(p, T);
 }
 
 
@@ -155,33 +155,18 @@ inline void Foam::hConstThermo<EquationOfState>::operator+=
     const hConstThermo<EquationOfState>& ct
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
     EquationOfState::operator+=(ct);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        scalar Y2 = ct.Y()/this->Y();
 
-    Cp_ = molr1*Cp_ + molr2*ct.Cp_;
-    Hf_ = molr1*Hf_ + molr2*ct.Hf_;
-}
-
-
-template<class EquationOfState>
-inline void Foam::hConstThermo<EquationOfState>::operator-=
-(
-    const hConstThermo<EquationOfState>& ct
-)
-{
-    scalar molr1 = this->nMoles();
-
-    EquationOfState::operator-=(ct);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
-
-    Cp_ = molr1*Cp_ - molr2*ct.Cp_;
-    Hf_ = molr1*Hf_ - molr2*ct.Hf_;
+        Cp_ = Y1*Cp_ + Y2*ct.Cp_;
+        Hf_ = Y1*Hf_ + Y2*ct.Hf_;
+    }
 }
 
 
@@ -200,38 +185,26 @@ inline Foam::hConstThermo<EquationOfState> Foam::operator+
       + static_cast<const EquationOfState&>(ct2)
     );
 
-    return hConstThermo<EquationOfState>
-    (
-        eofs,
-        ct1.nMoles()/eofs.nMoles()*ct1.Cp_
-      + ct2.nMoles()/eofs.nMoles()*ct2.Cp_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
-      + ct2.nMoles()/eofs.nMoles()*ct2.Hf_
-    );
-}
-
-
-template<class EquationOfState>
-inline Foam::hConstThermo<EquationOfState> Foam::operator-
-(
-    const hConstThermo<EquationOfState>& ct1,
-    const hConstThermo<EquationOfState>& ct2
-)
-{
-    EquationOfState eofs
-    (
-        static_cast<const EquationOfState&>(ct1)
-      - static_cast<const EquationOfState&>(ct2)
-    );
-
-    return hConstThermo<EquationOfState>
-    (
-        eofs,
-        ct1.nMoles()/eofs.nMoles()*ct1.Cp_
-      - ct2.nMoles()/eofs.nMoles()*ct2.Cp_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
-      - ct2.nMoles()/eofs.nMoles()*ct2.Hf_
-    );
+    if (mag(eofs.Y()) < SMALL)
+    {
+        return hConstThermo<EquationOfState>
+        (
+            eofs,
+            ct1.Cp_,
+            ct1.Hf_
+        );
+    }
+    else
+    {
+        return hConstThermo<EquationOfState>
+        (
+            eofs,
+            ct1.Y()/eofs.Y()*ct1.Cp_
+          + ct2.Y()/eofs.Y()*ct2.Cp_,
+            ct1.Y()/eofs.Y()*ct1.Hf_
+          + ct2.Y()/eofs.Y()*ct2.Hf_
+        );
+    }
 }
 
 
@@ -258,7 +231,20 @@ inline Foam::hConstThermo<EquationOfState> Foam::operator==
     const hConstThermo<EquationOfState>& ct2
 )
 {
-    return ct2 - ct1;
+    EquationOfState eofs
+    (
+        static_cast<const EquationOfState&>(ct1)
+     == static_cast<const EquationOfState&>(ct2)
+    );
+
+    return hConstThermo<EquationOfState>
+    (
+        eofs,
+        ct2.Y()/eofs.Y()*ct2.Cp_
+      - ct1.Y()/eofs.Y()*ct1.Cp_,
+        ct2.Y()/eofs.Y()*ct2.Hf_
+      - ct1.Y()/eofs.Y()*ct1.Hf_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index 511e871bf1..0aa43c1f72 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,10 +41,6 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
     hCoeffs_(),
     sCoeffs_()
 {
-    Hf_ *= this->W();
-    Sf_ *= this->W();
-    CpCoeffs_ *= this->W();
-
     hCoeffs_ = CpCoeffs_.integral();
     sCoeffs_ = CpCoeffs_.integralMinus1();
 
@@ -75,10 +71,6 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
     hCoeffs_(),
     sCoeffs_()
 {
-    Hf_ *= this->W();
-    Sf_ *= this->W();
-    CpCoeffs_ *= this->W();
-
     hCoeffs_ = CpCoeffs_.integral();
     sCoeffs_ = CpCoeffs_.integralMinus1();
 
@@ -101,12 +93,12 @@ void Foam::hPolynomialThermo<EquationOfState, PolySize>::write
     EquationOfState::write(os);
 
     dictionary dict("thermodynamics");
-    dict.add("Hf", Hf_/this->W());
-    dict.add("Sf", Sf_/this->W());
+    dict.add("Hf", Hf_);
+    dict.add("Sf", Sf_);
     dict.add
     (
         word("CpCoeffs<" + Foam::name(PolySize) + '>'),
-        CpCoeffs_/this->W()
+        CpCoeffs_
     );
     os  << indent << dict.dictName() << dict;
 }
@@ -122,10 +114,10 @@ Foam::Ostream& Foam::operator<<
 )
 {
     os  << static_cast<const EquationOfState&>(pt) << tab
-        << pt.Hf_/pt.W() << tab
-        << pt.Sf_/pt.W() << tab
+        << pt.Hf_ << tab
+        << pt.Sf_ << tab
         << "CpCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << pt.CpCoeffs_/pt.W();
+        << pt.CpCoeffs_/pt;
 
     os.check
     (
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
index e7d48a6d0d..d8acaee18a 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,13 +93,6 @@ inline hPolynomialThermo<EquationOfState, PolySize> operator+
     const hPolynomialThermo<EquationOfState, PolySize>&
 );
 
-template<class EquationOfState, int PolySize>
-inline hPolynomialThermo<EquationOfState, PolySize> operator-
-(
-    const hPolynomialThermo<EquationOfState, PolySize>&,
-    const hPolynomialThermo<EquationOfState, PolySize>&
-);
-
 template<class EquationOfState, int PolySize>
 inline hPolynomialThermo<EquationOfState, PolySize> operator*
 (
@@ -195,20 +188,20 @@ public:
 
         // Fundamental properties
 
-            //- Heat capacity at constant pressure [J/(kmol K)]
-            inline scalar cp(const scalar p, const scalar T) const;
+            //- Heat capacity at constant pressure [J/(kg K)]
+            inline scalar Cp(const scalar p, const scalar T) const;
 
-            //- Absolute Enthalpy [J/kmol]
-            inline scalar ha(const scalar p, const scalar T) const;
+            //- Absolute Enthalpy [J/kg]
+            inline scalar Ha(const scalar p, const scalar T) const;
 
-            //- Sensible enthalpy [J/kmol]
-            inline scalar hs(const scalar p, const scalar T) const;
+            //- Sensible enthalpy [J/kg]
+            inline scalar Hs(const scalar p, const scalar T) const;
 
-            //- Chemical enthalpy [J/kmol]
-            inline scalar hc() const;
+            //- Chemical enthalpy [J/kg]
+            inline scalar Hc() const;
 
-            //- Entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
 
         // I-O
@@ -221,7 +214,6 @@ public:
 
         inline void operator=(const hPolynomialThermo&);
         inline void operator+=(const hPolynomialThermo&);
-        inline void operator-=(const hPolynomialThermo&);
         inline void operator*=(const scalar);
 
 
@@ -233,12 +225,6 @@ public:
             const hPolynomialThermo&
         );
 
-        friend hPolynomialThermo operator- <EquationOfState, PolySize>
-        (
-            const hPolynomialThermo&,
-            const hPolynomialThermo&
-        );
-
         friend hPolynomialThermo operator* <EquationOfState, PolySize>
         (
             const scalar,
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
index 7cef8ce2b5..26049dfc5f 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,37 +93,37 @@ inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::limit
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::cp
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::Cp
 (
     const scalar p, const scalar T
 ) const
 {
-    return CpCoeffs_.value(T) + EquationOfState::cp(p, T);
+    return CpCoeffs_.value(T) + EquationOfState::Cp(p, T);
 }
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::ha
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::Ha
 (
     const scalar p, const scalar T
 ) const
 {
-    return hCoeffs_.value(T) + EquationOfState::h(p, T);
+    return hCoeffs_.value(T) + EquationOfState::H(p, T);
 }
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::hs
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::Hs
 (
     const scalar p, const scalar T
 ) const
 {
-    return ha(p, T) - hc();
+    return Ha(p, T) - Hc();
 }
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::hc()
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::Hc()
 const
 {
     return Hf_;
@@ -131,13 +131,13 @@ const
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::s
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::S
 (
     const scalar p,
     const scalar T
 ) const
 {
-    return sCoeffs_.value(T) + EquationOfState::s(p, T);
+    return sCoeffs_.value(T) + EquationOfState::S(p, T);
 }
 
 
@@ -165,39 +165,21 @@ inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator+=
     const hPolynomialThermo<EquationOfState, PolySize>& pt
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
     EquationOfState::operator+=(pt);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = pt.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = pt.Y()/this->Y();
 
-    Hf_ = molr1*Hf_ + molr2*pt.Hf_;
-    Sf_ = molr1*Sf_ + molr2*pt.Sf_;
-    CpCoeffs_ = molr1*CpCoeffs_ + molr2*pt.CpCoeffs_;
-    hCoeffs_ = molr1*hCoeffs_ + molr2*pt.hCoeffs_;
-    sCoeffs_ = molr1*sCoeffs_ + molr2*pt.sCoeffs_;
-}
-
-
-template<class EquationOfState, int PolySize>
-inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator-=
-(
-    const hPolynomialThermo<EquationOfState, PolySize>& pt
-)
-{
-    scalar molr1 = this->nMoles();
-
-    EquationOfState::operator-=(pt);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = pt.nMoles()/this->nMoles();
-
-    Hf_ = molr1*Hf_ - molr2*pt.Hf_;
-    Sf_ = molr1*Sf_ - molr2*pt.Sf_;
-    CpCoeffs_ = molr1*CpCoeffs_ - molr2*pt.CpCoeffs_;
-    hCoeffs_ = molr1*hCoeffs_ - molr2*pt.hCoeffs_;
-    sCoeffs_ = molr1*sCoeffs_ - molr2*pt.sCoeffs_;
+        Hf_ = Y1*Hf_ + Y2*pt.Hf_;
+        Sf_ = Y1*Sf_ + Y2*pt.Sf_;
+        CpCoeffs_ = Y1*CpCoeffs_ + Y2*pt.CpCoeffs_;
+        hCoeffs_ = Y1*hCoeffs_ + Y2*pt.hCoeffs_;
+        sCoeffs_ = Y1*sCoeffs_ + Y2*pt.sCoeffs_;
+    }
 }
 
 
@@ -223,43 +205,32 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator+
     EquationOfState eofs = pt1;
     eofs += pt2;
 
-    scalar molr1 = pt1.nMoles()/eofs.nMoles();
-    scalar molr2 = pt2.nMoles()/eofs.nMoles();
+    if (mag(eofs.Y()) < SMALL)
+    {
+        return hPolynomialThermo<EquationOfState, PolySize>
+        (
+            eofs,
+            pt1.Hf_,
+            pt1.Sf_,
+            pt1.CpCoeffs_,
+            pt1.hCoeffs_,
+            pt1.sCoeffs_
+        );
+    }
+    {
+        const scalar Y1 = pt1.Y()/eofs.Y();
+        const scalar Y2 = pt2.Y()/eofs.Y();
 
-    return hPolynomialThermo<EquationOfState, PolySize>
-    (
-        eofs,
-        molr1*pt1.Hf_ + molr2*pt2.Hf_,
-        molr1*pt1.Sf_ + molr2*pt2.Sf_,
-        molr1*pt1.CpCoeffs_ + molr2*pt2.CpCoeffs_,
-        molr1*pt1.hCoeffs_ + molr2*pt2.hCoeffs_,
-        molr1*pt1.sCoeffs_ + molr2*pt2.sCoeffs_
-    );
-}
-
-
-template<class EquationOfState, int PolySize>
-inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator-
-(
-    const hPolynomialThermo<EquationOfState, PolySize>& pt1,
-    const hPolynomialThermo<EquationOfState, PolySize>& pt2
-)
-{
-    EquationOfState eofs = pt1;
-    eofs -= pt2;
-
-    scalar molr1 = pt1.nMoles()/eofs.nMoles();
-    scalar molr2 = pt2.nMoles()/eofs.nMoles();
-
-    return hPolynomialThermo<EquationOfState, PolySize>
-    (
-        eofs,
-        molr1*pt1.Hf_ - molr2*pt2.Hf_,
-        molr1*pt1.Sf_ - molr2*pt2.Sf_,
-        molr1*pt1.CpCoeffs_ - molr2*pt2.CpCoeffs_,
-        molr1*pt1.hCoeffs_ - molr2*pt2.hCoeffs_,
-        molr1*pt1.sCoeffs_ - molr2*pt2.sCoeffs_
-    );
+        return hPolynomialThermo<EquationOfState, PolySize>
+        (
+            eofs,
+            Y1*pt1.Hf_ + Y2*pt2.Hf_,
+            Y1*pt1.Sf_ + Y2*pt2.Sf_,
+            Y1*pt1.CpCoeffs_ + Y2*pt2.CpCoeffs_,
+            Y1*pt1.hCoeffs_ + Y2*pt2.hCoeffs_,
+            Y1*pt1.sCoeffs_ + Y2*pt2.sCoeffs_
+        );
+    }
 }
 
 
@@ -289,7 +260,24 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator==
     const hPolynomialThermo<EquationOfState, PolySize>& pt2
 )
 {
-    return pt2 - pt1;
+    EquationOfState eofs
+    (
+        static_cast<const EquationOfState&>(pt1)
+     == static_cast<const EquationOfState&>(pt2)
+    );
+
+    const scalar Y1 = pt1.Y()/eofs.Y();
+    const scalar Y2 = pt2.Y()/eofs.Y();
+
+    return hPolynomialThermo<EquationOfState, PolySize>
+    (
+        eofs,
+        Y2*pt2.Hf_       - Y1*pt1.Hf_,
+        Y2*pt2.Sf_       - Y1*pt1.Sf_,
+        Y2*pt2.CpCoeffs_ - Y1*pt1.CpCoeffs_,
+        Y2*pt2.hCoeffs_  - Y1*pt1.hCoeffs_,
+        Y2*pt2.sCoeffs_  - Y1*pt1.sCoeffs_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C
index 4ab71b4e65..bab5f226ae 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,9 +37,6 @@ Foam::hPowerThermo<EquationOfState>::hPowerThermo(Istream& is)
     Hf_(readScalar(is))
 {
     is.check("hPowerThermo::hPowerThermo(Istream& is)");
-
-    c0_ *= this->W();
-    Hf_ *= this->W();
 }
 
 
@@ -54,10 +51,7 @@ Foam::hPowerThermo<EquationOfState>::hPowerThermo
     n0_(readScalar(dict.subDict("thermodynamics").lookup("n0"))),
     Tref_(readScalar(dict.subDict("thermodynamics").lookup("Tref"))),
     Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf")))
-{
-    c0_ *= this->W();
-    Hf_ *= this->W();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H
index 1f0caaff09..be30a506ad 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,13 +61,6 @@ inline hPowerThermo<EquationOfState> operator+
     const hPowerThermo<EquationOfState>&
 );
 
-template<class EquationOfState>
-inline hPowerThermo<EquationOfState> operator-
-(
-    const hPowerThermo<EquationOfState>&,
-    const hPowerThermo<EquationOfState>&
-);
-
 template<class EquationOfState>
 inline hPowerThermo<EquationOfState> operator*
 (
@@ -167,25 +160,24 @@ public:
         // Fundamental properties
 
             //- Heat capacity at constant pressure [J/(kg K)]
-            inline scalar cp(const scalar p, const scalar T) const;
+            inline scalar Cp(const scalar p, const scalar T) const;
 
-            //- Absolute enthalpy [J/kmol]
-            inline scalar ha(const scalar p, const scalar T) const;
+            //- Absolute Enthalpy [J/kg]
+            inline scalar Ha(const scalar p, const scalar T) const;
 
             //- Sensible enthalpy [J/kg]
-            inline scalar hs(const scalar p, const scalar T) const;
+            inline scalar Hs(const scalar p, const scalar T) const;
 
             //- Chemical enthalpy [J/kg]
-            inline scalar hc() const;
+            inline scalar Hc() const;
 
-            //- Entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
 
     // Member operators
 
         inline void operator+=(const hPowerThermo&);
-        inline void operator-=(const hPowerThermo&);
 
 
     // Friend operators
@@ -196,12 +188,6 @@ public:
             const hPowerThermo&
         );
 
-        friend hPowerThermo operator- <EquationOfState>
-        (
-            const hPowerThermo&,
-            const hPowerThermo&
-        );
-
         friend hPowerThermo operator* <EquationOfState>
         (
             const scalar,
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
index c9114a1dd8..e5160d973c 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,53 +125,53 @@ inline Foam::scalar Foam::hPowerThermo<EquationOfState>::limit
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hPowerThermo<EquationOfState>::cp
+inline Foam::scalar Foam::hPowerThermo<EquationOfState>::Cp
 (
     const scalar p, const scalar T
 ) const
 {
-    return c0_*pow(T/Tref_, n0_) + EquationOfState::cp(p, T);
+    return c0_*pow(T/Tref_, n0_) + EquationOfState::Cp(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hPowerThermo<EquationOfState>::ha
+inline Foam::scalar Foam::hPowerThermo<EquationOfState>::Ha
 (
     const scalar p, const scalar T
 ) const
 {
-    return hs(p, T) + hc();
+    return Hs(p, T) + Hc();
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hPowerThermo<EquationOfState>::hs
+inline Foam::scalar Foam::hPowerThermo<EquationOfState>::Hs
 (
     const scalar p, const scalar T
 ) const
 {
     return
         c0_*(pow(T, n0_ + 1) - pow(Tstd, n0_ + 1))/(pow(Tref_, n0_)*(n0_ + 1))
-      + EquationOfState::h(p, T);
+      + EquationOfState::H(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hPowerThermo<EquationOfState>::hc() const
+inline Foam::scalar Foam::hPowerThermo<EquationOfState>::Hc() const
 {
     return Hf_;
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hPowerThermo<EquationOfState>::s
+inline Foam::scalar Foam::hPowerThermo<EquationOfState>::S
 (
     const scalar p, const scalar T
 ) const
 {
     return
         c0_*(pow(T, n0_) - pow(Tstd, n0_))/(pow(Tref_, n0_)*n0_)
-      + EquationOfState::s(p, T);
+      + EquationOfState::S(p, T);
 }
 
 
@@ -183,36 +183,20 @@ inline void Foam::hPowerThermo<EquationOfState>::operator+=
     const hPowerThermo<EquationOfState>& ct
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
     EquationOfState::operator+=(ct);
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
 
-    Hf_ = molr1*Hf_ + molr2*ct.Hf_;
-    c0_ = molr1*c0_ + molr2*ct.c0_;
-    n0_ = molr1*n0_ + molr2*ct.n0_;
-    Tref_ = molr1*Tref_ + molr2*ct.Tref_;
-}
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = ct.Y()/this->Y();
 
-
-template<class EquationOfState>
-inline void Foam::hPowerThermo<EquationOfState>::operator-=
-(
-    const hPowerThermo<EquationOfState>& ct
-)
-{
-    scalar molr1 = this->nMoles();
-
-    EquationOfState::operator-=(ct);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
-
-    Hf_ = molr1*Hf_ - molr2*ct.Hf_;
-    c0_ = (molr1*c0_ - molr2*ct.c0_);
-    n0_ = (molr1*n0_ - molr2*ct.n0_);
-    Tref_ = (molr1*Tref_ - molr2*ct.Tref_);
+        Hf_ = Y1*Hf_ + Y2*ct.Hf_;
+        c0_ = Y1*c0_ + Y2*ct.c0_;
+        n0_ = Y1*n0_ + Y2*ct.n0_;
+        Tref_ = Y1*Tref_ + Y2*ct.Tref_;
+    }
 }
 
 
@@ -231,46 +215,32 @@ inline Foam::hPowerThermo<EquationOfState> Foam::operator+
       + static_cast<const EquationOfState&>(ct2)
     );
 
-    return hPowerThermo<EquationOfState>
-    (
-        eofs,
-        ct1.nMoles()/eofs.nMoles()*ct1.c0_
-      + ct2.nMoles()/eofs.nMoles()*ct2.c0_,
-        ct1.nMoles()/eofs.nMoles()*ct1.n0_
-      + ct2.nMoles()/eofs.nMoles()*ct2.n0_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Tref_
-      + ct2.nMoles()/eofs.nMoles()*ct2.Tref_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
-      + ct2.nMoles()/eofs.nMoles()*ct2.Hf_
-    );
-}
-
-
-template<class EquationOfState>
-inline Foam::hPowerThermo<EquationOfState> Foam::operator-
-(
-    const hPowerThermo<EquationOfState>& ct1,
-    const hPowerThermo<EquationOfState>& ct2
-)
-{
-    EquationOfState eofs
-    (
-        static_cast<const EquationOfState&>(ct1)
-      + static_cast<const EquationOfState&>(ct2)
-    );
-
-    return hPowerThermo<EquationOfState>
-    (
-        eofs,
-        ct1.nMoles()/eofs.nMoles()*ct1.c0_
-      - ct2.nMoles()/eofs.nMoles()*ct2.c0_,
-        ct1.nMoles()/eofs.nMoles()*ct1.n0_
-      - ct2.nMoles()/eofs.nMoles()*ct2.n0_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Tref_
-      - ct2.nMoles()/eofs.nMoles()*ct2.Tref_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
-      - ct2.nMoles()/eofs.nMoles()*ct2.Hf_
-    );
+    if (mag(eofs.Y()) < SMALL)
+    {
+        return hPowerThermo<EquationOfState>
+        (
+            eofs,
+            ct1.c0_,
+            ct1.n0_,
+            ct1.Tref_,
+            ct1.Hf_
+        );
+    }
+    else
+    {
+        return hPowerThermo<EquationOfState>
+        (
+            eofs,
+            ct1.Y()/eofs.Y()*ct1.c0_
+          + ct2.Y()/eofs.Y()*ct2.c0_,
+            ct1.Y()/eofs.Y()*ct1.n0_
+          + ct2.Y()/eofs.Y()*ct2.n0_,
+            ct1.Y()/eofs.Y()*ct1.Tref_
+          + ct2.Y()/eofs.Y()*ct2.Tref_,
+            ct1.Y()/eofs.Y()*ct1.Hf_
+          + ct2.Y()/eofs.Y()*ct2.Hf_
+        );
+    }
 }
 
 
@@ -299,7 +269,24 @@ inline Foam::hPowerThermo<EquationOfState> Foam::operator==
     const hPowerThermo<EquationOfState>& ct2
 )
 {
-    return ct2 - ct1;
+    EquationOfState eofs
+    (
+        static_cast<const EquationOfState&>(ct1)
+     == static_cast<const EquationOfState&>(ct2)
+    );
+
+    return hPowerThermo<EquationOfState>
+    (
+        eofs,
+        ct2.Y()/eofs.Y()*ct2.c0_
+      - ct1.Y()/eofs.Y()*ct1.c0_,
+        ct2.Y()/eofs.Y()*ct2.n0_
+      - ct1.Y()/eofs.Y()*ct1.n0_,
+        ct2.Y()/eofs.Y()*ct2.Tref_
+      - ct1.Y()/eofs.Y()*ct1.Tref_,
+        ct2.Y()/eofs.Y()*ct2.Hf_
+      - ct1.Y()/eofs.Y()*ct1.Hf_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
index fe83f1794b..a73c8748fa 100644
--- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,10 +38,6 @@ Foam::hRefConstThermo<EquationOfState>::hRefConstThermo(Istream& is)
     Href_(readScalar(is))
 {
     is.check("hRefConstThermo::hRefConstThermo(Istream& is)");
-
-    Cp_ *= this->W();
-    Hf_ *= this->W();
-    Href_ *= this->W();
 }
 
 
@@ -53,11 +49,7 @@ Foam::hRefConstThermo<EquationOfState>::hRefConstThermo(const dictionary& dict)
     Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf"))),
     Tref_(readScalar(dict.subDict("thermodynamics").lookup("Tref"))),
     Href_(readScalar(dict.subDict("thermodynamics").lookup("Href")))
-{
-    Cp_ *= this->W();
-    Hf_ *= this->W();
-    Href_ *= this->W();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -68,10 +60,10 @@ void Foam::hRefConstThermo<EquationOfState>::write(Ostream& os) const
     EquationOfState::write(os);
 
     dictionary dict("thermodynamics");
-    dict.add("Cp", Cp_/this->W());
-    dict.add("Hf", Hf_/this->W());
+    dict.add("Cp", Cp_);
+    dict.add("Hf", Hf_);
     dict.add("Tref", Tref_);
-    dict.add("Href", Href_/this->W());
+    dict.add("Href", Href_);
     os  << indent << dict.dictName() << dict;
 }
 
@@ -86,8 +78,8 @@ Foam::Ostream& Foam::operator<<
 )
 {
     os  << static_cast<const EquationOfState&>(ct) << tab
-        << ct.Cp_/ct.W() << tab << ct.Hf_/ct.W() << tab
-        << ct.Tref_ << tab << ct.Href_/ct.W();
+        << ct.Cp_ << tab << ct.Hf_ << tab
+        << ct.Tref_ << tab << ct.Href_;
 
     os.check("Ostream& operator<<(Ostream& os, const hRefConstThermo& ct)");
     return os;
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
index 04b9d311b4..0bb1820386 100644
--- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,13 +53,6 @@ inline hRefConstThermo<EquationOfState> operator+
     const hRefConstThermo<EquationOfState>&
 );
 
-template<class EquationOfState>
-inline hRefConstThermo<EquationOfState> operator-
-(
-    const hRefConstThermo<EquationOfState>&,
-    const hRefConstThermo<EquationOfState>&
-);
-
 template<class EquationOfState>
 inline hRefConstThermo<EquationOfState> operator*
 (
@@ -149,20 +142,20 @@ public:
 
         // Fundamental properties
 
-            //- Heat capacity at constant pressure [J/(kmol K)]
-            inline scalar cp(const scalar p, const scalar T) const;
+            //- Heat capacity at constant pressure [J/(kg K)]
+            inline scalar Cp(const scalar p, const scalar T) const;
 
-            //- Absolute Enthalpy [J/kmol]
-            inline scalar ha(const scalar p, const scalar T) const;
+            //- Absolute Enthalpy [J/kg]
+            inline scalar Ha(const scalar p, const scalar T) const;
 
-            //- Sensible enthalpy [J/kmol]
-            inline scalar hs(const scalar p, const scalar T) const;
+            //- Sensible enthalpy [J/kg]
+            inline scalar Hs(const scalar p, const scalar T) const;
 
-            //- Chemical enthalpy [J/kmol]
-            inline scalar hc() const;
+            //- Chemical enthalpy [J/kg]
+            inline scalar Hc() const;
 
-            //- Entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
 
         // I-O
@@ -174,7 +167,6 @@ public:
     // Member operators
 
         inline void operator+=(const hRefConstThermo&);
-        inline void operator-=(const hRefConstThermo&);
 
 
     // Friend operators
@@ -185,12 +177,6 @@ public:
             const hRefConstThermo&
         );
 
-        friend hRefConstThermo operator- <EquationOfState>
-        (
-            const hRefConstThermo&,
-            const hRefConstThermo&
-        );
-
         friend hRefConstThermo operator* <EquationOfState>
         (
             const scalar,
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
index 29bd2c9753..941c4b5e88 100644
--- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -106,50 +106,50 @@ inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::limit
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::cp
+inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::Cp
 (
     const scalar p,
     const scalar T
 ) const
 {
-    return Cp_ + EquationOfState::cp(p, T);
+    return Cp_ + EquationOfState::Cp(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::ha
+inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::Ha
 (
     const scalar p, const scalar T
 ) const
 {
-    return Cp_*(T-Tref_) + Href_ + Hf_ + EquationOfState::h(p, T);
+    return Cp_*(T-Tref_) + Href_ + Hf_ + EquationOfState::H(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::hs
+inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::Hs
 (
     const scalar p, const scalar T
 ) const
 {
-    return Cp_*(T-Tref_) + Href_ + EquationOfState::h(p, T);
+    return Cp_*(T-Tref_) + Href_ + EquationOfState::H(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::hc() const
+inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::Hc() const
 {
     return Hf_;
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::s
+inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::S
 (
     const scalar p, const scalar T
 ) const
 {
-    return Cp_*log(T/Tstd) + EquationOfState::s(p, T);
+    return Cp_*log(T/Tstd) + EquationOfState::S(p, T);
 }
 
 
@@ -161,33 +161,18 @@ inline void Foam::hRefConstThermo<EquationOfState>::operator+=
     const hRefConstThermo<EquationOfState>& ct
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
     EquationOfState::operator+=(ct);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        const scalar Y2 = ct.Y()/this->Y();
 
-    Cp_ = molr1*Cp_ + molr2*ct.Cp_;
-    Hf_ = molr1*Hf_ + molr2*ct.Hf_;
-}
-
-
-template<class EquationOfState>
-inline void Foam::hRefConstThermo<EquationOfState>::operator-=
-(
-    const hRefConstThermo<EquationOfState>& ct
-)
-{
-    scalar molr1 = this->nMoles();
-
-    EquationOfState::operator-=(ct);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = ct.nMoles()/this->nMoles();
-
-    Cp_ = molr1*Cp_ - molr2*ct.Cp_;
-    Hf_ = molr1*Hf_ - molr2*ct.Hf_;
+        Cp_ = Y1*Cp_ + Y2*ct.Cp_;
+        Hf_ = Y1*Hf_ + Y2*ct.Hf_;
+    }
 }
 
 
@@ -206,42 +191,32 @@ inline Foam::hRefConstThermo<EquationOfState> Foam::operator+
       + static_cast<const EquationOfState&>(ct2)
     );
 
-    return hRefConstThermo<EquationOfState>
-    (
-        eofs,
-        ct1.nMoles()/eofs.nMoles()*ct1.Cp_
-      + ct2.nMoles()/eofs.nMoles()*ct2.Cp_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
-      + ct2.nMoles()/eofs.nMoles()*ct2.Hf_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Tref_
-      + ct2.nMoles()/eofs.nMoles()*ct2.Tref_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Href_
-      + ct2.nMoles()/eofs.nMoles()*ct2.Href_
-    );
-}
-
-
-template<class EquationOfState>
-inline Foam::hRefConstThermo<EquationOfState> Foam::operator-
-(
-    const hRefConstThermo<EquationOfState>& ct1,
-    const hRefConstThermo<EquationOfState>& ct2
-)
-{
-    EquationOfState eofs
-    (
-        static_cast<const EquationOfState&>(ct1)
-      - static_cast<const EquationOfState&>(ct2)
-    );
-
-    return hRefConstThermo<EquationOfState>
-    (
-        eofs,
-        ct1.nMoles()/eofs.nMoles()*ct1.Cp_
-      - ct2.nMoles()/eofs.nMoles()*ct2.Cp_,
-        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
-      - ct2.nMoles()/eofs.nMoles()*ct2.Hf_
-    );
+    if (mag(eofs.Y()) < SMALL)
+    {
+        return hRefConstThermo<EquationOfState>
+        (
+            eofs,
+            ct1.Cp_,
+            ct1.Hf_,
+            ct1.Tref_,
+            ct1.Href_
+        );
+    }
+    else
+    {
+        return hRefConstThermo<EquationOfState>
+        (
+            eofs,
+            ct1.Y()/eofs.Y()*ct1.Cp_
+          + ct2.Y()/eofs.Y()*ct2.Cp_,
+            ct1.Y()/eofs.Y()*ct1.Hf_
+          + ct2.Y()/eofs.Y()*ct2.Hf_,
+            ct1.Y()/eofs.Y()*ct1.Tref_
+          + ct2.Y()/eofs.Y()*ct2.Tref_,
+            ct1.Y()/eofs.Y()*ct1.Href_
+          + ct2.Y()/eofs.Y()*ct2.Href_
+        );
+    }
 }
 
 
@@ -270,7 +245,20 @@ inline Foam::hRefConstThermo<EquationOfState> Foam::operator==
     const hRefConstThermo<EquationOfState>& ct2
 )
 {
-    return ct2 - ct1;
+    EquationOfState eofs
+    (
+        static_cast<const EquationOfState&>(ct1)
+     == static_cast<const EquationOfState&>(ct2)
+    );
+
+    return hRefConstThermo<EquationOfState>
+    (
+        eofs,
+        ct2.Y()/eofs.Y()*ct2.Cp_
+      - ct1.Y()/eofs.Y()*ct1.Cp_,
+        ct2.Y()/eofs.Y()*ct2.Hf_
+      - ct1.Y()/eofs.Y()*ct1.Hf_
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
index 63c379825d..44c053e0f1 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,31 +56,6 @@ void Foam::janafThermo<EquationOfState>::checkInputData() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class EquationOfState>
-Foam::janafThermo<EquationOfState>::janafThermo(Istream& is)
-:
-    EquationOfState(is),
-    Tlow_(readScalar(is)),
-    Thigh_(readScalar(is)),
-    Tcommon_(readScalar(is))
-{
-    checkInputData();
-
-    forAll(highCpCoeffs_, i)
-    {
-        is >> highCpCoeffs_[i];
-    }
-
-    forAll(lowCpCoeffs_, i)
-    {
-        is >> lowCpCoeffs_[i];
-    }
-
-    // Check state of Istream
-    is.check("janafThermo::janafThermo(Istream& is)");
-}
-
-
 template<class EquationOfState>
 Foam::janafThermo<EquationOfState>::janafThermo(const dictionary& dict)
 :
@@ -91,6 +66,13 @@ Foam::janafThermo<EquationOfState>::janafThermo(const dictionary& dict)
     highCpCoeffs_(dict.subDict("thermodynamics").lookup("highCpCoeffs")),
     lowCpCoeffs_(dict.subDict("thermodynamics").lookup("lowCpCoeffs"))
 {
+    // Convert coefficients to mass-basis
+    for (label coefLabel=0; coefLabel<nCoeffs_; coefLabel++)
+    {
+        highCpCoeffs_[coefLabel] *= this->R();
+        lowCpCoeffs_[coefLabel] *= this->R();
+    }
+
     checkInputData();
 }
 
@@ -102,12 +84,21 @@ void Foam::janafThermo<EquationOfState>::write(Ostream& os) const
 {
     EquationOfState::write(os);
 
+    // Convert coefficients back to dimensionless form
+    coeffArray highCpCoeffs;
+    coeffArray lowCpCoeffs;
+    for (label coefLabel=0; coefLabel<nCoeffs_; coefLabel++)
+    {
+        highCpCoeffs[coefLabel] = highCpCoeffs_[coefLabel]/this->R();
+        lowCpCoeffs[coefLabel] = lowCpCoeffs_[coefLabel]/this->R();
+    }
+
     dictionary dict("thermodynamics");
     dict.add("Tlow", Tlow_);
     dict.add("Thigh", Thigh_);
     dict.add("Tcommon", Tcommon_);
-    dict.add("highCpCoeffs", highCpCoeffs_);
-    dict.add("lowCpCoeffs", lowCpCoeffs_);
+    dict.add("highCpCoeffs", highCpCoeffs);
+    dict.add("lowCpCoeffs", lowCpCoeffs);
     os  << indent << dict.dictName() << dict;
 }
 
@@ -130,14 +121,14 @@ Foam::Ostream& Foam::operator<<
 
     forAll(jt.highCpCoeffs_, i)
     {
-        os << jt.highCpCoeffs_[i] << ' ';
+        os << jt.highCpCoeffs_[i]/jt.R() << ' ';
     }
 
     os << nl << "    ";
 
     forAll(jt.lowCpCoeffs_, i)
     {
-        os << jt.lowCpCoeffs_[i] << ' ';
+        os << jt.lowCpCoeffs_[i]/jt.R() << ' ';
     }
 
     os << endl;
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
index 34f3777c51..f16b76ebfe 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,13 +56,6 @@ inline janafThermo<EquationOfState> operator+
     const janafThermo<EquationOfState>&
 );
 
-template<class EquationOfState>
-inline janafThermo<EquationOfState> operator-
-(
-    const janafThermo<EquationOfState>&,
-    const janafThermo<EquationOfState>&
-);
-
 template<class EquationOfState>
 inline janafThermo<EquationOfState> operator*
 (
@@ -135,12 +128,10 @@ public:
             const scalar Thigh,
             const scalar Tcommon,
             const coeffArray& highCpCoeffs,
-            const coeffArray& lowCpCoeffs
+            const coeffArray& lowCpCoeffs,
+            const bool convertCoeffs = false
         );
 
-        //- Construct from Istream
-        janafThermo(Istream&);
-
         //- Construct from dictionary
         janafThermo(const dictionary& dict);
 
@@ -180,20 +171,20 @@ public:
 
         // Fundamental properties
 
-            //- Heat capacity at constant pressure [J/(kmol K)]
-            inline scalar cp(const scalar p, const scalar T) const;
+            //- Heat capacity at constant pressure [J/(kg K)]
+            inline scalar Cp(const scalar p, const scalar T) const;
 
-            //- Absolute Enthalpy [J/kmol]
-            inline scalar ha(const scalar p, const scalar T) const;
+            //- Absolute Enthalpy [J/kg]
+            inline scalar Ha(const scalar p, const scalar T) const;
 
-            //- Sensible enthalpy [J/kmol]
-            inline scalar hs(const scalar p, const scalar T) const;
+            //- Sensible enthalpy [J/kg]
+            inline scalar Hs(const scalar p, const scalar T) const;
 
-            //- Chemical enthalpy [J/kmol]
-            inline scalar hc() const;
+            //- Chemical enthalpy [J/kg]
+            inline scalar Hc() const;
 
-            //- Entropy [J/(kmol K)]
-            inline scalar s(const scalar p, const scalar T) const;
+            //- Entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
 
 
         // I-O
@@ -205,7 +196,6 @@ public:
     // Member operators
 
         inline void operator+=(const janafThermo&);
-        inline void operator-=(const janafThermo&);
 
 
     // Friend operators
@@ -216,12 +206,6 @@ public:
             const janafThermo&
         );
 
-        friend janafThermo operator- <EquationOfState>
-        (
-            const janafThermo&,
-            const janafThermo&
-        );
-
         friend janafThermo operator* <EquationOfState>
         (
             const scalar,
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
index b3fd676a29..8935b04685 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,8 @@ inline Foam::janafThermo<EquationOfState>::janafThermo
     const scalar Thigh,
     const scalar Tcommon,
     const typename janafThermo<EquationOfState>::coeffArray& highCpCoeffs,
-    const typename janafThermo<EquationOfState>::coeffArray& lowCpCoeffs
+    const typename janafThermo<EquationOfState>::coeffArray& lowCpCoeffs,
+    const bool convertCoeffs
 )
 :
     EquationOfState(st),
@@ -44,10 +45,21 @@ inline Foam::janafThermo<EquationOfState>::janafThermo
     Thigh_(Thigh),
     Tcommon_(Tcommon)
 {
-    for (label coefLabel=0; coefLabel<nCoeffs_; coefLabel++)
+    if (convertCoeffs)
     {
-        highCpCoeffs_[coefLabel] = highCpCoeffs[coefLabel];
-        lowCpCoeffs_[coefLabel] = lowCpCoeffs[coefLabel];
+        for (label coefLabel=0; coefLabel<nCoeffs_; coefLabel++)
+        {
+            highCpCoeffs_[coefLabel] = highCpCoeffs[coefLabel]*this->R();
+            lowCpCoeffs_[coefLabel] = lowCpCoeffs[coefLabel]*this->R();
+        }
+    }
+    else
+    {
+        for (label coefLabel=0; coefLabel<nCoeffs_; coefLabel++)
+        {
+            highCpCoeffs_[coefLabel] = highCpCoeffs[coefLabel];
+            lowCpCoeffs_[coefLabel] = lowCpCoeffs[coefLabel];
+        }
     }
 }
 
@@ -155,7 +167,7 @@ Foam::janafThermo<EquationOfState>::lowCpCoeffs() const
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::janafThermo<EquationOfState>::cp
+inline Foam::scalar Foam::janafThermo<EquationOfState>::Cp
 (
     const scalar p,
     const scalar T
@@ -163,44 +175,43 @@ inline Foam::scalar Foam::janafThermo<EquationOfState>::cp
 {
     const coeffArray& a = coeffs(T);
     return
-        RR*((((a[4]*T + a[3])*T + a[2])*T + a[1])*T + a[0])
-      + EquationOfState::cp(p, T);
+        ((((a[4]*T + a[3])*T + a[2])*T + a[1])*T + a[0])
+      + EquationOfState::Cp(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::janafThermo<EquationOfState>::ha
+inline Foam::scalar Foam::janafThermo<EquationOfState>::Ha
 (
     const scalar p,
     const scalar T
 ) const
 {
     const coeffArray& a = coeffs(T);
-    return RR*
+    return
     (
         ((((a[4]/5.0*T + a[3]/4.0)*T + a[2]/3.0)*T + a[1]/2.0)*T + a[0])*T
       + a[5]
-    )
-  + EquationOfState::h(p, T);
+    ) + EquationOfState::H(p, T);
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::janafThermo<EquationOfState>::hs
+inline Foam::scalar Foam::janafThermo<EquationOfState>::Hs
 (
     const scalar p,
     const scalar T
 ) const
 {
-    return ha(p, T) - hc();
+    return Ha(p, T) - Hc();
 }
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::janafThermo<EquationOfState>::hc() const
+inline Foam::scalar Foam::janafThermo<EquationOfState>::Hc() const
 {
     const coeffArray& a = lowCpCoeffs_;
-    return RR*
+    return
     (
         (
             (((a[4]/5.0*Tstd + a[3]/4.0)*Tstd + a[2]/3.0)*Tstd + a[1]/2.0)*Tstd
@@ -211,7 +222,7 @@ inline Foam::scalar Foam::janafThermo<EquationOfState>::hc() const
 
 
 template<class EquationOfState>
-inline Foam::scalar Foam::janafThermo<EquationOfState>::s
+inline Foam::scalar Foam::janafThermo<EquationOfState>::S
 (
     const scalar p,
     const scalar T
@@ -219,12 +230,10 @@ inline Foam::scalar Foam::janafThermo<EquationOfState>::s
 {
     const coeffArray& a = coeffs(T);
     return
-    RR*
     (
         (((a[4]/4.0*T + a[3]/3.0)*T + a[2]/2.0)*T + a[1])*T + a[0]*log(T)
       + a[6]
-    )
-  + EquationOfState::s(p, T);
+    ) + EquationOfState::S(p, T);
 }
 
 
@@ -236,84 +245,47 @@ inline void Foam::janafThermo<EquationOfState>::operator+=
     const janafThermo<EquationOfState>& jt
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
     EquationOfState::operator+=(jt);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = jt.nMoles()/this->nMoles();
-
-    Tlow_ = max(Tlow_, jt.Tlow_);
-    Thigh_ = min(Thigh_, jt.Thigh_);
-
-    if (janafThermo<EquationOfState>::debug && notEqual(Tcommon_, jt.Tcommon_))
+    if (mag(this->Y()) > SMALL)
     {
-        FatalErrorInFunction
-            << "Tcommon " << Tcommon_ << " for "
-            << (this->name().size() ? this->name() : "others")
-            << " != " << jt.Tcommon_ << " for "
-            << (jt.name().size() ? jt.name() : "others")
-            << exit(FatalError);
-    }
+        Y1 /= this->Y();
+        const scalar Y2 = jt.Y()/this->Y();
 
-    for
-    (
-        label coefLabel=0;
-        coefLabel<janafThermo<EquationOfState>::nCoeffs_;
-        coefLabel++
-    )
-    {
-        highCpCoeffs_[coefLabel] =
-            molr1*highCpCoeffs_[coefLabel]
-          + molr2*jt.highCpCoeffs_[coefLabel];
+        Tlow_ = max(Tlow_, jt.Tlow_);
+        Thigh_ = min(Thigh_, jt.Thigh_);
 
-        lowCpCoeffs_[coefLabel] =
-            molr1*lowCpCoeffs_[coefLabel]
-          + molr2*jt.lowCpCoeffs_[coefLabel];
-    }
-}
+        if
+        (
+            janafThermo<EquationOfState>::debug
+         && notEqual(Tcommon_, jt.Tcommon_)
+        )
+        {
+            FatalErrorInFunction
+                << "Tcommon " << Tcommon_ << " for "
+                << (this->name().size() ? this->name() : "others")
+                << " != " << jt.Tcommon_ << " for "
+                << (jt.name().size() ? jt.name() : "others")
+                << exit(FatalError);
+        }
 
+        for
+        (
+            label coefLabel=0;
+            coefLabel<janafThermo<EquationOfState>::nCoeffs_;
+            coefLabel++
+        )
+        {
+            highCpCoeffs_[coefLabel] =
+                Y1*highCpCoeffs_[coefLabel]
+              + Y2*jt.highCpCoeffs_[coefLabel];
 
-template<class EquationOfState>
-inline void Foam::janafThermo<EquationOfState>::operator-=
-(
-    const janafThermo<EquationOfState>& jt
-)
-{
-    scalar molr1 = this->nMoles();
-
-    EquationOfState::operator-=(jt);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = jt.nMoles()/this->nMoles();
-
-    Tlow_ = max(Tlow_, jt.Tlow_);
-    Thigh_ = min(Thigh_, jt.Thigh_);
-
-    if (janafThermo<EquationOfState>::debug && notEqual(Tcommon_, jt.Tcommon_))
-    {
-        FatalErrorInFunction
-            << "Tcommon " << Tcommon_ << " for "
-            << (this->name().size() ? this->name() : "others")
-            << " != " << jt.Tcommon_ << " for "
-            << (jt.name().size() ? jt.name() : "others")
-            << exit(FatalError);
-    }
-
-    for
-    (
-        label coefLabel=0;
-        coefLabel<janafThermo<EquationOfState>::nCoeffs_;
-        coefLabel++
-    )
-    {
-        highCpCoeffs_[coefLabel] =
-            molr1*highCpCoeffs_[coefLabel]
-          - molr2*jt.highCpCoeffs_[coefLabel];
-
-        lowCpCoeffs_[coefLabel] =
-            molr1*lowCpCoeffs_[coefLabel]
-          - molr2*jt.lowCpCoeffs_[coefLabel];
+            lowCpCoeffs_[coefLabel] =
+                Y1*lowCpCoeffs_[coefLabel]
+              + Y2*jt.lowCpCoeffs_[coefLabel];
+        }
     }
 }
 
@@ -330,109 +302,66 @@ inline Foam::janafThermo<EquationOfState> Foam::operator+
     EquationOfState eofs = jt1;
     eofs += jt2;
 
-    scalar molr1 = jt1.nMoles()/eofs.nMoles();
-    scalar molr2 = jt2.nMoles()/eofs.nMoles();
-
-    typename janafThermo<EquationOfState>::coeffArray highCpCoeffs;
-    typename janafThermo<EquationOfState>::coeffArray lowCpCoeffs;
-
-    for
-    (
-        label coefLabel=0;
-        coefLabel<janafThermo<EquationOfState>::nCoeffs_;
-        coefLabel++
-    )
+    if (mag(eofs.Y()) < SMALL)
     {
-        highCpCoeffs[coefLabel] =
-            molr1*jt1.highCpCoeffs_[coefLabel]
-          + molr2*jt2.highCpCoeffs_[coefLabel];
-
-        lowCpCoeffs[coefLabel] =
-            molr1*jt1.lowCpCoeffs_[coefLabel]
-          + molr2*jt2.lowCpCoeffs_[coefLabel];
+        return janafThermo<EquationOfState>
+        (
+            eofs,
+            jt1.Tlow_,
+            jt1.Thigh_,
+            jt1.Tcommon_,
+            jt1.highCpCoeffs_,
+            jt1.lowCpCoeffs_
+        );
     }
-
-    if
-    (
-        janafThermo<EquationOfState>::debug
-     && notEqual(jt1.Tcommon_, jt2.Tcommon_)
-    )
+    else
     {
-        FatalErrorInFunction
-            << "Tcommon " << jt1.Tcommon_ << " for "
-            << (jt1.name().size() ? jt1.name() : "others")
-            << " != " << jt2.Tcommon_ << " for "
-            << (jt2.name().size() ? jt2.name() : "others")
-            << exit(FatalError);
+        const scalar Y1 = jt1.Y()/eofs.Y();
+        const scalar Y2 = jt2.Y()/eofs.Y();
+
+        typename janafThermo<EquationOfState>::coeffArray highCpCoeffs;
+        typename janafThermo<EquationOfState>::coeffArray lowCpCoeffs;
+
+        for
+        (
+            label coefLabel=0;
+            coefLabel<janafThermo<EquationOfState>::nCoeffs_;
+            coefLabel++
+        )
+        {
+            highCpCoeffs[coefLabel] =
+                Y1*jt1.highCpCoeffs_[coefLabel]
+              + Y2*jt2.highCpCoeffs_[coefLabel];
+
+            lowCpCoeffs[coefLabel] =
+                Y1*jt1.lowCpCoeffs_[coefLabel]
+              + Y2*jt2.lowCpCoeffs_[coefLabel];
+        }
+
+        if
+        (
+            janafThermo<EquationOfState>::debug
+         && notEqual(jt1.Tcommon_, jt2.Tcommon_)
+        )
+        {
+            FatalErrorInFunction
+                << "Tcommon " << jt1.Tcommon_ << " for "
+                << (jt1.name().size() ? jt1.name() : "others")
+                << " != " << jt2.Tcommon_ << " for "
+                << (jt2.name().size() ? jt2.name() : "others")
+                << exit(FatalError);
+        }
+
+        return janafThermo<EquationOfState>
+        (
+            eofs,
+            max(jt1.Tlow_, jt2.Tlow_),
+            min(jt1.Thigh_, jt2.Thigh_),
+            jt1.Tcommon_,
+            highCpCoeffs,
+            lowCpCoeffs
+        );
     }
-
-    return janafThermo<EquationOfState>
-    (
-        eofs,
-        max(jt1.Tlow_, jt2.Tlow_),
-        min(jt1.Thigh_, jt2.Thigh_),
-        jt1.Tcommon_,
-        highCpCoeffs,
-        lowCpCoeffs
-    );
-}
-
-
-template<class EquationOfState>
-inline Foam::janafThermo<EquationOfState> Foam::operator-
-(
-    const janafThermo<EquationOfState>& jt1,
-    const janafThermo<EquationOfState>& jt2
-)
-{
-    EquationOfState eofs = jt1;
-    eofs -= jt2;
-
-    scalar molr1 = jt1.nMoles()/eofs.nMoles();
-    scalar molr2 = jt2.nMoles()/eofs.nMoles();
-
-    typename janafThermo<EquationOfState>::coeffArray highCpCoeffs;
-    typename janafThermo<EquationOfState>::coeffArray lowCpCoeffs;
-
-    for
-    (
-        label coefLabel=0;
-        coefLabel<janafThermo<EquationOfState>::nCoeffs_;
-        coefLabel++
-    )
-    {
-        highCpCoeffs[coefLabel] =
-            molr1*jt1.highCpCoeffs_[coefLabel]
-          - molr2*jt2.highCpCoeffs_[coefLabel];
-
-        lowCpCoeffs[coefLabel] =
-            molr1*jt1.lowCpCoeffs_[coefLabel]
-          - molr2*jt2.lowCpCoeffs_[coefLabel];
-    }
-
-    if
-    (
-        janafThermo<EquationOfState>::debug
-     && notEqual(jt1.Tcommon_, jt2.Tcommon_)
-    )
-    {
-        FatalErrorInFunction
-            << "Tcommon " << jt1.Tcommon_ << " for "
-            << (jt1.name().size() ? jt1.name() : "others")
-            << " != " << jt2.Tcommon_ << " for "
-            << (jt2.name().size() ? jt2.name() : "others")
-            << exit(FatalError);
-    }
-
-    return janafThermo<EquationOfState>
-    (
-        eofs,
-        max(jt1.Tlow_, jt2.Tlow_),
-        min(jt1.Thigh_, jt2.Thigh_),
-        jt1.Tcommon_,
-        highCpCoeffs,
-        lowCpCoeffs
-    );
 }
 
 
@@ -462,7 +391,57 @@ inline Foam::janafThermo<EquationOfState> Foam::operator==
     const janafThermo<EquationOfState>& jt2
 )
 {
-    return jt2 - jt1;
+    EquationOfState eofs
+    (
+        static_cast<const EquationOfState&>(jt1)
+     == static_cast<const EquationOfState&>(jt2)
+    );
+
+    const scalar Y1 = jt2.Y()/eofs.Y();
+    const scalar Y2 = jt1.Y()/eofs.Y();
+
+    typename janafThermo<EquationOfState>::coeffArray highCpCoeffs;
+    typename janafThermo<EquationOfState>::coeffArray lowCpCoeffs;
+
+    for
+    (
+        label coefLabel=0;
+        coefLabel<janafThermo<EquationOfState>::nCoeffs_;
+        coefLabel++
+    )
+    {
+        highCpCoeffs[coefLabel] =
+            Y1*jt2.highCpCoeffs_[coefLabel]
+          - Y2*jt1.highCpCoeffs_[coefLabel];
+
+        lowCpCoeffs[coefLabel] =
+            Y1*jt2.lowCpCoeffs_[coefLabel]
+          - Y2*jt1.lowCpCoeffs_[coefLabel];
+    }
+
+    if
+    (
+        janafThermo<EquationOfState>::debug
+     && notEqual(jt2.Tcommon_, jt1.Tcommon_)
+    )
+    {
+        FatalErrorInFunction
+            << "Tcommon " << jt2.Tcommon_ << " for "
+            << (jt2.name().size() ? jt2.name() : "others")
+            << " != " << jt1.Tcommon_ << " for "
+            << (jt1.name().size() ? jt1.name() : "others")
+            << exit(FatalError);
+    }
+
+    return janafThermo<EquationOfState>
+    (
+        eofs,
+        max(jt2.Tlow_, jt1.Tlow_),
+        min(jt2.Thigh_, jt1.Thigh_),
+        jt2.Tcommon_,
+        highCpCoeffs,
+        lowCpCoeffs
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/sensibleEnthalpy/sensibleEnthalpy.H b/src/thermophysicalModels/specie/thermo/sensibleEnthalpy/sensibleEnthalpy.H
index 07cf5a2765..1b77cd40a6 100644
--- a/src/thermophysicalModels/specie/thermo/sensibleEnthalpy/sensibleEnthalpy.H
+++ b/src/thermophysicalModels/specie/thermo/sensibleEnthalpy/sensibleEnthalpy.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,8 +25,7 @@ Class
     Foam::sensibleEnthalpy
 
 Description
-    Thermodynamics mapping class to expose the sensible enthalpy function
-    as the standard enthalpy function h(T).
+    Thermodynamics mapping class to expose the sensible enthalpy functions.
 
 \*---------------------------------------------------------------------------*/
 
@@ -70,30 +69,19 @@ public:
                 return "h";
             }
 
-            // Sensible enthalpy [J/kmol]
-            scalar he
+            // Heat capacity at constant pressure [J/(kg K)]
+            scalar Cpv
             (
                 const Thermo& thermo,
                 const scalar p,
                 const scalar T
             ) const
             {
-                return thermo.hs(p, T);
+                return thermo.Cp(p, T);
             }
 
-            // Heat capacity at constant pressure [J/(kmol K)]
-            scalar cpv
-            (
-                const Thermo& thermo,
-                const scalar p,
-                const scalar T
-            ) const
-            {
-                return thermo.cp(p, T);
-            }
-
-            //- cp/cp []
-            scalar cpBycpv
+            //- Cp/Cp []
+            scalar CpByCpv
             (
                 const Thermo& thermo,
                 const scalar p,
diff --git a/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H b/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H
index b6b5889ff5..0922569c7d 100644
--- a/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H
+++ b/src/thermophysicalModels/specie/thermo/sensibleInternalEnergy/sensibleInternalEnergy.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,8 +25,8 @@ Class
     Foam::sensibleInternalEnergy
 
 Description
-    Thermodynamics mapping class to expose the sensible internal energy function
-    as the standard internal energy function e(T).
+    Thermodynamics mapping class to expose the sensible internal energy
+    functions.
 
 \*---------------------------------------------------------------------------*/
 
@@ -70,29 +70,19 @@ public:
                 return "e";
             }
 
-            //- Sensible Internal energy [J/kmol]
-            scalar he
-            (
-                const Thermo& thermo,
-                const scalar p,
-                const scalar T) const
-            {
-                return thermo.es(p, T);
-            }
-
-            //- Heat capacity at constant volume [J/(kmol K)]
-            scalar cpv
+            //- Heat capacity at constant volume [J/(kg K)]
+            scalar Cpv
             (
                 const Thermo& thermo,
                 const scalar p,
                 const scalar T
             ) const
             {
-                return thermo.cv(p, T);
+                return thermo.Cv(p, T);
             }
 
-            //- cp/cv []
-            scalar cpBycpv
+            //- Cp/Cv []
+            scalar CpByCpv
             (
                 const Thermo& thermo,
                 const scalar p,
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermo.H b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
index 9820f11473..cc25cbaadf 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermo.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,13 +59,6 @@ inline thermo<Thermo, Type> operator+
     const thermo<Thermo, Type>&
 );
 
-template<class Thermo, template<class> class Type>
-inline thermo<Thermo, Type> operator-
-(
-    const thermo<Thermo, Type>&,
-    const thermo<Thermo, Type>&
-);
-
 template<class Thermo, template<class> class Type>
 inline thermo<Thermo, Type> operator*
 (
@@ -154,102 +147,94 @@ public:
                 + Type<thermo<Thermo, Type>>::typeName();
         }
 
+        //- Name of Enthalpy/Internal energy
+        static inline word heName();
+
+
         // Fundamental properties
         // (These functions must be provided in derived types)
 
-            // Heat capacity at constant pressure [J/(kmol K)]
-            // scalar cp(const scalar) const;
+            // Heat capacity at constant pressure [J/(kg K)]
+            // inline scalar Cp(const scalar p, const scalar T) const;
 
-            // Absolute Enthalpy [J/kmol]
-            // scalar ha(const scalar) const;
+            // Sensible enthalpy [J/kg]
+            // inline scalar Hs(const scalar p, const scalar T) const;
 
-            // Sensible enthalpy [J/kmol]
-            // scalar hs(const scalar) const;
+            // Chemical enthalpy [J/kg]
+            // inline scalar Hc() const;
 
-            // Chemical enthalpy [J/kmol]
-            // scalar hc(const scalar) const;
+            // Absolute Enthalpy [J/kg]
+            // inline scalar Ha(const scalar p, const scalar T) const;
 
-            // Entropy [J/(kmol K)]
-            // scalar s(const scalar) const;
+            // Entropy [J/(kg K)]
+            // inline scalar S(const scalar p, const scalar T) const;
 
 
-        // Calculate and return derived properties
-        // (These functions need not provided in derived types)
+        // Mass specific derived properties
 
-            // Mole specific properties
+            //- Heat capacity at constant volume [J/(kg K)]
+            inline scalar Cv(const scalar p, const scalar T) const;
 
-                //- Name of Enthalpy/Internal energy
-                static inline word heName();
+            //- Heat capacity at constant pressure/volume [J/(kg K)]
+            inline scalar Cpv(const scalar p, const scalar T) const;
 
-                //- Enthalpy/Internal energy [J/kmol]
-                inline scalar he(const scalar p, const scalar T) const;
+            //- Gamma = Cp/Cv []
+            inline scalar gamma(const scalar p, const scalar T) const;
 
-                //- Heat capacity at constant volume [J/(kmol K)]
-                inline scalar cv(const scalar p, const scalar T) const;
+            //- Ratio of heat capacity at constant pressure to that at
+            //  constant pressure/volume []
+            inline scalar CpByCpv(const scalar p, const scalar T) const;
 
-                //- Heat capacity at constant pressure/volume [J/(kmol K)]
-                inline scalar cpv(const scalar p, const scalar T) const;
+            //- Enthalpy/Internal energy [J/kg]
+            inline scalar HE(const scalar p, const scalar T) const;
 
-                //- Gamma = cp/cv []
-                inline scalar gamma(const scalar p, const scalar T) const;
+            //- Sensible internal energy [J/kg]
+            inline scalar Es(const scalar p, const scalar T) const;
 
-                //- Ratio of heat capacity at constant pressure to that at
-                //  constant pressure/volume []
-                inline scalar cpBycpv(const scalar p, const scalar T) const;
+            //- Absolute internal energy [J/kg]
+            inline scalar Ea(const scalar p, const scalar T) const;
 
-                //- Sensible internal energy [J/kmol]
-                inline scalar es(const scalar p, const scalar T) const;
+            //- Gibbs free energy [J/kg]
+            inline scalar G(const scalar p, const scalar T) const;
 
-                //- Absolute internal energy [J/kmol]
-                inline scalar ea(const scalar p, const scalar T) const;
-
-                //- Gibbs free energy [J/kmol]
-                inline scalar g(const scalar p, const scalar T) const;
-
-                //- Helmholtz free energy [J/kmol]
-                inline scalar a(const scalar p, const scalar T) const;
+            //- Helmholtz free energy [J/kg]
+            inline scalar A(const scalar p, const scalar T) const;
 
 
-            // Mass specific properties
+        // Mole specific derived properties
 
-                //- Heat capacity at constant pressure [J/(kg K)]
-                inline scalar Cp(const scalar p, const scalar T) const;
+            //- Heat capacity at constant pressure [J/(kmol K)]
+            inline scalar cp(const scalar p, const scalar T) const;
 
-                //- Heat capacity at constant volume [J/(kg K)]
-                inline scalar Cv(const scalar p, const scalar T) const;
+            //- Absolute Enthalpy [J/kmol]
+            inline scalar ha(const scalar p, const scalar T) const;
 
-                //- Heat capacity at constant pressure/volume [J/(kg K)]
-                inline scalar Cpv(const scalar p, const scalar T) const;
+            //- Sensible enthalpy [J/kmol]
+            inline scalar hs(const scalar p, const scalar T) const;
 
-                //- Enthalpy/Internal energy [J/kg]
-                inline scalar HE(const scalar p, const scalar T) const;
+            //- Chemical enthalpy [J/kmol]
+            inline scalar hc() const;
 
-                //- Sensible enthalpy [J/kg]
-                inline scalar Hs(const scalar p, const scalar T) const;
+            //- Entropy [J/(kmol K)]
+            inline scalar s(const scalar p, const scalar T) const;
 
-                //- Chemical enthalpy [J/kg]
-                inline scalar Hc() const;
+            //- Enthalpy/Internal energy [J/kmol]
+            inline scalar he(const scalar p, const scalar T) const;
 
-                //- Absolute Enthalpy [J/kg]
-                inline scalar Ha(const scalar p, const scalar T) const;
+            //- Heat capacity at constant volume [J/(kmol K)]
+            inline scalar cv(const scalar p, const scalar T) const;
 
-                //- Entropy [J/(kg K)]
-                inline scalar S(const scalar p, const scalar T) const;
+            //- Sensible internal energy [J/kmol]
+            inline scalar es(const scalar p, const scalar T) const;
 
-                //- Internal energy [J/kg]
-                inline scalar E(const scalar p, const scalar T) const;
+            //- Absolute internal energy [J/kmol]
+            inline scalar ea(const scalar p, const scalar T) const;
 
-                //- Sensible internal energy [J/kg]
-                inline scalar Es(const scalar p, const scalar T) const;
+            //- Gibbs free energy [J/kmol]
+            inline scalar g(const scalar p, const scalar T) const;
 
-                //- Absolute internal energy [J/kg]
-                inline scalar Ea(const scalar p, const scalar T) const;
-
-                //- Gibbs free energy [J/kg]
-                inline scalar G(const scalar p, const scalar T) const;
-
-                //- Helmholtz free energy [J/kg]
-                inline scalar A(const scalar p, const scalar T) const;
+            //- Helmholtz free energy [J/kmol]
+            inline scalar a(const scalar p, const scalar T) const;
 
 
         // Equilibrium reaction thermodynamics
@@ -345,8 +330,6 @@ public:
     // Member operators
 
         inline void operator+=(const thermo&);
-        inline void operator-=(const thermo&);
-
         inline void operator*=(const scalar);
 
 
@@ -358,12 +341,6 @@ public:
             const thermo&
         );
 
-        friend thermo operator- <Thermo, Type>
-        (
-            const thermo&,
-            const thermo&
-        );
-
         friend thermo operator* <Thermo, Type>
         (
             const scalar s,
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
index 669d7e7a21..cdaa340076 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
@@ -106,78 +106,9 @@ Foam::species::thermo<Thermo, Type>::heName()
 
 template<class Thermo, template<class> class Type>
 inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::he(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::Cv(const scalar p, const scalar T) const
 {
-    return Type<thermo<Thermo, Type>>::he(*this, p, T);
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::cv(const scalar p, const scalar T) const
-{
-    return this->cp(p, T) - this->cpMcv(p, T);
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::cpv(const scalar p, const scalar T) const
-{
-    return Type<thermo<Thermo, Type>>::cpv(*this, p, T);
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::gamma(const scalar p, const scalar T) const
-{
-    scalar cp = this->cp(p, T);
-    return cp/(cp - this->cpMcv(p, T));
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::cpBycpv
-(
-    const scalar p,
-    const scalar T
-) const
-{
-    return Type<thermo<Thermo, Type>>::cpBycpv(*this, p, T);
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::es(const scalar p, const scalar T) const
-{
-    return this->hs(p, T) - p*this->W()/this->rho(p, T);
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::ea(const scalar p, const scalar T) const
-{
-    return this->ha(p, T) - p*this->W()/this->rho(p, T);
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::g(const scalar p, const scalar T) const
-{
-    return this->ha(p, T) - T*this->s(p, T);
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::a(const scalar p, const scalar T) const
-{
-    return this->ea(p, T) - T*this->s(p, T);
+    return this->Cp(p, T) - this->CpMCv(p, T);
 }
 
 
@@ -185,23 +116,28 @@ template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::Cpv(const scalar p, const scalar T) const
 {
-    return this->cpv(p, T)/this->W();
+    return Type<thermo<Thermo, Type>>::Cpv(*this, p, T);
 }
 
 
 template<class Thermo, template<class> class Type>
 inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::Cp(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::gamma(const scalar p, const scalar T) const
 {
-    return this->cp(p, T)/this->W();
+    const scalar Cp = this->Cp(p, T);
+    return Cp/(Cp - this->CpMCv(p, T));
 }
 
 
 template<class Thermo, template<class> class Type>
 inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::Cv(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::CpByCpv
+(
+    const scalar p,
+    const scalar T
+) const
 {
-    return this->cv(p, T)/this->W();
+    return Type<thermo<Thermo, Type>>::CpByCpv(*this, p, T);
 }
 
 
@@ -213,58 +149,19 @@ Foam::species::thermo<Thermo, Type>::HE(const scalar p, const scalar T) const
 }
 
 
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::Hs(const scalar p, const scalar T) const
-{
-    return this->hs(p, T)/this->W();
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::Hc() const
-{
-    return this->hc()/this->W();
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::Ha(const scalar p, const scalar T) const
-{
-    return this->ha(p, T)/this->W();
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::S(const scalar p, const scalar T) const
-{
-    return this->s(p, T)/this->W();
-}
-
-
-template<class Thermo, template<class> class Type>
-inline Foam::scalar
-Foam::species::thermo<Thermo, Type>::E(const scalar p, const scalar T) const
-{
-    return this->e(p, T)/this->W();
-}
-
-
 template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::Es(const scalar p, const scalar T) const
 {
-    return this->es(p, T)/this->W();
+    return this->Hs(p, T) - p/this->rho(p, T);
 }
 
+
 template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::Ea(const scalar p, const scalar T) const
 {
-    return this->ea(p, T)/this->W();
+    return this->Ha(p, T) - p/this->rho(p, T);
 }
 
 
@@ -272,7 +169,7 @@ template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::G(const scalar p, const scalar T) const
 {
-    return this->g(p, T)/this->W();
+    return this->Ha(p, T) - T*this->S(p, T);
 }
 
 
@@ -280,7 +177,95 @@ template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::A(const scalar p, const scalar T) const
 {
-    return this->a(p, T)/this->W();
+    return this->Ea(p, T) - T*this->S(p, T);
+}
+
+
+template<class Thermo, template<class> class Type>
+inline Foam::scalar
+Foam::species::thermo<Thermo, Type>::cp(const scalar p, const scalar T) const
+{
+    return this->Cp(p, T)*this->W();
+}
+
+
+template<class Thermo, template<class> class Type>
+inline Foam::scalar
+Foam::species::thermo<Thermo, Type>::ha(const scalar p, const scalar T) const
+{
+    return this->Ha(p, T)*this->W();
+}
+
+
+template<class Thermo, template<class> class Type>
+inline Foam::scalar
+Foam::species::thermo<Thermo, Type>::hs(const scalar p, const scalar T) const
+{
+    return this->Hs(p, T)*this->W();
+}
+
+
+template<class Thermo, template<class> class Type>
+inline Foam::scalar
+Foam::species::thermo<Thermo, Type>::hc() const
+{
+    return this->Hc()*this->W();
+}
+
+
+template<class Thermo, template<class> class Type>
+inline Foam::scalar
+Foam::species::thermo<Thermo, Type>::s(const scalar p, const scalar T) const
+{
+    return this->S(p, T)*this->W();
+}
+
+
+template<class Thermo, template<class> class Type>
+inline Foam::scalar
+Foam::species::thermo<Thermo, Type>::he(const scalar p, const scalar T) const
+{
+    return this->HE(p, T)*this->W();
+}
+
+
+template<class Thermo, template<class> class Type>
+inline Foam::scalar
+Foam::species::thermo<Thermo, Type>::cv(const scalar p, const scalar T) const
+{
+    return this->Cv(p, T)*this->W();
+}
+
+
+template<class Thermo, template<class> class Type>
+inline Foam::scalar
+Foam::species::thermo<Thermo, Type>::es(const scalar p, const scalar T) const
+{
+    return this->Es(p, T)*this->W();
+}
+
+
+template<class Thermo, template<class> class Type>
+inline Foam::scalar
+Foam::species::thermo<Thermo, Type>::ea(const scalar p, const scalar T) const
+{
+    return this->Ea(p, T)*this->W();
+}
+
+
+template<class Thermo, template<class> class Type>
+inline Foam::scalar
+Foam::species::thermo<Thermo, Type>::g(const scalar p, const scalar T) const
+{
+    return this->G(p, T)*this->W();
+}
+
+
+template<class Thermo, template<class> class Type>
+inline Foam::scalar
+Foam::species::thermo<Thermo, Type>::a(const scalar p, const scalar T) const
+{
+    return this->A(p, T)*this->W();
 }
 
 
@@ -288,9 +273,9 @@ template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::K(const scalar p, const scalar T) const
 {
-    scalar arg = -this->nMoles()*this->g(Pstd, T)/(RR*T);
+    scalar arg = -this->Y()*this->G(Pstd, T)/(RR*T);
 
-    if (arg < 600.0)
+    if (arg < 600)
     {
         return exp(arg);
     }
@@ -313,13 +298,15 @@ template<class Thermo, template<class> class Type>
 inline Foam::scalar
 Foam::species::thermo<Thermo, Type>::Kc(const scalar p, const scalar T) const
 {
-    if (equal(this->nMoles(), SMALL))
+    const scalar nm = this->Y()/this->W();
+
+    if (equal(nm, SMALL))
     {
         return Kp(p, T);
     }
     else
     {
-        return Kp(p, T)*pow(Pstd/(RR*T), this->nMoles());
+        return Kp(p, T)*pow(Pstd/(RR*T), nm);
     }
 }
 
@@ -331,13 +318,15 @@ inline Foam::scalar Foam::species::thermo<Thermo, Type>::Kx
     const scalar T
 ) const
 {
-    if (equal(this->nMoles(), SMALL))
+    const scalar nm = this->Y()/this->W();
+
+    if (equal(nm, SMALL))
     {
         return Kp(p, T);
     }
     else
     {
-        return Kp(p, T)*pow(Pstd/p, this->nMoles());
+        return Kp(p, T)*pow(Pstd/p, nm);
     }
 }
 
@@ -350,13 +339,15 @@ inline Foam::scalar Foam::species::thermo<Thermo, Type>::Kn
     const scalar n
 ) const
 {
-    if (equal(this->nMoles(), SMALL))
+    const scalar nm = this->Y()/this->W();
+
+    if (equal(nm, SMALL))
     {
         return Kp(p, T);
     }
     else
     {
-        return Kp(p, T)*pow(n*Pstd/p, this->nMoles());
+        return Kp(p, T)*pow(n*Pstd/p, nm);
     }
 }
 
@@ -465,16 +456,6 @@ inline void Foam::species::thermo<Thermo, Type>::operator+=
 }
 
 
-template<class Thermo, template<class> class Type>
-inline void Foam::species::thermo<Thermo, Type>::operator-=
-(
-    const thermo<Thermo, Type>& st
-)
-{
-    Thermo::operator-=(st);
-}
-
-
 template<class Thermo, template<class> class Type>
 inline void Foam::species::thermo<Thermo, Type>::operator*=(const scalar s)
 {
@@ -498,20 +479,6 @@ inline Foam::species::thermo<Thermo, Type> Foam::species::operator+
 }
 
 
-template<class Thermo, template<class> class Type>
-inline Foam::species::thermo<Thermo, Type> Foam::species::operator-
-(
-    const thermo<Thermo, Type>& st1,
-    const thermo<Thermo, Type>& st2
-)
-{
-    return thermo<Thermo, Type>
-    (
-        static_cast<const Thermo&>(st1) - static_cast<const Thermo&>(st2)
-    );
-}
-
-
 template<class Thermo, template<class> class Type>
 inline Foam::species::thermo<Thermo, Type> Foam::species::operator*
 (
@@ -533,7 +500,10 @@ inline Foam::species::thermo<Thermo, Type> Foam::species::operator==
     const thermo<Thermo, Type>& st2
 )
 {
-    return st2 - st1;
+    return thermo<Thermo, Type>
+    (
+        static_cast<const Thermo&>(st1) == static_cast<const Thermo&>(st2)
+    );
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.H b/src/thermophysicalModels/specie/transport/const/constTransport.H
index 2c2e691bf2..2c4be8d4d3 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,13 +54,6 @@ inline constTransport<Thermo> operator+
     const constTransport<Thermo>&
 );
 
-template<class Thermo>
-inline constTransport<Thermo> operator-
-(
-    const constTransport<Thermo>&,
-    const constTransport<Thermo>&
-);
-
 template<class Thermo>
 inline constTransport<Thermo> operator*
 (
@@ -68,13 +61,6 @@ inline constTransport<Thermo> operator*
     const constTransport<Thermo>&
 );
 
-template<class Thermo>
-inline constTransport<Thermo> operator==
-(
-    const constTransport<Thermo>&,
-    const constTransport<Thermo>&
-);
-
 template<class Thermo>
 Ostream& operator<<
 (
@@ -165,8 +151,6 @@ public:
 
         inline void operator+=(const constTransport&);
 
-        inline void operator-=(const constTransport&);
-
         inline void operator*=(const scalar);
 
 
@@ -178,24 +162,12 @@ public:
             const constTransport&
         );
 
-        friend constTransport operator- <Thermo>
-        (
-            const constTransport&,
-            const constTransport&
-        );
-
         friend constTransport operator* <Thermo>
         (
             const scalar,
             const constTransport&
         );
 
-        friend constTransport operator== <Thermo>
-        (
-            const constTransport&,
-            const constTransport&
-        );
-
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H
index 6c304476fd..71a2102179 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransportI.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -147,38 +147,17 @@ inline void Foam::constTransport<Thermo>::operator+=
     const constTransport<Thermo>& st
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
     Thermo::operator+=(st);
 
-    if (mag(molr1) + mag(st.nMoles()) > SMALL)
+    if (mag(this->Y()) > SMALL)
     {
-        molr1 /= this->nMoles();
-        scalar molr2 = st.nMoles()/this->nMoles();
+        Y1 /= this->Y();
+        scalar Y2 = st.Y()/this->Y();
 
-        mu_ = molr1*mu_ + molr2*st.mu_;
-        rPr_ = 1.0/(molr1/rPr_ + molr2/st.rPr_);
-    }
-}
-
-
-template<class Thermo>
-inline void Foam::constTransport<Thermo>::operator-=
-(
-    const constTransport<Thermo>& st
-)
-{
-    scalar molr1 = this->nMoles();
-
-    Thermo::operator-=(st);
-
-    if (mag(molr1) + mag(st.nMoles()) > SMALL)
-    {
-        molr1 /= this->nMoles();
-        scalar molr2 = st.nMoles()/this->nMoles();
-
-        mu_ = molr1*mu_ - molr2*st.mu_;
-        rPr_ = 1.0/(molr1/rPr_ - molr2/st.rPr_);
+        mu_ = Y1*mu_ + Y2*st.mu_;
+        rPr_ = 1.0/(Y1/rPr_ + Y2/st.rPr_);
     }
 }
 
@@ -207,7 +186,7 @@ inline Foam::constTransport<Thermo> Foam::operator+
         static_cast<const Thermo&>(ct1) + static_cast<const Thermo&>(ct2)
     );
 
-    if (mag(ct1.nMoles()) + mag(ct2.nMoles()) < SMALL)
+    if (mag(t.Y()) < SMALL)
     {
         return constTransport<Thermo>
         (
@@ -218,50 +197,14 @@ inline Foam::constTransport<Thermo> Foam::operator+
     }
     else
     {
-        scalar molr1 = ct1.nMoles()/t.nMoles();
-        scalar molr2 = ct2.nMoles()/t.nMoles();
+        scalar Y1 = ct1.Y()/t.Y();
+        scalar Y2 = ct2.Y()/t.Y();
 
         return constTransport<Thermo>
         (
             t,
-            molr1*ct1.mu_ + molr2*ct2.mu_,
-            1.0/(molr1/ct1.rPr_ + molr2/ct2.rPr_)
-        );
-    }
-}
-
-
-template<class Thermo>
-inline Foam::constTransport<Thermo> Foam::operator-
-(
-    const constTransport<Thermo>& ct1,
-    const constTransport<Thermo>& ct2
-)
-{
-    Thermo t
-    (
-        static_cast<const Thermo&>(ct1) - static_cast<const Thermo&>(ct2)
-    );
-
-    if (mag(ct1.nMoles()) + mag(ct2.nMoles()) < SMALL)
-    {
-        return constTransport<Thermo>
-        (
-            t,
-            0,
-            ct1.rPr_
-        );
-    }
-    else
-    {
-        scalar molr1 = ct1.nMoles()/t.nMoles();
-        scalar molr2 = ct2.nMoles()/t.nMoles();
-
-        return constTransport<Thermo>
-        (
-            t,
-            molr1*ct1.mu_ - molr2*ct2.mu_,
-            1.0/(molr1/ct1.rPr_ - molr2/ct2.rPr_)
+            Y1*ct1.mu_ + Y2*ct2.mu_,
+            1.0/(Y1/ct1.rPr_ + Y2/ct2.rPr_)
         );
     }
 }
@@ -283,15 +226,4 @@ inline Foam::constTransport<Thermo> Foam::operator*
 }
 
 
-template<class Thermo>
-inline Foam::constTransport<Thermo> Foam::operator==
-(
-    const constTransport<Thermo>& ct1,
-    const constTransport<Thermo>& ct2
-)
-{
-    return ct2 - ct1;
-}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
index b1fd1f8216..0d53683fce 100644
--- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,10 +37,7 @@ Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
     Thermo(is),
     muCoeffs_("muLogCoeffs<" + Foam::name(PolySize) + '>', is),
     kappaCoeffs_("kappaLogCoeffs<" + Foam::name(PolySize) + '>', is)
-{
-    muCoeffs_ *= this->W();
-    kappaCoeffs_ *= this->W();
-}
+{}
 
 
 template<class Thermo, int PolySize>
@@ -64,10 +61,7 @@ Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
             "kappaLogCoeffs<" + Foam::name(PolySize) + '>'
         )
     )
-{
-    muCoeffs_ *= this->W();
-    kappaCoeffs_ *= this->W();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -84,12 +78,12 @@ void Foam::logPolynomialTransport<Thermo, PolySize>::write(Ostream& os) const
     dict.add
     (
         word("muLogCoeffs<" + Foam::name(PolySize) + '>'),
-        muCoeffs_/this->W()
+        muCoeffs_
     );
     dict.add
     (
         word("kappaLogCoeffs<" + Foam::name(PolySize) + '>'),
-        kappaCoeffs_/this->W()
+        kappaCoeffs_
     );
     os  << indent << dict.dictName() << dict;
 
@@ -108,9 +102,9 @@ Foam::Ostream& Foam::operator<<
 {
     os  << static_cast<const Thermo&>(pt) << tab
         << "muLogCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << pt.muCoeffs_/pt.W() << tab
+        << pt.muCoeffs_ << tab
         << "kappaLogCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << pt.kappaCoeffs_/pt.W();
+        << pt.kappaCoeffs_;
 
     os.check
     (
diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
index 65f7ba6617..01b4fc9f33 100644
--- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,13 +99,6 @@ inline logPolynomialTransport<Thermo, PolySize> operator+
     const logPolynomialTransport<Thermo, PolySize>&
 );
 
-template<class Thermo, int PolySize>
-inline logPolynomialTransport<Thermo, PolySize> operator-
-(
-    const logPolynomialTransport<Thermo, PolySize>&,
-    const logPolynomialTransport<Thermo, PolySize>&
-);
-
 template<class Thermo, int PolySize>
 inline logPolynomialTransport<Thermo, PolySize> operator*
 (
@@ -113,13 +106,6 @@ inline logPolynomialTransport<Thermo, PolySize> operator*
     const logPolynomialTransport<Thermo, PolySize>&
 );
 
-template<class Thermo, int PolySize>
-inline logPolynomialTransport<Thermo, PolySize> operator==
-(
-    const logPolynomialTransport<Thermo, PolySize>&,
-    const logPolynomialTransport<Thermo, PolySize>&
-);
-
 template<class Thermo, int PolySize>
 Ostream& operator<<
 (
@@ -219,8 +205,9 @@ public:
     // Member operators
 
         inline void operator=(const logPolynomialTransport&);
+
         inline void operator+=(const logPolynomialTransport&);
-        inline void operator-=(const logPolynomialTransport&);
+
         inline void operator*=(const scalar);
 
 
@@ -232,24 +219,12 @@ public:
             const logPolynomialTransport&
         );
 
-        friend logPolynomialTransport operator- <Thermo, PolySize>
-        (
-            const logPolynomialTransport&,
-            const logPolynomialTransport&
-        );
-
         friend logPolynomialTransport operator* <Thermo, PolySize>
         (
             const scalar,
             const logPolynomialTransport&
         );
 
-        friend logPolynomialTransport operator== <Thermo, PolySize>
-        (
-            const logPolynomialTransport&,
-            const logPolynomialTransport&
-        );
-
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H
index 4fb373c893..514d243dec 100644
--- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ inline Foam::scalar Foam::logPolynomialTransport<Thermo, PolySize>::mu
     const scalar T
 ) const
 {
-    return exp(muCoeffs_.value(log(T))/this->W());
+    return exp(muCoeffs_.value(log(T)));
 }
 
 
@@ -119,7 +119,7 @@ inline Foam::scalar Foam::logPolynomialTransport<Thermo, PolySize>::kappa
     const scalar T
 ) const
 {
-    return exp(kappaCoeffs_.value(log(T))/this->W());
+    return exp(kappaCoeffs_.value(log(T)));
 }
 
 
@@ -154,33 +154,18 @@ inline void Foam::logPolynomialTransport<Thermo, PolySize>::operator+=
     const logPolynomialTransport<Thermo, PolySize>& pt
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
     Thermo::operator+=(pt);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = pt.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        scalar Y2 = pt.Y()/this->Y();
 
-    muCoeffs_ = molr1*muCoeffs_ + molr2*pt.muCoeffs_;
-    kappaCoeffs_ = molr1*kappaCoeffs_ + molr2*pt.kappaCoeffs_;
-}
-
-
-template<class Thermo, int PolySize>
-inline void Foam::logPolynomialTransport<Thermo, PolySize>::operator-=
-(
-    const logPolynomialTransport<Thermo, PolySize>& pt
-)
-{
-    scalar molr1 = this->nMoles();
-
-    Thermo::operator-=(pt);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = pt.nMoles()/this->nMoles();
-
-    muCoeffs_ = molr1*muCoeffs_ - molr2*pt.muCoeffs_;
-    kappaCoeffs_ = molr1*kappaCoeffs_ - molr2*pt.kappaCoeffs_;
+        muCoeffs_ = Y1*muCoeffs_ + Y2*pt.muCoeffs_;
+        kappaCoeffs_ = Y1*kappaCoeffs_ + Y2*pt.kappaCoeffs_;
+    }
 }
 
 
@@ -208,39 +193,28 @@ inline Foam::logPolynomialTransport<Thermo, PolySize> Foam::operator+
         static_cast<const Thermo&>(pt1) + static_cast<const Thermo&>(pt2)
     );
 
-    scalar molr1 = pt1.nMoles()/t.nMoles();
-    scalar molr2 = pt2.nMoles()/t.nMoles();
+    if (mag(t.Y()) < SMALL)
+    {
+        return logPolynomialTransport<Thermo>
+        (
+            t,
+            0,
+            pt1.muCoeffs_,
+            pt1.kappaCoeffs_
+        );
+    }
+    else
+    {
+        scalar Y1 = pt1.Y()/t.Y();
+        scalar Y2 = pt2.Y()/t.Y();
 
-    return logPolynomialTransport<Thermo, PolySize>
-    (
-        t,
-        molr1*pt1.muCoeffs_ + molr2*pt2.muCoeffs_,
-        molr1*pt1.kappaCoeffs_ + molr2*pt2.kappaCoeffs_
-    );
-}
-
-
-template<class Thermo, int PolySize>
-inline Foam::logPolynomialTransport<Thermo, PolySize> Foam::operator-
-(
-    const logPolynomialTransport<Thermo, PolySize>& pt1,
-    const logPolynomialTransport<Thermo, PolySize>& pt2
-)
-{
-    Thermo t
-    (
-        static_cast<const Thermo&>(pt1) - static_cast<const Thermo&>(pt2)
-    );
-
-    scalar molr1 = pt1.nMoles()/t.nMoles();
-    scalar molr2 = pt2.nMoles()/t.nMoles();
-
-    return logPolynomialTransport<Thermo, PolySize>
-    (
-        t,
-        molr1*pt1.muCoeffs_ - molr2*pt2.muCoeffs_,
-        molr1*pt1.kappaCoeffs_ - molr2*pt2.kappaCoeffs_
-    );
+        return logPolynomialTransport<Thermo, PolySize>
+        (
+            t,
+            Y1*pt1.muCoeffs_ + Y2*pt2.muCoeffs_,
+            Y1*pt1.kappaCoeffs_ + Y2*pt2.kappaCoeffs_
+        );
+    }
 }
 
 
@@ -260,15 +234,4 @@ inline Foam::logPolynomialTransport<Thermo, PolySize> Foam::operator*
 }
 
 
-template<class Thermo, int PolySize>
-inline Foam::logPolynomialTransport<Thermo, PolySize> Foam::operator==
-(
-    const logPolynomialTransport<Thermo, PolySize>& pt1,
-    const logPolynomialTransport<Thermo, PolySize>& pt2
-)
-{
-    return pt2 - pt1;
-}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
index 32640927d9..adcc8485d1 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,10 +34,7 @@ Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport(Istream& is)
     Thermo(is),
     muCoeffs_("muCoeffs<" + Foam::name(PolySize) + '>', is),
     kappaCoeffs_("kappaCoeffs<" + Foam::name(PolySize) + '>', is)
-{
-    muCoeffs_ *= this->W();
-    kappaCoeffs_ *= this->W();
-}
+{}
 
 
 template<class Thermo, int PolySize>
@@ -61,10 +58,7 @@ Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport
             "kappaCoeffs<" + Foam::name(PolySize) + '>'
         )
     )
-{
-    muCoeffs_ *= this->W();
-    kappaCoeffs_ *= this->W();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -81,12 +75,12 @@ void Foam::polynomialTransport<Thermo, PolySize>::write(Ostream& os) const
     dict.add
     (
         word("muCoeffs<" + Foam::name(PolySize) + '>'),
-        muCoeffs_/this->W()
+        muCoeffs_
     );
     dict.add
     (
         word("kappaCoeffs<" + Foam::name(PolySize) + '>'),
-        kappaCoeffs_/this->W()
+        kappaCoeffs_
     );
     os  << indent << dict.dictName() << dict;
 
@@ -105,9 +99,9 @@ Foam::Ostream& Foam::operator<<
 {
     os  << static_cast<const Thermo&>(pt) << tab
         << "muCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << pt.muCoeffs_/pt.W() << tab
+        << pt.muCoeffs_ << tab
         << "kappaCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << pt.kappaCoeffs_/pt.W();
+        << pt.kappaCoeffs_;
 
     os.check
     (
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
index 8f7e39b1fb..8b7c95cedc 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,13 +90,6 @@ inline polynomialTransport<Thermo, PolySize> operator+
     const polynomialTransport<Thermo, PolySize>&
 );
 
-template<class Thermo, int PolySize>
-inline polynomialTransport<Thermo, PolySize> operator-
-(
-    const polynomialTransport<Thermo, PolySize>&,
-    const polynomialTransport<Thermo, PolySize>&
-);
-
 template<class Thermo, int PolySize>
 inline polynomialTransport<Thermo, PolySize> operator*
 (
@@ -104,13 +97,6 @@ inline polynomialTransport<Thermo, PolySize> operator*
     const polynomialTransport<Thermo, PolySize>&
 );
 
-template<class Thermo, int PolySize>
-inline polynomialTransport<Thermo, PolySize> operator==
-(
-    const polynomialTransport<Thermo, PolySize>&,
-    const polynomialTransport<Thermo, PolySize>&
-);
-
 template<class Thermo, int PolySize>
 Ostream& operator<<
 (
@@ -201,8 +187,9 @@ public:
     // Member operators
 
         inline void operator=(const polynomialTransport&);
+
         inline void operator+=(const polynomialTransport&);
-        inline void operator-=(const polynomialTransport&);
+
         inline void operator*=(const scalar);
 
 
@@ -214,24 +201,12 @@ public:
             const polynomialTransport&
         );
 
-        friend polynomialTransport operator- <Thermo, PolySize>
-        (
-            const polynomialTransport&,
-            const polynomialTransport&
-        );
-
         friend polynomialTransport operator* <Thermo, PolySize>
         (
             const scalar,
             const polynomialTransport&
         );
 
-        friend polynomialTransport operator== <Thermo, PolySize>
-        (
-            const polynomialTransport&,
-            const polynomialTransport&
-        );
-
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
index ca82f18d86..501c9f0633 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,7 +108,7 @@ inline Foam::scalar Foam::polynomialTransport<Thermo, PolySize>::mu
     const scalar T
 ) const
 {
-    return muCoeffs_.value(T)/this->W();
+    return muCoeffs_.value(T);
 }
 
 
@@ -119,7 +119,7 @@ inline Foam::scalar Foam::polynomialTransport<Thermo, PolySize>::kappa
     const scalar T
 ) const
 {
-    return kappaCoeffs_.value(T)/this->W();
+    return kappaCoeffs_.value(T);
 }
 
 
@@ -154,33 +154,18 @@ inline void Foam::polynomialTransport<Thermo, PolySize>::operator+=
     const polynomialTransport<Thermo, PolySize>& pt
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
     Thermo::operator+=(pt);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = pt.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        scalar Y2 = pt.Y()/this->Y();
 
-    muCoeffs_ = molr1*muCoeffs_ + molr2*pt.muCoeffs_;
-    kappaCoeffs_ = molr1*kappaCoeffs_ + molr2*pt.kappaCoeffs_;
-}
-
-
-template<class Thermo, int PolySize>
-inline void Foam::polynomialTransport<Thermo, PolySize>::operator-=
-(
-    const polynomialTransport<Thermo, PolySize>& pt
-)
-{
-    scalar molr1 = this->nMoles();
-
-    Thermo::operator-=(pt);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = pt.nMoles()/this->nMoles();
-
-    muCoeffs_ = molr1*muCoeffs_ - molr2*pt.muCoeffs_;
-    kappaCoeffs_ = molr1*kappaCoeffs_ - molr2*pt.kappaCoeffs_;
+        muCoeffs_ = Y1*muCoeffs_ + Y2*pt.muCoeffs_;
+        kappaCoeffs_ = Y1*kappaCoeffs_ + Y2*pt.kappaCoeffs_;
+    }
 }
 
 
@@ -208,39 +193,28 @@ inline Foam::polynomialTransport<Thermo, PolySize> Foam::operator+
         static_cast<const Thermo&>(pt1) + static_cast<const Thermo&>(pt2)
     );
 
-    scalar molr1 = pt1.nMoles()/t.nMoles();
-    scalar molr2 = pt2.nMoles()/t.nMoles();
+    if (mag(t.Y()) < SMALL)
+    {
+        return polynomialTransport<Thermo>
+        (
+            t,
+            0,
+            pt1.muCoeffs_,
+            pt1.kappaCoeffs_
+        );
+    }
+    else
+    {
+        scalar Y1 = pt1.Y()/t.Y();
+        scalar Y2 = pt2.Y()/t.Y();
 
-    return polynomialTransport<Thermo, PolySize>
-    (
-        t,
-        molr1*pt1.muCoeffs_ + molr2*pt2.muCoeffs_,
-        molr1*pt1.kappaCoeffs_ + molr2*pt2.kappaCoeffs_
-    );
-}
-
-
-template<class Thermo, int PolySize>
-inline Foam::polynomialTransport<Thermo, PolySize> Foam::operator-
-(
-    const polynomialTransport<Thermo, PolySize>& pt1,
-    const polynomialTransport<Thermo, PolySize>& pt2
-)
-{
-    Thermo t
-    (
-        static_cast<const Thermo&>(pt1) - static_cast<const Thermo&>(pt2)
-    );
-
-    scalar molr1 = pt1.nMoles()/t.nMoles();
-    scalar molr2 = pt2.nMoles()/t.nMoles();
-
-    return polynomialTransport<Thermo, PolySize>
-    (
-        t,
-        molr1*pt1.muCoeffs_ - molr2*pt2.muCoeffs_,
-        molr1*pt1.kappaCoeffs_ - molr2*pt2.kappaCoeffs_
-    );
+        return polynomialTransport<Thermo, PolySize>
+        (
+            t,
+            Y1*pt1.muCoeffs_ + Y2*pt2.muCoeffs_,
+            Y1*pt1.kappaCoeffs_ + Y2*pt2.kappaCoeffs_
+        );
+    }
 }
 
 
@@ -260,15 +234,4 @@ inline Foam::polynomialTransport<Thermo, PolySize> Foam::operator*
 }
 
 
-template<class Thermo, int PolySize>
-inline Foam::polynomialTransport<Thermo, PolySize> Foam::operator==
-(
-    const polynomialTransport<Thermo, PolySize>& pt1,
-    const polynomialTransport<Thermo, PolySize>& pt2
-)
-{
-    return pt2 - pt1;
-}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
index 3c926eb005..1acc05bcc5 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,13 +60,6 @@ inline sutherlandTransport<Thermo> operator+
     const sutherlandTransport<Thermo>&
 );
 
-template<class Thermo>
-inline sutherlandTransport<Thermo> operator-
-(
-    const sutherlandTransport<Thermo>&,
-    const sutherlandTransport<Thermo>&
-);
-
 template<class Thermo>
 inline sutherlandTransport<Thermo> operator*
 (
@@ -74,13 +67,6 @@ inline sutherlandTransport<Thermo> operator*
     const sutherlandTransport<Thermo>&
 );
 
-template<class Thermo>
-inline sutherlandTransport<Thermo> operator==
-(
-    const sutherlandTransport<Thermo>&,
-    const sutherlandTransport<Thermo>&
-);
-
 template<class Thermo>
 Ostream& operator<<
 (
@@ -190,8 +176,6 @@ public:
 
         inline void operator+=(const sutherlandTransport&);
 
-        inline void operator-=(const sutherlandTransport&);
-
         inline void operator*=(const scalar);
 
 
@@ -203,24 +187,12 @@ public:
             const sutherlandTransport&
         );
 
-        friend sutherlandTransport operator- <Thermo>
-        (
-            const sutherlandTransport&,
-            const sutherlandTransport&
-        );
-
         friend sutherlandTransport operator* <Thermo>
         (
             const scalar,
             const sutherlandTransport&
         );
 
-        friend sutherlandTransport operator== <Thermo>
-        (
-            const sutherlandTransport&,
-            const sutherlandTransport&
-        );
-
 
     // Ostream Operator
 
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
index 60ce87da8c..71b4449079 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -183,33 +183,18 @@ inline void Foam::sutherlandTransport<Thermo>::operator+=
     const sutherlandTransport<Thermo>& st
 )
 {
-    scalar molr1 = this->nMoles();
+    scalar Y1 = this->Y();
 
     Thermo::operator+=(st);
 
-    molr1 /= this->nMoles();
-    scalar molr2 = st.nMoles()/this->nMoles();
+    if (mag(this->Y()) > SMALL)
+    {
+        Y1 /= this->Y();
+        scalar Y2 = st.Y()/this->Y();
 
-    As_ = molr1*As_ + molr2*st.As_;
-    Ts_ = molr1*Ts_ + molr2*st.Ts_;
-}
-
-
-template<class Thermo>
-inline void Foam::sutherlandTransport<Thermo>::operator-=
-(
-    const sutherlandTransport<Thermo>& st
-)
-{
-    scalar molr1 = this->nMoles();
-
-    Thermo::operator-=(st);
-
-    molr1 /= this->nMoles();
-    scalar molr2 = st.nMoles()/this->nMoles();
-
-    As_ = molr1*As_ - molr2*st.As_;
-    Ts_ = molr1*Ts_ - molr2*st.Ts_;
+        As_ = Y1*As_ + Y2*st.As_;
+        Ts_ = Y1*Ts_ + Y2*st.Ts_;
+    }
 }
 
 
@@ -237,39 +222,28 @@ inline Foam::sutherlandTransport<Thermo> Foam::operator+
         static_cast<const Thermo&>(st1) + static_cast<const Thermo&>(st2)
     );
 
-    scalar molr1 = st1.nMoles()/t.nMoles();
-    scalar molr2 = st2.nMoles()/t.nMoles();
+    if (mag(t.Y()) < SMALL)
+    {
+        return sutherlandTransport<Thermo>
+        (
+            t,
+            0,
+            st1.As_,
+            st1.Ts_
+        );
+    }
+    else
+    {
+        scalar Y1 = st1.Y()/t.Y();
+        scalar Y2 = st2.Y()/t.Y();
 
-    return sutherlandTransport<Thermo>
-    (
-        t,
-        molr1*st1.As_ + molr2*st2.As_,
-        molr1*st1.Ts_ + molr2*st2.Ts_
-    );
-}
-
-
-template<class Thermo>
-inline Foam::sutherlandTransport<Thermo> Foam::operator-
-(
-    const sutherlandTransport<Thermo>& st1,
-    const sutherlandTransport<Thermo>& st2
-)
-{
-    Thermo t
-    (
-        static_cast<const Thermo&>(st1) - static_cast<const Thermo&>(st2)
-    );
-
-    scalar molr1 = st1.nMoles()/t.nMoles();
-    scalar molr2 = st2.nMoles()/t.nMoles();
-
-    return sutherlandTransport<Thermo>
-    (
-        t,
-        molr1*st1.As_ - molr2*st2.As_,
-        molr1*st1.Ts_ - molr2*st2.Ts_
-    );
+        return sutherlandTransport<Thermo>
+        (
+            t,
+            Y1*st1.As_ + Y2*st2.As_,
+            Y1*st1.Ts_ + Y2*st2.Ts_
+        );
+    }
 }
 
 
@@ -289,15 +263,4 @@ inline Foam::sutherlandTransport<Thermo> Foam::operator*
 }
 
 
-template<class Thermo>
-inline Foam::sutherlandTransport<Thermo> Foam::operator==
-(
-    const sutherlandTransport<Thermo>& st1,
-    const sutherlandTransport<Thermo>& st2
-)
-{
-    return st2 - st1;
-}
-
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
index f2bfd9fb9b..93db588c6f 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
@@ -32,7 +32,6 @@ fuel
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0962;
     }
     thermodynamics
@@ -55,7 +54,6 @@ oxidant
 {
     specie
     {
-        nMoles          1;
         molWeight       28.8504;
     }
     thermodynamics
@@ -77,7 +75,6 @@ burntProducts
 {
     specie
     {
-        nMoles         1;
         molWeight      28.3233;
     }
     thermodynamics
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties
index e6e3ab3a22..8489c7fa7d 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties
@@ -19,32 +19,43 @@ thermoType
 {
     type            heheuPsiThermo;
     mixture         homogeneousMixture;
-    transport       sutherland;
+    transport       const;
     thermo          janaf;
     equationOfState perfectGas;
     specie          specie;
     energy          absoluteEnthalpy;
 }
 
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675;
+stoichiometricAirFuelMassRatio
+    stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675;
 
 reactants
 {
     specie
     {
-        nMoles          24.8095;
         molWeight       29.4649;
     }
     thermodynamics
     {
         Tlow            200;
-        Thigh           5000;
+        Thigh           6000;
         Tcommon         1000;
-        highCpCoeffs    ( 3.28069 0.00195035 -6.53483e-07 1.00239e-10 -5.64653e-15 -1609.55 4.41496 );
-        lowCpCoeffs     ( 3.47696 0.000367499 1.84866e-06 -9.8993e-10 -3.10214e-14 -1570.81 3.76075 );
+        highCpCoeffs
+        (
+            3.24515 0.00202212 -6.98806e-07 1.11477e-10
+            -6.60444e-15 -1601.58 4.60831
+        );
+        lowCpCoeffs
+        (
+            3.60909 -0.000628822 4.45105e-06 -3.81328e-09
+            1.0553e-12 -1587.86 3.21309
+        );
     }
     transport
     {
+        mu              1e-5;
+        Pr              1;
+
         As              1.67212e-06;
         Ts              170.672;
     }
@@ -54,19 +65,29 @@ products
 {
     specie
     {
-        nMoles          1;
         molWeight       28.3233;
     }
     thermodynamics
     {
         Tlow            200;
-        Thigh           5000;
+        Thigh           6000;
         Tcommon         1000;
-        highCpCoeffs    ( 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 );
-        lowCpCoeffs     ( 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 );
+        highCpCoeffs
+        (
+            3.10561 0.00179748 -5.94701e-07 9.05612e-11
+            -5.08447e-15 -11003.6 5.12109
+        );
+        lowCpCoeffs
+        (
+            3.498 0.000638554 -1.83885e-07 1.20991e-09
+            -7.68702e-13 -11080.6 3.1819
+        );
     }
     transport
     {
+        mu              1e-5;
+        Pr              1;
+
         As              1.67212e-06;
         Ts              170.672;
     }
diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
index 397d6345d0..e4b3555955 100644
--- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
+++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
@@ -32,7 +32,6 @@ reactants
 {
     specie
     {
-        nMoles          24.8095;
         molWeight       16.0243;
     }
     thermodynamics
@@ -54,7 +53,6 @@ products
 {
     specie
     {
-        nMoles          1;
         molWeight       17.9973;
     }
     thermodynamics
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
index 863152a970..b64b041ab3 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
@@ -33,7 +33,6 @@ fuel
 {
     specie
     {
-        nMoles          1;
         molWeight       114.23;
     }
     thermodynamics
@@ -55,7 +54,6 @@ oxidant
 {
     specie
     {
-        nMoles          1;
         molWeight       28.8504;
     }
     thermodynamics
@@ -77,7 +75,6 @@ burntProducts
 {
     specie
     {
-        nMoles          1;
         molWeight       28.6068;
     }
     thermodynamics
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
index a4b2c48134..ecb4a042a2 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermo.solid
@@ -19,7 +19,6 @@ wood
 {
     specie
     {
-        nMoles      1;
         molWeight   100;
     }
     transport
@@ -41,7 +40,6 @@ char
 {
     specie
     {
-        nMoles      1;
         molWeight   50;
     }
     transport
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
index 4765d84e02..e1db45d87e 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/thermophysicalProperties
@@ -46,7 +46,6 @@ gas
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
index d2d8f2cd2a..3a25b01d28 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermo.compressibleGas
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -41,7 +40,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -63,7 +61,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -85,7 +82,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
@@ -107,7 +103,6 @@ C3H8
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0962;
     }
     thermodynamics
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermo.solid b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermo.solid
index a4b2c48134..ecb4a042a2 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermo.solid
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermo.solid
@@ -19,7 +19,6 @@ wood
 {
     specie
     {
-        nMoles      1;
         molWeight   100;
     }
     transport
@@ -41,7 +40,6 @@ char
 {
     specie
     {
-        nMoles      1;
         molWeight   50;
     }
     transport
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
index a4d89de8c3..df2e38a59e 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
@@ -46,7 +46,6 @@ gas
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermo.compressibleGas
index 7544819fc4..57b05bac72 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/thermo.compressibleGas
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -41,7 +40,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -63,7 +61,6 @@ C3H8
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -85,7 +82,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -107,7 +103,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermo.compressibleGas
index db19942525..6506999a70 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/thermo.compressibleGas
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -41,7 +40,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -63,7 +61,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0428;
     }
     thermodynamics
@@ -85,7 +82,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -107,7 +103,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermo.compressibleGas
index db19942525..6506999a70 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/thermo.compressibleGas
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -41,7 +40,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -63,7 +61,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0428;
     }
     thermodynamics
@@ -85,7 +82,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -107,7 +103,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas
index ff00e560b4..1bacad52c3 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/thermo.compressibleGas
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -41,7 +40,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -63,7 +61,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0428;
     }
     thermodynamics
@@ -85,7 +82,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -107,7 +103,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermo.compressibleGas
index ff00e560b4..1bacad52c3 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/thermo.compressibleGas
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -41,7 +40,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -63,7 +61,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0428;
     }
     thermodynamics
@@ -85,7 +82,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -107,7 +103,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGas
index 33208fc6c0..8e3adfc37f 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGas
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     elements
@@ -45,7 +44,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     elements
@@ -72,7 +70,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0428;
     }
     elements
@@ -99,7 +96,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     elements
@@ -126,7 +122,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     elements
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGasGRI b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGasGRI
index 00d5cd86dc..f709692e99 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGasGRI
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/thermo.compressibleGasGRI
@@ -2,7 +2,6 @@ OH
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0074;
     }
     thermodynamics
@@ -28,7 +27,6 @@ CN
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0179;
     }
     thermodynamics
@@ -54,7 +52,6 @@ C2H3
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0462;
     }
     thermodynamics
@@ -80,7 +77,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
@@ -105,7 +101,6 @@ HOCN
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -133,7 +128,6 @@ N
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0067;
     }
     thermodynamics
@@ -158,7 +152,6 @@ C2H
 {
     specie
     {
-        nMoles          1;
         molWeight       25.0303;
     }
     thermodynamics
@@ -184,7 +177,6 @@ HNO
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0141;
     }
     thermodynamics
@@ -211,7 +203,6 @@ CH2CO
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0376;
     }
     thermodynamics
@@ -238,7 +229,6 @@ CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0351;
     }
     thermodynamics
@@ -264,7 +254,6 @@ C2H5
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0622;
     }
     thermodynamics
@@ -290,7 +279,6 @@ C2H4
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0542;
     }
     thermodynamics
@@ -316,7 +304,6 @@ C3H8
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0972;
     }
     thermodynamics
@@ -342,7 +329,6 @@ HCN
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0258;
     }
     thermodynamics
@@ -369,7 +355,6 @@ C2H6
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0701;
     }
     thermodynamics
@@ -395,7 +380,6 @@ NH3
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0306;
     }
     thermodynamics
@@ -421,7 +405,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -447,7 +430,6 @@ C2H2
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0382;
     }
     thermodynamics
@@ -473,7 +455,6 @@ CH2OH
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0345;
     }
     thermodynamics
@@ -500,7 +481,6 @@ H2CN
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0338;
     }
     thermodynamics
@@ -527,7 +507,6 @@ HCCOH
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0376;
     }
     thermodynamics
@@ -554,7 +533,6 @@ H2O2
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0147;
     }
     thermodynamics
@@ -580,7 +558,6 @@ HCO
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0185;
     }
     thermodynamics
@@ -607,7 +584,6 @@ NNH
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0214;
     }
     thermodynamics
@@ -633,7 +609,6 @@ N2O
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0128;
     }
     thermodynamics
@@ -659,7 +634,6 @@ CH2(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0271;
     }
     thermodynamics
@@ -685,7 +659,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -710,7 +683,6 @@ CH2CHO
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0456;
     }
     thermodynamics
@@ -737,7 +709,6 @@ HNCO
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -765,7 +736,6 @@ HCCO
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0297;
     }
     thermodynamics
@@ -792,7 +762,6 @@ H2
 {
     specie
     {
-        nMoles          1;
         molWeight       2.01594;
     }
     thermodynamics
@@ -817,7 +786,6 @@ NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0055;
     }
     thermodynamics
@@ -843,7 +811,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.043;
     }
     thermodynamics
@@ -869,7 +836,6 @@ C
 {
     specie
     {
-        nMoles          1;
         molWeight       12.0112;
     }
     thermodynamics
@@ -894,7 +860,6 @@ HO2
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0068;
     }
     thermodynamics
@@ -920,7 +885,6 @@ CH3CHO
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0536;
     }
     thermodynamics
@@ -947,7 +911,6 @@ C3H7
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0892;
     }
     thermodynamics
@@ -973,7 +936,6 @@ CH3OH
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0424;
     }
     thermodynamics
@@ -1000,7 +962,6 @@ CH2O
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0265;
     }
     thermodynamics
@@ -1027,7 +988,6 @@ CO
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0106;
     }
     thermodynamics
@@ -1053,7 +1013,6 @@ CH3O
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0345;
     }
     thermodynamics
@@ -1080,7 +1039,6 @@ O
 {
     specie
     {
-        nMoles          1;
         molWeight       15.9994;
     }
     thermodynamics
@@ -1105,7 +1063,6 @@ HCNN
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0325;
     }
     thermodynamics
@@ -1132,7 +1089,6 @@ NCO
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0173;
     }
     thermodynamics
@@ -1159,7 +1115,6 @@ CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0271;
     }
     thermodynamics
@@ -1185,7 +1140,6 @@ HCNO
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -1213,7 +1167,6 @@ NH2
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0226;
     }
     thermodynamics
@@ -1239,7 +1192,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -1265,7 +1217,6 @@ NH
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0147;
     }
     thermodynamics
@@ -1291,7 +1242,6 @@ H
 {
     specie
     {
-        nMoles          1;
         molWeight       1.00797;
     }
     thermodynamics
@@ -1316,7 +1266,6 @@ AR
 {
     specie
     {
-        nMoles          1;
         molWeight       39.948;
     }
     thermodynamics
@@ -1341,7 +1290,6 @@ NO
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0061;
     }
     thermodynamics
@@ -1367,7 +1315,6 @@ CH
 {
     specie
     {
-        nMoles          1;
         molWeight       13.0191;
     }
     thermodynamics
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas
index 33208fc6c0..8e3adfc37f 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGas
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     elements
@@ -45,7 +44,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     elements
@@ -72,7 +70,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0428;
     }
     elements
@@ -99,7 +96,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     elements
@@ -126,7 +122,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     elements
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGasGRI b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGasGRI
index 00d5cd86dc..f709692e99 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGasGRI
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/thermo.compressibleGasGRI
@@ -2,7 +2,6 @@ OH
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0074;
     }
     thermodynamics
@@ -28,7 +27,6 @@ CN
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0179;
     }
     thermodynamics
@@ -54,7 +52,6 @@ C2H3
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0462;
     }
     thermodynamics
@@ -80,7 +77,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
@@ -105,7 +101,6 @@ HOCN
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -133,7 +128,6 @@ N
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0067;
     }
     thermodynamics
@@ -158,7 +152,6 @@ C2H
 {
     specie
     {
-        nMoles          1;
         molWeight       25.0303;
     }
     thermodynamics
@@ -184,7 +177,6 @@ HNO
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0141;
     }
     thermodynamics
@@ -211,7 +203,6 @@ CH2CO
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0376;
     }
     thermodynamics
@@ -238,7 +229,6 @@ CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0351;
     }
     thermodynamics
@@ -264,7 +254,6 @@ C2H5
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0622;
     }
     thermodynamics
@@ -290,7 +279,6 @@ C2H4
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0542;
     }
     thermodynamics
@@ -316,7 +304,6 @@ C3H8
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0972;
     }
     thermodynamics
@@ -342,7 +329,6 @@ HCN
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0258;
     }
     thermodynamics
@@ -369,7 +355,6 @@ C2H6
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0701;
     }
     thermodynamics
@@ -395,7 +380,6 @@ NH3
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0306;
     }
     thermodynamics
@@ -421,7 +405,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -447,7 +430,6 @@ C2H2
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0382;
     }
     thermodynamics
@@ -473,7 +455,6 @@ CH2OH
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0345;
     }
     thermodynamics
@@ -500,7 +481,6 @@ H2CN
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0338;
     }
     thermodynamics
@@ -527,7 +507,6 @@ HCCOH
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0376;
     }
     thermodynamics
@@ -554,7 +533,6 @@ H2O2
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0147;
     }
     thermodynamics
@@ -580,7 +558,6 @@ HCO
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0185;
     }
     thermodynamics
@@ -607,7 +584,6 @@ NNH
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0214;
     }
     thermodynamics
@@ -633,7 +609,6 @@ N2O
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0128;
     }
     thermodynamics
@@ -659,7 +634,6 @@ CH2(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0271;
     }
     thermodynamics
@@ -685,7 +659,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -710,7 +683,6 @@ CH2CHO
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0456;
     }
     thermodynamics
@@ -737,7 +709,6 @@ HNCO
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -765,7 +736,6 @@ HCCO
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0297;
     }
     thermodynamics
@@ -792,7 +762,6 @@ H2
 {
     specie
     {
-        nMoles          1;
         molWeight       2.01594;
     }
     thermodynamics
@@ -817,7 +786,6 @@ NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0055;
     }
     thermodynamics
@@ -843,7 +811,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.043;
     }
     thermodynamics
@@ -869,7 +836,6 @@ C
 {
     specie
     {
-        nMoles          1;
         molWeight       12.0112;
     }
     thermodynamics
@@ -894,7 +860,6 @@ HO2
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0068;
     }
     thermodynamics
@@ -920,7 +885,6 @@ CH3CHO
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0536;
     }
     thermodynamics
@@ -947,7 +911,6 @@ C3H7
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0892;
     }
     thermodynamics
@@ -973,7 +936,6 @@ CH3OH
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0424;
     }
     thermodynamics
@@ -1000,7 +962,6 @@ CH2O
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0265;
     }
     thermodynamics
@@ -1027,7 +988,6 @@ CO
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0106;
     }
     thermodynamics
@@ -1053,7 +1013,6 @@ CH3O
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0345;
     }
     thermodynamics
@@ -1080,7 +1039,6 @@ O
 {
     specie
     {
-        nMoles          1;
         molWeight       15.9994;
     }
     thermodynamics
@@ -1105,7 +1063,6 @@ HCNN
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0325;
     }
     thermodynamics
@@ -1132,7 +1089,6 @@ NCO
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0173;
     }
     thermodynamics
@@ -1159,7 +1115,6 @@ CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0271;
     }
     thermodynamics
@@ -1185,7 +1140,6 @@ HCNO
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -1213,7 +1167,6 @@ NH2
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0226;
     }
     thermodynamics
@@ -1239,7 +1192,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -1265,7 +1217,6 @@ NH
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0147;
     }
     thermodynamics
@@ -1291,7 +1242,6 @@ H
 {
     specie
     {
-        nMoles          1;
         molWeight       1.00797;
     }
     thermodynamics
@@ -1316,7 +1266,6 @@ AR
 {
     specie
     {
-        nMoles          1;
         molWeight       39.948;
     }
     thermodynamics
@@ -1341,7 +1290,6 @@ NO
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0061;
     }
     thermodynamics
@@ -1367,7 +1315,6 @@ CH
 {
     specie
     {
-        nMoles          1;
         molWeight       13.0191;
     }
     thermodynamics
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas
index 33208fc6c0..8e3adfc37f 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGas
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     elements
@@ -45,7 +44,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     elements
@@ -72,7 +70,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0428;
     }
     elements
@@ -99,7 +96,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     elements
@@ -126,7 +122,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     elements
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGasGRI b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGasGRI
index 00d5cd86dc..f709692e99 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGasGRI
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/thermo.compressibleGasGRI
@@ -2,7 +2,6 @@ OH
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0074;
     }
     thermodynamics
@@ -28,7 +27,6 @@ CN
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0179;
     }
     thermodynamics
@@ -54,7 +52,6 @@ C2H3
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0462;
     }
     thermodynamics
@@ -80,7 +77,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
@@ -105,7 +101,6 @@ HOCN
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -133,7 +128,6 @@ N
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0067;
     }
     thermodynamics
@@ -158,7 +152,6 @@ C2H
 {
     specie
     {
-        nMoles          1;
         molWeight       25.0303;
     }
     thermodynamics
@@ -184,7 +177,6 @@ HNO
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0141;
     }
     thermodynamics
@@ -211,7 +203,6 @@ CH2CO
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0376;
     }
     thermodynamics
@@ -238,7 +229,6 @@ CH3
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0351;
     }
     thermodynamics
@@ -264,7 +254,6 @@ C2H5
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0622;
     }
     thermodynamics
@@ -290,7 +279,6 @@ C2H4
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0542;
     }
     thermodynamics
@@ -316,7 +304,6 @@ C3H8
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0972;
     }
     thermodynamics
@@ -342,7 +329,6 @@ HCN
 {
     specie
     {
-        nMoles          1;
         molWeight       27.0258;
     }
     thermodynamics
@@ -369,7 +355,6 @@ C2H6
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0701;
     }
     thermodynamics
@@ -395,7 +380,6 @@ NH3
 {
     specie
     {
-        nMoles          1;
         molWeight       17.0306;
     }
     thermodynamics
@@ -421,7 +405,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -447,7 +430,6 @@ C2H2
 {
     specie
     {
-        nMoles          1;
         molWeight       26.0382;
     }
     thermodynamics
@@ -473,7 +455,6 @@ CH2OH
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0345;
     }
     thermodynamics
@@ -500,7 +481,6 @@ H2CN
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0338;
     }
     thermodynamics
@@ -527,7 +507,6 @@ HCCOH
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0376;
     }
     thermodynamics
@@ -554,7 +533,6 @@ H2O2
 {
     specie
     {
-        nMoles          1;
         molWeight       34.0147;
     }
     thermodynamics
@@ -580,7 +558,6 @@ HCO
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0185;
     }
     thermodynamics
@@ -607,7 +584,6 @@ NNH
 {
     specie
     {
-        nMoles          1;
         molWeight       29.0214;
     }
     thermodynamics
@@ -633,7 +609,6 @@ N2O
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0128;
     }
     thermodynamics
@@ -659,7 +634,6 @@ CH2(S)
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0271;
     }
     thermodynamics
@@ -685,7 +659,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -710,7 +683,6 @@ CH2CHO
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0456;
     }
     thermodynamics
@@ -737,7 +709,6 @@ HNCO
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -765,7 +736,6 @@ HCCO
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0297;
     }
     thermodynamics
@@ -792,7 +762,6 @@ H2
 {
     specie
     {
-        nMoles          1;
         molWeight       2.01594;
     }
     thermodynamics
@@ -817,7 +786,6 @@ NO2
 {
     specie
     {
-        nMoles          1;
         molWeight       46.0055;
     }
     thermodynamics
@@ -843,7 +811,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.043;
     }
     thermodynamics
@@ -869,7 +836,6 @@ C
 {
     specie
     {
-        nMoles          1;
         molWeight       12.0112;
     }
     thermodynamics
@@ -894,7 +860,6 @@ HO2
 {
     specie
     {
-        nMoles          1;
         molWeight       33.0068;
     }
     thermodynamics
@@ -920,7 +885,6 @@ CH3CHO
 {
     specie
     {
-        nMoles          1;
         molWeight       44.0536;
     }
     thermodynamics
@@ -947,7 +911,6 @@ C3H7
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0892;
     }
     thermodynamics
@@ -973,7 +936,6 @@ CH3OH
 {
     specie
     {
-        nMoles          1;
         molWeight       32.0424;
     }
     thermodynamics
@@ -1000,7 +962,6 @@ CH2O
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0265;
     }
     thermodynamics
@@ -1027,7 +988,6 @@ CO
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0106;
     }
     thermodynamics
@@ -1053,7 +1013,6 @@ CH3O
 {
     specie
     {
-        nMoles          1;
         molWeight       31.0345;
     }
     thermodynamics
@@ -1080,7 +1039,6 @@ O
 {
     specie
     {
-        nMoles          1;
         molWeight       15.9994;
     }
     thermodynamics
@@ -1105,7 +1063,6 @@ HCNN
 {
     specie
     {
-        nMoles          1;
         molWeight       41.0325;
     }
     thermodynamics
@@ -1132,7 +1089,6 @@ NCO
 {
     specie
     {
-        nMoles          1;
         molWeight       42.0173;
     }
     thermodynamics
@@ -1159,7 +1115,6 @@ CH2
 {
     specie
     {
-        nMoles          1;
         molWeight       14.0271;
     }
     thermodynamics
@@ -1185,7 +1140,6 @@ HCNO
 {
     specie
     {
-        nMoles          1;
         molWeight       43.0252;
     }
     thermodynamics
@@ -1213,7 +1167,6 @@ NH2
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0226;
     }
     thermodynamics
@@ -1239,7 +1192,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -1265,7 +1217,6 @@ NH
 {
     specie
     {
-        nMoles          1;
         molWeight       15.0147;
     }
     thermodynamics
@@ -1291,7 +1242,6 @@ H
 {
     specie
     {
-        nMoles          1;
         molWeight       1.00797;
     }
     thermodynamics
@@ -1316,7 +1266,6 @@ AR
 {
     specie
     {
-        nMoles          1;
         molWeight       39.948;
     }
     thermodynamics
@@ -1341,7 +1290,6 @@ NO
 {
     specie
     {
-        nMoles          1;
         molWeight       30.0061;
     }
     thermodynamics
@@ -1367,7 +1315,6 @@ CH
 {
     specie
     {
-        nMoles          1;
         molWeight       13.0191;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/thermophysicalProperties
index 582e7e1ac1..112ba7f12b 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
index f7ae5e91df..bd0da1ae5c 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.96;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
index 311e40d8fa..b4813dcb63 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.01348;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
index f26f216f96..d78a252eca 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
@@ -33,7 +33,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       11640.3;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
index 20369bc4ac..82a7d7e923 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
@@ -31,7 +31,6 @@ mixture
     // normalised gas
     specie
     {
-        nMoles          1;
         molWeight       11640.3;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
index dff8b1620d..8db0e85dec 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.96;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
index 20369bc4ac..82a7d7e923 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
@@ -31,7 +31,6 @@ mixture
     // normalised gas
     specie
     {
-        nMoles          1;
         molWeight       11640.3;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/thermophysicalProperties
index 7182386e00..32542b344e 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/thermophysicalProperties
index 392e2e045b..665522c09e 100644
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/thermophysicalProperties
index 7182386e00..32542b344e 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/thermophysicalProperties
index 7182386e00..32542b344e 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/thermophysicalProperties
index 6671abebe7..56843556d0 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/thermophysicalProperties
index 82e3c59f87..861ac55c79 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties
index 392e2e045b..665522c09e 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
index 920fff435c..75b4b67f38 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties
index db1f5947af..c4bdac2f8b 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties
index 8658d3da81..7fc31fc96b 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties b/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties
index 582e7e1ac1..112ba7f12b 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties
index 341cdb94d5..56c00e7541 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties
index 341cdb94d5..56c00e7541 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9;
     }
     thermodynamics
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
index f26f216f96..d78a252eca 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
@@ -33,7 +33,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       11640.3;
     }
     thermodynamics
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
index 7d0bc7caf3..de265e60e9 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
index ab678e4d88..dcecaaf3c6 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -32,7 +32,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
index 95579e34cb..516edffaa3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.96;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo
index 82a4468a90..cf3af70f1c 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/1DBaffle/1DbaffleSolidThermo
@@ -8,7 +8,6 @@
 
 specie
 {
-    nMoles          1;
     molWeight       20;
 }
 transport
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo
index 05d8ca3f74..751501e13a 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DbaffleSolidThermo
@@ -22,7 +22,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       20;
     }
     transport
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
index 95579e34cb..516edffaa3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.96;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/thermophysicalProperties
index 95579e34cb..516edffaa3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.96;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties
index ab678e4d88..dcecaaf3c6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/thermophysicalProperties
@@ -32,7 +32,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
index ab678e4d88..dcecaaf3c6 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
@@ -32,7 +32,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties
index 828c78d208..c82346a41a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomWater/thermophysicalProperties
@@ -29,7 +29,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       18;
     }
     equationOfState
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
index edb01db8b8..97bdf46290 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
@@ -29,7 +29,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   50;
     }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index c293c032a3..8309d666a8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index c293c032a3..8309d666a8 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
index df146b74f3..3569242da5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
@@ -29,7 +29,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   12;
     }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties
index b3c0a58998..6553fe2a21 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties
@@ -32,7 +32,6 @@ mixture
 
     specie
     {
-        nMoles          1;
         molWeight       28.85;
     }
     equationOfState
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties
index 41e355a66b..4f46120b50 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties
@@ -32,7 +32,6 @@ mixture
 
     specie
     {
-        nMoles          1;
         molWeight       18;
     }
     equationOfState
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
index c293c032a3..8309d666a8 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9;
     }
     thermodynamics
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
index 894a9f39be..e6e7b76fec 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
@@ -29,7 +29,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   12;
     }
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
index 3b2be66914..320de4df7d 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat
@@ -19,7 +19,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -41,7 +40,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.043;
     }
     thermodynamics
@@ -63,7 +61,6 @@ H2
 {
     specie
     {
-        nMoles          1;
         molWeight       2.01594;
     }
     thermodynamics
@@ -85,7 +82,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -107,7 +103,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -129,7 +124,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat
index 1cff004fd8..3521a7ef72 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/foam.dat
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -41,7 +40,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -63,7 +61,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat
index 1cff004fd8..3521a7ef72 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/foam.dat
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -41,7 +40,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -63,7 +61,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/foam.dat
index 1cff004fd8..3521a7ef72 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/foam.dat
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -41,7 +40,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -63,7 +61,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat
index 1cff004fd8..3521a7ef72 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/foam.dat
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -41,7 +40,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -63,7 +61,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
index ff00e560b4..1bacad52c3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas
@@ -19,7 +19,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     thermodynamics
@@ -41,7 +40,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -63,7 +61,6 @@ CH4
 {
     specie
     {
-        nMoles          1;
         molWeight       16.0428;
     }
     thermodynamics
@@ -85,7 +82,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -107,7 +103,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     thermodynamics
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
index ec4289e977..6989ffe501 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly
@@ -19,7 +19,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     equationOfState
@@ -43,7 +42,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     equationOfState
@@ -67,7 +65,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     equationOfState
@@ -91,7 +88,6 @@ air
 {
     specie
     {
-        nMoles          1;
         molWeight       28.85;
     }
     equationOfState
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
index ec4289e977..6989ffe501 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
@@ -19,7 +19,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     equationOfState
@@ -43,7 +42,6 @@ O2
 {
     specie
     {
-        nMoles          1;
         molWeight       31.9988;
     }
     equationOfState
@@ -67,7 +65,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     equationOfState
@@ -91,7 +88,6 @@ air
 {
     specie
     {
-        nMoles          1;
         molWeight       28.85;
     }
     equationOfState
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
index 3b8bf27dfe..669e2c7ad1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
@@ -19,7 +19,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     equationOfState
@@ -43,7 +42,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     equationOfState
@@ -67,7 +65,6 @@ air
 {
     specie
     {
-        nMoles          1;
         molWeight       28.85;
     }
     equationOfState
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
index 3b8bf27dfe..669e2c7ad1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly
@@ -19,7 +19,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     equationOfState
@@ -43,7 +42,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     equationOfState
@@ -67,7 +65,6 @@ air
 {
     specie
     {
-        nMoles          1;
         molWeight       28.85;
     }
     equationOfState
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
index 3b8bf27dfe..669e2c7ad1 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly
@@ -19,7 +19,6 @@ N2
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0134;
     }
     equationOfState
@@ -43,7 +42,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     equationOfState
@@ -67,7 +65,6 @@ air
 {
     specie
     {
-        nMoles          1;
         molWeight       28.85;
     }
     equationOfState
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties
index 4f39633071..07da539297 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/constant/thermophysicalProperties
@@ -24,7 +24,6 @@ mixture
 {
     specie
     {
-        nMoles          1;
         molWeight       11640.3;
     }
     thermodynamics
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.air
index e61009c10b..5a63396e43 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water
index 1ffcbddad7..8c1db784a4 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterDyMFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18.0;
     }
     equationOfState
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
index e61009c10b..5a63396e43 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
index 1ffcbddad7..8c1db784a4 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18.0;
     }
     equationOfState
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
index e61009c10b..5a63396e43 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
index 1ffcbddad7..8c1db784a4 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18.0;
     }
     equationOfState
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
index e90070ef13..e82a6b9a7e 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   200.59;
     }
     equationOfState
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
index 0bcdc33f4c..431b0c3c14 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   100.21;
     }
     equationOfState
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
index 91e7adc381..d1cd8cb9e0 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18.0;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
index 864b73f24e..04754d7798 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   200;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
index 7c0d16aa90..953ae48bb0 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   160;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
index a2a98f45f2..9a2c2de58e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
index 84dae4b716..3bd3e7f512 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   100;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermo.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermo.gas
index dde77f0871..5a836c21d1 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermo.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermo.gas
@@ -2,7 +2,6 @@ CO
 {
     specie
     {
-        nMoles          1;
         molWeight       28.0106;
     }
     thermodynamics
@@ -24,7 +23,6 @@ CO2
 {
     specie
     {
-        nMoles          1;
         molWeight       44.01;
     }
     thermodynamics
@@ -46,7 +44,6 @@ H2
 {
     specie
     {
-        nMoles          1;
         molWeight       2.01594;
     }
     thermodynamics
@@ -68,7 +65,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -90,7 +86,6 @@ AIR
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9596;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
index 90073f75ef..f5bae7e9cb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid
@@ -38,7 +38,6 @@ inertSpecie H2O;
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     equationOfState
@@ -62,7 +61,6 @@ AIR
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
index 7508b70aa3..e710b21d50 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   100;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
index 7b3b350ea1..31715a77a5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas
@@ -43,7 +43,6 @@ water
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
index 7406b2ce4f..7d579f06cb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid
@@ -39,7 +39,6 @@ inertSpecie water;
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
index 7b3b350ea1..31715a77a5 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas
@@ -43,7 +43,6 @@ water
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
index 7406b2ce4f..7d579f06cb 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid
@@ -39,7 +39,6 @@ inertSpecie water;
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
index 0bfc34018d..68649a6afc 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas
@@ -38,7 +38,6 @@ H2O
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     thermodynamics
@@ -60,7 +59,6 @@ air
 {
     specie
     {
-        nMoles          1;
         molWeight       28.9596;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
index 2f486f8bea..41529cc02e 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid
@@ -38,7 +38,6 @@ inertSpecie H2O;
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
     equationOfState
@@ -62,7 +61,6 @@ air
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
index 8b81329328..3c54e2737d 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas
@@ -38,7 +38,6 @@ inertSpecie air;
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -57,7 +56,6 @@ water
 {
     specie
     {
-        nMoles      1;
         molWeight   18.0153;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
index 22a48eded3..a5db4a1f29 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid
@@ -38,7 +38,6 @@ inertSpecie water;
 {
     specie
     {
-        nMoles      1;
         molWeight   18.0153;
     }
     equationOfState
@@ -62,7 +61,6 @@ air
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
index 7508b70aa3..e710b21d50 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   100;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
index 4053b173ee..73efe39b11 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
@@ -37,7 +37,6 @@ water
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
index 3e40c9dce6..84cdbf1965 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
@@ -37,7 +37,6 @@ water
 {
     specie
     {
-        nMoles          1;
         molWeight       18.0153;
     }
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
index 7508b70aa3..e710b21d50 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   100;
     }
     equationOfState
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
index 7508b70aa3..e710b21d50 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   100;
     }
     equationOfState
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
index befc0aeae4..eb9bb8ab73 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
index c44c005d3b..31d8cf0589 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState

From 3e4d253cc1dc8c2b28a1f621103ae0b9eaa9d1fa Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 17 Feb 2017 13:41:05 +0000
Subject: [PATCH 24/40] liquidProperties: Removed unused construction from
 Istream

---
 .../properties/liquidProperties/Ar/Ar.C       | 39 ---------------
 .../properties/liquidProperties/Ar/Ar.H       |  6 ---
 .../liquidProperties/C10H22/C10H22.C          | 39 ---------------
 .../liquidProperties/C10H22/C10H22.H          |  6 ---
 .../liquidProperties/C12H26/C12H26.C          | 39 ---------------
 .../liquidProperties/C12H26/C12H26.H          |  6 ---
 .../liquidProperties/C13H28/C13H28.C          | 39 ---------------
 .../liquidProperties/C13H28/C13H28.H          |  6 ---
 .../liquidProperties/C14H30/C14H30.C          | 39 ---------------
 .../liquidProperties/C14H30/C14H30.H          |  6 ---
 .../liquidProperties/C16H34/C16H34.C          | 39 ---------------
 .../liquidProperties/C16H34/C16H34.H          |  6 ---
 .../liquidProperties/C2H5OH/C2H5OH.C          | 39 ---------------
 .../liquidProperties/C2H5OH/C2H5OH.H          |  6 ---
 .../properties/liquidProperties/C2H6/C2H6.C   | 39 ---------------
 .../properties/liquidProperties/C2H6/C2H6.H   |  6 ---
 .../properties/liquidProperties/C2H6O/C2H6O.C | 38 --------------
 .../properties/liquidProperties/C2H6O/C2H6O.H |  6 ---
 .../properties/liquidProperties/C3H6O/C3H6O.C | 39 ---------------
 .../properties/liquidProperties/C3H6O/C3H6O.H |  6 ---
 .../properties/liquidProperties/C3H8/C3H8.C   | 39 ---------------
 .../properties/liquidProperties/C3H8/C3H8.H   |  6 ---
 .../liquidProperties/C4H10O/C4H10O.C          | 39 ---------------
 .../liquidProperties/C4H10O/C4H10O.H          |  6 ---
 .../properties/liquidProperties/C6H14/C6H14.C | 39 ---------------
 .../properties/liquidProperties/C6H14/C6H14.H |  6 ---
 .../properties/liquidProperties/C6H6/C6H6.C   | 39 ---------------
 .../properties/liquidProperties/C6H6/C6H6.H   |  6 ---
 .../properties/liquidProperties/C7H16/C7H16.C | 39 ---------------
 .../properties/liquidProperties/C7H16/C7H16.H |  6 ---
 .../properties/liquidProperties/C7H8/C7H8.C   | 39 ---------------
 .../properties/liquidProperties/C7H8/C7H8.H   |  6 ---
 .../properties/liquidProperties/C8H10/C8H10.C | 39 ---------------
 .../properties/liquidProperties/C8H10/C8H10.H |  6 ---
 .../properties/liquidProperties/C8H18/C8H18.C | 39 ---------------
 .../properties/liquidProperties/C8H18/C8H18.H |  6 ---
 .../properties/liquidProperties/C9H20/C9H20.C | 39 ---------------
 .../properties/liquidProperties/C9H20/C9H20.H |  6 ---
 .../properties/liquidProperties/CH3OH/CH3OH.C | 39 ---------------
 .../properties/liquidProperties/CH3OH/CH3OH.H |  6 ---
 .../liquidProperties/CH4N2O/CH4N2O.C          | 39 ---------------
 .../liquidProperties/CH4N2O/CH4N2O.H          |  6 ---
 .../properties/liquidProperties/H2O/H2O.C     | 50 +++----------------
 .../properties/liquidProperties/H2O/H2O.H     |  7 ---
 .../liquidProperties/IC8H18/IC8H18.C          | 39 ---------------
 .../liquidProperties/IC8H18/IC8H18.H          |  6 ---
 .../properties/liquidProperties/IDEA/IDEA.C   | 39 ---------------
 .../properties/liquidProperties/IDEA/IDEA.H   |  6 ---
 .../properties/liquidProperties/MB/MB.C       | 39 ---------------
 .../properties/liquidProperties/MB/MB.H       |  6 ---
 .../properties/liquidProperties/N2/N2.C       | 39 ---------------
 .../properties/liquidProperties/N2/N2.H       |  6 ---
 .../liquidProperties/aC10H7CH3/aC10H7CH3.C    | 39 ---------------
 .../liquidProperties/aC10H7CH3/aC10H7CH3.H    |  6 ---
 .../liquidProperties/bC10H7CH3/bC10H7CH3.C    | 38 --------------
 .../liquidProperties/bC10H7CH3/bC10H7CH3.H    |  6 ---
 .../liquidProperties/iC3H8O/iC3H8O.C          | 39 ---------------
 .../liquidProperties/iC3H8O/iC3H8O.H          |  6 ---
 .../liquidProperties/liquidProperties.C       | 34 -------------
 .../liquidProperties/liquidProperties.H       | 18 -------
 .../liquidProperties/nC3H8O/nC3H8O.C          | 39 ---------------
 .../liquidProperties/nC3H8O/nC3H8O.H          |  6 ---
 62 files changed, 8 insertions(+), 1404 deletions(-)

diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
index 8a4844a722..c6bcfbdc11 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
+++ b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(Ar, 0);
     addToRunTimeSelectionTable(liquidProperties, Ar,);
-    addToRunTimeSelectionTable(liquidProperties, Ar, Istream);
     addToRunTimeSelectionTable(liquidProperties, Ar, dictionary);
 }
 
@@ -120,25 +119,6 @@ Foam::Ar::Ar
 {}
 
 
-Foam::Ar::Ar(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::Ar::Ar(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -158,23 +138,4 @@ Foam::Ar::Ar(const dictionary& dict)
 {}
 
 
-Foam::Ar::Ar(const Ar& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
index c26405a96b..f5710401d8 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
+++ b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        Ar(Istream& is);
-
         //- Construct from dictionary
         Ar(const dictionary& dict);
 
-        //- Construct copy
-        Ar(const Ar& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
index 6358c3bd4c..5d82ef6da1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C10H22, 0);
     addToRunTimeSelectionTable(liquidProperties, C10H22,);
-    addToRunTimeSelectionTable(liquidProperties, C10H22, Istream);
     addToRunTimeSelectionTable(liquidProperties, C10H22, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C10H22::C10H22
 {}
 
 
-Foam::C10H22::C10H22(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C10H22::C10H22(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C10H22::C10H22(const dictionary& dict)
 {}
 
 
-Foam::C10H22::C10H22(const C10H22& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
index bfa91a6a35..2f747a27bd 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C10H22(Istream& is);
-
         //- Construct from dictionary
         C10H22(const dictionary& dict);
 
-        //- Construct copy
-        C10H22(const C10H22& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
index 54a5124afb..3f5271210f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C12H26, 0);
     addToRunTimeSelectionTable(liquidProperties, C12H26,);
-    addToRunTimeSelectionTable(liquidProperties, C12H26, Istream);
     addToRunTimeSelectionTable(liquidProperties, C12H26, dictionary);
 }
 
@@ -120,25 +119,6 @@ Foam::C12H26::C12H26
 {}
 
 
-Foam::C12H26::C12H26(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C12H26::C12H26(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -158,23 +138,4 @@ Foam::C12H26::C12H26(const dictionary& dict)
 {}
 
 
-Foam::C12H26::C12H26(const C12H26& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
index c665f2678c..23c1ad9077 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C12H26(Istream& is);
-
         //- Construct from dictionary
         C12H26(const dictionary& dict);
 
-        //- Construct copy
-        C12H26(const C12H26& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
index 1f9eb06b66..a4011182ab 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C13H28, 0);
     addToRunTimeSelectionTable(liquidProperties, C13H28,);
-    addToRunTimeSelectionTable(liquidProperties, C13H28, Istream);
     addToRunTimeSelectionTable(liquidProperties, C13H28, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C13H28::C13H28
 {}
 
 
-Foam::C13H28::C13H28(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C13H28::C13H28(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C13H28::C13H28(const dictionary& dict)
 {}
 
 
-Foam::C13H28::C13H28(const C13H28& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
index 6962ea8a51..4ed22aafeb 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C13H28(Istream& is);
-
         //- Construct from dictionary
         C13H28(const dictionary& dict);
 
-        //- Construct copy
-        C13H28(const C13H28& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
index 5c0cd60c50..98fbbc8f7f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C14H30, 0);
     addToRunTimeSelectionTable(liquidProperties, C14H30,);
-    addToRunTimeSelectionTable(liquidProperties, C14H30, Istream);
     addToRunTimeSelectionTable(liquidProperties, C14H30, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C14H30::C14H30
 {}
 
 
-Foam::C14H30::C14H30(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C14H30::C14H30(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C14H30::C14H30(const dictionary& dict)
 {}
 
 
-Foam::C14H30::C14H30(const C14H30& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
index f1ea7dff2e..bfa65436d5 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C14H30(Istream& is);
-
         //- Construct from dictionary
         C14H30(const dictionary& dict);
 
-        //- Construct copy
-        C14H30(const C14H30& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
index f583cc2716..12a00555b5 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C16H34, 0);
     addToRunTimeSelectionTable(liquidProperties, C16H34,);
-    addToRunTimeSelectionTable(liquidProperties, C16H34, Istream);
     addToRunTimeSelectionTable(liquidProperties, C16H34, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C16H34::C16H34
 {}
 
 
-Foam::C16H34::C16H34(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C16H34::C16H34(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C16H34::C16H34(const dictionary& dict)
 {}
 
 
-Foam::C16H34::C16H34(const C16H34& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
index e1c39b9a2e..36085db54b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C16H34(Istream& is);
-
         //- Construct from dictionary
         C16H34(const dictionary& dict);
 
-        //- Construct copy
-        C16H34(const C16H34& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
index ad3a0b167b..a9d441a942 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C2H5OH, 0);
     addToRunTimeSelectionTable(liquidProperties, C2H5OH,);
-    addToRunTimeSelectionTable(liquidProperties, C2H5OH, Istream);
     addToRunTimeSelectionTable(liquidProperties, C2H5OH, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C2H5OH::C2H5OH
 {}
 
 
-Foam::C2H5OH::C2H5OH(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C2H5OH::C2H5OH(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C2H5OH::C2H5OH(const dictionary& dict)
 {}
 
 
-Foam::C2H5OH::C2H5OH(const C2H5OH& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
index 526d7fe49c..7296b4e343 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C2H5OH(Istream& is);
-
         //- Construct from dictionary
         C2H5OH(const dictionary& dict);
 
-        //- Construct copy
-        C2H5OH(const C2H5OH& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
index b118dc310d..9cab052a77 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C2H6, 0);
     addToRunTimeSelectionTable(liquidProperties, C2H6,);
-    addToRunTimeSelectionTable(liquidProperties, C2H6, Istream);
     addToRunTimeSelectionTable(liquidProperties, C2H6, dictionary);
 }
 
@@ -119,25 +118,6 @@ Foam::C2H6::C2H6
 {}
 
 
-Foam::C2H6::C2H6(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C2H6::C2H6(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -157,23 +137,4 @@ Foam::C2H6::C2H6(const dictionary& dict)
 {}
 
 
-Foam::C2H6::C2H6(const C2H6& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
index 74b7f1a018..ebed8aa44c 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C2H6(Istream& is);
-
         //- Construct from dictionary
         C2H6(const dictionary& dict);
 
-        //- Construct copy
-        C2H6(const C2H6& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
index 1a9ba151a4..bf0528dc0d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C2H6O, 0);
     addToRunTimeSelectionTable(liquidProperties, C2H6O,);
-    addToRunTimeSelectionTable(liquidProperties, C2H6O, Istream);
     addToRunTimeSelectionTable(liquidProperties, C2H6O, dictionary);
 }
 
@@ -128,24 +127,6 @@ Foam::C2H6O::C2H6O
 {}
 
 
-Foam::C2H6O::C2H6O(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
 
 Foam::C2H6O::C2H6O(const dictionary& dict)
 :
@@ -166,23 +147,4 @@ Foam::C2H6O::C2H6O(const dictionary& dict)
 {}
 
 
-Foam::C2H6O::C2H6O(const C2H6O& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
index b85d7273ef..0477b7993e 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C2H6O(Istream& is);
-
         //- Construct from dictionary
         C2H6O(const dictionary& dict);
 
-        //- Construct copy
-        C2H6O(const C2H6O& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
index d0e3a5c160..f617fd592f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C3H6O, 0);
     addToRunTimeSelectionTable(liquidProperties, C3H6O,);
-    addToRunTimeSelectionTable(liquidProperties, C3H6O, Istream);
     addToRunTimeSelectionTable(liquidProperties, C3H6O, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C3H6O::C3H6O
 {}
 
 
-Foam::C3H6O::C3H6O(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C3H6O::C3H6O(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C3H6O::C3H6O(const dictionary& dict)
 {}
 
 
-Foam::C3H6O::C3H6O(const C3H6O& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
index 3e58a5fb09..9cafa34313 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C3H6O(Istream& is);
-
         //- Construct from dictionary
         C3H6O(const dictionary& dict);
 
-        //- Construct copy
-        C3H6O(const C3H6O& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
index 669dd0056b..58abb7117e 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C3H8, 0);
     addToRunTimeSelectionTable(liquidProperties, C3H8,);
-    addToRunTimeSelectionTable(liquidProperties, C3H8, Istream);
     addToRunTimeSelectionTable(liquidProperties, C3H8, dictionary);
 }
 
@@ -118,25 +117,6 @@ Foam::C3H8::C3H8
 {}
 
 
-Foam::C3H8::C3H8(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C3H8::C3H8(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -156,23 +136,4 @@ Foam::C3H8::C3H8(const dictionary& dict)
 {}
 
 
-Foam::C3H8::C3H8(const C3H8& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
index ab345407e2..9d451dcd62 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C3H8(Istream& is);
-
         //- Construct from dictionary
         C3H8(const dictionary& dict);
 
-        //- Construct copy
-        C3H8(const C3H8& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
index 32e217cd4d..1012d7bcf1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C4H10O, 0);
     addToRunTimeSelectionTable(liquidProperties, C4H10O,);
-    addToRunTimeSelectionTable(liquidProperties, C4H10O, Istream);
     addToRunTimeSelectionTable(liquidProperties, C4H10O, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C4H10O::C4H10O
 {}
 
 
-Foam::C4H10O::C4H10O(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C4H10O::C4H10O(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C4H10O::C4H10O(const dictionary& dict)
 {}
 
 
-Foam::C4H10O::C4H10O(const C4H10O& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
index c3e04909cd..16072f1c86 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C4H10O(Istream& is);
-
         //- Construct from dictionary
         C4H10O(const dictionary& dict);
 
-        //- Construct copy
-        C4H10O(const C4H10O& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
index 0aa12512fd..dfd50d0e3a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C6H14, 0);
     addToRunTimeSelectionTable(liquidProperties, C6H14,);
-    addToRunTimeSelectionTable(liquidProperties, C6H14, Istream);
     addToRunTimeSelectionTable(liquidProperties, C6H14, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C6H14::C6H14
 {}
 
 
-Foam::C6H14::C6H14(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C6H14::C6H14(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C6H14::C6H14(const dictionary& dict)
 {}
 
 
-Foam::C6H14::C6H14(const C6H14& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
index 574b249b4d..9769fc41dd 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C6H14(Istream& is);
-
         //- Construct from dictionary
         C6H14(const dictionary& dict);
 
-        //- Construct copy
-        C6H14(const C6H14& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
index ff3e040ef0..a4c10bea04 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C6H6, 0);
     addToRunTimeSelectionTable(liquidProperties, C6H6,);
-    addToRunTimeSelectionTable(liquidProperties, C6H6, Istream);
     addToRunTimeSelectionTable(liquidProperties, C6H6, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C6H6::C6H6
 {}
 
 
-Foam::C6H6::C6H6(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C6H6::C6H6(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C6H6::C6H6(const dictionary& dict)
 {}
 
 
-Foam::C6H6::C6H6(const C6H6& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
index 8f682060c4..260f228e8c 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C6H6(Istream& is);
-
         //- Construct from dictionary
         C6H6(const dictionary& dict);
 
-        //- Construct copy
-        C6H6(const C6H6& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
index 90651a711c..c2032f5479 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C7H16, 0);
     addToRunTimeSelectionTable(liquidProperties, C7H16,);
-    addToRunTimeSelectionTable(liquidProperties, C7H16, Istream);
     addToRunTimeSelectionTable(liquidProperties, C7H16, dictionary);
 }
 
@@ -127,25 +126,6 @@ Foam::C7H16::C7H16
 {}
 
 
-Foam::C7H16::C7H16(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C7H16::C7H16(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -165,23 +145,4 @@ Foam::C7H16::C7H16(const dictionary& dict)
 {}
 
 
-Foam::C7H16::C7H16(const C7H16& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
index b8032cd919..f18c7bf389 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C7H16(Istream& is);
-
         //- Construct from dictionary
         C7H16(const dictionary& dict);
 
-        //- Construct copy
-        C7H16(const C7H16& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
index a9026f39de..8b070065b1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C7H8, 0);
     addToRunTimeSelectionTable(liquidProperties, C7H8,);
-    addToRunTimeSelectionTable(liquidProperties, C7H8, Istream);
     addToRunTimeSelectionTable(liquidProperties, C7H8, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C7H8::C7H8
 {}
 
 
-Foam::C7H8::C7H8(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C7H8::C7H8(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C7H8::C7H8(const dictionary& dict)
 {}
 
 
-Foam::C7H8::C7H8(const C7H8& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
index 7e01f058b0..28e018d7f2 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C7H8(Istream& is);
-
         //- Construct from dictionary
         C7H8(const dictionary& dict);
 
-        //- Construct copy
-        C7H8(const C7H8& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
index 8c8484270f..95822a69fd 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C8H10, 0);
     addToRunTimeSelectionTable(liquidProperties, C8H10,);
-    addToRunTimeSelectionTable(liquidProperties, C8H10, Istream);
     addToRunTimeSelectionTable(liquidProperties, C8H10, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C8H10::C8H10
 {}
 
 
-Foam::C8H10::C8H10(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C8H10::C8H10(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C8H10::C8H10(const dictionary& dict)
 {}
 
 
-Foam::C8H10::C8H10(const C8H10& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
index 4e36b54294..d53a9dc761 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
@@ -106,15 +106,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C8H10(Istream& is);
-
         //- Construct from dictionary
         C8H10(const dictionary& dict);
 
-        //- Construct copy
-        C8H10(const C8H10& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
index d50c15e0af..0bd8dad721 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C8H18, 0);
     addToRunTimeSelectionTable(liquidProperties, C8H18,);
-    addToRunTimeSelectionTable(liquidProperties, C8H18, Istream);
     addToRunTimeSelectionTable(liquidProperties, C8H18, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C8H18::C8H18
 {}
 
 
-Foam::C8H18::C8H18(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C8H18::C8H18(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C8H18::C8H18(const dictionary& dict)
 {}
 
 
-Foam::C8H18::C8H18(const C8H18& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
index 8bd606d1e5..3146c7f788 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C8H18(Istream& is);
-
         //- Construct from dictionary
         C8H18(const dictionary& dict);
 
-        //- Construct copy
-        C8H18(const C8H18& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
index 4db12992a2..803ec867f9 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C9H20, 0);
     addToRunTimeSelectionTable(liquidProperties, C9H20,);
-    addToRunTimeSelectionTable(liquidProperties, C9H20, Istream);
     addToRunTimeSelectionTable(liquidProperties, C9H20, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::C9H20::C9H20
 {}
 
 
-Foam::C9H20::C9H20(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::C9H20::C9H20(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::C9H20::C9H20(const dictionary& dict)
 {}
 
 
-Foam::C9H20::C9H20(const C9H20& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
index 7cd448be55..61ea898d96 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
+++ b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        C9H20(Istream& is);
-
         //- Construct from dictionary
         C9H20(const dictionary& dict);
 
-        //- Construct copy
-        C9H20(const C9H20& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
index f656c0bc9f..7e3918fc71 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
+++ b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(CH3OH, 0);
     addToRunTimeSelectionTable(liquidProperties, CH3OH,);
-    addToRunTimeSelectionTable(liquidProperties, CH3OH, Istream);
     addToRunTimeSelectionTable(liquidProperties, CH3OH, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::CH3OH::CH3OH
 {}
 
 
-Foam::CH3OH::CH3OH(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::CH3OH::CH3OH(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::CH3OH::CH3OH(const dictionary& dict)
 {}
 
 
-Foam::CH3OH::CH3OH(const CH3OH& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
index 43d9b7acf7..705493ab02 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
+++ b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        CH3OH(Istream& is);
-
         //- Construct from dictionary
         CH3OH(const dictionary& dict);
 
-        //- Construct copy
-        CH3OH(const CH3OH& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
index 0e271803ec..7c218a20b7 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(CH4N2O, 0);
     addToRunTimeSelectionTable(liquidProperties, CH4N2O,);
-    addToRunTimeSelectionTable(liquidProperties, CH4N2O, Istream);
     addToRunTimeSelectionTable(liquidProperties, CH4N2O, dictionary);
 }
 
@@ -112,25 +111,6 @@ Foam::CH4N2O::CH4N2O
 {}
 
 
-Foam::CH4N2O::CH4N2O(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::CH4N2O::CH4N2O(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -150,23 +130,4 @@ Foam::CH4N2O::CH4N2O(const dictionary& dict)
 {}
 
 
-Foam::CH4N2O::CH4N2O(const CH4N2O& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
index ceca9fc4eb..3a459e2a95 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        CH4N2O(Istream& is);
-
         //- Construct from dictionary
         CH4N2O(const dictionary& dict);
 
-        //- Construct copy
-        CH4N2O(const CH4N2O& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
index fc1c64a5c3..5f705a7067 100644
--- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(H2O, 0);
     addToRunTimeSelectionTable(liquidProperties, H2O,);
-    addToRunTimeSelectionTable(liquidProperties, H2O, Istream);
     addToRunTimeSelectionTable(liquidProperties, H2O, dictionary);
 }
 
@@ -135,31 +134,17 @@ Foam::H2O::H2O
 {}
 
 
-Foam::H2O::H2O(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::H2O::H2O(const dictionary& dict)
-    :
+:
     H2O()
-// :
+{
 //     liquidProperties(dict),
 //     rho_(dict.subDict("rho")),
+    InfoInFunction;
+    if (dict.found("rho"))
+    {
+        rho_ = NSRDSfunc5(dict.subDict("rho"));
+    }
 //     pv_(dict.subDict("pv")),
 //     hl_(dict.subDict("hl")),
 //     Cp_(dict.subDict("Cp")),
@@ -172,26 +157,7 @@ Foam::H2O::H2O(const dictionary& dict)
 //     kappag_(dict.subDict("kappag")),
 //     sigma_(dict.subDict("sigma")),
 //     D_(dict.subDict("D"))
-{}
-
-
-Foam::H2O::H2O(const H2O& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
index 2b599e1866..542dfd66c4 100644
--- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
@@ -106,15 +106,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        H2O(Istream& is);
-
         //- Construct from dictionary
         H2O(const dictionary& dict);
 
-        //- Construct copy
-        H2O(const H2O& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
@@ -188,7 +182,6 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
         //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const H2O& l)
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
index fc793c8c74..77ba4be1d1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
+++ b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(IC8H18, 0);
     addToRunTimeSelectionTable(liquidProperties, IC8H18,);
-    addToRunTimeSelectionTable(liquidProperties, IC8H18, Istream);
     addToRunTimeSelectionTable(liquidProperties, IC8H18, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::IC8H18::IC8H18
 {}
 
 
-Foam::IC8H18::IC8H18(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::IC8H18::IC8H18(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::IC8H18::IC8H18(const dictionary& dict)
 {}
 
 
-Foam::IC8H18::IC8H18(const IC8H18& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
index d044ccfaa9..9a2e06fdf6 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
+++ b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        IC8H18(Istream& is);
-
         //- Construct from dictionary
         IC8H18(const dictionary& dict);
 
-        //- Construct copy
-        IC8H18(const IC8H18& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
index fc950df619..01777a26ce 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
+++ b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(IDEA, 0);
     addToRunTimeSelectionTable(liquidProperties, IDEA,);
-    addToRunTimeSelectionTable(liquidProperties, IDEA, Istream);
     addToRunTimeSelectionTable(liquidProperties, IDEA, dictionary);
 }
 
@@ -148,25 +147,6 @@ Foam::IDEA::IDEA
 {}
 
 
-Foam::IDEA::IDEA(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::IDEA::IDEA(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -186,23 +166,4 @@ Foam::IDEA::IDEA(const dictionary& dict)
 {}
 
 
-Foam::IDEA::IDEA(const IDEA& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
index ec19b10984..b34a7db9e9 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
+++ b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
@@ -129,15 +129,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        IDEA(Istream& is);
-
         //- Construct from dictionary
         IDEA(const dictionary& dict);
 
-        //- Construct copy
-        IDEA(const IDEA& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
index f2cce3c18c..d98ef565b1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
+++ b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(MB, 0);
     addToRunTimeSelectionTable(liquidProperties, MB,);
-    addToRunTimeSelectionTable(liquidProperties, MB, Istream);
     addToRunTimeSelectionTable(liquidProperties, MB, dictionary);
 }
 
@@ -112,25 +111,6 @@ Foam::MB::MB
 {}
 
 
-Foam::MB::MB(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::MB::MB(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -150,23 +130,4 @@ Foam::MB::MB(const dictionary& dict)
 {}
 
 
-Foam::MB::MB(const MB& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H b/src/thermophysicalModels/properties/liquidProperties/MB/MB.H
index 2d204bf851..4f7e5a5db7 100644
--- a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H
+++ b/src/thermophysicalModels/properties/liquidProperties/MB/MB.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        MB(Istream& is);
-
         //- Construct from dictionary
         MB(const dictionary& dict);
 
-        //- Construct copy
-        MB(const MB& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
index 3470173d97..f22e3b0688 100644
--- a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
+++ b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(N2, 0);
     addToRunTimeSelectionTable(liquidProperties, N2,);
-    addToRunTimeSelectionTable(liquidProperties, N2, Istream);
     addToRunTimeSelectionTable(liquidProperties, N2, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::N2::N2
 {}
 
 
-Foam::N2::N2(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::N2::N2(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::N2::N2(const dictionary& dict)
 {}
 
 
-Foam::N2::N2(const N2& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H b/src/thermophysicalModels/properties/liquidProperties/N2/N2.H
index 77c155d58f..9bcc0cb67a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H
+++ b/src/thermophysicalModels/properties/liquidProperties/N2/N2.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        N2(Istream& is);
-
         //- Construct from dictionary
         N2(const dictionary& dict);
 
-        //- Construct copy
-        N2(const N2& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
index 83e9e894f4..562a59198b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
+++ b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(aC10H7CH3, 0);
     addToRunTimeSelectionTable(liquidProperties, aC10H7CH3,);
-    addToRunTimeSelectionTable(liquidProperties, aC10H7CH3, Istream);
     addToRunTimeSelectionTable(liquidProperties, aC10H7CH3, dictionary);
 }
 
@@ -120,25 +119,6 @@ Foam::aC10H7CH3::aC10H7CH3
 {}
 
 
-Foam::aC10H7CH3::aC10H7CH3(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -158,23 +138,4 @@ Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict)
 {}
 
 
-Foam::aC10H7CH3::aC10H7CH3(const aC10H7CH3& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
index 06a25fdca1..04bdf87200 100644
--- a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
+++ b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        aC10H7CH3(Istream& is);
-
         //- Construct from dictionary
         aC10H7CH3(const dictionary& dict);
 
-        //- Construct copy
-        aC10H7CH3(const aC10H7CH3& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
index 159b7c9de9..d2c2fd82d5 100644
--- a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
+++ b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(bC10H7CH3, 0);
     addToRunTimeSelectionTable(liquidProperties, bC10H7CH3,);
-    addToRunTimeSelectionTable(liquidProperties, bC10H7CH3, Istream);
     addToRunTimeSelectionTable(liquidProperties, bC10H7CH3, dictionary);
 }
 
@@ -120,24 +119,6 @@ Foam::bC10H7CH3::bC10H7CH3
 {}
 
 
-Foam::bC10H7CH3::bC10H7CH3(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
 
 Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict)
 :
@@ -158,23 +139,4 @@ Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict)
 {}
 
 
-Foam::bC10H7CH3::bC10H7CH3(const bC10H7CH3& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
index 7869b2db5d..6f8966edf9 100644
--- a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
+++ b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
@@ -107,15 +107,9 @@ public:
             const APIdiffCoefFunc& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        bC10H7CH3(Istream& is);
-
         //- Construct from dictionary
         bC10H7CH3(const dictionary& dict);
 
-        //- Construct copy
-        bC10H7CH3(const bC10H7CH3& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
index 48d92becb1..c77141a9b1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(iC3H8O, 0);
     addToRunTimeSelectionTable(liquidProperties, iC3H8O,);
-    addToRunTimeSelectionTable(liquidProperties, iC3H8O, Istream);
     addToRunTimeSelectionTable(liquidProperties, iC3H8O, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::iC3H8O::iC3H8O
 {}
 
 
-Foam::iC3H8O::iC3H8O(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::iC3H8O::iC3H8O(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::iC3H8O::iC3H8O(const dictionary& dict)
 {}
 
 
-Foam::iC3H8O::iC3H8O(const iC3H8O& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
index 8ad465f512..bac19d8d72 100644
--- a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
@@ -105,15 +105,9 @@ public:
             const NSRDSfunc1& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        iC3H8O(Istream& is);
-
         //- Construct from dictionary
         iC3H8O(const dictionary& dict);
 
-        //- Construct copy
-        iC3H8O(const iC3H8O& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
index 7e0f43c7ef..c5db6942fc 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
@@ -33,7 +33,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(liquidProperties, 0);
     defineRunTimeSelectionTable(liquidProperties,);
-    defineRunTimeSelectionTable(liquidProperties, Istream);
     defineRunTimeSelectionTable(liquidProperties, dictionary);
 }
 
@@ -68,22 +67,6 @@ Foam::liquidProperties::liquidProperties
 {}
 
 
-Foam::liquidProperties::liquidProperties(Istream& is)
-:
-    W_(readScalar(is)),
-    Tc_(readScalar(is)),
-    Pc_(readScalar(is)),
-    Vc_(readScalar(is)),
-    Zc_(readScalar(is)),
-    Tt_(readScalar(is)),
-    Pt_(readScalar(is)),
-    Tb_(readScalar(is)),
-    dipm_(readScalar(is)),
-    omega_(readScalar(is)),
-    delta_(readScalar(is))
-{}
-
-
 Foam::liquidProperties::liquidProperties(const dictionary& dict)
 :
     W_(readScalar(dict.lookup("W"))),
@@ -100,22 +83,6 @@ Foam::liquidProperties::liquidProperties(const dictionary& dict)
 {}
 
 
-Foam::liquidProperties::liquidProperties(const liquidProperties& liq)
-:
-    W_(liq.W_),
-    Tc_(liq.Tc_),
-    Pc_(liq.Pc_),
-    Vc_(liq.Vc_),
-    Zc_(liq.Zc_),
-    Tt_(liq.Tt_),
-    Pt_(liq.Pt_),
-    Tb_(liq.Tb_),
-    dipm_(liq.dipm_),
-    omega_(liq.omega_),
-    delta_(liq.delta_)
-{}
-
-
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
@@ -310,7 +277,6 @@ Foam::scalar Foam::liquidProperties::pvInvert(scalar p) const
 
 void Foam::liquidProperties::writeData(Ostream& os) const
 {
-
     os  << W_ << token::SPACE
         << Tc_ << token::SPACE
         << Pc_ << token::SPACE
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
index 5cbfebf261..54eb237b1a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
@@ -105,15 +105,6 @@ public:
             ()
         );
 
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            liquidProperties,
-            Istream,
-            (Istream& is),
-            (is)
-        );
-
         declareRunTimeSelectionTable
         (
             autoPtr,
@@ -142,15 +133,9 @@ public:
             scalar delta
         );
 
-        //- Construct from Istream
-        liquidProperties(Istream& is);
-
         //- Construct from dictionary
         liquidProperties(const dictionary& dict);
 
-        //- Construct copy
-        liquidProperties(const liquidProperties& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {
@@ -160,9 +145,6 @@ public:
 
     // Selectors
 
-        //- Return a pointer to a new liquidProperties created from input
-    // static autoPtr<liquidProperties> New(Istream& is);
-
         //- Return a pointer to a new liquidProperties created from dictionary
         static autoPtr<liquidProperties> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
index 2369adffd0..419c0c1920 100644
--- a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(nC3H8O, 0);
     addToRunTimeSelectionTable(liquidProperties, nC3H8O,);
-    addToRunTimeSelectionTable(liquidProperties, nC3H8O, Istream);
     addToRunTimeSelectionTable(liquidProperties, nC3H8O, dictionary);
 }
 
@@ -128,25 +127,6 @@ Foam::nC3H8O::nC3H8O
 {}
 
 
-Foam::nC3H8O::nC3H8O(Istream& is)
-:
-    liquidProperties(is),
-    rho_(is),
-    pv_(is),
-    hl_(is),
-    Cp_(is),
-    h_(is),
-    Cpg_(is),
-    B_(is),
-    mu_(is),
-    mug_(is),
-    kappa_(is),
-    kappag_(is),
-    sigma_(is),
-    D_(is)
-{}
-
-
 Foam::nC3H8O::nC3H8O(const dictionary& dict)
 :
     liquidProperties(dict),
@@ -166,23 +146,4 @@ Foam::nC3H8O::nC3H8O(const dictionary& dict)
 {}
 
 
-Foam::nC3H8O::nC3H8O(const nC3H8O& liq)
-:
-    liquidProperties(liq),
-    rho_(liq.rho_),
-    pv_(liq.pv_),
-    hl_(liq.hl_),
-    Cp_(liq.Cp_),
-    h_(liq.h_),
-    Cpg_(liq.Cpg_),
-    B_(liq.B_),
-    mu_(liq.mu_),
-    mug_(liq.mug_),
-    kappa_(liq.kappa_),
-    kappag_(liq.kappag_),
-    sigma_(liq.sigma_),
-    D_(liq.D_)
-{}
-
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
index a55a0e53ff..d5dec6a855 100644
--- a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
+++ b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
@@ -105,15 +105,9 @@ public:
             const NSRDSfunc1& vapourDiffussivity
         );
 
-        //- Construct from Istream
-        nC3H8O(Istream& is);
-
         //- Construct from dictionary
         nC3H8O(const dictionary& dict);
 
-        //- Construct copy
-        nC3H8O(const nC3H8O& liq);
-
         //- Construct and return clone
         virtual autoPtr<liquidProperties> clone() const
         {

From 72b705edbdb1c96d362cc471c0be9e56433283a1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 17 Feb 2017 15:50:00 +0000
Subject: [PATCH 25/40] thermophysicalModels: Removed unused and unmaintained
 Istream constructors

---
 .../properties/solidProperties/C/C.C          | 15 +----
 .../properties/solidProperties/C/C.H          |  8 +--
 .../properties/solidProperties/CaCO3/CaCO3.C  | 15 +----
 .../properties/solidProperties/CaCO3/CaCO3.H  |  8 +--
 .../properties/solidProperties/ash/ash.C      | 15 +----
 .../properties/solidProperties/ash/ash.H      |  8 +--
 .../solidProperties/solidProperties.C         | 21 ------
 .../solidProperties/solidProperties.H         | 18 -----
 .../solidProperties/solidPropertiesNew.C      | 45 +------------
 .../fvDOM/absorptionCoeffs/absorptionCoeffs.C | 28 +-------
 .../fvDOM/absorptionCoeffs/absorptionCoeffs.H |  8 +--
 .../Reactions/solidReaction/solidReaction.C   | 19 +-----
 .../Reactions/solidReaction/solidReaction.H   | 11 +---
 .../solidArrheniusReactionRate.H              |  8 +--
 .../solidArrheniusReactionRateI.H             | 18 +----
 .../reaction/reactions/makeSolidReaction.H    | 10 +--
 .../const/constAnIsoSolidTransport.C          | 11 +---
 .../transport/const/constIsoSolidTransport.C  | 11 +---
 .../transport/const/constIsoSolidTransport.H  |  2 +-
 .../exponential/exponentialSolidTransport.C   | 11 +---
 .../polynomial/polynomialSolidTransport.C     | 28 +-------
 .../polynomial/polynomialSolidTransport.H     |  9 ---
 .../polynomial/polynomialSolidTransportI.H    | 23 -------
 .../equationOfState/Boussinesq/Boussinesq.C   | 27 +-------
 .../equationOfState/Boussinesq/Boussinesq.H   |  9 ---
 .../equationOfState/Boussinesq/BoussinesqI.H  | 27 --------
 .../PengRobinsonGas/PengRobinsonGas.C         | 26 +-------
 .../PengRobinsonGas/PengRobinsonGas.H         |  6 --
 .../PengRobinsonGas/PengRobinsonGasI.H        | 11 ----
 .../adiabaticPerfectFluid.C                   | 28 +-------
 .../adiabaticPerfectFluid.H                   |  6 --
 .../adiabaticPerfectFluidI.H                  | 11 ----
 .../icoPolynomial/icoPolynomial.C             | 19 +-----
 .../icoPolynomial/icoPolynomial.H             |  9 ---
 .../icoPolynomial/icoPolynomialI.H            | 22 -------
 .../incompressiblePerfectGas.C                | 23 +------
 .../incompressiblePerfectGas.H                |  9 ---
 .../incompressiblePerfectGasI.H               | 25 -------
 .../specie/equationOfState/linear/linear.C    | 17 +----
 .../specie/equationOfState/linear/linear.H    |  6 --
 .../specie/equationOfState/linear/linearI.H   |  8 ---
 .../perfectFluid/perfectFluid.C               | 17 +----
 .../perfectFluid/perfectFluid.H               |  6 --
 .../perfectFluid/perfectFluidI.H              |  8 ---
 .../equationOfState/perfectGas/perfectGas.C   | 13 +---
 .../equationOfState/perfectGas/perfectGas.H   |  6 --
 .../equationOfState/perfectGas/perfectGasI.H  |  8 ---
 .../equationOfState/rhoConst/rhoConst.C       | 17 +----
 .../equationOfState/rhoConst/rhoConst.H       |  6 --
 .../equationOfState/rhoConst/rhoConstI.H      |  8 ---
 .../IrreversibleReaction.C                    | 21 +-----
 .../IrreversibleReaction.H                    | 10 +--
 .../NonEquilibriumReversibleReaction.C        | 28 +-------
 .../NonEquilibriumReversibleReaction.H        | 10 +--
 .../reaction/Reactions/Reaction/Reaction.C    | 61 -----------------
 .../reaction/Reactions/Reaction/Reaction.H    | 65 +------------------
 .../Reactions/ReactionList/ReactionList.C     | 21 +-----
 .../Reactions/ReactionList/ReactionList.H     | 10 +--
 .../ReversibleReaction/ReversibleReaction.C   | 21 +-----
 .../ReversibleReaction/ReversibleReaction.H   | 10 +--
 .../ArrheniusReactionRate.H                   |  9 +--
 .../ArrheniusReactionRateI.H                  | 16 +----
 .../ChemicallyActivatedReactionRate.H         |  9 +--
 .../ChemicallyActivatedReactionRateI.H        | 22 +------
 .../FallOffReactionRate/FallOffReactionRate.H |  9 +--
 .../FallOffReactionRateI.H                    | 19 +-----
 .../JanevReactionRate/JanevReactionRate.H     |  9 +--
 .../JanevReactionRate/JanevReactionRateI.H    | 17 +----
 .../LandauTellerReactionRate.H                |  9 +--
 .../LandauTellerReactionRateI.H               | 18 +----
 .../LangmuirHinshelwoodReactionRate.H         |  9 +--
 .../LangmuirHinshelwoodReactionRateI.H        | 23 +------
 .../LindemannFallOffFunction.H                |  5 +-
 .../LindemannFallOffFunctionI.H               |  6 +-
 .../SRIFallOffFunction/SRIFallOffFunction.H   |  5 +-
 .../SRIFallOffFunction/SRIFallOffFunctionI.H  | 14 +---
 .../TroeFallOffFunction/TroeFallOffFunction.H |  5 +-
 .../TroeFallOffFunctionI.H                    | 13 +---
 .../infiniteReactionRate.H                    |  4 +-
 .../powerSeries/powerSeriesReactionRate.H     |  9 +--
 .../powerSeries/powerSeriesReactionRateI.H    | 17 +----
 .../thirdBodyArrheniusReactionRate.H          |  9 +--
 .../thirdBodyArrheniusReactionRateI.H         | 19 +-----
 .../thirdBodyEfficiencies.H                   |  9 +--
 .../thirdBodyEfficienciesI.H                  | 58 +----------------
 .../specie/reaction/reactions/makeReaction.H  | 11 +---
 .../specie/reaction/reactions/makeReactions.C |  3 +-
 .../specie/specie/specie.C                    | 16 +----
 .../specie/specie/specie.H                    |  6 --
 .../specie/specie/specieI.H                   |  8 ---
 .../specie/thermo/eConst/eConstThermo.C       | 16 +----
 .../specie/thermo/eConst/eConstThermo.H       |  6 --
 .../specie/thermo/eConst/eConstThermoI.H      | 11 ----
 .../specie/thermo/hConst/hConstThermo.C       | 16 +----
 .../specie/thermo/hConst/hConstThermo.H       |  6 --
 .../specie/thermo/hConst/hConstThermoI.H      | 11 ----
 .../thermo/hPolynomial/hPolynomialThermo.C    | 40 +-----------
 .../thermo/hPolynomial/hPolynomialThermo.H    |  6 --
 .../thermo/hPolynomial/hPolynomialThermoI.H   | 15 -----
 .../specie/thermo/hPower/hPowerThermo.C       | 28 +-------
 .../specie/thermo/hPower/hPowerThermo.H       |  6 --
 .../specie/thermo/hPower/hPowerThermoI.H      | 11 ----
 .../specie/thermo/hRefConst/hRefConstThermo.C | 19 +-----
 .../specie/thermo/hRefConst/hRefConstThermo.H |  6 --
 .../thermo/hRefConst/hRefConstThermoI.H       | 11 ----
 .../specie/thermo/janaf/janafThermo.C         | 27 +-------
 .../specie/thermo/thermo/thermo.C             | 16 +----
 .../specie/thermo/thermo/thermo.H             |  3 -
 .../specie/transport/const/constTransport.C   | 19 +-----
 .../specie/transport/const/constTransport.H   |  6 --
 .../specie/transport/const/constTransportI.H  | 14 ----
 .../logPolynomial/logPolynomialTransport.C    | 28 +-------
 .../logPolynomial/logPolynomialTransport.H    |  9 ---
 .../logPolynomial/logPolynomialTransportI.H   | 23 -------
 .../polynomial/polynomialTransport.C          | 25 +------
 .../polynomial/polynomialTransport.H          |  9 ---
 .../polynomial/polynomialTransportI.H         | 23 -------
 .../sutherland/sutherlandTransport.C          | 21 +-----
 .../sutherland/sutherlandTransport.H          |  6 --
 .../sutherland/sutherlandTransportI.H         | 14 ----
 .../APIdiffCoefFunc/APIdiffCoefFunc.C         | 19 +-----
 .../APIdiffCoefFunc/APIdiffCoefFunc.H         |  5 +-
 .../NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C    | 14 +---
 .../NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H    |  5 +-
 .../NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C    | 13 +---
 .../NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H    |  5 +-
 .../NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C  | 13 +---
 .../NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H  |  5 +-
 .../NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C    | 12 +---
 .../NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H    |  5 +-
 .../NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C    | 12 +---
 .../NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H    |  5 +-
 .../NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C    | 13 +---
 .../NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H    |  5 +-
 .../NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C    | 12 +---
 .../NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H    |  5 +-
 .../NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C    | 14 +---
 .../NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H    |  5 +-
 .../NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C    | 13 +---
 .../NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H    |  5 +-
 .../thermophysicalFunction.C                  | 37 +----------
 .../thermophysicalFunction.H                  | 14 +---
 142 files changed, 112 insertions(+), 1946 deletions(-)

diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.C b/src/thermophysicalModels/properties/solidProperties/C/C.C
index 2f8dfa9acb..3547468570 100644
--- a/src/thermophysicalModels/properties/solidProperties/C/C.C
+++ b/src/thermophysicalModels/properties/solidProperties/C/C.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(C, 0);
     addToRunTimeSelectionTable(solidProperties, C,);
-    addToRunTimeSelectionTable(solidProperties, C, Istream);
     addToRunTimeSelectionTable(solidProperties, C, dictionary);
 }
 
@@ -57,24 +56,12 @@ Foam::C::C(const solidProperties& s)
 {}
 
 
-Foam::C::C(Istream& is)
-:
-    solidProperties(is)
-{}
-
-
 Foam::C::C(const dictionary& dict)
 :
     solidProperties(dict)
 {}
 
 
-Foam::C::C(const C& s)
-:
-    solidProperties(s)
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::C::writeData(Ostream& os) const
diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.H b/src/thermophysicalModels/properties/solidProperties/C/C.H
index a266b152c2..7086df5324 100644
--- a/src/thermophysicalModels/properties/solidProperties/C/C.H
+++ b/src/thermophysicalModels/properties/solidProperties/C/C.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,15 +73,9 @@ public:
         //- Construct from solidProperties
         C(const solidProperties& s);
 
-        //- Construct from Istream
-        C(Istream& is);
-
         //- Construct from dictionary
         C(const dictionary& dict);
 
-        //- Construct copy
-        C(const C& s);
-
         //- Construct and return clone
         virtual autoPtr<solidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
index a7dbb8bff4..2bcfee1b6d 100644
--- a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
+++ b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(CaCO3, 0);
     addToRunTimeSelectionTable(solidProperties, CaCO3,);
-    addToRunTimeSelectionTable(solidProperties, CaCO3, Istream);
     addToRunTimeSelectionTable(solidProperties, CaCO3, dictionary);
 }
 
@@ -57,24 +56,12 @@ Foam::CaCO3::CaCO3(const solidProperties& s)
 {}
 
 
-Foam::CaCO3::CaCO3(Istream& is)
-:
-    solidProperties(is)
-{}
-
-
 Foam::CaCO3::CaCO3(const dictionary& dict)
 :
     solidProperties(dict)
 {}
 
 
-Foam::CaCO3::CaCO3(const CaCO3& s)
-:
-    solidProperties(s)
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::CaCO3::writeData(Ostream& os) const
diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
index 0ff59dae28..92bcdead4b 100644
--- a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
+++ b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,15 +74,9 @@ public:
         //- Construct from solidProperties
         CaCO3(const solidProperties& s);
 
-        //- Construct from Istream
-        CaCO3(Istream& is);
-
         //- Construct from dictionary
         CaCO3(const dictionary& dict);
 
-        //- Construct copy
-        CaCO3(const CaCO3& s);
-
         //- Construct and return clone
         virtual autoPtr<solidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.C b/src/thermophysicalModels/properties/solidProperties/ash/ash.C
index 381191f89e..4ab67b5cdf 100644
--- a/src/thermophysicalModels/properties/solidProperties/ash/ash.C
+++ b/src/thermophysicalModels/properties/solidProperties/ash/ash.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(ash, 0);
     addToRunTimeSelectionTable(solidProperties, ash,);
-    addToRunTimeSelectionTable(solidProperties, ash, Istream);
     addToRunTimeSelectionTable(solidProperties, ash, dictionary);
 }
 
@@ -57,24 +56,12 @@ Foam::ash::ash(const solidProperties& s)
 {}
 
 
-Foam::ash::ash(Istream& is)
-:
-    solidProperties(is)
-{}
-
-
 Foam::ash::ash(const dictionary& dict)
 :
     solidProperties(dict)
 {}
 
 
-Foam::ash::ash(const ash& s)
-:
-    solidProperties(s)
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::ash::writeData(Ostream& os) const
diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.H b/src/thermophysicalModels/properties/solidProperties/ash/ash.H
index 2958b79849..5f6e2135b7 100644
--- a/src/thermophysicalModels/properties/solidProperties/ash/ash.H
+++ b/src/thermophysicalModels/properties/solidProperties/ash/ash.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,15 +74,9 @@ public:
         //- Construct from solidProperties
         ash(const solidProperties& s);
 
-        //- Construct from Istream
-        ash(Istream& is);
-
         //- Construct from dictionary
         ash(const dictionary& dict);
 
-        //- Construct copy
-        ash(const ash& s);
-
         //- Construct and return clone
         virtual autoPtr<solidProperties> clone() const
         {
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
index 9151ff5da7..cca1392203 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
@@ -31,7 +31,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(solidProperties, 0);
     defineRunTimeSelectionTable(solidProperties,);
-    defineRunTimeSelectionTable(solidProperties, Istream);
     defineRunTimeSelectionTable(solidProperties, dictionary);
 }
 
@@ -54,16 +53,6 @@ Foam::solidProperties::solidProperties
 {}
 
 
-Foam::solidProperties::solidProperties(Istream& is)
-:
-    rho_(readScalar(is)),
-    Cp_(readScalar(is)),
-    kappa_(readScalar(is)),
-    Hf_(readScalar(is)),
-    emissivity_(readScalar(is))
-{}
-
-
 Foam::solidProperties::solidProperties(const dictionary& dict)
 :
     rho_(readScalar(dict.lookup("rho"))),
@@ -74,16 +63,6 @@ Foam::solidProperties::solidProperties(const dictionary& dict)
 {}
 
 
-Foam::solidProperties::solidProperties(const solidProperties& s)
-:
-    rho_(s.rho_),
-    Cp_(s.Cp_),
-    kappa_(s.kappa_),
-    Hf_(s.Hf_),
-    emissivity_(s.emissivity_)
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::solidProperties::writeData(Ostream& os) const
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
index c0acae07ed..f42e84be64 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
@@ -96,15 +96,6 @@ public:
         ()
     );
 
-    declareRunTimeSelectionTable
-    (
-        autoPtr,
-        solidProperties,
-        Istream,
-        (Istream& is),
-        (is)
-    );
-
     declareRunTimeSelectionTable
     (
         autoPtr,
@@ -127,15 +118,9 @@ public:
             scalar emissivity
         );
 
-        //- Construct from Istream
-        solidProperties(Istream& is);
-
         //- Construct from dictionary
         solidProperties(const dictionary& dict);
 
-        //- Construct copy
-        solidProperties(const solidProperties& s);
-
         //- Construct and return clone
         virtual autoPtr<solidProperties> clone() const
         {
@@ -145,9 +130,6 @@ public:
 
     // Selectors
 
-        //- Return a pointer to a new solidProperties created from input
-        static autoPtr<solidProperties> New(Istream& is);
-
         //- Return a pointer to a new solidProperties created from dictionary
         static autoPtr<solidProperties> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
index e9c34b5726..0e6119e0f0 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,49 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New(Istream& is)
-{
-    if (debug)
-    {
-        InfoInFunction << "Constructing solid" << endl;
-    }
-
-    const word solidType(is);
-    const word coeffs(is);
-
-    if (coeffs == "defaultCoeffs")
-    {
-        ConstructorTable::iterator cstrIter =
-            ConstructorTablePtr_->find(solidType);
-
-        if (cstrIter == ConstructorTablePtr_->end())
-        {
-            FatalErrorInFunction
-                << "Unknown solidProperties type " << solidType << nl << nl
-                << "Valid solidProperties types are :" << endl
-                << ConstructorTablePtr_->sortedToc()
-                << exit(FatalError);
-        }
-
-        return autoPtr<solidProperties>(cstrIter()());
-    }
-    else if (coeffs == "coeffs")
-    {
-        return autoPtr<solidProperties>(new solidProperties(is));
-    }
-    else
-    {
-        FatalErrorInFunction
-            << "solidProperties type " << solidType
-            << ", option " << coeffs << " given"
-            << ", should be coeffs or defaultCoeffs"
-            << exit(FatalError);
-
-        return autoPtr<solidProperties>(nullptr);
-    }
-}
-
-
 Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
 (
     const dictionary& dict
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C
index c3bc3ef327..1b50a08cfd 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,26 +26,6 @@ License
 #include "absorptionCoeffs.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::radiation::absorptionCoeffs::absorptionCoeffs(Istream& is)
-:
-   Tcommon_(readScalar(is)),
-   Tlow_(readScalar(is)),
-   Thigh_(readScalar(is)),
-   invTemp_(readBool(is))
-{
-    for (label coefLabel=0; absorptionCoeffs::nCoeffs_; coefLabel++)
-    {
-        is >> highACoeffs_[coefLabel];
-    }
-
-    for (label coefLabel=0; absorptionCoeffs::nCoeffs_; coefLabel++)
-    {
-        is >> lowACoeffs_[coefLabel];
-    }
-}
-
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
 
@@ -86,12 +66,6 @@ Foam::radiation::absorptionCoeffs::coeffs
 }
 
 
-void Foam::radiation::absorptionCoeffs::initialise(Istream&)
-{
-    absorptionCoeffs(Istream);
-}
-
-
 void Foam::radiation::absorptionCoeffs::initialise(const dictionary& dict)
 {
     dict.lookup("Tcommon") >> Tcommon_;
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.H
index b2eed50da4..4f18495e53 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.H
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/absorptionCoeffs/absorptionCoeffs.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,9 +90,6 @@ public:
 
     // Constructors
 
-        //- Construct from Istream
-        absorptionCoeffs(Istream&);
-
         // Null constructor
         absorptionCoeffs()
         {}
@@ -110,9 +107,6 @@ public:
         // Initialise from a dictionary
         void initialise(const dictionary&);
 
-        // Initialise from an Istream
-        void initialise(Istream&);
-
 
     // Access Functions
 
diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
index b5a4cfde96..bffd5f8d2f 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
+++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,23 +59,6 @@ Foam::solidReaction<ReactionThermo>::solidReaction
 {}
 
 
-template<class ReactionThermo>
-Foam::solidReaction<ReactionThermo>::solidReaction
-(
-    const speciesTable& species,
-    const HashPtrTable<ReactionThermo>& thermoDatabase,
-    Istream& is
-)
-:
-    Reaction<ReactionThermo>(species, thermoDatabase, is),
-    pyrolisisGases_(),
-    glhs_(),
-    grhs_()
-{
-    NotImplemented;
-}
-
-
 template<class ReactionThermo>
 Foam::solidReaction<ReactionThermo>::solidReaction
 (
diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
index 190e758123..6addc87494 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -120,15 +120,6 @@ public:
         );
 
 
-        //- Construct from Istream
-        solidReaction
-        (
-            const speciesTable& pyrolisisGases,
-            const HashPtrTable<ReactionThermo>& thermoDatabase,
-            Istream& is
-        );
-
-
         //- Construct from dictionary
         solidReaction
         (
diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H
index 1a734a96db..c5642e627b 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,12 +75,6 @@ public:
             const scalar Tcrit
         );
 
-        //- Construct from Istream
-        inline solidArrheniusReactionRate
-        (
-            const speciesTable& species,
-            Istream& is
-        );
 
         //- Construct from dictionary
         inline solidArrheniusReactionRate
diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
index 2c59b28428..1ab4bcb50d 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,18 +39,6 @@ inline Foam::solidArrheniusReactionRate::solidArrheniusReactionRate
 {}
 
 
-inline Foam::solidArrheniusReactionRate::solidArrheniusReactionRate
-(
-    const speciesTable&,
-    Istream& is
-)
-:
-    A_(readScalar(is.readBegin("solidArrheniusReaction(Istream&)"))),
-    Ta_(readScalar(is)),
-    Tcrit_(readScalar(is))
-{}
-
-
 inline Foam::solidArrheniusReactionRate::solidArrheniusReactionRate
 (
     const speciesTable&,
@@ -101,9 +89,7 @@ inline Foam::Ostream& Foam::operator<<
     const solidArrheniusReactionRate& arr
 )
 {
-    os  << token::BEGIN_LIST
-        << arr.A_ << token::SPACE << arr.Ta_ << token::SPACE << arr.Tcrit_
-        << token::END_LIST;
+    arr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
index bc17d12bb4..b5444f1e59 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/reactions/makeSolidReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,6 @@ namespace Foam
     typedef ReactionType<solidReaction, Thermo, ReactionRate>                  \
         ReactionType##Thermo##ReactionRate;                                    \
                                                                                \
-    defineTemplateRunTimeSelectionTable(Reaction##Thermo, Istream);            \
     defineTemplateRunTimeSelectionTable(Reaction##Thermo, dictionary);         \
                                                                                \
     defineTemplateTypeNameAndDebug(solidReaction##Thermo, 0);                  \
@@ -69,13 +68,6 @@ namespace Foam
     );                                                                         \
                                                                                \
     addToRunTimeSelectionTable                                                 \
-    (                                                                          \
-        Reaction##Thermo,                                                      \
-        ReactionType##Thermo##ReactionRate,                                    \
-        Istream                                                                \
-    );                                                                         \
-                                                                               \
-    addToRunTimeSelectionTable                                                 \
     (                                                                          \
         Reaction##Thermo,                                                      \
         ReactionType##Thermo##ReactionRate,                                    \
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C
index bef8102944..5a99f4caaa 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,14 +64,7 @@ Foam::Ostream& Foam::operator<<
     const constAnIsoSolidTransport<Thermo>& ct
 )
 {
-    operator<<(os, static_cast<const Thermo&>(ct));
-    os << tab << ct.kappa_;
-
-    os.check
-    (
-        "Ostream& operator<<(Ostream& os,const constAnIsoSolidTransport& ct)"
-    );
-
+    ct.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C
index 02684194fc..2d9135e811 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,14 +64,7 @@ Foam::Ostream& Foam::operator<<
     const constIsoSolidTransport<Thermo>& ct
 )
 {
-    operator<<(os, static_cast<const Thermo&>(ct));
-    os << tab << ct.kappa_;
-
-    os.check
-    (
-        "Ostream& operator<<(Ostream& os,const constIsoSolidTransport& ct)"
-    );
-
+    ct.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
index f290b4288d..5de4c38fcf 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
@@ -94,7 +94,7 @@ public:
             const constIsoSolidTransport&
         );
 
-        //- Construct from Istream
+        //- Construct from dictionary
         constIsoSolidTransport(const dictionary& dict);
 
         // Selector from dictionary
diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C
index 24abeac8ae..02d6635d3f 100644
--- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C
+++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,14 +72,7 @@ Foam::Ostream& Foam::operator<<
     Ostream& os, const exponentialSolidTransport<Thermo>& et
 )
 {
-    operator<<(os, static_cast<const Thermo&>(et));
-    os << tab << et.kappa0_  << tab << et.n0_ << tab << et.Tref_;
-
-    os.check
-    (
-        "Ostream& operator<<(Ostream& os, const exponentialSolidTransport& et)"
-    );
-
+    et.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C
index e43b30a2e8..0a2d0a665f 100644
--- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C
+++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,18 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Thermo, int PolySize>
-Foam::polynomialSolidTransport<Thermo, PolySize>::polynomialSolidTransport
-(
-    Istream& is
-)
-:
-    Thermo(is),
-    kappaCoeffs_("kappaCoeffs<" + Foam::name(PolySize) + '>', is)
-{
-}
-
-
 template<class Thermo, int PolySize>
 Foam::polynomialSolidTransport<Thermo, PolySize>::polynomialSolidTransport
 (
@@ -85,19 +73,7 @@ Foam::Ostream& Foam::operator<<
     const polynomialSolidTransport<Thermo, PolySize>& pt
 )
 {
-    os  << static_cast<const Thermo&>(pt) << tab
-        << "kappaCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << pt.kappaCoeffs_;
-
-    os.check
-    (
-        "Ostream& operator<<"
-        "("
-            "Ostream&, "
-            "const polynomialSolidTransport<Thermo, PolySize>&"
-        ")"
-    );
-
+    pt.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
index 716284cb1b..3cb7a3b3ec 100644
--- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
+++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H
@@ -127,9 +127,6 @@ public:
 
     // Constructors
 
-        //- Construct copy
-        inline polynomialSolidTransport(const polynomialSolidTransport&);
-
         //- Construct as named copy
         inline polynomialSolidTransport
         (
@@ -137,18 +134,12 @@ public:
             const polynomialSolidTransport&
         );
 
-        //- Construct from Istream
-        polynomialSolidTransport(Istream& is);
-
         //- Construct from dictionary
         polynomialSolidTransport(const dictionary& dict);
 
         //- Construct and return a clone
         inline autoPtr<polynomialSolidTransport> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<polynomialSolidTransport> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<polynomialSolidTransport> New
         (
diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
index 1a923d490f..727e2be6b0 100644
--- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
+++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H
@@ -27,18 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Thermo, int PolySize>
-inline Foam::polynomialSolidTransport<Thermo, PolySize>::
-polynomialSolidTransport
-(
-    const polynomialSolidTransport& pt
-)
-:
-    Thermo(pt),
-    kappaCoeffs_(pt.kappaCoeffs_)
-{}
-
-
 template<class Thermo, int PolySize>
 inline Foam::polynomialSolidTransport<Thermo, PolySize>::
 polynomialSolidTransport
@@ -76,17 +64,6 @@ Foam::polynomialSolidTransport<Thermo, PolySize>::clone() const
 }
 
 
-template<class Thermo, int PolySize>
-inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize>>
-Foam::polynomialSolidTransport<Thermo, PolySize>::New(Istream& is)
-{
-    return autoPtr<polynomialSolidTransport<Thermo, PolySize>>
-    (
-        new polynomialSolidTransport<Thermo, PolySize>(is)
-    );
-}
-
-
 template<class Thermo, int PolySize>
 inline Foam::autoPtr<Foam::polynomialSolidTransport<Thermo, PolySize>>
 Foam::polynomialSolidTransport<Thermo, PolySize>::New(const dictionary& dict)
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
index 12286d13f6..66ae9a7cf7 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
@@ -28,22 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Specie>
-Foam::Boussinesq<Specie>::Boussinesq(Istream& is)
-:
-    Specie(is),
-    rho0_(readScalar(is)),
-    T0_(readScalar(is)),
-    beta_(readScalar(is))
-{
-    is.check
-    (
-        "Boussinesq<Specie>::"
-        "Boussinesq(Istream& is)"
-    );
-}
-
-
 template<class Specie>
 Foam::Boussinesq<Specie>::Boussinesq
 (
@@ -81,16 +65,7 @@ Foam::Ostream& Foam::operator<<
     const Boussinesq<Specie>& b
 )
 {
-    os  << static_cast<const Specie&>(b)
-        << token::SPACE << b.rho0_
-        << token::SPACE << b.T0_
-        << token::SPACE << b.beta_;
-
-    os.check
-    (
-        "Ostream& operator<<"
-        "(Ostream& os, const Boussinesq<Specie>& st)"
-    );
+    b.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
index 720483c07e..4c91afbf27 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H
@@ -115,12 +115,6 @@ public:
             const scalar beta
         );
 
-        //- Construct from Boussinesq
-        inline Boussinesq(const Boussinesq& sp);
-
-        //- Construct from Istream
-        Boussinesq(Istream&);
-
         //- Construct from dictionary
         Boussinesq(const dictionary& dict);
 
@@ -134,9 +128,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<Boussinesq> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<Boussinesq> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<Boussinesq> New
         (
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
index 45b9d58cfe..814a9a1e82 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H
@@ -41,19 +41,6 @@ inline Foam::Boussinesq<Specie>::Boussinesq
 {}
 
 
-template<class Specie>
-inline Foam::Boussinesq<Specie>::Boussinesq
-(
-    const Boussinesq& b
-)
-:
-    Specie(b),
-    rho0_(b.rho0_),
-    T0_(b.T0_),
-    beta_(b.beta_)
-{}
-
-
 template<class Specie>
 inline Foam::Boussinesq<Specie>::Boussinesq
 (
@@ -79,20 +66,6 @@ Foam::Boussinesq<Specie>::clone() const
 }
 
 
-template<class Specie>
-inline Foam::autoPtr<Foam::Boussinesq<Specie>>
-Foam::Boussinesq<Specie>::New
-(
-    Istream& is
-)
-{
-    return autoPtr<Boussinesq<Specie>>
-    (
-        new Boussinesq<Specie>(is)
-    );
-}
-
-
 template<class Specie>
 inline Foam::autoPtr<Foam::Boussinesq<Specie>>
 Foam::Boussinesq<Specie>::New
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
index eeaa0a2cea..e61f40d5f2 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
@@ -28,20 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Specie>
-Foam::PengRobinsonGas<Specie>::PengRobinsonGas(Istream& is)
-:
-    Specie(is),
-    Tc_(readScalar(is)),
-    Vc_(readScalar(is)),
-    Zc_(readScalar(is)),
-    Pc_(readScalar(is)),
-    omega_(readScalar(is))
-{
-    is.check("PengRobinsonGas<Specie>::PengRobinsonGas(Istream& is)");
-}
-
-
 template<class Specie>
 Foam::PengRobinsonGas<Specie>::PengRobinsonGas
 (
@@ -78,17 +64,7 @@ Foam::Ostream& Foam::operator<<
     const PengRobinsonGas<Specie>& pg
 )
 {
-    os  << static_cast<const Specie&>(pg)
-        << token::SPACE << pg.Tc_
-        << token::SPACE << pg.Vc_
-        << token::SPACE << pg.Zc_
-        << token::SPACE << pg.Pc_
-        << token::SPACE << pg.omega_;
-
-    os.check
-    (
-        "Ostream& operator<<(Ostream& os, const PengRobinsonGas<Specie>& st)"
-    );
+    pg.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
index 3f0498bb5e..8f15ae892f 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H
@@ -119,9 +119,6 @@ public:
             const scalar& omega
         );
 
-        //- Construct from Istream
-        PengRobinsonGas(Istream&);
-
         //- Construct from dictionary
         PengRobinsonGas(const dictionary& dict);
 
@@ -131,9 +128,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<PengRobinsonGas> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<PengRobinsonGas> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<PengRobinsonGas> New
         (
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
index d4553eb380..85df8cea5a 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H
@@ -77,17 +77,6 @@ Foam::PengRobinsonGas<Specie>::clone() const
 }
 
 
-template<class Specie>
-inline Foam::autoPtr<Foam::PengRobinsonGas<Specie>>
-Foam::PengRobinsonGas<Specie>::New
-(
-    Istream& is
-)
-{
-    return autoPtr<PengRobinsonGas<Specie>>(new PengRobinsonGas<Specie>(is));
-}
-
-
 template<class Specie>
 inline Foam::autoPtr<Foam::PengRobinsonGas<Specie>>
 Foam::PengRobinsonGas<Specie>::New
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
index a8609cb7ad..2c415b8748 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
@@ -28,22 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Specie>
-Foam::adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid(Istream& is)
-:
-    Specie(is),
-    p0_(readScalar(is)),
-    rho0_(readScalar(is)),
-    gamma_(readScalar(is)),
-    B_(readScalar(is))
-{
-    is.check
-    (
-        "adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid(Istream& is)"
-    );
-}
-
-
 template<class Specie>
 Foam::adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid
 (
@@ -84,17 +68,7 @@ Foam::Ostream& Foam::operator<<
     const adiabaticPerfectFluid<Specie>& pf
 )
 {
-    os  << static_cast<const Specie&>(pf)
-        << token::SPACE << pf.R_
-        << token::SPACE << pf.rho0_
-        << token::SPACE << pf.gamma_
-        << token::SPACE << pf.B_;
-
-    os.check
-    (
-        "Ostream& operator<<(Ostream&, const adiabaticPerfectFluid<Specie>&)"
-    );
-
+    pf.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
index f22275cf91..bfb2dc19d5 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
@@ -114,9 +114,6 @@ public:
             const scalar B
         );
 
-        //- Construct from Istream
-        adiabaticPerfectFluid(Istream&);
-
         //- Construct from dictionary
         adiabaticPerfectFluid(const dictionary& dict);
 
@@ -130,9 +127,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<adiabaticPerfectFluid> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<adiabaticPerfectFluid> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<adiabaticPerfectFluid> New
         (
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
index c6275c9900..57424a902e 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H
@@ -73,17 +73,6 @@ Foam::adiabaticPerfectFluid<Specie>::clone() const
 }
 
 
-template<class Specie>
-inline Foam::autoPtr<Foam::adiabaticPerfectFluid<Specie>>
-Foam::adiabaticPerfectFluid<Specie>::New(Istream& is)
-{
-    return autoPtr<adiabaticPerfectFluid<Specie>>
-    (
-        new adiabaticPerfectFluid<Specie>(is)
-    );
-}
-
-
 template<class Specie>
 inline Foam::autoPtr<Foam::adiabaticPerfectFluid<Specie>>
 Foam::adiabaticPerfectFluid<Specie>::New
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
index 472ff3e5fe..fb5b0f5da1 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
@@ -33,14 +33,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Specie, int PolySize>
-icoPolynomial<Specie, PolySize>::icoPolynomial(Istream& is)
-:
-    Specie(is),
-    rhoCoeffs_("rhoCoeffs<" + Foam::name(PolySize) + '>', is)
-{}
-
-
 template<class Specie, int PolySize>
 icoPolynomial<Specie, PolySize>::icoPolynomial(const dictionary& dict)
 :
@@ -78,16 +70,7 @@ void icoPolynomial<Specie, PolySize>::write(Ostream& os) const
 template<class Specie, int PolySize>
 Ostream& operator<<(Ostream& os, const icoPolynomial<Specie, PolySize>& ip)
 {
-    os  << static_cast<const Specie&>(ip) << tab
-        << "rhoCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << ip.rhoCoeffs_;
-
-    os.check
-    (
-        "Ostream& operator<<"
-        "(Ostream& os, const icoPolynomial<Specie, PolySize>& ip)"
-    );
-
+    ip.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
index 2ba5425125..e57f2b905a 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
@@ -131,24 +131,15 @@ public:
             const Polynomial<PolySize>& rhoPoly
         );
 
-        //- Construct from Istream
-        icoPolynomial(Istream&);
-
         //- Construct from dictionary
         icoPolynomial(const dictionary& dict);
 
-        //- Construct as copy
-        inline icoPolynomial(const icoPolynomial&);
-
         //- Construct as named copy
         inline icoPolynomial(const word& name, const icoPolynomial&);
 
         //- Construct and return a clone
         inline autoPtr<icoPolynomial> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<icoPolynomial> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<icoPolynomial> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
index 5358f425e3..66edf3f842 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
@@ -41,17 +41,6 @@ inline Foam::icoPolynomial<Specie, PolySize>::icoPolynomial
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Specie, int PolySize>
-inline Foam::icoPolynomial<Specie, PolySize>::icoPolynomial
-(
-    const icoPolynomial<Specie, PolySize>& ip
-)
-:
-    Specie(ip),
-    rhoCoeffs_(ip.rhoCoeffs_)
-{}
-
-
 template<class Specie, int PolySize>
 inline Foam::icoPolynomial<Specie, PolySize>::icoPolynomial
 (
@@ -75,17 +64,6 @@ Foam::icoPolynomial<Specie, PolySize>::clone() const
 }
 
 
-template<class Specie, int PolySize>
-inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize>>
-Foam::icoPolynomial<Specie, PolySize>::New(Istream& is)
-{
-    return autoPtr<icoPolynomial<Specie, PolySize>>
-    (
-        new icoPolynomial<Specie, PolySize>(is)
-    );
-}
-
-
 template<class Specie, int PolySize>
 inline Foam::autoPtr<Foam::icoPolynomial<Specie, PolySize>>
 Foam::icoPolynomial<Specie, PolySize>::New(const dictionary& dict)
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C
index 02955422ba..c2aa3c0a8f 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C
@@ -28,20 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Specie>
-Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas(Istream& is)
-:
-    Specie(is),
-    pRef_(readScalar(is))
-{
-    is.check
-    (
-        "incompressiblePerfectGas<Specie>::"
-        "incompressiblePerfectGas(Istream& is)"
-    );
-}
-
-
 template<class Specie>
 Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
 (
@@ -75,14 +61,7 @@ Foam::Ostream& Foam::operator<<
     const incompressiblePerfectGas<Specie>& pg
 )
 {
-    os  << static_cast<const Specie&>(pg)
-        << token::SPACE << pg.pRef_;
-
-    os.check
-    (
-        "Ostream& operator<<"
-        "(Ostream& os, const incompressiblePerfectGas<Specie>& st)"
-    );
+    pg.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
index cf0c73dbf1..26027dc6a3 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H
@@ -100,12 +100,6 @@ public:
         //- Construct from components
         inline incompressiblePerfectGas(const Specie& sp, const scalar pRef);
 
-        //- Construct from incompressiblePerfectGas
-        inline incompressiblePerfectGas(const incompressiblePerfectGas& sp);
-
-        //- Construct from Istream
-        incompressiblePerfectGas(Istream&);
-
         //- Construct from dictionary
         incompressiblePerfectGas(const dictionary& dict);
 
@@ -119,9 +113,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<incompressiblePerfectGas> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<incompressiblePerfectGas> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<incompressiblePerfectGas> New
         (
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
index f1772442b5..d04880a6db 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H
@@ -39,17 +39,6 @@ inline Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
 {}
 
 
-template<class Specie>
-inline Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
-(
-    const incompressiblePerfectGas& ipg
-)
-:
-    Specie(ipg),
-    pRef_(ipg.pRef_)
-{}
-
-
 template<class Specie>
 inline Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
 (
@@ -73,20 +62,6 @@ Foam::incompressiblePerfectGas<Specie>::clone() const
 }
 
 
-template<class Specie>
-inline Foam::autoPtr<Foam::incompressiblePerfectGas<Specie>>
-Foam::incompressiblePerfectGas<Specie>::New
-(
-    Istream& is
-)
-{
-    return autoPtr<incompressiblePerfectGas<Specie>>
-    (
-        new incompressiblePerfectGas<Specie>(is)
-    );
-}
-
-
 template<class Specie>
 inline Foam::autoPtr<Foam::incompressiblePerfectGas<Specie>>
 Foam::incompressiblePerfectGas<Specie>::New
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.C b/src/thermophysicalModels/specie/equationOfState/linear/linear.C
index 6259930aea..723eef4639 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linear.C
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.C
@@ -28,17 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Specie>
-Foam::linear<Specie>::linear(Istream& is)
-:
-    Specie(is),
-    psi_(readScalar(is)),
-    rho0_(readScalar(is))
-{
-    is.check("linear<Specie>::linear(Istream& is)");
-}
-
-
 template<class Specie>
 Foam::linear<Specie>::linear(const dictionary& dict)
 :
@@ -68,11 +57,7 @@ void Foam::linear<Specie>::write(Ostream& os) const
 template<class Specie>
 Foam::Ostream& Foam::operator<<(Ostream& os, const linear<Specie>& pf)
 {
-    os  << static_cast<const Specie&>(pf)
-        << token::SPACE << pf.psi_
-        << token::SPACE << pf.rho0_;
-
-    os.check("Ostream& operator<<(Ostream&, const linear<Specie>&)");
+    pf.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.H b/src/thermophysicalModels/specie/equationOfState/linear/linear.H
index 9bff7e46fa..85be3d50db 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linear.H
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.H
@@ -110,9 +110,6 @@ public:
             const scalar rho0
         );
 
-        //- Construct from Istream
-        linear(Istream&);
-
         //- Construct from dictionary
         linear(const dictionary& dict);
 
@@ -122,9 +119,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<linear> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<linear> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<linear> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
index 951268eab9..c3d361d2dc 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H
@@ -64,14 +64,6 @@ Foam::linear<Specie>::clone() const
 }
 
 
-template<class Specie>
-inline Foam::autoPtr<Foam::linear<Specie>>
-Foam::linear<Specie>::New(Istream& is)
-{
-    return autoPtr<linear<Specie>>(new linear<Specie>(is));
-}
-
-
 template<class Specie>
 inline Foam::autoPtr<Foam::linear<Specie>>
 Foam::linear<Specie>::New
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C
index 1857552c6b..cf64fb75a8 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C
@@ -28,17 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Specie>
-Foam::perfectFluid<Specie>::perfectFluid(Istream& is)
-:
-    Specie(is),
-    R_(readScalar(is)),
-    rho0_(readScalar(is))
-{
-    is.check("perfectFluid<Specie>::perfectFluid(Istream& is)");
-}
-
-
 template<class Specie>
 Foam::perfectFluid<Specie>::perfectFluid(const dictionary& dict)
 :
@@ -68,11 +57,7 @@ void Foam::perfectFluid<Specie>::write(Ostream& os) const
 template<class Specie>
 Foam::Ostream& Foam::operator<<(Ostream& os, const perfectFluid<Specie>& pf)
 {
-    os  << static_cast<const Specie&>(pf)
-        << token::SPACE << pf.R_
-        << token::SPACE << pf.rho0_;
-
-    os.check("Ostream& operator<<(Ostream&, const perfectFluid<Specie>&)");
+    pf.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
index 89fcab7873..614183d0a6 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H
@@ -106,9 +106,6 @@ public:
             const scalar rho0
         );
 
-        //- Construct from Istream
-        perfectFluid(Istream&);
-
         //- Construct from dictionary
         perfectFluid(const dictionary& dict);
 
@@ -118,9 +115,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<perfectFluid> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<perfectFluid> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<perfectFluid> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
index 133902b871..a16c06c151 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
@@ -65,14 +65,6 @@ Foam::perfectFluid<Specie>::clone() const
 }
 
 
-template<class Specie>
-inline Foam::autoPtr<Foam::perfectFluid<Specie>>
-Foam::perfectFluid<Specie>::New(Istream& is)
-{
-    return autoPtr<perfectFluid<Specie>>(new perfectFluid<Specie>(is));
-}
-
-
 template<class Specie>
 inline Foam::autoPtr<Foam::perfectFluid<Specie>>
 Foam::perfectFluid<Specie>::New
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
index f63ffbbc63..8f9972cda6 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
@@ -28,15 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Specie>
-Foam::perfectGas<Specie>::perfectGas(Istream& is)
-:
-    Specie(is)
-{
-    is.check("perfectGas<Specie>::perfectGas(Istream& is)");
-}
-
-
 template<class Specie>
 Foam::perfectGas<Specie>::perfectGas(const dictionary& dict)
 :
@@ -58,9 +49,7 @@ void Foam::perfectGas<Specie>::write(Ostream& os) const
 template<class Specie>
 Foam::Ostream& Foam::operator<<(Ostream& os, const perfectGas<Specie>& pg)
 {
-    os  << static_cast<const Specie&>(pg);
-
-    os.check("Ostream& operator<<(Ostream& os, const perfectGas<Specie>& st)");
+    pg.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
index 6d519c75c3..bbb9101256 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H
@@ -93,9 +93,6 @@ public:
         //- Construct from components
         inline perfectGas(const Specie& sp);
 
-        //- Construct from Istream
-        perfectGas(Istream&);
-
         //- Construct from dictionary
         perfectGas(const dictionary& dict);
 
@@ -105,9 +102,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<perfectGas> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<perfectGas> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<perfectGas> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
index 764a53dfef..7795e465bb 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H
@@ -55,14 +55,6 @@ Foam::perfectGas<Specie>::clone() const
 }
 
 
-template<class Specie>
-inline Foam::autoPtr<Foam::perfectGas<Specie>>
-Foam::perfectGas<Specie>::New(Istream& is)
-{
-    return autoPtr<perfectGas<Specie>>(new perfectGas<Specie>(is));
-}
-
-
 template<class Specie>
 inline Foam::autoPtr<Foam::perfectGas<Specie>> Foam::perfectGas<Specie>::New
 (
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C
index 895ec1859f..f7ccfdb5a5 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,16 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Specie>
-Foam::rhoConst<Specie>::rhoConst(Istream& is)
-:
-    Specie(is),
-    rho_(readScalar(is))
-{
-    is.check("rhoConst<Specie>::rhoConst(Istream& is)");
-}
-
-
 template<class Specie>
 Foam::rhoConst<Specie>::rhoConst(const dictionary& dict)
 :
@@ -65,10 +55,7 @@ void Foam::rhoConst<Specie>::write(Ostream& os) const
 template<class Specie>
 Foam::Ostream& Foam::operator<<(Ostream& os, const rhoConst<Specie>& ico)
 {
-    os  << static_cast<const Specie&>(ico)
-        << token::SPACE << ico.rho_;
-
-    os.check("Ostream& operator<<(Ostream& os, const rhoConst<Specie>& ico)");
+    ico.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
index a60f52581d..5cefe1f1e3 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H
@@ -98,9 +98,6 @@ public:
         //- Construct from components
         inline rhoConst(const Specie& sp, const scalar rho);
 
-        //- Construct from Istream
-        rhoConst(Istream&);
-
         //- Construct from dictionary
         rhoConst(const dictionary& dict);
 
@@ -110,9 +107,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<rhoConst> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<rhoConst> New(Istream& is);
-
 
     // Member functions
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
index fb5e101248..ee41587e8a 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H
@@ -61,14 +61,6 @@ Foam::rhoConst<Specie>::clone() const
 }
 
 
-template<class Specie>
-inline Foam::autoPtr<Foam::rhoConst<Specie>>
-Foam::rhoConst<Specie>::New(Istream& is)
-{
-    return autoPtr<rhoConst<Specie>>(new rhoConst<Specie>(is));
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Specie>
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
index c691af1897..32a301fab9 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,25 +45,6 @@ IrreversibleReaction
 {}
 
 
-template
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::IrreversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
-IrreversibleReaction
-(
-    const speciesTable& species,
-    const HashPtrTable<ReactionThermo>& thermoDatabase,
-    Istream& is
-)
-:
-    ReactionType<ReactionThermo>(species, thermoDatabase, is),
-    k_(species, is)
-{}
-
-
 template
 <
     template<class> class ReactionType,
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
index c5273d8302..3c3aa7eada 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,14 +103,6 @@ public:
             const speciesTable& species
         );
 
-        //- Construct from Istream
-        IrreversibleReaction
-        (
-            const speciesTable& species,
-            const HashPtrTable<ReactionThermo>& thermoDatabase,
-            Istream& is
-        );
-
         //- Construct from dictionary
         IrreversibleReaction
         (
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
index f2f8b175bc..255cf2b93f 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,32 +52,6 @@ NonEquilibriumReversibleReaction
 {}
 
 
-
-template
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::NonEquilibriumReversibleReaction
-<
-    ReactionType,
-    ReactionThermo,
-    ReactionRate
->::
-NonEquilibriumReversibleReaction
-(
-    const speciesTable& species,
-    const HashPtrTable<ReactionThermo>& thermoDatabase,
-    Istream& is
-)
-:
-    ReactionType<ReactionThermo>(species, thermoDatabase, is),
-    fk_(species, is),
-    rk_(species, is)
-{}
-
-
 template
 <
     template<class> class ReactionType,
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
index f1b23abfec..8e76691d3b 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,14 +97,6 @@ public:
             const speciesTable& species
         );
 
-        //- Construct from Istream
-        NonEquilibriumReversibleReaction
-        (
-            const speciesTable& species,
-            const HashPtrTable<ReactionThermo>& thermoDatabase,
-            Istream& is
-        );
-
         //- Construct from dictionary
         NonEquilibriumReversibleReaction
         (
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index dc43975c46..7d36f14180 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -320,23 +320,6 @@ void Foam::Reaction<ReactionThermo>::setLRhs
 }
 
 
-template<class ReactionThermo>
-Foam::Reaction<ReactionThermo>::Reaction
-(
-    const speciesTable& species,
-    const HashPtrTable<ReactionThermo>& thermoDatabase,
-    Istream& is
-)
-:
-    ReactionThermo::thermoType(*thermoDatabase[species[0]]),
-    name_("un-named-reaction" + Foam::name(getNewReactionID())),
-    species_(species)
-{
-    setLRhs(is, species, lhs_, rhs_);
-    setThermo(thermoDatabase);
-}
-
-
 template<class ReactionThermo>
 Foam::Reaction<ReactionThermo>::Reaction
 (
@@ -362,50 +345,6 @@ Foam::Reaction<ReactionThermo>::Reaction
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-template<class ReactionThermo>
-Foam::autoPtr<Foam::Reaction<ReactionThermo>>
-Foam::Reaction<ReactionThermo>::New
-(
-    const speciesTable& species,
-    const HashPtrTable<ReactionThermo>& thermoDatabase,
-    Istream& is
-)
-{
-    if (is.eof())
-    {
-        FatalIOErrorInFunction
-        (
-            is
-        )   << "Reaction type not specified" << nl << nl
-            << "Valid Reaction types are :" << nl
-            << IstreamConstructorTablePtr_->sortedToc()
-            << exit(FatalIOError);
-    }
-
-    const word reactionTypeName(is);
-
-    typename IstreamConstructorTable::iterator cstrIter
-        = IstreamConstructorTablePtr_->find(reactionTypeName);
-
-    if (cstrIter == IstreamConstructorTablePtr_->end())
-    {
-        FatalIOErrorInFunction
-        (
-            is
-        )   << "Unknown reaction type "
-            << reactionTypeName << nl << nl
-            << "Valid reaction types are :" << nl
-            << IstreamConstructorTablePtr_->sortedToc()
-            << exit(FatalIOError);
-    }
-
-    return autoPtr<Reaction<ReactionThermo>>
-    (
-        cstrIter()(species, thermoDatabase, is)
-    );
-}
-
-
 template<class ReactionThermo>
 Foam::autoPtr<Foam::Reaction<ReactionThermo>>
 Foam::Reaction<ReactionThermo>::New
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
index ead361e110..d96134aac9 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -164,19 +164,6 @@ public:
 
     // Declare run-time constructor selection tables
 
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            Reaction,
-            Istream,
-            (
-                const speciesTable& species,
-                const HashPtrTable<ReactionThermo>& thermoDatabase,
-                Istream& is
-            ),
-            (species, thermoDatabase, is)
-        );
-
         declareRunTimeSelectionTable
         (
             autoPtr,
@@ -191,36 +178,6 @@ public:
         );
 
 
-    // Public classes
-
-        //- Class used for the read-construction of PtrLists of reaction
-        class iNew
-        {
-            const speciesTable& species_;
-            const HashPtrTable<ReactionThermo>& thermoDatabase_;
-
-        public:
-
-            iNew
-            (
-                const speciesTable& species,
-                const HashPtrTable<ReactionThermo>& thermoDatabase
-            )
-            :
-                species_(species),
-                thermoDatabase_(thermoDatabase)
-            {}
-
-            autoPtr<Reaction> operator()(Istream& is) const
-            {
-                return autoPtr<Reaction>
-                (
-                    Reaction::New(species_, thermoDatabase_, is)
-                );
-            }
-        };
-
-
     // Constructors
 
         //- Construct from components
@@ -235,14 +192,6 @@ public:
         //- Construct as copy given new speciesTable
         Reaction(const Reaction<ReactionThermo>&, const speciesTable& species);
 
-        //- Construct from Istream
-        Reaction
-        (
-            const speciesTable& species,
-            const HashPtrTable<ReactionThermo>& thermoDatabase,
-            Istream& is
-        );
-
         //- Construct from dictionary
         Reaction
         (
@@ -275,14 +224,6 @@ public:
 
     // Selectors
 
-        //- Return a pointer to new patchField created on freestore from input
-        static autoPtr<Reaction<ReactionThermo>> New
-        (
-            const speciesTable& species,
-            const HashPtrTable<ReactionThermo>& thermoDatabase,
-            Istream& is
-        );
-
         //- Return a pointer to new patchField created on freestore from dict
         static autoPtr<Reaction<ReactionThermo>> New
         (
@@ -312,10 +253,10 @@ public:
             virtual const List<specieCoeffs>& grhs() const;
             virtual const List<specieCoeffs>& glhs() const;
 
-            // - Access to specie list
+            //- Access to specie list
             const speciesTable& species() const;
 
-            // - Access to gas specie list
+            //- Access to gas specie list
             virtual const speciesTable& gasSpecies() const;
 
             //- Construct the left- and right-hand-side reaction coefficients
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
index ca0334107d..6d3f2539fc 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,25 +60,6 @@ Foam::ReactionList<ThermoType>::ReactionList
 }
 
 
-template<class ThermoType>
-Foam::ReactionList<ThermoType>::ReactionList
-(
-    const speciesTable& species,
-    const HashPtrTable<ThermoType>& thermoDb,
-    const fileName& fName
-)
-:
-    SLPtrList<Reaction<ThermoType>>
-    (
-        dictionary(IFstream(fName)()).lookup("reactions"),
-        Reaction<ThermoType>::iNew(species, thermoDb)
-    ),
-    species_(species),
-    thermoDb_(thermoDb),
-    dict_(dictionary::null)
-{}
-
-
 template<class ThermoType>
 Foam::ReactionList<ThermoType>::ReactionList(const ReactionList& reactions)
 :
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
index c9a4b2c001..6251fda9e4 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReactionList/ReactionList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,14 +93,6 @@ public:
             const dictionary& dict
         );
 
-        //- Construct from file using (Istream)
-        ReactionList
-        (
-            const speciesTable& species,
-            const HashPtrTable<ThermoType>& thermoDatabase,
-            const fileName& fName
-        );
-
         //- Construct copy
         ReactionList(const ReactionList<ThermoType>& reactions);
 
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
index fb62950ff5..2183986e26 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,25 +45,6 @@ ReversibleReaction
 {}
 
 
-template
-<
-    template<class> class ReactionType,
-    class ReactionThermo,
-    class ReactionRate
->
-Foam::ReversibleReaction<ReactionType, ReactionThermo, ReactionRate>::
-ReversibleReaction
-(
-    const speciesTable& species,
-    const HashPtrTable<ReactionThermo>& thermoDatabase,
-    Istream& is
-)
-:
-    ReactionType<ReactionThermo>(species, thermoDatabase, is),
-    k_(species, is)
-{}
-
-
 template
 <
     template<class> class ReactionType,
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
index fd801d347b..798b757592 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,14 +103,6 @@ public:
             const speciesTable& species
         );
 
-        //- Construct from Istream
-        ReversibleReaction
-        (
-            const speciesTable& species,
-            const HashPtrTable<ReactionThermo>& thermoDatabase,
-            Istream& is
-        );
-
         //- Construct from dictionary
         ReversibleReaction
         (
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H
index deb1bb2ebd..fbe89154ba 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,13 +77,6 @@ public:
             const scalar Ta
         );
 
-        //- Construct from Istream
-        inline ArrheniusReactionRate
-        (
-            const speciesTable& species,
-            Istream& is
-        );
-
         //- Construct from dictionary
         inline ArrheniusReactionRate
         (
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
index 273e15fd94..5c67a60e96 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,20 +38,6 @@ inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
 {}
 
 
-inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
-(
-    const speciesTable&,
-    Istream& is
-)
-:
-    A_(readScalar(is.readBegin("ArrheniusReactionRate(Istream&)"))),
-    beta_(readScalar(is)),
-    Ta_(readScalar(is))
-{
-    is.readEnd("ArrheniusReactionRate(Istream&)");
-}
-
-
 inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
 (
     const speciesTable&,
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H
index 75a8fa507e..87eab0d403 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,13 +84,6 @@ public:
             const thirdBodyEfficiencies& tbes
         );
 
-        //- Construct from Istream
-        inline ChemicallyActivatedReactionRate
-        (
-            const speciesTable& species,
-            Istream& is
-        );
-
         //- Construct from dictionary
         inline ChemicallyActivatedReactionRate
         (
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
index 952ceaa740..f8e71fd4e3 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,26 +45,6 @@ inline Foam::ChemicallyActivatedReactionRate
 {}
 
 
-template<class ReactionRate, class ChemicallyActivationFunction>
-inline Foam::ChemicallyActivatedReactionRate
-<
-    ReactionRate,
-    ChemicallyActivationFunction
->::ChemicallyActivatedReactionRate
-(
-    const speciesTable& species,
-    Istream& is
-)
-:
-    k0_(species, is.readBegin("ChemicallyActivatedReactionRate(Istream&)")),
-    kInf_(species, is),
-    F_(is),
-    thirdBodyEfficiencies_(species, is)
-{
-    is.readEnd("ChemicallyActivatedReactionRate(Istream&)");
-}
-
-
 template<class ReactionRate, class ChemicallyActivationFunction>
 inline Foam::ChemicallyActivatedReactionRate
 <
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H
index d668f214d0..e89aa89498 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,13 +83,6 @@ public:
             const thirdBodyEfficiencies& tbes
         );
 
-        //- Construct from Istream
-        inline FallOffReactionRate
-        (
-            const speciesTable& species,
-            Istream& is
-        );
-
         //- Construct from dictionary
         inline FallOffReactionRate
         (
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
index 954816aca3..0b7fa5f032 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,23 +42,6 @@ FallOffReactionRate
 {}
 
 
-template<class ReactionRate, class FallOffFunction>
-inline Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::
-FallOffReactionRate
-(
-    const speciesTable& species,
-    Istream& is
-)
-:
-    k0_(species, is.readBegin("FallOffReactionRate(Istream&)")),
-    kInf_(species, is),
-    F_(is),
-    thirdBodyEfficiencies_(species, is)
-{
-    is.readEnd("FallOffReactionRate(Istream&)");
-}
-
-
 template<class ReactionRate, class FallOffFunction>
 inline Foam::FallOffReactionRate<ReactionRate, FallOffFunction>::
 FallOffReactionRate
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H
index bf3d10c6b9..ab37e054fe 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,13 +80,6 @@ public:
             const FixedList<scalar, nb_> b
         );
 
-        //- Construct from Istream
-        inline JanevReactionRate
-        (
-            const speciesTable& species,
-            Istream& is
-        );
-
         //- Construct from dictionary
         inline JanevReactionRate
         (
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
index 381a94e587..055d6291d7 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,21 +40,6 @@ inline Foam::JanevReactionRate::JanevReactionRate
 {}
 
 
-inline Foam::JanevReactionRate::JanevReactionRate
-(
-    const speciesTable&,
-    Istream& is
-)
-:
-    A_(readScalar(is.readBegin("JanevReactionRate(Istream&)"))),
-    beta_(readScalar(is)),
-    Ta_(readScalar(is)),
-    b_(is)
-{
-    is.readEnd("JanevReactionRate(Istream&)");
-}
-
-
 inline Foam::JanevReactionRate::JanevReactionRate
 (
     const speciesTable&,
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H
index cba8b20cb8..c353475be7 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,13 +79,6 @@ public:
             const scalar C
         );
 
-        //- Construct from Istream
-        inline LandauTellerReactionRate
-        (
-            const speciesTable& species,
-            Istream& is
-        );
-
         //- Construct from dictionary
         inline LandauTellerReactionRate
         (
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
index d3b1b79ec7..56a636e9c7 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,22 +42,6 @@ inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
 {}
 
 
-inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
-(
-    const speciesTable&,
-    Istream& is
-)
-:
-    A_(readScalar(is.readBegin("LandauTellerReactionRate(Istream&)"))),
-    beta_(readScalar(is)),
-    Ta_(readScalar(is)),
-    B_(readScalar(is)),
-    C_(readScalar(is))
-{
-    is.readEnd("LandauTellerReactionRate(Istream&)");
-}
-
-
 inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
 (
     const speciesTable&,
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H
index e96f9ea20c..1d1c5dd337 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,13 +81,6 @@ public:
             const label no
         );
 
-        //- Construct from Istream
-        inline LangmuirHinshelwoodReactionRate
-        (
-            const speciesTable& species,
-            Istream& is
-        );
-
         //- Construct from dictionary
         inline LangmuirHinshelwoodReactionRate
         (
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
index 26fd07bfad..029d254441 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,27 +49,6 @@ inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
 }
 
 
-inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
-(
-    const speciesTable& st,
-    Istream& is
-)
-:
-    co_(st["CO"]),
-    c3h6_(st["C3H6"]),
-    no_(st["NO"])
-{
-    is.readBegin("LangmuirHinshelwoodReactionRate(Istream&)");
-
-    for (int i=0; i<n_; i++)
-    {
-        is >> A_[i] >> Ta_[i];
-    }
-
-    is.readEnd("LangmuirHinshelwoodReactionRate(Istream&)");
-}
-
-
 inline Foam::LangmuirHinshelwoodReactionRate::LangmuirHinshelwoodReactionRate
 (
     const speciesTable& st,
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H
index 298ca332c5..76c2f3acc9 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,9 +62,6 @@ public:
         //- Construct null
         inline LindemannFallOffFunction();
 
-        //- Construct from Istream
-        inline LindemannFallOffFunction(Istream&);
-
         //- Construct from dictionary
         inline LindemannFallOffFunction(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H
index 1dd6ba4b55..8421898b64 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/LindemannFallOffFunction/LindemannFallOffFunctionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,10 +29,6 @@ inline Foam::LindemannFallOffFunction::LindemannFallOffFunction()
 {}
 
 
-inline Foam::LindemannFallOffFunction::LindemannFallOffFunction(Istream&)
-{}
-
-
 inline Foam::LindemannFallOffFunction::LindemannFallOffFunction
 (
     const dictionary& dict
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H
index 60e9bdfbd1..2a73db4be8 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,9 +73,6 @@ public:
             const scalar e
         );
 
-        //- Construct from Istream
-        inline SRIFallOffFunction(Istream&);
-
         //- Construct from dictionary
         inline SRIFallOffFunction(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
index 6c3dd203d7..df45885479 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,18 +42,6 @@ inline Foam::SRIFallOffFunction::SRIFallOffFunction
 {}
 
 
-inline Foam::SRIFallOffFunction::SRIFallOffFunction(Istream& is)
-:
-    a_(readScalar(is.readBegin("SRIFallOffFunction(Istream&)"))),
-    b_(readScalar(is)),
-    c_(readScalar(is)),
-    d_(readScalar(is)),
-    e_(readScalar(is))
-{
-    is.readEnd("SRIFallOffFunction(Istream&)");
-}
-
-
 inline Foam::SRIFallOffFunction::SRIFallOffFunction(const dictionary& dict)
 :
     a_(readScalar(dict.lookup("a"))),
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H
index ba14378315..18b39038fb 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,9 +73,6 @@ public:
             const scalar Tss
         );
 
-        //- Construct from Istream
-        inline TroeFallOffFunction(Istream&);
-
         //- Construct from dictionary
         inline TroeFallOffFunction(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
index 74a8e0a17d..ff504a29f2 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,17 +40,6 @@ inline Foam::TroeFallOffFunction::TroeFallOffFunction
 {}
 
 
-inline Foam::TroeFallOffFunction::TroeFallOffFunction(Istream& is)
-:
-    alpha_(readScalar(is.readBegin("TroeFallOffFunction(Istream&)"))),
-    Tsss_(readScalar(is)),
-    Ts_(readScalar(is)),
-    Tss_(readScalar(is))
-{
-    is.readEnd("TroeFallOffFunction(Istream&)");
-}
-
-
 inline Foam::TroeFallOffFunction::TroeFallOffFunction(const dictionary& dict)
 :
     alpha_(readScalar(dict.lookup("alpha"))),
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H
index 47dde38b49..ec8abe2cdc 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ public:
         inline infiniteReactionRate
         ();
 
-        //- Construct from Istream
+        //- Construct from dictionary
         inline infiniteReactionRate
         (
             const speciesTable& species,
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H
index a8561815be..f12d3ba0d0 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,13 +80,6 @@ public:
             const FixedList<scalar, nCoeff_> coeffs
         );
 
-        //- Construct from Istream
-        inline powerSeriesReactionRate
-        (
-            const speciesTable& species,
-            Istream& is
-        );
-
         //- Construct from dictionary
         inline powerSeriesReactionRate
         (
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
index c14d329641..5cee7f9b7f 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,21 +40,6 @@ inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
 {}
 
 
-inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
-(
-    const speciesTable&,
-    Istream& is
-)
-:
-    A_(readScalar(is.readBegin("powerSeriesReactionRate(Istream&)"))),
-    beta_(readScalar(is)),
-    Ta_(readScalar(is)),
-    coeffs_(is)
-{
-    is.readEnd("powerSeriesReactionRate(Istream&)");
-}
-
-
 inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
 (
     const speciesTable&,
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H
index 9e7599ac73..c12d914c63 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,13 +76,6 @@ public:
             const thirdBodyEfficiencies& tbes
         );
 
-        //- Construct from Istream
-        inline thirdBodyArrheniusReactionRate
-        (
-            const speciesTable& species,
-            Istream& is
-        );
-
         //- Construct from dictionary
         inline thirdBodyArrheniusReactionRate
         (
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
index 0cba38cee0..711dfde0e1 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,23 +38,6 @@ inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
 {}
 
 
-inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
-(
-    const speciesTable& species,
-    Istream& is
-)
-:
-    ArrheniusReactionRate
-    (
-        species,
-        is.readBegin("thirdBodyArrheniusReactionRate(Istream&)")
-    ),
-    thirdBodyEfficiencies_(species, is)
-{
-    is.readEnd("thirdBodyArrheniusReactionRate(Istream&)");
-}
-
-
 inline Foam::thirdBodyArrheniusReactionRate::thirdBodyArrheniusReactionRate
 (
     const speciesTable& species,
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H
index 8b164da171..62b80cb37b 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficiencies.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,13 +73,6 @@ public:
             const scalarList& efficiencies
         );
 
-        //- Construct from Istream
-        inline thirdBodyEfficiencies
-        (
-            const speciesTable& species,
-            Istream& is
-        );
-
         //- Construct from dictionary
         inline thirdBodyEfficiencies
         (
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index 59c25bcf4b..d77df740ba 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,62 +46,6 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 }
 
 
-inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
-(
-    const speciesTable& species,
-    Istream& is
-)
-:
-    scalarList(species.size()),
-    species_(species)
-{
-    is.readBeginList
-    (
-        "thirdBodyEfficiencies::thirdBodyEfficiencies"
-        "(const speciesTable& species, Istream& is)"
-    );
-    scalar defaultEff = readScalar(is);
-    scalarList::operator=(defaultEff);
-
-    token t;
-
-    while ((is >> t) && !t.isPunctuation())
-    {
-        if (t.isWord())
-        {
-            operator[](species[t.wordToken()]) = readScalar(is);
-        }
-        else
-        {
-            FatalIOErrorInFunction
-            (
-                is
-            )   << "expected <word>, found " << t.info()
-                << exit(FatalIOError);
-        }
-    }
-
-    if (t.pToken() != token::END_LIST)
-    {
-        FatalIOErrorInFunction
-        (
-            is
-        )   << "expected ')', found " << t.info()
-            << exit(FatalIOError);
-    }
-
-    if (size() != species_.size())
-    {
-        FatalIOErrorInFunction
-        (
-            is
-        )   << "number of efficiencies = " << size()
-            << " is not equal to the number of species " << species_.size()
-            << exit(FatalIOError);
-    }
-}
-
-
 inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 (
     const speciesTable& species,
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
index 74cf7c1e48..ba51a746cc 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,13 +73,6 @@ namespace Foam
     );                                                                         \
                                                                                \
     addToRunTimeSelectionTable                                                 \
-    (                                                                          \
-        Reaction##Thermo,                                                      \
-        ReactionType##Thermo##ReactionRate,                                    \
-        Istream                                                                \
-    );                                                                         \
-                                                                               \
-    addToRunTimeSelectionTable                                                 \
     (                                                                          \
         Reaction##Thermo,                                                      \
         ReactionType##Thermo##ReactionRate,                                    \
@@ -121,7 +114,7 @@ namespace Foam
     makeReaction(Thermo, NonEquilibriumReversibleReaction, ReactionRate)
 
 
-#define makePressureDependentReactions(Thermo, ReactionRate, FallOffFunction) \
+#define makePressureDependentReactions(Thermo, ReactionRate, FallOffFunction)  \
                                                                                \
     makePressureDependentReaction                                              \
     (                                                                          \
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C
index 96352b2c9b..d6b9a3c0b4 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,6 @@ License
 #define makeReactions(Thermo, Reaction)                                        \
                                                                                \
     defineTemplateTypeNameAndDebug(Reaction, 0);                               \
-    defineTemplateRunTimeSelectionTable(Reaction, Istream);                    \
     defineTemplateRunTimeSelectionTable(Reaction, dictionary);                 \
                                                                                \
     makeIRNReactions(Thermo, ArrheniusReactionRate)                            \
diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C
index b507212cd0..508d755626 100644
--- a/src/thermophysicalModels/specie/specie/specie.C
+++ b/src/thermophysicalModels/specie/specie/specie.C
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "specie.H"
-#include "IOstreams.H"
 #include "constants.H"
 
 /* * * * * * * * * * * * * * * public constants  * * * * * * * * * * * * * * */
@@ -37,16 +36,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::specie::specie(Istream& is)
-:
-    name_(is),
-    Y_(readScalar(is)),
-    molWeight_(readScalar(is))
-{
-    is.check("specie::specie(Istream& is)");
-}
-
-
 Foam::specie::specie(const dictionary& dict)
 :
     name_(dict.dictName()),
@@ -73,10 +62,7 @@ void Foam::specie::write(Ostream& os) const
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const specie& st)
 {
-    os  << st.name_ << tab
-        << st.Y_ << tab
-        << st.molWeight_;
-
+    st.write(os);
     os.check("Ostream& operator<<(Ostream& os, const specie& st)");
     return os;
 }
diff --git a/src/thermophysicalModels/specie/specie/specie.H b/src/thermophysicalModels/specie/specie/specie.H
index 52ebcbe13e..192c42931f 100644
--- a/src/thermophysicalModels/specie/specie/specie.H
+++ b/src/thermophysicalModels/specie/specie/specie.H
@@ -96,15 +96,9 @@ public:
             const scalar molWeight
         );
 
-        //- Construct as copy
-        inline specie(const specie&);
-
         //- Construct as named copy
         inline specie(const word& name, const specie&);
 
-        //- Construct from Istream
-        specie(Istream&);
-
         //- Construct from dictionary
         specie(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/specie/specieI.H b/src/thermophysicalModels/specie/specie/specieI.H
index fb8255dbef..222ca1ceee 100644
--- a/src/thermophysicalModels/specie/specie/specieI.H
+++ b/src/thermophysicalModels/specie/specie/specieI.H
@@ -58,14 +58,6 @@ inline specie::specie
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline specie::specie(const specie& st)
-:
-    name_(st.name_),
-    Y_(st.Y_),
-    molWeight_(st.molWeight_)
-{}
-
-
 inline specie::specie(const word& name, const specie& st)
 :
     name_(name),
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
index d38693c03f..fa283c7116 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
@@ -28,17 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class EquationOfState>
-Foam::eConstThermo<EquationOfState>::eConstThermo(Istream& is)
-:
-    EquationOfState(is),
-    Cv_(readScalar(is)),
-    Hf_(readScalar(is))
-{
-    is.check("eConstThermo<EquationOfState>::eConstThermo(Istream&)");
-}
-
-
 template<class EquationOfState>
 Foam::eConstThermo<EquationOfState>::eConstThermo(const dictionary& dict)
 :
@@ -71,10 +60,7 @@ Foam::Ostream& Foam::operator<<
     const eConstThermo<EquationOfState>& ct
 )
 {
-    os  << static_cast<const EquationOfState&>(ct) << tab
-        << ct.Cv_ << tab << ct.Hf_;
-
-    os.check("Ostream& operator<<(Ostream&, const eConstThermo&)");
+    ct.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
index 9f5354ca9c..2a9c599ffc 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
@@ -112,9 +112,6 @@ public:
 
     // Constructors
 
-        //- Construct from Istream
-        eConstThermo(Istream&);
-
         //- Construct from dictionary
         eConstThermo(const dictionary& dict);
 
@@ -124,9 +121,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<eConstThermo> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<eConstThermo> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<eConstThermo> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
index e6c1b84afe..4b5ba8005a 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H
@@ -65,17 +65,6 @@ Foam::eConstThermo<EquationOfState>::clone() const
 }
 
 
-template<class EquationOfState>
-inline Foam::autoPtr<Foam::eConstThermo<EquationOfState>>
-Foam::eConstThermo<EquationOfState>::New(Istream& is)
-{
-    return autoPtr<eConstThermo<EquationOfState>>
-    (
-        new eConstThermo<EquationOfState>(is)
-    );
-}
-
-
 template<class EquationOfState>
 inline Foam::autoPtr<Foam::eConstThermo<EquationOfState>>
 Foam::eConstThermo<EquationOfState>::New(const dictionary& dict)
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
index 2f892cbbf6..1bfc380457 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
@@ -28,17 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class EquationOfState>
-Foam::hConstThermo<EquationOfState>::hConstThermo(Istream& is)
-:
-    EquationOfState(is),
-    Cp_(readScalar(is)),
-    Hf_(readScalar(is))
-{
-    is.check("hConstThermo::hConstThermo(Istream& is)");
-}
-
-
 template<class EquationOfState>
 Foam::hConstThermo<EquationOfState>::hConstThermo(const dictionary& dict)
 :
@@ -71,10 +60,7 @@ Foam::Ostream& Foam::operator<<
     const hConstThermo<EquationOfState>& ct
 )
 {
-    os  << static_cast<const EquationOfState&>(ct) << tab
-        << ct.Cp_ << tab << ct.Hf_;
-
-    os.check("Ostream& operator<<(Ostream& os, const hConstThermo& ct)");
+    ct.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
index 7c04be81e3..dadbb0712f 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.H
@@ -105,9 +105,6 @@ public:
 
     // Constructors
 
-        //- Construct from Istream
-        hConstThermo(Istream&);
-
         //- Construct from dictionary
         hConstThermo(const dictionary& dict);
 
@@ -117,9 +114,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<hConstThermo> clone() const;
 
-        //- Selector from Istream
-        inline static autoPtr<hConstThermo> New(Istream& is);
-
         //- Selector from dictionary
         inline static autoPtr<hConstThermo> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
index ebed57e432..09dcb98603 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H
@@ -65,17 +65,6 @@ Foam::hConstThermo<EquationOfState>::clone() const
 }
 
 
-template<class EquationOfState>
-inline Foam::autoPtr<Foam::hConstThermo<EquationOfState>>
-Foam::hConstThermo<EquationOfState>::New(Istream& is)
-{
-    return autoPtr<hConstThermo<EquationOfState>>
-    (
-        new hConstThermo<EquationOfState>(is)
-    );
-}
-
-
 template<class EquationOfState>
 inline Foam::autoPtr<Foam::hConstThermo<EquationOfState>>
 Foam::hConstThermo<EquationOfState>::New(const dictionary& dict)
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index 0aa43c1f72..2f7817e0b8 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -28,30 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class EquationOfState, int PolySize>
-Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
-(
-    Istream& is
-)
-:
-    EquationOfState(is),
-    Hf_(readScalar(is)),
-    Sf_(readScalar(is)),
-    CpCoeffs_("CpCoeffs<" + Foam::name(PolySize) + '>', is),
-    hCoeffs_(),
-    sCoeffs_()
-{
-    hCoeffs_ = CpCoeffs_.integral();
-    sCoeffs_ = CpCoeffs_.integralMinus1();
-
-    // Offset h poly so that it is relative to the enthalpy at Tstd
-    hCoeffs_[0] += Hf_ - hCoeffs_.value(Tstd);
-
-    // Offset s poly so that it is relative to the entropy at Tstd
-    sCoeffs_[0] += Sf_ - sCoeffs_.value(Tstd);
-}
-
-
 template<class EquationOfState, int PolySize>
 Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
 (
@@ -113,21 +89,7 @@ Foam::Ostream& Foam::operator<<
     const hPolynomialThermo<EquationOfState, PolySize>& pt
 )
 {
-    os  << static_cast<const EquationOfState&>(pt) << tab
-        << pt.Hf_ << tab
-        << pt.Sf_ << tab
-        << "CpCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << pt.CpCoeffs_/pt;
-
-    os.check
-    (
-        "operator<<"
-        "("
-            "Ostream&, "
-            "const hPolynomialThermo<EquationOfState, PolySize>&"
-        ")"
-    );
-
+    pt.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
index d8acaee18a..f9b73bd93d 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
@@ -161,15 +161,9 @@ public:
 
     // Constructors
 
-        //- Construct from Istream
-        hPolynomialThermo(Istream& is);
-
         //- Construct from dictionary
         hPolynomialThermo(const dictionary& dict);
 
-        //- Construct as copy
-        inline hPolynomialThermo(const hPolynomialThermo&);
-
         //- Construct as a named copy
         inline hPolynomialThermo(const word&, const hPolynomialThermo&);
 
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
index 26049dfc5f..fb5ac1bdeb 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
@@ -49,21 +49,6 @@ inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class EquationOfState, int PolySize>
-inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
-(
-    const hPolynomialThermo& pt
-)
-:
-    EquationOfState(pt),
-    Hf_(pt.Hf_),
-    Sf_(pt.Sf_),
-    CpCoeffs_(pt.CpCoeffs_),
-    hCoeffs_(pt.hCoeffs_),
-    sCoeffs_(pt.sCoeffs_)
-{}
-
-
 template<class EquationOfState, int PolySize>
 inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
 (
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C
index bab5f226ae..5e742e2388 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C
@@ -28,18 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class EquationOfState>
-Foam::hPowerThermo<EquationOfState>::hPowerThermo(Istream& is)
-:
-    EquationOfState(is),
-    n0_(readScalar(is)),
-    Tref_(readScalar(is)),
-    Hf_(readScalar(is))
-{
-    is.check("hPowerThermo::hPowerThermo(Istream& is)");
-}
-
-
 template<class EquationOfState>
 Foam::hPowerThermo<EquationOfState>::hPowerThermo
 (
@@ -63,21 +51,7 @@ Foam::Ostream& Foam::operator<<
     const hPowerThermo<EquationOfState>& et
 )
 {
-    os  << static_cast<const EquationOfState&>(et) << nl
-        << "    " << et.c0_
-        << tab << et.n0_
-        << tab << et.Tref_
-        << tab << et.Hf_;
-
-    os << nl << "    ";
-
-    os << endl;
-
-    os.check
-    (
-        "operator<<(Ostream& os, const hPowerThermo<EquationOfState>& et)"
-    );
-
+    et.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H
index be30a506ad..7ca3b2bbd4 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.H
@@ -122,9 +122,6 @@ public:
 
     // Constructors
 
-        //- Construct from Istream
-        hPowerThermo(Istream&);
-
         //- Construct from dictionary
         hPowerThermo(const dictionary&);
 
@@ -138,9 +135,6 @@ public:
          //- Construct and return a clone
         inline autoPtr<hPowerThermo> clone() const;
 
-        //- Selector from Istream
-        inline static autoPtr<hPowerThermo> New(Istream& is);
-
         //- Selector from dictionary
         inline static autoPtr<hPowerThermo> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
index e5160d973c..3f22215dbf 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H
@@ -90,17 +90,6 @@ Foam::hPowerThermo<EquationOfState>::clone() const
 }
 
 
-template<class EquationOfState>
-inline Foam::autoPtr<Foam::hPowerThermo<EquationOfState>>
-Foam::hPowerThermo<EquationOfState>::New(Istream& is)
-{
-    return autoPtr<hPowerThermo<EquationOfState>>
-    (
-        new hPowerThermo<EquationOfState>(is)
-    );
-}
-
-
 template<class EquationOfState>
 inline Foam::autoPtr<Foam::hPowerThermo<EquationOfState>>
 Foam::hPowerThermo<EquationOfState>::New(const dictionary& dict)
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
index a73c8748fa..c7a8cb4221 100644
--- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
@@ -28,19 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class EquationOfState>
-Foam::hRefConstThermo<EquationOfState>::hRefConstThermo(Istream& is)
-:
-    EquationOfState(is),
-    Cp_(readScalar(is)),
-    Hf_(readScalar(is)),
-    Tref_(readScalar(is)),
-    Href_(readScalar(is))
-{
-    is.check("hRefConstThermo::hRefConstThermo(Istream& is)");
-}
-
-
 template<class EquationOfState>
 Foam::hRefConstThermo<EquationOfState>::hRefConstThermo(const dictionary& dict)
 :
@@ -77,11 +64,7 @@ Foam::Ostream& Foam::operator<<
     const hRefConstThermo<EquationOfState>& ct
 )
 {
-    os  << static_cast<const EquationOfState&>(ct) << tab
-        << ct.Cp_ << tab << ct.Hf_ << tab
-        << ct.Tref_ << tab << ct.Href_;
-
-    os.check("Ostream& operator<<(Ostream& os, const hRefConstThermo& ct)");
+    ct.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
index 0bb1820386..5af0265404 100644
--- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
@@ -109,9 +109,6 @@ public:
 
     // Constructors
 
-        //- Construct from Istream
-        hRefConstThermo(Istream&);
-
         //- Construct from dictionary
         hRefConstThermo(const dictionary& dict);
 
@@ -121,9 +118,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<hRefConstThermo> clone() const;
 
-        //- Selector from Istream
-        inline static autoPtr<hRefConstThermo> New(Istream& is);
-
         //- Selector from dictionary
         inline static autoPtr<hRefConstThermo> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
index 941c4b5e88..575a648ddf 100644
--- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
@@ -71,17 +71,6 @@ Foam::hRefConstThermo<EquationOfState>::clone() const
 }
 
 
-template<class EquationOfState>
-inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState>>
-Foam::hRefConstThermo<EquationOfState>::New(Istream& is)
-{
-    return autoPtr<hRefConstThermo<EquationOfState>>
-    (
-        new hRefConstThermo<EquationOfState>(is)
-    );
-}
-
-
 template<class EquationOfState>
 inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState>>
 Foam::hRefConstThermo<EquationOfState>::New(const dictionary& dict)
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
index 44c053e0f1..6a4d0d4dc0 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
@@ -112,32 +112,7 @@ Foam::Ostream& Foam::operator<<
     const janafThermo<EquationOfState>& jt
 )
 {
-    os  << static_cast<const EquationOfState&>(jt) << nl
-        << "    " << jt.Tlow_
-        << tab << jt.Thigh_
-        << tab << jt.Tcommon_;
-
-    os << nl << "    ";
-
-    forAll(jt.highCpCoeffs_, i)
-    {
-        os << jt.highCpCoeffs_[i]/jt.R() << ' ';
-    }
-
-    os << nl << "    ";
-
-    forAll(jt.lowCpCoeffs_, i)
-    {
-        os << jt.lowCpCoeffs_[i]/jt.R() << ' ';
-    }
-
-    os << endl;
-
-    os.check
-    (
-        "operator<<(Ostream& os, const janafThermo<EquationOfState>& jt)"
-    );
-
+    jt.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermo.C b/src/thermophysicalModels/specie/thermo/thermo/thermo.C
index 400c2d4a88..09ce3f1d56 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermo.C
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "thermo.H"
-#include "IOstreams.H"
 
 /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
 
@@ -37,15 +36,6 @@ const int Foam::species::thermo<Thermo, Type>::maxIter_ = 100;
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Thermo, template<class> class Type>
-Foam::species::thermo<Thermo, Type>::thermo(Istream& is)
-:
-    Thermo(is)
-{
-    is.check("thermo<Thermo, Type>::thermo(Istream&)");
-}
-
-
 template<class Thermo, template<class> class Type>
 Foam::species::thermo<Thermo, Type>::thermo(const dictionary& dict)
 :
@@ -70,9 +60,7 @@ Foam::Ostream& Foam::species::operator<<
     Ostream& os, const thermo<Thermo, Type>& st
 )
 {
-    os  << static_cast<const Thermo&>(st);
-
-    os.check("Ostream& operator<<(Ostream&, const thermo&)");
+    st.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/thermo/thermo/thermo.H b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
index cc25cbaadf..a5cdba6ecd 100644
--- a/src/thermophysicalModels/specie/thermo/thermo/thermo.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
@@ -127,9 +127,6 @@ public:
         //- Construct from components
         inline thermo(const Thermo& sp);
 
-        //- Construct from Istream
-        thermo(Istream&);
-
         //- Construct from dictionary
         thermo(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C
index 92e4a19e4c..8b709c9c82 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.C
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,17 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Thermo>
-Foam::constTransport<Thermo>::constTransport(Istream& is)
-:
-    Thermo(is),
-    mu_(readScalar(is)),
-    rPr_(1.0/readScalar(is))
-{
-    is.check("constTransport::constTransport(Istream& is)");
-}
-
-
 template<class Thermo>
 Foam::constTransport<Thermo>::constTransport(const dictionary& dict)
 :
@@ -72,11 +61,7 @@ void Foam::constTransport<Thermo>::constTransport::write(Ostream& os) const
 template<class Thermo>
 Foam::Ostream& Foam::operator<<(Ostream& os, const constTransport<Thermo>& ct)
 {
-    operator<<(os, static_cast<const Thermo&>(ct));
-    os << tab << ct.mu_ << tab << 1.0/ct.rPr_;
-
-    os.check("Ostream& operator<<(Ostream&, const constTransport&)");
-
+    ct.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.H b/src/thermophysicalModels/specie/transport/const/constTransport.H
index 2c4be8d4d3..1caad9bd73 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.H
@@ -105,18 +105,12 @@ public:
         //- Construct as named copy
         inline constTransport(const word&, const constTransport&);
 
-        //- Construct from Istream
-        constTransport(Istream&);
-
         //- Construct from dictionary
         constTransport(const dictionary& dict);
 
         //- Construct and return a clone
         inline autoPtr<constTransport> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<constTransport> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<constTransport> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H
index 71a2102179..ab865dd9ab 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransportI.H
+++ b/src/thermophysicalModels/specie/transport/const/constTransportI.H
@@ -63,20 +63,6 @@ Foam::constTransport<Thermo>::clone() const
 }
 
 
-template<class Thermo>
-inline Foam::autoPtr<Foam::constTransport<Thermo>>
-Foam::constTransport<Thermo>::New
-(
-    Istream& is
-)
-{
-    return autoPtr<constTransport<Thermo>>
-    (
-        new constTransport<Thermo>(is)
-    );
-}
-
-
 template<class Thermo>
 inline Foam::autoPtr<Foam::constTransport<Thermo>>
 Foam::constTransport<Thermo>::New
diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
index 0d53683fce..27366f2893 100644
--- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C
@@ -28,18 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Thermo, int PolySize>
-Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
-(
-    Istream& is
-)
-:
-    Thermo(is),
-    muCoeffs_("muLogCoeffs<" + Foam::name(PolySize) + '>', is),
-    kappaCoeffs_("kappaLogCoeffs<" + Foam::name(PolySize) + '>', is)
-{}
-
-
 template<class Thermo, int PolySize>
 Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
 (
@@ -100,21 +88,7 @@ Foam::Ostream& Foam::operator<<
     const logPolynomialTransport<Thermo, PolySize>& pt
 )
 {
-    os  << static_cast<const Thermo&>(pt) << tab
-        << "muLogCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << pt.muCoeffs_ << tab
-        << "kappaLogCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << pt.kappaCoeffs_;
-
-    os.check
-    (
-        "Ostream& operator<<"
-        "("
-            "Ostream&, "
-            "const logPolynomialTransport<Thermo, PolySize>&"
-        ")"
-    );
-
+    pt.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
index 01b4fc9f33..712ae33115 100644
--- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H
@@ -149,9 +149,6 @@ public:
 
     // Constructors
 
-        //- Construct copy
-        inline logPolynomialTransport(const logPolynomialTransport&);
-
         //- Construct as named copy
         inline logPolynomialTransport
         (
@@ -159,18 +156,12 @@ public:
             const logPolynomialTransport&
         );
 
-        //- Construct from Istream
-        logPolynomialTransport(Istream& is);
-
         //- Construct from dictionary
         logPolynomialTransport(const dictionary& dict);
 
         //- Construct and return a clone
         inline autoPtr<logPolynomialTransport> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<logPolynomialTransport> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<logPolynomialTransport> New
         (
diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H
index 514d243dec..29c1553696 100644
--- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransportI.H
@@ -27,18 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Thermo, int PolySize>
-inline Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
-(
-    const logPolynomialTransport& pt
-)
-:
-    Thermo(pt),
-    muCoeffs_(pt.muCoeffs_),
-    kappaCoeffs_(pt.kappaCoeffs_)
-{}
-
-
 template<class Thermo, int PolySize>
 inline Foam::logPolynomialTransport<Thermo, PolySize>::logPolynomialTransport
 (
@@ -77,17 +65,6 @@ Foam::logPolynomialTransport<Thermo, PolySize>::clone() const
 }
 
 
-template<class Thermo, int PolySize>
-inline Foam::autoPtr<Foam::logPolynomialTransport<Thermo, PolySize>>
-Foam::logPolynomialTransport<Thermo, PolySize>::New(Istream& is)
-{
-    return autoPtr<logPolynomialTransport<Thermo, PolySize>>
-    (
-        new logPolynomialTransport<Thermo, PolySize>(is)
-    );
-}
-
-
 template<class Thermo, int PolySize>
 inline Foam::autoPtr<Foam::logPolynomialTransport<Thermo, PolySize>>
 Foam::logPolynomialTransport<Thermo, PolySize>::New(const dictionary& dict)
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
index adcc8485d1..cb907dd01d 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
@@ -28,15 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Thermo, int PolySize>
-Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport(Istream& is)
-:
-    Thermo(is),
-    muCoeffs_("muCoeffs<" + Foam::name(PolySize) + '>', is),
-    kappaCoeffs_("kappaCoeffs<" + Foam::name(PolySize) + '>', is)
-{}
-
-
 template<class Thermo, int PolySize>
 Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport
 (
@@ -97,21 +88,7 @@ Foam::Ostream& Foam::operator<<
     const polynomialTransport<Thermo, PolySize>& pt
 )
 {
-    os  << static_cast<const Thermo&>(pt) << tab
-        << "muCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << pt.muCoeffs_ << tab
-        << "kappaCoeffs<" << Foam::name(PolySize) << '>' << tab
-        << pt.kappaCoeffs_;
-
-    os.check
-    (
-        "Ostream& operator<<"
-        "("
-            "Ostream&, "
-            "const polynomialTransport<Thermo, PolySize>&"
-        ")"
-    );
-
+    pt.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
index 8b7c95cedc..425706f024 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
@@ -138,24 +138,15 @@ public:
 
     // Constructors
 
-        //- Construct copy
-        inline polynomialTransport(const polynomialTransport&);
-
         //- Construct as named copy
         inline polynomialTransport(const word&, const polynomialTransport&);
 
-        //- Construct from Istream
-        polynomialTransport(Istream& is);
-
         //- Construct from dictionary
         polynomialTransport(const dictionary& dict);
 
         //- Construct and return a clone
         inline autoPtr<polynomialTransport> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<polynomialTransport> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<polynomialTransport> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
index 501c9f0633..3715ccbb18 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H
@@ -27,18 +27,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Thermo, int PolySize>
-inline Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport
-(
-    const polynomialTransport& pt
-)
-:
-    Thermo(pt),
-    muCoeffs_(pt.muCoeffs_),
-    kappaCoeffs_(pt.kappaCoeffs_)
-{}
-
-
 template<class Thermo, int PolySize>
 inline Foam::polynomialTransport<Thermo, PolySize>::polynomialTransport
 (
@@ -77,17 +65,6 @@ Foam::polynomialTransport<Thermo, PolySize>::clone() const
 }
 
 
-template<class Thermo, int PolySize>
-inline Foam::autoPtr<Foam::polynomialTransport<Thermo, PolySize>>
-Foam::polynomialTransport<Thermo, PolySize>::New(Istream& is)
-{
-    return autoPtr<polynomialTransport<Thermo, PolySize>>
-    (
-        new polynomialTransport<Thermo, PolySize>(is)
-    );
-}
-
-
 template<class Thermo, int PolySize>
 inline Foam::autoPtr<Foam::polynomialTransport<Thermo, PolySize>>
 Foam::polynomialTransport<Thermo, PolySize>::New(const dictionary& dict)
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
index db8cc73026..1fa0789014 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,17 +41,6 @@ Foam::scalar Foam::sutherlandTransport<Thermo>::readCoeff
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Thermo>
-Foam::sutherlandTransport<Thermo>::sutherlandTransport(Istream& is)
-:
-    Thermo(is),
-    As_(readScalar(is)),
-    Ts_(readScalar(is))
-{
-    is.check("sutherlandTransport<Thermo>::sutherlandTransport(Istream&)");
-}
-
-
 template<class Thermo>
 Foam::sutherlandTransport<Thermo>::sutherlandTransport(const dictionary& dict)
 :
@@ -102,13 +91,7 @@ Foam::Ostream& Foam::operator<<
     const sutherlandTransport<Thermo>& st
 )
 {
-    os << static_cast<const Thermo&>(st) << tab << st.As_ << tab << st.Ts_;
-
-    os.check
-    (
-        "Ostream& operator<<(Ostream&, const sutherlandTransport<Thermo>&)"
-    );
-
+    st.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
index 1acc05bcc5..0551a566fe 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
@@ -127,9 +127,6 @@ public:
         //- Construct as named copy
         inline sutherlandTransport(const word&, const sutherlandTransport&);
 
-        //- Construct from Istream
-        sutherlandTransport(Istream&);
-
         //- Construct from dictionary
         sutherlandTransport(const dictionary& dict);
 
@@ -139,9 +136,6 @@ public:
         //- Construct and return a clone
         inline autoPtr<sutherlandTransport> clone() const;
 
-        // Selector from Istream
-        inline static autoPtr<sutherlandTransport> New(Istream& is);
-
         // Selector from dictionary
         inline static autoPtr<sutherlandTransport> New(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
index 71b4449079..b5a0f6835f 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
@@ -98,20 +98,6 @@ Foam::sutherlandTransport<Thermo>::clone() const
 }
 
 
-template<class Thermo>
-inline Foam::autoPtr<Foam::sutherlandTransport<Thermo>>
-Foam::sutherlandTransport<Thermo>::New
-(
-    Istream& is
-)
-{
-    return autoPtr<sutherlandTransport<Thermo>>
-    (
-        new sutherlandTransport<Thermo>(is)
-    );
-}
-
-
 template<class Thermo>
 inline Foam::autoPtr<Foam::sutherlandTransport<Thermo>>
 Foam::sutherlandTransport<Thermo>::New
diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
index c28171c3bf..ff23b18402 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,12 +32,6 @@ namespace Foam
 {
     defineTypeNameAndDebug(APIdiffCoefFunc, 0);
     addToRunTimeSelectionTable
-    (
-        thermophysicalFunction,
-        APIdiffCoefFunc,
-        Istream
-    );
-    addToRunTimeSelectionTable
     (
         thermophysicalFunction,
         APIdiffCoefFunc,
@@ -64,17 +58,6 @@ Foam::APIdiffCoefFunc::APIdiffCoefFunc
 {}
 
 
-Foam::APIdiffCoefFunc::APIdiffCoefFunc(Istream& is)
-:
-    a_(readScalar(is)),
-    b_(readScalar(is)),
-    wf_(readScalar(is)),
-    wa_(readScalar(is)),
-    alpha_(sqrt(1/wf_ + 1/wa_)),
-    beta_(sqr((cbrt(a_) + cbrt(b_))))
-{}
-
-
 Foam::APIdiffCoefFunc::APIdiffCoefFunc(const dictionary& dict)
 :
     a_(readScalar(dict.lookup("a"))),
diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
index 164be51f0f..a431bdee6f 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,9 +79,6 @@ public:
             const scalar wa
         );
 
-        //- Construct from Istream
-        APIdiffCoefFunc(Istream& is);
-
         //- Construct from dictionary
         APIdiffCoefFunc(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
index fa6bf14bb1..0fccd567f5 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(NSRDSfunc0, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc0, Istream);
     addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc0, dictionary);
 }
 
@@ -56,17 +55,6 @@ Foam::NSRDSfunc0::NSRDSfunc0
 {}
 
 
-Foam::NSRDSfunc0::NSRDSfunc0(Istream& is)
-:
-    a_(readScalar(is)),
-    b_(readScalar(is)),
-    c_(readScalar(is)),
-    d_(readScalar(is)),
-    e_(readScalar(is)),
-    f_(readScalar(is))
-{}
-
-
 Foam::NSRDSfunc0::NSRDSfunc0(const dictionary& dict)
 :
     a_(readScalar(dict.lookup("a"))),
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H
index a6da31dad2..38a4e7d2bc 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,9 +94,6 @@ public:
             const scalar f
         );
 
-        //- Construct from Istream
-        NSRDSfunc0(Istream& is);
-
         //- Construct from dictionary
         NSRDSfunc0(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
index b7db748376..60b61614b1 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(NSRDSfunc1, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc1, Istream);
     addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc1, dictionary);
 }
 
@@ -54,16 +53,6 @@ Foam::NSRDSfunc1::NSRDSfunc1
 {}
 
 
-Foam::NSRDSfunc1::NSRDSfunc1(Istream& is)
-:
-    a_(readScalar(is)),
-    b_(readScalar(is)),
-    c_(readScalar(is)),
-    d_(readScalar(is)),
-    e_(readScalar(is))
-{}
-
-
 Foam::NSRDSfunc1::NSRDSfunc1(const dictionary& dict)
 :
     a_(readScalar(dict.lookup("a"))),
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H
index 87ba132778..c9c8e1088e 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,6 @@ public:
             const scalar e
         );
 
-        //- Construct from Istream
-        NSRDSfunc1(Istream& is);
-
         //- Construct from dictionary
         NSRDSfunc1(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
index b8e8c44313..b5aa066933 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(NSRDSfunc14, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc14, Istream);
     addToRunTimeSelectionTable
     (
         thermophysicalFunction,
@@ -59,16 +58,6 @@ Foam::NSRDSfunc14::NSRDSfunc14
 {}
 
 
-Foam::NSRDSfunc14::NSRDSfunc14(Istream& is)
-:
-    Tc_(readScalar(is)),
-    a_(readScalar(is)),
-    b_(readScalar(is)),
-    c_(readScalar(is)),
-    d_(readScalar(is))
-{}
-
-
 Foam::NSRDSfunc14::NSRDSfunc14(const dictionary& dict)
 :
     Tc_(readScalar(dict.lookup("Tc"))),
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H
index 4e1890384a..719aa0789d 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,6 @@ public:
             const scalar d
         );
 
-        //- Construct from Istream
-        NSRDSfunc14(Istream& is);
-
         //- Construct from dictionary
         NSRDSfunc14(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
index 93da6a1ce7..3365d08c5c 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(NSRDSfunc2, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc2, Istream);
     addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc2, dictionary);
 }
 
@@ -52,15 +51,6 @@ Foam::NSRDSfunc2::NSRDSfunc2
 {}
 
 
-Foam::NSRDSfunc2::NSRDSfunc2(Istream& is)
-:
-    a_(readScalar(is)),
-    b_(readScalar(is)),
-    c_(readScalar(is)),
-    d_(readScalar(is))
-{}
-
-
 Foam::NSRDSfunc2::NSRDSfunc2(const dictionary& dict)
 :
     a_(readScalar(dict.lookup("a"))),
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H
index 3434eb9ef9..58a7d46129 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,6 @@ public:
             const scalar d
         );
 
-        //- Construct from Istream
-        NSRDSfunc2(Istream& is);
-
         //- Construct from dictionary
         NSRDSfunc2(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
index 9ed62c7472..2c25a0ae6e 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(NSRDSfunc3, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc3, Istream);
     addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc3, dictionary);
 }
 
@@ -52,15 +51,6 @@ Foam::NSRDSfunc3::NSRDSfunc3
 {}
 
 
-Foam::NSRDSfunc3::NSRDSfunc3(Istream& is)
-:
-    a_(readScalar(is)),
-    b_(readScalar(is)),
-    c_(readScalar(is)),
-    d_(readScalar(is))
-{}
-
-
 Foam::NSRDSfunc3::NSRDSfunc3(const dictionary& dict)
 :
     a_(readScalar(dict.lookup("a"))),
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H
index 18d8bc4961..ad9809af7f 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,6 @@ public:
             const scalar d
         );
 
-        //- Construct from Istream
-        NSRDSfunc3(Istream& is);
-
         //- Construct from dictionary
         NSRDSfunc3(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
index 626b003669..809af7aa4a 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(NSRDSfunc4, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc4, Istream);
     addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc4, dictionary);
 }
 
@@ -54,16 +53,6 @@ Foam::NSRDSfunc4::NSRDSfunc4
 {}
 
 
-Foam::NSRDSfunc4::NSRDSfunc4(Istream& is)
-:
-    a_(readScalar(is)),
-    b_(readScalar(is)),
-    c_(readScalar(is)),
-    d_(readScalar(is)),
-    e_(readScalar(is))
-{}
-
-
 Foam::NSRDSfunc4::NSRDSfunc4(const dictionary& dict)
 :
     a_(readScalar(dict.lookup("a"))),
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H
index 275ecbc82f..6da5500b7f 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,6 @@ public:
             const scalar e
         );
 
-        //- Construct from Istream
-        NSRDSfunc4(Istream& is);
-
         //- Construct from dictionary
         NSRDSfunc4(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
index 151a17f26c..0c6100beb5 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(NSRDSfunc5, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc5, Istream);
     addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc5, dictionary);
 }
 
@@ -52,15 +51,6 @@ Foam::NSRDSfunc5::NSRDSfunc5
 {}
 
 
-Foam::NSRDSfunc5::NSRDSfunc5(Istream& is)
-:
-    a_(readScalar(is)),
-    b_(readScalar(is)),
-    c_(readScalar(is)),
-    d_(readScalar(is))
-{}
-
-
 Foam::NSRDSfunc5::NSRDSfunc5(const dictionary& dict)
 :
     a_(readScalar(dict.lookup("a"))),
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H
index ec6372c71d..222c8686ae 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,9 +92,6 @@ public:
             const scalar d
         );
 
-        //- Construct from Istream
-        NSRDSfunc5(Istream& is);
-
         //- Construct from dictionary
         NSRDSfunc5(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
index 5bfce5c5bc..766d9e8839 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(NSRDSfunc6, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc6, Istream);
     addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc6, dictionary);
 }
 
@@ -56,17 +55,6 @@ Foam::NSRDSfunc6::NSRDSfunc6
 {}
 
 
-Foam::NSRDSfunc6::NSRDSfunc6(Istream& is)
-:
-    Tc_(readScalar(is)),
-    a_(readScalar(is)),
-    b_(readScalar(is)),
-    c_(readScalar(is)),
-    d_(readScalar(is)),
-    e_(readScalar(is))
-{}
-
-
 Foam::NSRDSfunc6::NSRDSfunc6(const dictionary& dict)
 :
     Tc_(readScalar(dict.lookup("Tc"))),
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H
index e061dbb2b3..4d8241ce98 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,9 +94,6 @@ public:
             const scalar e
         );
 
-        //- Construct from Istream
-        NSRDSfunc6(Istream& is);
-
         //- Construct from dictionary
         NSRDSfunc6(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
index 82f095e736..a508c91d95 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,6 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(NSRDSfunc7, 0);
-    addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc7, Istream);
     addToRunTimeSelectionTable(thermophysicalFunction, NSRDSfunc7, dictionary);
 }
 
@@ -54,16 +53,6 @@ Foam::NSRDSfunc7::NSRDSfunc7
 {}
 
 
-Foam::NSRDSfunc7::NSRDSfunc7(Istream& is)
-:
-    a_(readScalar(is)),
-    b_(readScalar(is)),
-    c_(readScalar(is)),
-    d_(readScalar(is)),
-    e_(readScalar(is))
-{}
-
-
 Foam::NSRDSfunc7::NSRDSfunc7(const dictionary& dict)
 :
     a_(readScalar(dict.lookup("a"))),
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H
index 0ce3da7c94..f61ec13c3b 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,9 +93,6 @@ public:
             const scalar e
         );
 
-        //- Construct from Istream
-        NSRDSfunc7(Istream& is);
-
         //- Construct from dictionary
         NSRDSfunc7(const dictionary& dict);
 
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
index 16e8f0971a..673e80162d 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,45 +31,12 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(thermophysicalFunction, 0);
-    defineRunTimeSelectionTable(thermophysicalFunction, Istream);
     defineRunTimeSelectionTable(thermophysicalFunction, dictionary);
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
-(
-    Istream& is
-)
-{
-    if (debug)
-    {
-        InfoInFunction
-            << "Constructing thermophysicalFunction"
-            << endl;
-    }
-
-    const word thermophysicalFunctionType(is);
-
-    IstreamConstructorTable::iterator cstrIter =
-        IstreamConstructorTablePtr_->find(thermophysicalFunctionType);
-
-    if (cstrIter == IstreamConstructorTablePtr_->end())
-    {
-        FatalErrorInFunction
-            << "Unknown thermophysicalFunction type "
-            << thermophysicalFunctionType
-            << nl << nl
-            << "Valid thermophysicalFunction types are :" << endl
-            << IstreamConstructorTablePtr_->sortedToc()
-            << abort(FatalError);
-    }
-
-    return autoPtr<thermophysicalFunction>(cstrIter()(is));
-}
-
-
 Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
 (
     const dictionary& dict
@@ -87,7 +54,7 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(thermophysicalFunctionType);
 
-    if (cstrIter == IstreamConstructorTablePtr_->end())
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorInFunction
             << "Unknown thermophysicalFunction type "
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
index 63d3b28879..8f263ed553 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,15 +59,6 @@ public:
 
     // Declare run-time constructor selection tables
 
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            thermophysicalFunction,
-            Istream,
-            (Istream& is),
-            (is)
-        );
-
         declareRunTimeSelectionTable
         (
             autoPtr,
@@ -84,9 +75,6 @@ public:
         thermophysicalFunction()
         {}
 
-        //- Return pointer to new thermophysicalFunction created from input
-        static autoPtr<thermophysicalFunction> New(Istream& is);
-
         //- Return pointer to new thermophysicalFunction created from dict
         static autoPtr<thermophysicalFunction> New(const dictionary& dict);
 

From ba9d58a26fb6beae0aec90ee989794891e0460a7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 17 Feb 2017 16:35:43 +0000
Subject: [PATCH 26/40] thermophysicalModels: Ostream operator calls write(os)
 for consistent IO

---
 .../reaction/Reactions/Reaction/ReactionI.H   |  7 ++-
 .../ArrheniusReactionRateI.H                  |  4 +-
 .../ChemicallyActivatedReactionRateI.H        |  4 +-
 .../FallOffReactionRateI.H                    |  7 +--
 .../JanevReactionRate/JanevReactionRateI.H    | 11 +----
 .../LandauTellerReactionRateI.H               |  5 +-
 .../LangmuirHinshelwoodReactionRateI.H        | 11 +----
 .../SRIFallOffFunction/SRIFallOffFunctionI.H  |  9 +---
 .../TroeFallOffFunctionI.H                    |  8 +---
 .../infiniteReactionRateI.H                   |  5 +-
 .../powerSeries/powerSeriesReactionRateI.H    | 11 +----
 .../thirdBodyArrheniusReactionRateI.H         |  5 +-
 .../thirdBodyEfficienciesI.H                  | 48 +------------------
 13 files changed, 16 insertions(+), 119 deletions(-)

diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
index 6dece80ba7..55287cbfd6 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,9 +67,8 @@ Reaction<ReactionThermo>::rhs() const
 template<class ReactionThermo>
 inline Ostream& operator<<(Ostream& os, const Reaction<ReactionThermo>& r)
 {
-    OStringStream reaction;
-    os << r.reactionStr(reaction)<< token::END_STATEMENT <<nl;
-   return os;
+    r.write(os);
+    return os;
 }
 
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
index 5c67a60e96..49ec48c71e 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
@@ -89,9 +89,7 @@ inline Foam::Ostream& Foam::operator<<
     const ArrheniusReactionRate& arr
 )
 {
-    os  << token::BEGIN_LIST
-        << arr.A_ << token::SPACE << arr.beta_ << token::SPACE << arr.Ta_
-        << token::END_LIST;
+    arr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
index f8e71fd4e3..3e54f9a6ab 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
@@ -108,9 +108,7 @@ inline Foam::Ostream& Foam::operator<<
         <ReactionRate, ChemicallyActivationFunction>& carr
 )
 {
-    os  << token::BEGIN_LIST
-        << carr.k0_ << token::SPACE << carr.kInf_ << token::SPACE << carr.F_
-        << token::END_LIST;
+    carr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
index 0b7fa5f032..fff348d481 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
@@ -120,12 +120,7 @@ inline Foam::Ostream& Foam::operator<<
     const FallOffReactionRate<ReactionRate, FallOffFunction>& forr
 )
 {
-    os  << token::BEGIN_LIST
-        << forr.k0_ << token::SPACE
-        << forr.kInf_ << token::SPACE
-        << forr.F_ << token::SPACE
-        << forr.thirdBodyEfficiencies_
-        << token::END_LIST;
+    forr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
index 055d6291d7..cc76c2c2c5 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
@@ -104,16 +104,7 @@ inline Foam::Ostream& Foam::operator<<
     const JanevReactionRate& jrr
 )
 {
-    os  << token::BEGIN_LIST
-        << jrr.A_ << token::SPACE << jrr.beta_ << token::SPACE << jrr.Ta_;
-
-    for (int n=0; n<JanevReactionRate::nb_; n++)
-    {
-        os  << token::SPACE << jrr.b_[n];
-    }
-
-    os << token::END_LIST;
-
+    jrr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
index 56a636e9c7..7d2c9ecd79 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
@@ -114,10 +114,7 @@ inline Foam::Ostream& Foam::operator<<
     const LandauTellerReactionRate& arr
 )
 {
-    os  << token::BEGIN_LIST
-        << arr.A_ << token::SPACE << arr.beta_ << token::SPACE << arr.Ta_
-        << token::SPACE << arr.B_ << token::SPACE << arr.C_
-        << token::END_LIST;
+    arr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
index 029d254441..d0b13587bf 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
@@ -109,16 +109,7 @@ inline Foam::Ostream& Foam::operator<<
     const LangmuirHinshelwoodReactionRate& lhrr
 )
 {
-    os  << token::BEGIN_LIST;
-
-    for (int i=0; i<LangmuirHinshelwoodReactionRate::n_; i++)
-    {
-        os  << token::SPACE
-            << '(' << lhrr.A_[i] << token::SPACE << lhrr.Ta_[i] << ')';
-    }
-
-    os << token::END_LIST;
-
+    lhrr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
index df45885479..68cce0350d 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
@@ -83,14 +83,7 @@ inline Foam::Ostream& Foam::operator<<
     const Foam::SRIFallOffFunction& srifof
 )
 {
-    os  << token::BEGIN_LIST
-        << srifof.a_
-        << token::SPACE << srifof.b_
-        << token::SPACE << srifof.c_
-        << token::SPACE << srifof.d_
-        << token::SPACE << srifof.e_
-        << token::END_LIST;
-
+    srifof.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
index ff504a29f2..1913985c18 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
@@ -92,13 +92,7 @@ inline Foam::Ostream& Foam::operator<<
     const Foam::TroeFallOffFunction& tfof
 )
 {
-    os  << token::BEGIN_LIST
-        << tfof.alpha_
-        << token::SPACE << tfof.Tsss_
-        << token::SPACE << tfof.Ts_
-        << token::SPACE << tfof.Tss_
-        << token::END_LIST;
-
+    tfof.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H
index 7d95e55395..9186034511 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,8 +60,7 @@ inline Foam::Ostream& Foam::operator<<
     const infiniteReactionRate& rr
 )
 {
-    os  << token::BEGIN_LIST
-        << token::END_LIST;
+    rr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
index 5cee7f9b7f..fcf9b808c3 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
@@ -97,16 +97,7 @@ inline Foam::Ostream& Foam::operator<<
     const powerSeriesReactionRate& psrr
 )
 {
-    os  << token::BEGIN_LIST
-        << psrr.A_ << token::SPACE << psrr.beta_ << token::SPACE << psrr.Ta_;
-
-    for (int n=0; n<powerSeriesReactionRate::nCoeff_; n++)
-    {
-        os  << token::SPACE << psrr.coeffs_[n];
-    }
-
-    os << token::END_LIST;
-
+    psrr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
index 711dfde0e1..d9b39b61a5 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
@@ -81,10 +81,7 @@ inline Foam::Ostream& Foam::operator<<
     const thirdBodyArrheniusReactionRate& arr
 )
 {
-    os  << token::BEGIN_LIST
-        << static_cast<const ArrheniusReactionRate&>(arr)
-        << token::SPACE << arr.thirdBodyEfficiencies_
-        << token::END_LIST;
+    arr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index d77df740ba..97a0e8eeed 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -114,53 +114,7 @@ inline Foam::Ostream& Foam::operator<<
     const thirdBodyEfficiencies& tbes
 )
 {
-    scalarList orderedTbes = tbes;
-    sort(orderedTbes);
-
-    scalar val = orderedTbes[0];
-    label count = 1;
-
-    scalar valMaxCount = val;
-    label maxCount = 1;
-
-    for (label i=1; i<orderedTbes.size(); i++)
-    {
-        if (equal(orderedTbes[i], val))
-        {
-            count++;
-        }
-        else
-        {
-            if (count > maxCount)
-            {
-                maxCount = count;
-                valMaxCount = val;
-            }
-
-            count = 1;
-            val = orderedTbes[i];
-        }
-    }
-
-    if (count > maxCount)
-    {
-        maxCount = count;
-        valMaxCount = val;
-    }
-
-    os << token::BEGIN_LIST << valMaxCount;
-
-    forAll(tbes, i)
-    {
-        if (notEqual(tbes[i], valMaxCount))
-        {
-            os  << token::SPACE << tbes.species_[i]
-                << token::SPACE << tbes[i];
-        }
-    }
-
-    os << token::END_LIST;
-
+    tbes.write(os);
     return os;
 }
 

From a6fd99b87410df65f552f433fcec4ef36d070bed Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 17 Feb 2017 20:29:58 +0000
Subject: [PATCH 27/40] 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;
            }
        }
    }
}
---
 .../properties/liquidProperties/Ar/Ar.C       | 36 ++++++-----
 .../properties/liquidProperties/Ar/Ar.H       | 29 +++------
 .../liquidProperties/C10H22/C10H22.C          | 36 ++++++-----
 .../liquidProperties/C10H22/C10H22.H          | 30 +++------
 .../liquidProperties/C12H26/C12H26.C          | 36 ++++++-----
 .../liquidProperties/C12H26/C12H26.H          | 29 +++------
 .../liquidProperties/C13H28/C13H28.C          | 36 ++++++-----
 .../liquidProperties/C13H28/C13H28.H          | 29 +++------
 .../liquidProperties/C14H30/C14H30.C          | 36 ++++++-----
 .../liquidProperties/C14H30/C14H30.H          | 29 +++------
 .../liquidProperties/C16H34/C16H34.C          | 36 ++++++-----
 .../liquidProperties/C16H34/C16H34.H          | 29 +++------
 .../liquidProperties/C2H5OH/C2H5OH.C          | 36 ++++++-----
 .../liquidProperties/C2H5OH/C2H5OH.H          | 29 +++------
 .../properties/liquidProperties/C2H6/C2H6.C   | 36 ++++++-----
 .../properties/liquidProperties/C2H6/C2H6.H   | 29 +++------
 .../properties/liquidProperties/C2H6O/C2H6O.C | 36 ++++++-----
 .../properties/liquidProperties/C2H6O/C2H6O.H | 29 +++------
 .../properties/liquidProperties/C3H6O/C3H6O.C | 36 ++++++-----
 .../properties/liquidProperties/C3H6O/C3H6O.H | 30 +++------
 .../properties/liquidProperties/C3H8/C3H8.C   | 36 ++++++-----
 .../properties/liquidProperties/C3H8/C3H8.H   | 29 +++------
 .../liquidProperties/C4H10O/C4H10O.C          | 36 ++++++-----
 .../liquidProperties/C4H10O/C4H10O.H          | 29 +++------
 .../properties/liquidProperties/C6H14/C6H14.C | 36 ++++++-----
 .../properties/liquidProperties/C6H14/C6H14.H | 29 +++------
 .../properties/liquidProperties/C6H6/C6H6.C   | 36 ++++++-----
 .../properties/liquidProperties/C6H6/C6H6.H   | 29 +++------
 .../properties/liquidProperties/C7H16/C7H16.C | 36 ++++++-----
 .../properties/liquidProperties/C7H16/C7H16.H | 29 +++------
 .../properties/liquidProperties/C7H8/C7H8.C   | 36 ++++++-----
 .../properties/liquidProperties/C7H8/C7H8.H   | 29 +++------
 .../properties/liquidProperties/C8H10/C8H10.C | 36 ++++++-----
 .../properties/liquidProperties/C8H10/C8H10.H | 29 +++------
 .../properties/liquidProperties/C8H18/C8H18.C | 36 ++++++-----
 .../properties/liquidProperties/C8H18/C8H18.H | 29 +++------
 .../properties/liquidProperties/C9H20/C9H20.C | 36 ++++++-----
 .../properties/liquidProperties/C9H20/C9H20.H | 29 +++------
 .../properties/liquidProperties/CH3OH/CH3OH.C | 36 ++++++-----
 .../properties/liquidProperties/CH3OH/CH3OH.H | 29 +++------
 .../liquidProperties/CH4N2O/CH4N2O.C          | 36 ++++++-----
 .../liquidProperties/CH4N2O/CH4N2O.H          | 29 +++------
 .../properties/liquidProperties/H2O/H2O.C     | 37 ++++++-----
 .../properties/liquidProperties/H2O/H2O.H     | 29 +++------
 .../liquidProperties/IC8H18/IC8H18.C          | 36 ++++++-----
 .../liquidProperties/IC8H18/IC8H18.H          | 29 +++------
 .../properties/liquidProperties/IDEA/IDEA.C   | 36 ++++++-----
 .../properties/liquidProperties/IDEA/IDEA.H   | 28 +++------
 .../properties/liquidProperties/MB/MB.C       | 36 ++++++-----
 .../properties/liquidProperties/MB/MB.H       | 29 +++------
 .../properties/liquidProperties/N2/N2.C       | 36 ++++++-----
 .../properties/liquidProperties/N2/N2.H       | 29 +++------
 .../liquidProperties/aC10H7CH3/aC10H7CH3.C    | 36 ++++++-----
 .../liquidProperties/aC10H7CH3/aC10H7CH3.H    | 30 +++------
 .../liquidProperties/bC10H7CH3/bC10H7CH3.C    | 36 ++++++-----
 .../liquidProperties/bC10H7CH3/bC10H7CH3.H    | 29 +++------
 .../liquidProperties/iC3H8O/iC3H8O.C          | 36 ++++++-----
 .../liquidProperties/iC3H8O/iC3H8O.H          | 29 +++------
 .../liquidProperties/liquidProperties.C       | 25 ++++++++
 .../liquidProperties/liquidProperties.H       | 39 ++++++++++--
 .../liquidProperties/liquidPropertiesI.H      | 63 +++++++++++++++++++
 .../liquidProperties/nC3H8O/nC3H8O.C          | 36 ++++++-----
 .../liquidProperties/nC3H8O/nC3H8O.H          | 29 +++------
 63 files changed, 959 insertions(+), 1121 deletions(-)

diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
index c6bcfbdc11..a9f1b61bfa 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
+++ b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
@@ -121,21 +121,27 @@ Foam::Ar::Ar
 
 Foam::Ar::Ar(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    Ar()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::Ar::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const Ar& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
index f5710401d8..a84320b96d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const Ar& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const Ar& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const Ar& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
index 5d82ef6da1..14937565f9 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
@@ -129,21 +129,27 @@ Foam::C10H22::C10H22
 
 Foam::C10H22::C10H22(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C10H22()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C10H22::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C10H22& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
index 2f747a27bd..216acbf158 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
+++ b/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
-        {
-            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;
-        }
-
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C10H22& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C10H22& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C10H22& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
index 3f5271210f..9dbc1dcee9 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
@@ -121,21 +121,27 @@ Foam::C12H26::C12H26
 
 Foam::C12H26::C12H26(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C12H26()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C12H26::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C12H26& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
index 23c1ad9077..e50af5035f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C12H26& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C12H26& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C12H26& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
index a4011182ab..8c046e73e5 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
@@ -129,21 +129,27 @@ Foam::C13H28::C13H28
 
 Foam::C13H28::C13H28(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C13H28()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C13H28::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C13H28& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
index 4ed22aafeb..c8ebfdfdb0 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C13H28& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C13H28& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C13H28& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
index 98fbbc8f7f..63533f8ae2 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
@@ -129,21 +129,27 @@ Foam::C14H30::C14H30
 
 Foam::C14H30::C14H30(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C14H30()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C14H30::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C14H30& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
index bfa65436d5..68351c2d41 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C14H30& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C14H30& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C14H30& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
index 12a00555b5..bb9c5355d2 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
@@ -129,21 +129,27 @@ Foam::C16H34::C16H34
 
 Foam::C16H34::C16H34(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C16H34()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C16H34::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C16H34& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
index 36085db54b..a42139cc5a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C16H34& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C16H34& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C16H34& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
index a9d441a942..8f80b13a48 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
@@ -129,21 +129,27 @@ Foam::C2H5OH::C2H5OH
 
 Foam::C2H5OH::C2H5OH(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C2H5OH()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C2H5OH::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C2H5OH& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
index 7296b4e343..4d06bdb042 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C2H5OH& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C2H5OH& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C2H5OH& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
index 9cab052a77..bfa922171b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
@@ -120,21 +120,27 @@ Foam::C2H6::C2H6
 
 Foam::C2H6::C2H6(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C2H6()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C2H6::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C2H6& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
index ebed8aa44c..9f69f70298 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C2H6& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C2H6& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C2H6& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
index bf0528dc0d..94c46d94c1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
@@ -130,21 +130,27 @@ Foam::C2H6O::C2H6O
 
 Foam::C2H6O::C2H6O(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C2H6O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C2H6O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C2H6O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
index 0477b7993e..ec54cee6c3 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C2H6O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C2H6O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C2H6O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
index f617fd592f..8495142bfb 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
@@ -129,21 +129,27 @@ Foam::C3H6O::C3H6O
 
 Foam::C3H6O::C3H6O(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C3H6O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C3H6O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C3H6O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
index 9cafa34313..f1f770a524 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-
-        friend Ostream& operator<<(Ostream& os, const C3H6O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C3H6O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C3H6O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
index 58abb7117e..6c827993e1 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
@@ -119,21 +119,27 @@ Foam::C3H8::C3H8
 
 Foam::C3H8::C3H8(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C3H8()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C3H8::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C3H8& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
index 9d451dcd62..950b6e6085 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C3H8& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C3H8& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C3H8& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
index 1012d7bcf1..581e38fc33 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
@@ -129,21 +129,27 @@ Foam::C4H10O::C4H10O
 
 Foam::C4H10O::C4H10O(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C4H10O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C4H10O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C4H10O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
index 16072f1c86..1049d3692f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C4H10O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C4H10O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C4H10O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
index dfd50d0e3a..91cfa8f91d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
@@ -129,21 +129,27 @@ Foam::C6H14::C6H14
 
 Foam::C6H14::C6H14(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C6H14()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C6H14::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C6H14& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
index 9769fc41dd..da6301802f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C6H14& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C6H14& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C6H14& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
index a4c10bea04..fcce3cb513 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
@@ -129,21 +129,27 @@ Foam::C6H6::C6H6
 
 Foam::C6H6::C6H6(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C6H6()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C6H6::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C6H6& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
index 260f228e8c..da7a6f32be 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C6H6& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C6H6& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C6H6& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
index c2032f5479..d8e1101f1b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
@@ -128,21 +128,27 @@ Foam::C7H16::C7H16
 
 Foam::C7H16::C7H16(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C7H16()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C7H16::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C7H16& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
index f18c7bf389..c30a0d4cdc 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C7H16& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C7H16& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C7H16& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
index 8b070065b1..142a20a09d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
@@ -129,21 +129,27 @@ Foam::C7H8::C7H8
 
 Foam::C7H8::C7H8(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C7H8()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C7H8::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C7H8& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
index 28e018d7f2..16bbb8364a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C7H8& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C7H8& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C7H8& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
index 95822a69fd..99f021fa03 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
@@ -129,21 +129,27 @@ Foam::C8H10::C8H10
 
 Foam::C8H10::C8H10(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C8H10()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C8H10::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C8H10& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
index d53a9dc761..856071437e 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C8H10& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C8H10& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C8H10& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
index 0bd8dad721..290984601a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
@@ -129,21 +129,27 @@ Foam::C8H18::C8H18
 
 Foam::C8H18::C8H18(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C8H18()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C8H18::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C8H18& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
index 3146c7f788..caf1ad885a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C8H18& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C8H18& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C8H18& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
index 803ec867f9..2062ef8eda 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
+++ b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
@@ -129,21 +129,27 @@ Foam::C9H20::C9H20
 
 Foam::C9H20::C9H20(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    C9H20()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C9H20::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const C9H20& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
index 61ea898d96..72d2d6f937 100644
--- a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const C9H20& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const C9H20& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const C9H20& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
index 7e3918fc71..3e21b66336 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
+++ b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
@@ -129,21 +129,27 @@ Foam::CH3OH::CH3OH
 
 Foam::CH3OH::CH3OH(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    CH3OH()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::CH3OH::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const CH3OH& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
index 705493ab02..0d359ed831 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const CH3OH& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const CH3OH& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const CH3OH& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
index 7c218a20b7..b7120cbed0 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
@@ -113,21 +113,27 @@ Foam::CH4N2O::CH4N2O
 
 Foam::CH4N2O::CH4N2O(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    CH4N2O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::CH4N2O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const CH4N2O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
index 3a459e2a95..2e8be163ac 100644
--- a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const CH4N2O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const CH4N2O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const CH4N2O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
index 5f705a7067..eb211a946f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
@@ -138,25 +138,24 @@ Foam::H2O::H2O(const dictionary& dict)
 :
     H2O()
 {
-//     liquidProperties(dict),
-//     rho_(dict.subDict("rho")),
-    InfoInFunction;
-    if (dict.found("rho"))
-    {
-        rho_ = NSRDSfunc5(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")),
-//     kappa_(dict.subDict("K")),
-//     kappag_(dict.subDict("kappag")),
-//     sigma_(dict.subDict("sigma")),
-//     D_(dict.subDict("D"))
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::H2O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const H2O& l)
+{
+    l.writeData(os);
+    return os;
 }
 
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
index 542dfd66c4..dfa48fd32c 100644
--- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const H2O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const H2O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const H2O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
index 77ba4be1d1..7f6bd4a923 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
+++ b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
@@ -129,21 +129,27 @@ Foam::IC8H18::IC8H18
 
 Foam::IC8H18::IC8H18(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    IC8H18()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::IC8H18::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const IC8H18& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
index 9a2e06fdf6..9be7f5885c 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const IC8H18& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const IC8H18& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const IC8H18& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
index 01777a26ce..99bf130a16 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
+++ b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
@@ -149,21 +149,27 @@ Foam::IDEA::IDEA
 
 Foam::IDEA::IDEA(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    IDEA()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::IDEA::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const IDEA& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
index b34a7db9e9..dccf97c4fc 100644
--- a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const IDEA& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const IDEA& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const IDEA& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
index d98ef565b1..d101add34e 100644
--- a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
+++ b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C
@@ -113,21 +113,27 @@ Foam::MB::MB
 
 Foam::MB::MB(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    MB()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::MB::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const MB& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H b/src/thermophysicalModels/properties/liquidProperties/MB/MB.H
index 4f7e5a5db7..9b0c7fd430 100644
--- a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const MB& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const MB& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const MB& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
index f22e3b0688..67e7f4b89a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
+++ b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C
@@ -129,21 +129,27 @@ Foam::N2::N2
 
 Foam::N2::N2(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    N2()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::N2::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const N2& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H b/src/thermophysicalModels/properties/liquidProperties/N2/N2.H
index 9bcc0cb67a..db637e421f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const N2& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const N2& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const N2& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
index 562a59198b..09a765204a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
+++ b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
@@ -121,21 +121,27 @@ Foam::aC10H7CH3::aC10H7CH3
 
 Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    aC10H7CH3()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::aC10H7CH3::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const aC10H7CH3& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
index 04bdf87200..370609e2f6 100644
--- a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
+++ b/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
-        {
-            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;
-        }
-
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const aC10H7CH3& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const aC10H7CH3& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const aC10H7CH3& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
index d2c2fd82d5..5392da1737 100644
--- a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
+++ b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
@@ -122,21 +122,27 @@ Foam::bC10H7CH3::bC10H7CH3
 
 Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    bC10H7CH3()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::bC10H7CH3::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const bC10H7CH3& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
index 6f8966edf9..07e700773d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const bC10H7CH3& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const bC10H7CH3& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const bC10H7CH3& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
index c77141a9b1..bcb9b43254 100644
--- a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
@@ -129,21 +129,27 @@ Foam::iC3H8O::iC3H8O
 
 Foam::iC3H8O::iC3H8O(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    iC3H8O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::iC3H8O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const iC3H8O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
index bac19d8d72..4f616f79d3 100644
--- a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const iC3H8O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const iC3H8O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const iC3H8O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
index c5db6942fc..fa98b40945 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/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;
+}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
index 54eb237b1a..987f81a30e 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
+++ b/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)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const liquidProperties& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const liquidProperties& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H
index 61a0b8d5f9..fb53db8c44 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H
+++ b/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;
+}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
index 419c0c1920..dc2fac5b9b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
+++ b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
@@ -129,21 +129,27 @@ Foam::nC3H8O::nC3H8O
 
 Foam::nC3H8O::nC3H8O(const dictionary& dict)
 :
-    liquidProperties(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")),
-    kappa_(dict.subDict("K")),
-    kappag_(dict.subDict("kappag")),
-    sigma_(dict.subDict("sigma")),
-    D_(dict.subDict("D"))
-{}
+    nC3H8O()
+{
+    readIfPresent(*this, dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::nC3H8O::writeData(Ostream& os) const
+{
+    liquidProperties::writeData(*this, os);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const nC3H8O& l)
+{
+    l.writeData(os);
+    return os;
+}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
index d5dec6a855..578e57bb22 100644
--- a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
+++ b/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
-        {
-            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;
-        }
+        void writeData(Ostream& os) const;
 
         //- Ostream Operator
-        friend Ostream& operator<<(Ostream& os, const nC3H8O& l)
-        {
-            l.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const nC3H8O& l);
 };
 
 
+Ostream& operator<<(Ostream& os, const nC3H8O& l);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

From 9b4f327e2b993ba533d7ff1f0219dad39d78c23d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 17 Feb 2017 22:08:42 +0000
Subject: [PATCH 28/40] liquidProperties: Simplified dictionary format

The defaultCoeffs entry is now redundant and supported only for backward
compatibility.  To specify a liquid with default coefficients simply leave the
coefficients dictionary empty:

    liquids
    {
        H2O {}
    }

Any or all of the coefficients may be overridden by specifying the properties in
the coefficients dictionary, e.g.

    liquids
    {
        H2O
        {
            rho
            {
                a 1000;
                b 0;
                c 0;
                d 0;
            }
        }
    }
---
 .../liquidProperties/liquidProperties.C       | 86 ++++++++++++-------
 .../solidProperties/solidPropertiesNew.C      |  3 +-
 .../constant/thermophysicalProperties         |  5 +-
 .../constant/thermophysicalProperties         | 13 +--
 .../constant/thermophysicalProperties         |  9 +-
 .../constant/thermophysicalProperties         |  9 +-
 .../constant/thermophysicalProperties         |  9 +-
 .../constant/thermophysicalProperties         |  9 +-
 .../filter/constant/thermophysicalProperties  |  9 +-
 .../constant/thermophysicalProperties         |  9 +-
 .../constant/thermophysicalProperties         |  9 +-
 .../constant/thermophysicalProperties         | 10 +--
 .../constant/thermophysicalProperties         |  9 +-
 .../constant/thermophysicalProperties         | 10 +--
 14 files changed, 82 insertions(+), 117 deletions(-)

diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
index fa98b40945..e8731cd47f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
@@ -97,24 +97,49 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
 
     const word& liquidPropertiesTypeName = dict.dictName();
 
-    const Switch defaultCoeffs(dict.lookup("defaultCoeffs"));
-
-    if (defaultCoeffs)
+    if (dict.found("defaultCoeffs"))
     {
-        ConstructorTable::iterator cstrIter =
-            ConstructorTablePtr_->find(liquidPropertiesTypeName);
+        // Backward-compatibility
 
-        if (cstrIter == ConstructorTablePtr_->end())
+        const Switch defaultCoeffs(dict.lookup("defaultCoeffs"));
+
+        if (defaultCoeffs)
         {
-            FatalErrorInFunction
-                << "Unknown liquidProperties type "
-                << liquidPropertiesTypeName << nl << nl
-                << "Valid liquidProperties types are:" << nl
-                << ConstructorTablePtr_->sortedToc()
-                << abort(FatalError);
-        }
+            ConstructorTable::iterator cstrIter =
+                ConstructorTablePtr_->find(liquidPropertiesTypeName);
 
-        return autoPtr<liquidProperties>(cstrIter()());
+            if (cstrIter == ConstructorTablePtr_->end())
+            {
+                FatalErrorInFunction
+                    << "Unknown liquidProperties type "
+                    << liquidPropertiesTypeName << nl << nl
+                    << "Valid liquidProperties types are:" << nl
+                    << ConstructorTablePtr_->sortedToc()
+                    << abort(FatalError);
+            }
+
+            return autoPtr<liquidProperties>(cstrIter()());
+        }
+        else
+        {
+            dictionaryConstructorTable::iterator cstrIter =
+                dictionaryConstructorTablePtr_->find(liquidPropertiesTypeName);
+
+            if (cstrIter == dictionaryConstructorTablePtr_->end())
+            {
+                FatalErrorInFunction
+                    << "Unknown liquidProperties type "
+                    << liquidPropertiesTypeName << nl << nl
+                    << "Valid liquidProperties types are:" << nl
+                    << dictionaryConstructorTablePtr_->sortedToc()
+                    << abort(FatalError);
+            }
+
+            return autoPtr<liquidProperties>
+            (
+                cstrIter()(dict.subDict(liquidPropertiesTypeName + "Coeffs"))
+            );
+        }
     }
     else
     {
@@ -131,10 +156,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
                 << abort(FatalError);
         }
 
-        return autoPtr<liquidProperties>
-        (
-            cstrIter()(dict.subDict(liquidPropertiesTypeName + "Coeffs"))
-        );
+        return autoPtr<liquidProperties>(cstrIter()(dict));
     }
 }
 
@@ -144,91 +166,91 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
 Foam::scalar Foam::liquidProperties::rho(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::pv(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::hl(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::Cp(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::h(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::Cpg(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::mu(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::mug(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::kappa(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::kappag(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::sigma(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::D(scalar p, scalar T) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
 Foam::scalar Foam::liquidProperties::D(scalar p, scalar T, scalar Wb) const
 {
     NotImplemented;
-    return 0.0;
+    return 0;
 }
 
 
@@ -259,7 +281,7 @@ Foam::scalar Foam::liquidProperties::pvInvert(scalar p) const
 
     while ((Thi - Tlo) > 1.0e-4)
     {
-        if ((pv(p, T) - p) <= 0.0)
+        if ((pv(p, T) - p) <= 0)
         {
             Tlo = T;
         }
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
index 0e6119e0f0..66f6d8f96e 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
@@ -39,9 +39,8 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
     }
 
     const word solidType(dict.dictName());
-    const Switch defaultCoeffs(dict.lookup("defaultCoeffs"));
 
-    if (defaultCoeffs)
+    if (!dict.found("defaultCoeffs") || Switch(dict.lookup("defaultCoeffs")))
     {
         ConstructorTable::iterator cstrIter =
             ConstructorTablePtr_->find(solidType);
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
index 28c98b1d67..87cd6d9084 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/thermophysicalProperties
@@ -36,13 +36,10 @@ foamChemistryFile "$FOAM_CASE/constant/reactions";
 
 foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas";
 
-
 liquids
 {
     H2O
-    {
-        defaultCoeffs yes;
-    }
+    {}
 }
 
 solids
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index 63932b5a8d..5b7081583d 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -36,10 +36,7 @@ inertSpecie     N2;
 
 liquids
 {
-    H2O
-    {
-        defaultCoeffs   yes;
-    }
+    H2O {}
 }
 
 solids
@@ -47,7 +44,7 @@ solids
     C
     {
         defaultCoeffs   no;
-        // if  defaultCoeffs no properties should be :
+
         CCoeffs
         {
             rho             2010;
@@ -57,10 +54,8 @@ solids
             emissivity      1.0;
         }
     }
-    ash
-    {
-        defaultCoeffs   yes;
-    }
+
+    ash {}
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
index 0a37bdeb40..4f5a09da71 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
@@ -36,16 +36,11 @@ inertSpecie     N2;
 
 liquids
 {
-    H2O
-    {
-        defaultCoeffs   yes;
-    }
+    H2O {}
 }
 
 solids
-{
-    // none
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
index 0a37bdeb40..4f5a09da71 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
@@ -36,16 +36,11 @@ inertSpecie     N2;
 
 liquids
 {
-    H2O
-    {
-        defaultCoeffs   yes;
-    }
+    H2O {}
 }
 
 solids
-{
-    // none
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
index 0a37bdeb40..4f5a09da71 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
@@ -36,16 +36,11 @@ inertSpecie     N2;
 
 liquids
 {
-    H2O
-    {
-        defaultCoeffs   yes;
-    }
+    H2O {}
 }
 
 solids
-{
-    // none
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
index 0a37bdeb40..4f5a09da71 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
@@ -36,16 +36,11 @@ inertSpecie     N2;
 
 liquids
 {
-    H2O
-    {
-        defaultCoeffs   yes;
-    }
+    H2O {}
 }
 
 solids
-{
-    // none
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
index a703f9908a..4d387a46f6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
@@ -36,16 +36,11 @@ foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
 
 liquids
 {
-    H2O
-    {
-        defaultCoeffs   yes;
-    }
+    H2O {}
 }
 
 solids
-{
-    // none
-}
+{}
 
 inertSpecie     N2;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
index 8e324f5244..ee162cff25 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
@@ -38,16 +38,11 @@ inertSpecie     air;
 
 liquids
 {
-    H2O
-    {
-        defaultCoeffs yes;
-    }
+    H2O {}
 }
 
 solids
-{
-    // none
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index d12affc2f3..ee162cff25 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -38,16 +38,11 @@ inertSpecie     air;
 
 liquids
 {
-    H2O
-    {
-        defaultCoeffs   yes;
-    }
+    H2O {}
 }
 
 solids
-{
-    // none
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
index c2a5aa1eb7..76f240e5ca 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
@@ -36,18 +36,14 @@ inertSpecie     air;
 
 liquids
 {
-    H2O
-    {
-        defaultCoeffs   yes;
-    }
+    H2O {}
 }
 
 solids
-{
-    // none
-}
+{}
 
 // de-activate the pressure-work term when running local time-stepping
 dpdt            no;
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index 9b63bc18b3..9eb1bc7233 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -36,16 +36,11 @@ inertSpecie     air;
 
 liquids
 {
-    H2O
-    {
-        defaultCoeffs   yes;
-    }
+    H2O {}
 }
 
 solids
-{
-    // none
-}
+{}
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
index 312d8c6b95..4456333c91 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
@@ -36,15 +36,11 @@ inertSpecie     N2;
 
 liquids
 {
-    C7H16
-    {
-        defaultCoeffs   yes;
-    }
+    C7H16 {}
 }
 
 solids
-{
-    // none
-}
+{}
+
 
 // ************************************************************************* //

From de44d09ad9f1a57cd39d2dbb8b7a177d758b2fd6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 18 Feb 2017 12:43:10 +0000
Subject: [PATCH 29/40] liquidProperties, solidProperties: Simplified input

The entries for liquid and solid species can now be simply be the name unless
property coefficients are overridden in which are specified in a dictionary as
before e.g. in the tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek case
the water is simply specified

liquids
{
    H2O;
}

and solid ash uses standard coefficients but the coefficients for carbon are
overridden thus

solids
{
    C
    {
        rho             2010;
        Cp              710;
        kappa           0.04;
        Hf              0;
        emissivity      1.0;
    }

    ash;
}
---
 .../liquidMixtureProperties.C                 | 21 ++++--
 .../liquidProperties/liquidProperties.C       | 49 ++++++++-----
 .../liquidProperties/liquidProperties.H       | 15 ++--
 .../properties/solidProperties/C/C.C          | 12 ++--
 .../properties/solidProperties/C/C.H          | 21 ++----
 .../properties/solidProperties/CaCO3/CaCO3.C  | 12 ++--
 .../properties/solidProperties/CaCO3/CaCO3.H  | 19 ++---
 .../properties/solidProperties/ash/ash.C      | 12 ++--
 .../properties/solidProperties/ash/ash.H      | 19 ++---
 .../solidMixtureProperties.C                  | 18 ++++-
 .../solidProperties/solidProperties.C         | 22 +++++-
 .../solidProperties/solidProperties.H         | 29 ++++----
 .../solidProperties/solidPropertiesNew.C      | 69 ++++++++++++++-----
 .../constant/thermophysicalProperties         | 19 ++---
 .../constant/thermophysicalProperties         |  2 +-
 .../constant/thermophysicalProperties         |  2 +-
 .../constant/thermophysicalProperties         |  2 +-
 .../constant/thermophysicalProperties         |  2 +-
 .../filter/constant/thermophysicalProperties  |  2 +-
 .../constant/thermophysicalProperties         |  2 +-
 .../constant/thermophysicalProperties         |  2 +-
 .../constant/thermophysicalProperties         |  2 +-
 .../constant/thermophysicalProperties         |  2 +-
 .../constant/thermophysicalProperties         |  2 +-
 24 files changed, 194 insertions(+), 163 deletions(-)

diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
index fd31415172..c07e51462f 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
@@ -47,11 +47,22 @@ Foam::liquidMixtureProperties::liquidMixtureProperties
 
     forAll(components_, i)
     {
-        properties_.set
-        (
-            i,
-            liquidProperties::New(dict.subDict(components_[i]))
-        );
+        if (dict.isDict(components_[i]))
+        {
+            properties_.set
+            (
+                i,
+                liquidProperties::New(dict.subDict(components_[i]))
+            );
+        }
+        else
+        {
+            properties_.set
+            (
+                i,
+                liquidProperties::New(components_[i])
+            );
+        }
     }
 }
 
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
index e8731cd47f..49c88103b5 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
@@ -85,6 +85,32 @@ Foam::liquidProperties::liquidProperties(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
+Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
+(
+    const word& name
+)
+{
+    if (debug)
+    {
+        InfoInFunction << "Constructing liquidProperties" << endl;
+    }
+
+    ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(name);
+
+    if (cstrIter == ConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown liquidProperties type "
+            << name << nl << nl
+            << "Valid liquidProperties types are:" << nl
+            << ConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<liquidProperties>(cstrIter()());
+}
+
+
 Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
 (
     const dictionary& dict
@@ -101,24 +127,9 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
     {
         // Backward-compatibility
 
-        const Switch defaultCoeffs(dict.lookup("defaultCoeffs"));
-
-        if (defaultCoeffs)
+        if (Switch(dict.lookup("defaultCoeffs")))
         {
-            ConstructorTable::iterator cstrIter =
-                ConstructorTablePtr_->find(liquidPropertiesTypeName);
-
-            if (cstrIter == ConstructorTablePtr_->end())
-            {
-                FatalErrorInFunction
-                    << "Unknown liquidProperties type "
-                    << liquidPropertiesTypeName << nl << nl
-                    << "Valid liquidProperties types are:" << nl
-                    << ConstructorTablePtr_->sortedToc()
-                    << abort(FatalError);
-            }
-
-            return autoPtr<liquidProperties>(cstrIter()());
+            return New(liquidPropertiesTypeName);
         }
         else
         {
@@ -132,7 +143,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
                     << liquidPropertiesTypeName << nl << nl
                     << "Valid liquidProperties types are:" << nl
                     << dictionaryConstructorTablePtr_->sortedToc()
-                    << abort(FatalError);
+                    << exit(FatalError);
             }
 
             return autoPtr<liquidProperties>
@@ -153,7 +164,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
                 << liquidPropertiesTypeName << nl << nl
                 << "Valid liquidProperties types are:" << nl
                 << dictionaryConstructorTablePtr_->sortedToc()
-                << abort(FatalError);
+                << exit(FatalError);
         }
 
         return autoPtr<liquidProperties>(cstrIter()(dict));
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
index 987f81a30e..2f035a1f87 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
+++ b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
@@ -145,6 +145,9 @@ public:
 
     // Selectors
 
+        //- Return a pointer to a new liquidProperties created from name
+        static autoPtr<liquidProperties> New(const word& name);
+
         //- Return a pointer to a new liquidProperties created from dictionary
         static autoPtr<liquidProperties> New(const dictionary& dict);
 
@@ -300,22 +303,14 @@ public:
         //- Read and set the function coefficients
         //  if present it the given dictionary
         template<class Liquid>
-        inline void readIfPresent
-        (
-            Liquid& l,
-            const dictionary& dict
-        );
+        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;
+        inline void writeData(const Liquid& l, Ostream& os) const;
 
         //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const liquidProperties& l);
diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.C b/src/thermophysicalModels/properties/solidProperties/C/C.C
index 3547468570..ec7cbc0591 100644
--- a/src/thermophysicalModels/properties/solidProperties/C/C.C
+++ b/src/thermophysicalModels/properties/solidProperties/C/C.C
@@ -50,16 +50,12 @@ Foam::C::C()
 }
 
 
-Foam::C::C(const solidProperties& s)
-:
-    solidProperties(s)
-{}
-
-
 Foam::C::C(const dictionary& dict)
 :
-    solidProperties(dict)
-{}
+    C()
+{
+    readIfPresent(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.H b/src/thermophysicalModels/properties/solidProperties/C/C.H
index 7086df5324..7937e75ae9 100644
--- a/src/thermophysicalModels/properties/solidProperties/C/C.H
+++ b/src/thermophysicalModels/properties/solidProperties/C/C.H
@@ -42,15 +42,6 @@ SourceFiles
 namespace Foam
 {
 
-class C;
-
-Ostream& operator<<
-(
-    Ostream&,
-    const C&
-);
-
-
 /*---------------------------------------------------------------------------*\
                             Class C Declaration
 \*---------------------------------------------------------------------------*/
@@ -59,6 +50,7 @@ class C
 :
     public solidProperties
 {
+
 public:
 
     //- Runtime type information
@@ -70,9 +62,6 @@ public:
         //- Construct null
         C();
 
-        //- Construct from solidProperties
-        C(const solidProperties& s);
-
         //- Construct from dictionary
         C(const dictionary& dict);
 
@@ -88,12 +77,14 @@ public:
         //- Write the function coefficients
         void writeData(Ostream& os) const;
 
-
-    //- Ostream Operator
-    friend Ostream& operator<<(Ostream& os, const C& s);
+        //- Ostream Operator
+        friend Ostream& operator<<(Ostream& os, const C& s);
 };
 
 
+Ostream& operator<<(Ostream& os, const C& s);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
index 2bcfee1b6d..77a1f057ca 100644
--- a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
+++ b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
@@ -50,16 +50,12 @@ Foam::CaCO3::CaCO3()
 }
 
 
-Foam::CaCO3::CaCO3(const solidProperties& s)
-:
-    solidProperties(s)
-{}
-
-
 Foam::CaCO3::CaCO3(const dictionary& dict)
 :
-    solidProperties(dict)
-{}
+    CaCO3()
+{
+    readIfPresent(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
index 92bcdead4b..1ffb1f6b19 100644
--- a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
+++ b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
@@ -42,15 +42,6 @@ SourceFiles
 namespace Foam
 {
 
-class CaCO3;
-
-Ostream& operator<<
-(
-    Ostream&,
-    const CaCO3&
-);
-
-
 /*---------------------------------------------------------------------------*\
                           Class CaCO3 Declaration
 \*---------------------------------------------------------------------------*/
@@ -71,9 +62,6 @@ public:
         //- Construct null
         CaCO3();
 
-        //- Construct from solidProperties
-        CaCO3(const solidProperties& s);
-
         //- Construct from dictionary
         CaCO3(const dictionary& dict);
 
@@ -89,13 +77,14 @@ public:
         //- Write the function coefficients
         void writeData(Ostream& os) const;
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const CaCO3& s);
 };
 
 
+Ostream& operator<<(Ostream& os, const CaCO3& s);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.C b/src/thermophysicalModels/properties/solidProperties/ash/ash.C
index 4ab67b5cdf..f91fd494f4 100644
--- a/src/thermophysicalModels/properties/solidProperties/ash/ash.C
+++ b/src/thermophysicalModels/properties/solidProperties/ash/ash.C
@@ -50,16 +50,12 @@ Foam::ash::ash()
 }
 
 
-Foam::ash::ash(const solidProperties& s)
-:
-    solidProperties(s)
-{}
-
-
 Foam::ash::ash(const dictionary& dict)
 :
-    solidProperties(dict)
-{}
+    ash()
+{
+    readIfPresent(dict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.H b/src/thermophysicalModels/properties/solidProperties/ash/ash.H
index 5f6e2135b7..b80c0385a1 100644
--- a/src/thermophysicalModels/properties/solidProperties/ash/ash.H
+++ b/src/thermophysicalModels/properties/solidProperties/ash/ash.H
@@ -42,15 +42,6 @@ SourceFiles
 namespace Foam
 {
 
-class ash;
-
-Ostream& operator<<
-(
-    Ostream&,
-    const ash&
-);
-
-
 /*---------------------------------------------------------------------------*\
                               Class ash Declaration
 \*---------------------------------------------------------------------------*/
@@ -71,9 +62,6 @@ public:
         //- Construct null
         ash();
 
-        //- Construct from solidProperties
-        ash(const solidProperties& s);
-
         //- Construct from dictionary
         ash(const dictionary& dict);
 
@@ -89,13 +77,14 @@ public:
         //- Write the function coefficients
         void writeData(Ostream& os) const;
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const ash& s);
 };
 
 
+Ostream& operator<<(Ostream& os, const ash& s);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C b/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
index ea6c0efbc7..df9a4c1f0c 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
@@ -34,9 +34,25 @@ Foam::solidMixtureProperties::solidMixtureProperties(const dictionary& dict)
 {
     components_ = dict.toc();
     properties_.setSize(components_.size());
+
     forAll(components_, i)
     {
-        properties_.set(i, solidProperties::New(dict.subDict(components_[i])));
+        if (dict.isDict(components_[i]))
+        {
+            properties_.set
+            (
+                i,
+                solidProperties::New(dict.subDict(components_[i]))
+            );
+        }
+        else
+        {
+            properties_.set
+            (
+                i,
+                solidProperties::New(components_[i])
+            );
+        }
     }
 }
 
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
index cca1392203..1d9eb8fe65 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
@@ -40,14 +40,14 @@ Foam::solidProperties::solidProperties
 (
     scalar rho,
     scalar Cp,
-    scalar K,
+    scalar kappa,
     scalar Hf,
     scalar emissivity
 )
 :
     rho_(rho),
     Cp_(Cp),
-    kappa_(K),
+    kappa_(kappa),
     Hf_(Hf),
     emissivity_(emissivity)
 {}
@@ -57,7 +57,12 @@ Foam::solidProperties::solidProperties(const dictionary& dict)
 :
     rho_(readScalar(dict.lookup("rho"))),
     Cp_(readScalar(dict.lookup("Cp"))),
-    kappa_(readScalar(dict.lookup("K"))),
+    kappa_
+    (
+        dict.found("K")
+      ? readScalar(dict.lookup("K"))
+      : readScalar(dict.lookup("kappa"))
+    ),
     Hf_(readScalar(dict.lookup("Hf"))),
     emissivity_(readScalar(dict.lookup("emissivity")))
 {}
@@ -65,6 +70,17 @@ Foam::solidProperties::solidProperties(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::solidProperties::readIfPresent(const dictionary& dict)
+{
+    dict.readIfPresent("rho", rho_);
+    dict.readIfPresent("Cp", Cp_);
+    dict.readIfPresent("K", kappa_);
+    dict.readIfPresent("kappa", kappa_);
+    dict.readIfPresent("Hf_", Hf_);
+    dict.readIfPresent("emissivity", emissivity_);
+}
+
+
 void Foam::solidProperties::writeData(Ostream& os) const
 {
     os  << rho_ << token::SPACE
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
index f42e84be64..652c81d8fd 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
@@ -45,22 +45,12 @@ SourceFiles
 namespace Foam
 {
 
-class solidProperties;
-
-Ostream& operator<<
-(
-    Ostream&,
-    const solidProperties&
-);
-
-
 /*---------------------------------------------------------------------------*\
                      Class solidProperties Declaration
 \*---------------------------------------------------------------------------*/
 
 class solidProperties
 {
-
     // Private data
 
         //- Density [kg/m3]
@@ -113,7 +103,7 @@ public:
         (
             scalar rho,
             scalar Cp,
-            scalar K,
+            scalar kappa,
             scalar Hf,
             scalar emissivity
         );
@@ -130,6 +120,9 @@ public:
 
     // Selectors
 
+        //- Return a pointer to a new solidProperties created from name
+        static autoPtr<solidProperties> New(const word& name);
+
         //- Return a pointer to a new solidProperties created from dictionary
         static autoPtr<solidProperties> New(const dictionary& dict);
 
@@ -162,18 +155,22 @@ public:
             inline scalar emissivity() const;
 
 
-        // I-O
+    // I-O
 
-            //- Write the solidProperties properties
-            virtual void writeData(Ostream& os) const;
+        //- Read and set the properties present it the given dictionary
+        void readIfPresent(const dictionary& dict);
 
+        //- Write the solidProperties properties
+        virtual void writeData(Ostream& os) const;
 
-        // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const solidProperties& s);
 };
 
 
+Ostream& operator<<(Ostream&, const solidProperties&);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
index 66f6d8f96e..75463513e1 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
@@ -28,6 +28,32 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
+(
+    const word& name
+)
+{
+    if (debug)
+    {
+        InfoInFunction << "Constructing solidProperties" << endl;
+    }
+
+    ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(name);
+
+    if (cstrIter == ConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown solidProperties type "
+            << name << nl << nl
+            << "Valid solidProperties types are:" << nl
+            << ConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<solidProperties>(cstrIter()());
+}
+
+
 Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
 (
     const dictionary& dict
@@ -40,31 +66,38 @@ Foam::autoPtr<Foam::solidProperties> Foam::solidProperties::New
 
     const word solidType(dict.dictName());
 
-    if (!dict.found("defaultCoeffs") || Switch(dict.lookup("defaultCoeffs")))
+    if (dict.found("defaultCoeffs"))
     {
-        ConstructorTable::iterator cstrIter =
-            ConstructorTablePtr_->find(solidType);
+        // Backward-compatibility
 
-        if (cstrIter == ConstructorTablePtr_->end())
+        if (Switch(dict.lookup("defaultCoeffs")))
         {
-            FatalErrorInFunction
-                << "Unknown solidProperties type " << solidType << nl << nl
-                << "Valid solidProperties types are :" << endl
-                << ConstructorTablePtr_->sortedToc()
-                << exit(FatalError);
+            return New(solidType);
+        }
+        else
+        {
+            return autoPtr<solidProperties>
+            (
+                new solidProperties(dict.subDict(solidType + "Coeffs"))
+            );
         }
-
-        return autoPtr<solidProperties>(cstrIter()());
     }
     else
     {
-        return autoPtr<solidProperties>
-        (
-            new solidProperties
-            (
-                dict.subDict(solidType + "Coeffs")
-            )
-        );
+        dictionaryConstructorTable::iterator cstrIter =
+            dictionaryConstructorTablePtr_->find(solidType);
+
+        if (cstrIter == dictionaryConstructorTablePtr_->end())
+        {
+            FatalErrorInFunction
+                << "Unknown solidProperties type "
+                << solidType << nl << nl
+                << "Valid solidProperties types are:" << nl
+                << dictionaryConstructorTablePtr_->sortedToc()
+                << exit(FatalError);
+        }
+
+        return autoPtr<solidProperties>(cstrIter()(dict));
     }
 }
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index 5b7081583d..6fcb7f95c5 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -36,26 +36,21 @@ inertSpecie     N2;
 
 liquids
 {
-    H2O {}
+    H2O;
 }
 
 solids
 {
     C
     {
-        defaultCoeffs   no;
-
-        CCoeffs
-        {
-            rho             2010;
-            Cp              710;
-            K               0.04;
-            Hf              0;
-            emissivity      1.0;
-        }
+        rho             2010;
+        Cp              710;
+        kappa           0.04;
+        Hf              0;
+        emissivity      1.0;
     }
 
-    ash {}
+    ash;
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
index 4f5a09da71..b005f75a2c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie     N2;
 
 liquids
 {
-    H2O {}
+    H2O;
 }
 
 solids
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
index 4f5a09da71..b005f75a2c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie     N2;
 
 liquids
 {
-    H2O {}
+    H2O;
 }
 
 solids
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
index 4f5a09da71..b005f75a2c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie     N2;
 
 liquids
 {
-    H2O {}
+    H2O;
 }
 
 solids
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
index 4f5a09da71..b005f75a2c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie     N2;
 
 liquids
 {
-    H2O {}
+    H2O;
 }
 
 solids
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
index 4d387a46f6..d90945b4e9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ foamChemistryThermoFile "$FOAM_CASE/constant/thermo.incompressiblePoly";
 
 liquids
 {
-    H2O {}
+    H2O;
 }
 
 solids
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
index ee162cff25..1bc265d173 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties
@@ -38,7 +38,7 @@ inertSpecie     air;
 
 liquids
 {
-    H2O {}
+    H2O;
 }
 
 solids
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index ee162cff25..1bc265d173 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -38,7 +38,7 @@ inertSpecie     air;
 
 liquids
 {
-    H2O {}
+    H2O;
 }
 
 solids
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
index 76f240e5ca..5cb7a892a9 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie     air;
 
 liquids
 {
-    H2O {}
+    H2O;
 }
 
 solids
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
index 9eb1bc7233..b9d9f6647b 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie     air;
 
 liquids
 {
-    H2O {}
+    H2O;
 }
 
 solids
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
index 4456333c91..e7eac50280 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
@@ -36,7 +36,7 @@ inertSpecie     N2;
 
 liquids
 {
-    C7H16 {}
+    C7H16;
 }
 
 solids

From d2be645483f61e8cf5e31cce51d1ff1e8f23001c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 18 Feb 2017 21:53:20 +0000
Subject: [PATCH 30/40] thermophysicalProperties: New base-class for
 liquidProperties and in the future gasProperties

Description
    Base-class for thermophysical properties of solids, liquids and gases
    providing an interface compatible with the templated thermodynamics
    packages.

liquidProperties, solidProperties and thermophysicalFunction libraries have been
combined with the new thermophysicalProperties class into a single
thermophysicalProperties library to simplify compilation and linkage of models,
libraries and applications dependent on these classes.
---
 .../solvers/combustion/fireFoam/Make/options  |   5 +-
 .../lagrangian/DPMFoam/MPPICFoam/Make/options |   1 -
 .../solvers/lagrangian/DPMFoam/Make/options   |   1 -
 .../lagrangian/coalChemistryFoam/Make/options |   7 +-
 .../Make/options                              |   1 -
 .../Make/options                              |   1 -
 .../reactingParcelFilmFoam/Make/options       |   5 +-
 .../reactingParcelFoam/Make/options           |   7 +-
 .../simpleReactingParcelFoam/Make/options     |   7 +-
 .../solvers/lagrangian/sprayFoam/Make/options |   7 +-
 .../sprayFoam/sprayDyMFoam/Make/options       |   7 +-
 .../sprayFoam/sprayEngineFoam/Make/options    |   7 +-
 .../uncoupledKinematicParcelFoam/Make/options |   1 -
 .../interfacialCompositionModels/Make/options |   3 +-
 applications/test/Function1/Make/options      |   1 -
 applications/test/liquid/Make/options         |   4 +-
 .../miscellaneous/foamList/Make/options       |   4 +-
 src/lagrangian/coalCombustion/Make/options    |   6 +-
 src/lagrangian/intermediate/Make/options      |   6 +-
 src/lagrangian/spray/Make/options             |   6 +-
 src/lagrangian/turbulence/Make/options        |   6 +-
 src/regionModels/regionCoupling/Make/options  |   3 +-
 .../surfaceFilmModels/Make/options            |   6 +-
 .../wallFunctions/Make/options                |   6 +-
 .../liquidFilmThermo/liquidFilmThermo.C       |   3 +-
 src/thermophysicalModels/Allwmake             |   3 +-
 .../SLGThermo/Make/options                    |   3 +-
 src/thermophysicalModels/basic/Make/options   |   3 +
 .../chemistryModel/Make/options               |   1 -
 src/thermophysicalModels/properties/Allwmake  |  10 -
 .../properties/liquidProperties/Make/files    |  35 ---
 .../properties/liquidProperties/Make/options  |   7 -
 .../properties/solidProperties/Make/files     |   9 -
 .../radiation/Make/options                    |   6 +-
 .../thermophysicalFunctions/Make/files        |  17 --
 .../thermophysicalFunctions/Make/options      |   0
 .../thermophysicalProperties/Make/files       |  64 ++++++
 .../Make/options                              |   3 +
 .../liquidProperties/Ar/Ar.C                  |   0
 .../liquidProperties/Ar/Ar.H                  |   0
 .../liquidProperties/Ar/ArI.H                 |   0
 .../liquidProperties/C10H22/C10H22.C          |   0
 .../liquidProperties/C10H22/C10H22.H          |   0
 .../liquidProperties/C10H22/C10H22I.H         |   0
 .../liquidProperties/C12H26/C12H26.C          |   0
 .../liquidProperties/C12H26/C12H26.H          |   0
 .../liquidProperties/C12H26/C12H26I.H         |   0
 .../liquidProperties/C13H28/C13H28.C          |   0
 .../liquidProperties/C13H28/C13H28.H          |   0
 .../liquidProperties/C13H28/C13H28I.H         |   0
 .../liquidProperties/C14H30/C14H30.C          |   0
 .../liquidProperties/C14H30/C14H30.H          |   0
 .../liquidProperties/C14H30/C14H30I.H         |   0
 .../liquidProperties/C16H34/C16H34.C          |   0
 .../liquidProperties/C16H34/C16H34.H          |   0
 .../liquidProperties/C16H34/C16H34I.H         |   0
 .../liquidProperties/C2H5OH/C2H5OH.C          |   0
 .../liquidProperties/C2H5OH/C2H5OH.H          |   0
 .../liquidProperties/C2H5OH/C2H5OHI.H         |   0
 .../liquidProperties/C2H6/C2H6.C              |   0
 .../liquidProperties/C2H6/C2H6.H              |   0
 .../liquidProperties/C2H6/C2H6I.H             |   0
 .../liquidProperties/C2H6O/C2H6O.C            |   0
 .../liquidProperties/C2H6O/C2H6O.H            |   0
 .../liquidProperties/C2H6O/C2H6OI.H           |   0
 .../liquidProperties/C3H6O/C3H6O.C            |   0
 .../liquidProperties/C3H6O/C3H6O.H            |   0
 .../liquidProperties/C3H6O/C3H6OI.H           |   0
 .../liquidProperties/C3H8/C3H8.C              |   0
 .../liquidProperties/C3H8/C3H8.H              |   0
 .../liquidProperties/C3H8/C3H8I.H             |   0
 .../liquidProperties/C4H10O/C4H10O.C          |   0
 .../liquidProperties/C4H10O/C4H10O.H          |   0
 .../liquidProperties/C4H10O/C4H10OI.H         |   0
 .../liquidProperties/C6H14/C6H14.C            |   0
 .../liquidProperties/C6H14/C6H14.H            |   0
 .../liquidProperties/C6H14/C6H14I.H           |   0
 .../liquidProperties/C6H6/C6H6.C              |   0
 .../liquidProperties/C6H6/C6H6.H              |   0
 .../liquidProperties/C6H6/C6H6I.H             |   0
 .../liquidProperties/C7H16/C7H16.C            |   0
 .../liquidProperties/C7H16/C7H16.H            |   0
 .../liquidProperties/C7H16/C7H16I.H           |   0
 .../liquidProperties/C7H8/C7H8.C              |   0
 .../liquidProperties/C7H8/C7H8.H              |   0
 .../liquidProperties/C7H8/C7H8I.H             |   0
 .../liquidProperties/C8H10/C8H10.C            |   0
 .../liquidProperties/C8H10/C8H10.H            |   0
 .../liquidProperties/C8H10/C8H10I.H           |   0
 .../liquidProperties/C8H18/C8H18.C            |   0
 .../liquidProperties/C8H18/C8H18.H            |   0
 .../liquidProperties/C8H18/C8H18I.H           |   0
 .../liquidProperties/C9H20/C9H20.C            |   0
 .../liquidProperties/C9H20/C9H20.H            |   0
 .../liquidProperties/C9H20/C9H20I.H           |   0
 .../liquidProperties/CH3OH/CH3OH.C            |   0
 .../liquidProperties/CH3OH/CH3OH.H            |   0
 .../liquidProperties/CH3OH/CH3OHI.H           |   0
 .../liquidProperties/CH4N2O/CH4N2O.C          |   0
 .../liquidProperties/CH4N2O/CH4N2O.H          |   0
 .../liquidProperties/CH4N2O/CH4N2OI.H         |   0
 .../liquidProperties/H2O/H2O.C                |   2 +
 .../liquidProperties/H2O/H2O.H                |   0
 .../liquidProperties/H2O/H2OI.H               |   0
 .../liquidProperties/IC8H18/IC8H18.C          |   0
 .../liquidProperties/IC8H18/IC8H18.H          |   0
 .../liquidProperties/IC8H18/IC8H18I.H         |   0
 .../liquidProperties/IDEA/IDEA.C              |   0
 .../liquidProperties/IDEA/IDEA.H              |   0
 .../liquidProperties/IDEA/IDEA.thermo         |   0
 .../liquidProperties/IDEA/IDEAI.H             |   0
 .../liquidProperties/MB/MB.C                  |   0
 .../liquidProperties/MB/MB.H                  |   0
 .../liquidProperties/MB/MBI.H                 |   0
 .../liquidProperties/N2/N2.C                  |   0
 .../liquidProperties/N2/N2.H                  |   0
 .../liquidProperties/N2/N2I.H                 |   0
 .../liquidProperties/aC10H7CH3/aC10H7CH3.C    |   0
 .../liquidProperties/aC10H7CH3/aC10H7CH3.H    |   0
 .../liquidProperties/aC10H7CH3/aC10H7CH3I.H   |   0
 .../liquidProperties/bC10H7CH3/bC10H7CH3.C    |   0
 .../liquidProperties/bC10H7CH3/bC10H7CH3.H    |   0
 .../liquidProperties/bC10H7CH3/bC10H7CH3I.H   |   0
 .../liquidProperties/iC3H8O/iC3H8O.C          |   0
 .../liquidProperties/iC3H8O/iC3H8O.H          |   0
 .../liquidProperties/iC3H8O/iC3H8OI.H         |   0
 .../liquidMixtureProperties.C                 |   0
 .../liquidMixtureProperties.H                 |   0
 .../liquidProperties/liquidProperties.C       |  95 +-------
 .../liquidProperties/liquidProperties.H       |  60 ++---
 .../liquidProperties/liquidPropertiesI.H      |   6 -
 .../liquidProperties/nC3H8O/nC3H8O.C          |   0
 .../liquidProperties/nC3H8O/nC3H8O.H          |   0
 .../liquidProperties/nC3H8O/nC3H8OI.H         |   0
 .../solidProperties/C/C.C                     |   0
 .../solidProperties/C/C.H                     |   0
 .../solidProperties/CaCO3/CaCO3.C             |   0
 .../solidProperties/CaCO3/CaCO3.H             |   0
 .../solidProperties/ash/ash.C                 |   0
 .../solidProperties/ash/ash.H                 |   0
 .../solidMixtureProperties.C                  |   0
 .../solidMixtureProperties.H                  |   0
 .../solidProperties/solidProperties.C         |   0
 .../solidProperties/solidProperties.H         |   0
 .../solidProperties/solidPropertiesI.H        |   0
 .../solidProperties/solidPropertiesNew.C      |   0
 .../APIdiffCoefFunc/APIdiffCoefFunc.C         |   0
 .../APIdiffCoefFunc/APIdiffCoefFunc.H         |   0
 .../NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C    |   0
 .../NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H    |   0
 .../NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C    |   0
 .../NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H    |   0
 .../NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C  |   0
 .../NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H  |   0
 .../NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C    |   0
 .../NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H    |   0
 .../NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C    |   0
 .../NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H    |   0
 .../NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C    |   0
 .../NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H    |   0
 .../NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C    |   0
 .../NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H    |   0
 .../NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C    |   0
 .../NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H    |   0
 .../NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C    |   0
 .../NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H    |   0
 .../thermophysicalFunction.C                  |   0
 .../thermophysicalFunction.H                  |   0
 .../thermophysicalProperties.C                | 133 ++++++++++++
 .../thermophysicalProperties.H                | 205 ++++++++++++++++++
 .../thermophysicalPropertiesI.H               |  38 ++++
 171 files changed, 508 insertions(+), 303 deletions(-)
 delete mode 100755 src/thermophysicalModels/properties/Allwmake
 delete mode 100644 src/thermophysicalModels/properties/liquidProperties/Make/files
 delete mode 100644 src/thermophysicalModels/properties/liquidProperties/Make/options
 delete mode 100644 src/thermophysicalModels/properties/solidProperties/Make/files
 delete mode 100644 src/thermophysicalModels/thermophysicalFunctions/Make/files
 delete mode 100644 src/thermophysicalModels/thermophysicalFunctions/Make/options
 create mode 100644 src/thermophysicalModels/thermophysicalProperties/Make/files
 rename src/thermophysicalModels/{properties/solidProperties => thermophysicalProperties}/Make/options (71%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/Ar/Ar.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/Ar/Ar.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/Ar/ArI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C10H22/C10H22.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C10H22/C10H22.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C10H22/C10H22I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C12H26/C12H26.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C12H26/C12H26.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C12H26/C12H26I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C13H28/C13H28.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C13H28/C13H28.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C13H28/C13H28I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C14H30/C14H30.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C14H30/C14H30.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C14H30/C14H30I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C16H34/C16H34.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C16H34/C16H34.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C16H34/C16H34I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H5OH/C2H5OH.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H5OH/C2H5OH.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H5OH/C2H5OHI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6/C2H6.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6/C2H6.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6/C2H6I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6O/C2H6O.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6O/C2H6O.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C2H6O/C2H6OI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H6O/C3H6O.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H6O/C3H6O.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H6O/C3H6OI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H8/C3H8.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H8/C3H8.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C3H8/C3H8I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C4H10O/C4H10O.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C4H10O/C4H10O.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C4H10O/C4H10OI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H14/C6H14.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H14/C6H14.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H14/C6H14I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H6/C6H6.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H6/C6H6.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C6H6/C6H6I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H16/C7H16.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H16/C7H16.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H16/C7H16I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H8/C7H8.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H8/C7H8.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C7H8/C7H8I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H10/C8H10.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H10/C8H10.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H10/C8H10I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H18/C8H18.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H18/C8H18.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C8H18/C8H18I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C9H20/C9H20.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C9H20/C9H20.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/C9H20/C9H20I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH3OH/CH3OH.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH3OH/CH3OH.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH3OH/CH3OHI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH4N2O/CH4N2O.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH4N2O/CH4N2O.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/CH4N2O/CH4N2OI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/H2O/H2O.C (96%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/H2O/H2O.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/H2O/H2OI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IC8H18/IC8H18.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IC8H18/IC8H18.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IC8H18/IC8H18I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IDEA/IDEA.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IDEA/IDEA.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IDEA/IDEA.thermo (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/IDEA/IDEAI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/MB/MB.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/MB/MB.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/MB/MBI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/N2/N2.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/N2/N2.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/N2/N2I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/aC10H7CH3/aC10H7CH3.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/aC10H7CH3/aC10H7CH3.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/aC10H7CH3/aC10H7CH3I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/bC10H7CH3/bC10H7CH3.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/bC10H7CH3/bC10H7CH3.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/bC10H7CH3/bC10H7CH3I.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/iC3H8O/iC3H8O.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/iC3H8O/iC3H8O.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/iC3H8O/iC3H8OI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/liquidProperties/liquidProperties.C (82%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/liquidProperties/liquidProperties.H (82%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/liquidProperties/liquidPropertiesI.H (98%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/nC3H8O/nC3H8O.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/nC3H8O/nC3H8O.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/liquidProperties/nC3H8O/nC3H8OI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/C/C.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/C/C.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/CaCO3/CaCO3.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/CaCO3/CaCO3.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/ash/ash.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/ash/ash.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidMixtureProperties/solidMixtureProperties.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidMixtureProperties/solidMixtureProperties.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidProperties/solidProperties.C (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidProperties/solidProperties.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidProperties/solidPropertiesI.H (100%)
 rename src/thermophysicalModels/{properties => thermophysicalProperties}/solidProperties/solidProperties/solidPropertiesNew.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C (100%)
 rename src/thermophysicalModels/{ => thermophysicalProperties}/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H (100%)
 create mode 100644 src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C
 create mode 100644 src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H
 create mode 100644 src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H

diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index 4b25d248ea..869c315f4c 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -13,8 +13,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
     -I$(LIB_SRC)/combustionModels/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -36,8 +35,6 @@ EXE_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lsolidProperties \
-    -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lchemistryModel \
diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
index aed6969724..b0eaf6453e 100644
--- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options
@@ -25,7 +25,6 @@ EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
-    -lthermophysicalFunctions \
     -lspecie \
     -lradiationModels \
     -lincompressibleTransportModels \
diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options
index 8ab44318e6..b1f295e294 100644
--- a/applications/solvers/lagrangian/DPMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/Make/options
@@ -21,7 +21,6 @@ EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
-    -lthermophysicalFunctions \
     -lspecie \
     -lradiationModels \
     -lincompressibleTransportModels \
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index 978ea9d9b2..7e4d2dccfc 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -10,8 +10,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -36,9 +35,7 @@ EXE_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lliquidProperties \
-    -lsolidProperties \
-    -lthermophysicalFunctions \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lchemistryModel \
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
index 0004a128e4..aebc4519bb 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
@@ -19,7 +19,6 @@ EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
-    -lthermophysicalFunctions \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
index 4f94e7f64f..76fa725a3a 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
@@ -23,7 +23,6 @@ EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
-    -lthermophysicalFunctions \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index 4e218c6dbc..eab72a2389 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -9,8 +9,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -34,8 +33,6 @@ EXE_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lsolidProperties \
-    -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lchemistryModel \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index f66d16750b..8038347006 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -11,8 +11,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -37,9 +36,7 @@ EXE_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lliquidProperties \
-    -lsolidProperties \
-    -lthermophysicalFunctions \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lchemistryModel \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
index f66d16750b..8038347006 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
@@ -11,8 +11,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -37,9 +36,7 @@ EXE_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lliquidProperties \
-    -lsolidProperties \
-    -lthermophysicalFunctions \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lchemistryModel \
diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options
index 28b5e6ac7a..75f471f270 100644
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@@ -13,8 +13,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -35,9 +34,7 @@ EXE_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lliquidProperties \
-    -lsolidProperties \
-    -lthermophysicalFunctions \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lchemistryModel \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
index ebb0621e93..f6f65d7c6c 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
@@ -14,8 +14,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -39,9 +38,7 @@ EXE_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lliquidProperties \
-    -lsolidProperties \
-    -lthermophysicalFunctions \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lchemistryModel \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
index 3cda53424f..fe32be8cfe 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
@@ -15,8 +15,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@@ -42,9 +41,7 @@ EXE_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lliquidProperties \
-    -lsolidProperties \
-    -lthermophysicalFunctions \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lchemistryModel \
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
index f9056dd790..639909b38e 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -17,7 +17,6 @@ EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
-    -lthermophysicalFunctions \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
index 5f109df522..65db644ba7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
@@ -2,8 +2,7 @@ EXE_INC = \
     -I../phaseSystems/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
diff --git a/applications/test/Function1/Make/options b/applications/test/Function1/Make/options
index af5541db76..b8e72a86c6 100644
--- a/applications/test/Function1/Make/options
+++ b/applications/test/Function1/Make/options
@@ -9,7 +9,6 @@ EXE_INC = \
 EXE_LIBS = \
     -llagrangianIntermediate \
     -lradiationModels \
-    -lthermophysicalFunctions \
     -lregionModels \
     -lfiniteVolume \
     -lmeshTools \
diff --git a/applications/test/liquid/Make/options b/applications/test/liquid/Make/options
index 94e250c052..a1664efd97 100644
--- a/applications/test/liquid/Make/options
+++ b/applications/test/liquid/Make/options
@@ -1,5 +1,3 @@
 EXE_INC = \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
-
-EXE_LIBS = -lliquidProperties -lthermophysicalFunctions
diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options
index 5ce9e05d42..1835b22397 100644
--- a/applications/utilities/miscellaneous/foamList/Make/options
+++ b/applications/utilities/miscellaneous/foamList/Make/options
@@ -49,7 +49,7 @@ EXE_LIBS = \
     -llagrangianSpray \
     -llagrangianTurbulence \
     -llaminarFlameSpeedModels \
-    -lliquidProperties \
+    -lthermophysicalProperties \
     -lmeshTools \
     -lmolecularMeasurements \
     -lmolecule \
@@ -81,7 +81,6 @@ EXE_LIBS = \
     -lsnappyHexMesh \
     -lsolidChemistryModel \
     -lsolidParticle \
-    -lsolidProperties \
     -lsolidSpecie \
     -lsolidThermo \
     -lsolverFunctionObjects \
@@ -90,7 +89,6 @@ EXE_LIBS = \
     -lsurfaceFilmModels \
     -lsurfMesh \
     -lthermalBaffleModels \
-    -lthermophysicalFunctions \
     -ltopoChangerFvMesh \
     -ltriSurface \
     -lturbulenceModels \
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 10c855cf41..6687004631 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -5,8 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@@ -28,8 +27,7 @@ LIB_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lliquidProperties \
-    -lsolidProperties \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index e1ec44b4b6..6b1b5c901c 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -4,8 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@@ -23,8 +22,7 @@ LIB_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lliquidProperties \
-    -lsolidProperties \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options
index 51974e3c99..2f941fe323 100644
--- a/src/lagrangian/spray/Make/options
+++ b/src/lagrangian/spray/Make/options
@@ -6,8 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
@@ -30,8 +29,7 @@ LIB_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lliquidProperties \
-    -lsolidProperties \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
diff --git a/src/lagrangian/turbulence/Make/options b/src/lagrangian/turbulence/Make/options
index 825da6fbb8..4a7f193503 100644
--- a/src/lagrangian/turbulence/Make/options
+++ b/src/lagrangian/turbulence/Make/options
@@ -5,8 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
@@ -28,8 +27,7 @@ LIB_LIBS = \
     -lspecie \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
-    -lliquidProperties \
-    -lsolidProperties \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options
index 90d6d183b0..a5cab5feb1 100644
--- a/src/regionModels/regionCoupling/Make/options
+++ b/src/regionModels/regionCoupling/Make/options
@@ -7,9 +7,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude\
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/lnInclude \
diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options
index a5311a2cc8..566ec315e5 100644
--- a/src/regionModels/surfaceFilmModels/Make/options
+++ b/src/regionModels/surfaceFilmModels/Make/options
@@ -2,8 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
@@ -15,8 +14,7 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lliquidProperties \
-    -lsolidProperties \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -ldistributionModels \
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
index 8ea8ffa2e9..9f799143bc 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
@@ -2,8 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
@@ -17,8 +16,7 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lliquidProperties \
-    -lsolidProperties \
+    -lthermophysicalProperties \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lturbulenceModels \
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
index 6c511cc549..d70b14bbf5 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@@ -93,7 +93,8 @@ void liquidFilmThermo::initLiquid(const dictionary& dict)
         // new liquid create
         ownLiquid_ = true;
 
-        liquidPtr_ = new liquidProperties(dict.subDict(name_ + "Coeffs"));
+        liquidPtr_ =
+            liquidProperties::New(dict.subDict(name_ + "Coeffs")).ptr();
     }
 }
 
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index 2c90db55a8..2d59e0aae5 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/Allwmake
@@ -6,8 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 wmake $targetType specie
 wmake $targetType solidSpecie
-wmake $targetType thermophysicalFunctions
-./properties/Allwmake $targetType $*
+wmake $targetType thermophysicalProperties
 
 wmake $targetType basic
 wmake $targetType reactionThermo
diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options
index 37e3533de0..6ac037828e 100644
--- a/src/thermophysicalModels/SLGThermo/Make/options
+++ b/src/thermophysicalModels/SLGThermo/Make/options
@@ -2,8 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
diff --git a/src/thermophysicalModels/basic/Make/options b/src/thermophysicalModels/basic/Make/options
index b5c859baf1..cb12503892 100644
--- a/src/thermophysicalModels/basic/Make/options
+++ b/src/thermophysicalModels/basic/Make/options
@@ -1,10 +1,13 @@
 EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
     -lcompressibleTransportModels \
+    -lspecie \
+    -lthermophysicalProperties \
     -lfiniteVolume \
     -lmeshTools
diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options
index 5997147f12..9da89fb7b4 100644
--- a/src/thermophysicalModels/chemistryModel/Make/options
+++ b/src/thermophysicalModels/chemistryModel/Make/options
@@ -15,7 +15,6 @@ LIB_LIBS = \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
     -lspecie \
-    -lthermophysicalFunctions \
     -lODE \
     -lfiniteVolume \
     -lmeshTools
diff --git a/src/thermophysicalModels/properties/Allwmake b/src/thermophysicalModels/properties/Allwmake
deleted file mode 100755
index 0837290b62..0000000000
--- a/src/thermophysicalModels/properties/Allwmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-
-wmake $targetType liquidProperties
-wmake $targetType solidProperties
-
-#------------------------------------------------------------------------------
diff --git a/src/thermophysicalModels/properties/liquidProperties/Make/files b/src/thermophysicalModels/properties/liquidProperties/Make/files
deleted file mode 100644
index 47f70772e8..0000000000
--- a/src/thermophysicalModels/properties/liquidProperties/Make/files
+++ /dev/null
@@ -1,35 +0,0 @@
-liquidProperties/liquidProperties.C
-liquidMixtureProperties/liquidMixtureProperties.C
-
-H2O/H2O.C
-C7H16/C7H16.C
-C12H26/C12H26.C
-C10H22/C10H22.C
-C8H18/C8H18.C
-IC8H18/IC8H18.C
-C4H10O/C4H10O.C
-C2H6O/C2H6O.C
-IDEA/IDEA.C
-aC10H7CH3/aC10H7CH3.C
-bC10H7CH3/bC10H7CH3.C
-C8H10/C8H10.C
-C16H34/C16H34.C
-C9H20/C9H20.C
-C6H6/C6H6.C
-C7H8/C7H8.C
-C6H14/C6H14.C
-C13H28/C13H28.C
-C14H30/C14H30.C
-C3H8/C3H8.C
-C3H6O/C3H6O.C
-C2H6/C2H6.C
-CH3OH/CH3OH.C
-C2H5OH/C2H5OH.C
-Ar/Ar.C
-N2/N2.C
-MB/MB.C
-CH4N2O/CH4N2O.C
-nC3H8O/nC3H8O.C
-iC3H8O/iC3H8O.C
-
-LIB = $(FOAM_LIBBIN)/libliquidProperties
diff --git a/src/thermophysicalModels/properties/liquidProperties/Make/options b/src/thermophysicalModels/properties/liquidProperties/Make/options
deleted file mode 100644
index 383322f7d4..0000000000
--- a/src/thermophysicalModels/properties/liquidProperties/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
-
-LIB_LIBS = \
-    -lspecie \
-    -lthermophysicalFunctions
diff --git a/src/thermophysicalModels/properties/solidProperties/Make/files b/src/thermophysicalModels/properties/solidProperties/Make/files
deleted file mode 100644
index fdd25a7a6b..0000000000
--- a/src/thermophysicalModels/properties/solidProperties/Make/files
+++ /dev/null
@@ -1,9 +0,0 @@
-solidProperties/solidProperties.C
-solidProperties/solidPropertiesNew.C
-solidMixtureProperties/solidMixtureProperties.C
-
-ash/ash.C
-C/C.C
-CaCO3/CaCO3.C
-
-LIB = $(FOAM_LIBBIN)/libsolidProperties
diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiation/Make/options
index 3cc7218bdd..5a768463e8 100644
--- a/src/thermophysicalModels/radiation/Make/options
+++ b/src/thermophysicalModels/radiation/Make/options
@@ -4,8 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
@@ -16,7 +15,6 @@ LIB_LIBS = \
     -lspecie \
     -lsolidThermo \
     -lSLGThermo \
-    -lsolidProperties \
-    -lliquidProperties \
+    -lthermophysicalProperties \
     -lfiniteVolume \
     -lmeshTools
diff --git a/src/thermophysicalModels/thermophysicalFunctions/Make/files b/src/thermophysicalModels/thermophysicalFunctions/Make/files
deleted file mode 100644
index 4fbfc660d5..0000000000
--- a/src/thermophysicalModels/thermophysicalFunctions/Make/files
+++ /dev/null
@@ -1,17 +0,0 @@
-thermophysicalFunction = thermophysicalFunction
-NSRDSfunctions         = NSRDSfunctions
-APIfunctions           = APIfunctions
-
-$(thermophysicalFunction)/thermophysicalFunction.C
-$(NSRDSfunctions)/NSRDSfunc0/NSRDSfunc0.C
-$(NSRDSfunctions)/NSRDSfunc1/NSRDSfunc1.C
-$(NSRDSfunctions)/NSRDSfunc2/NSRDSfunc2.C
-$(NSRDSfunctions)/NSRDSfunc3/NSRDSfunc3.C
-$(NSRDSfunctions)/NSRDSfunc4/NSRDSfunc4.C
-$(NSRDSfunctions)/NSRDSfunc5/NSRDSfunc5.C
-$(NSRDSfunctions)/NSRDSfunc6/NSRDSfunc6.C
-$(NSRDSfunctions)/NSRDSfunc7/NSRDSfunc7.C
-$(NSRDSfunctions)/NSRDSfunc14/NSRDSfunc14.C
-$(APIfunctions)/APIdiffCoefFunc/APIdiffCoefFunc.C
-
-LIB = $(FOAM_LIBBIN)/libthermophysicalFunctions
diff --git a/src/thermophysicalModels/thermophysicalFunctions/Make/options b/src/thermophysicalModels/thermophysicalFunctions/Make/options
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/thermophysicalModels/thermophysicalProperties/Make/files b/src/thermophysicalModels/thermophysicalProperties/Make/files
new file mode 100644
index 0000000000..0ca2221441
--- /dev/null
+++ b/src/thermophysicalModels/thermophysicalProperties/Make/files
@@ -0,0 +1,64 @@
+thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+
+NSRDSfunctions = thermophysicalFunctions/NSRDSfunctions
+$(NSRDSfunctions)/NSRDSfunc0/NSRDSfunc0.C
+$(NSRDSfunctions)/NSRDSfunc1/NSRDSfunc1.C
+$(NSRDSfunctions)/NSRDSfunc2/NSRDSfunc2.C
+$(NSRDSfunctions)/NSRDSfunc3/NSRDSfunc3.C
+$(NSRDSfunctions)/NSRDSfunc4/NSRDSfunc4.C
+$(NSRDSfunctions)/NSRDSfunc5/NSRDSfunc5.C
+$(NSRDSfunctions)/NSRDSfunc6/NSRDSfunc6.C
+$(NSRDSfunctions)/NSRDSfunc7/NSRDSfunc7.C
+$(NSRDSfunctions)/NSRDSfunc14/NSRDSfunc14.C
+
+APIfunctions           = thermophysicalFunctions/APIfunctions
+$(APIfunctions)/APIdiffCoefFunc/APIdiffCoefFunc.C
+
+thermophysicalProperties/thermophysicalProperties.C
+
+
+liquidProperties/liquidProperties/liquidProperties.C
+liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
+
+liquidProperties/H2O/H2O.C
+liquidProperties/C7H16/C7H16.C
+liquidProperties/C12H26/C12H26.C
+liquidProperties/C10H22/C10H22.C
+liquidProperties/C8H18/C8H18.C
+liquidProperties/IC8H18/IC8H18.C
+liquidProperties/C4H10O/C4H10O.C
+liquidProperties/C2H6O/C2H6O.C
+liquidProperties/IDEA/IDEA.C
+liquidProperties/aC10H7CH3/aC10H7CH3.C
+liquidProperties/bC10H7CH3/bC10H7CH3.C
+liquidProperties/C8H10/C8H10.C
+liquidProperties/C16H34/C16H34.C
+liquidProperties/C9H20/C9H20.C
+liquidProperties/C6H6/C6H6.C
+liquidProperties/C7H8/C7H8.C
+liquidProperties/C6H14/C6H14.C
+liquidProperties/C13H28/C13H28.C
+liquidProperties/C14H30/C14H30.C
+liquidProperties/C3H8/C3H8.C
+liquidProperties/C3H6O/C3H6O.C
+liquidProperties/C2H6/C2H6.C
+liquidProperties/CH3OH/CH3OH.C
+liquidProperties/C2H5OH/C2H5OH.C
+liquidProperties/Ar/Ar.C
+liquidProperties/N2/N2.C
+liquidProperties/MB/MB.C
+liquidProperties/CH4N2O/CH4N2O.C
+liquidProperties/nC3H8O/nC3H8O.C
+liquidProperties/iC3H8O/iC3H8O.C
+
+
+solidProperties/solidProperties/solidProperties.C
+solidProperties/solidProperties/solidPropertiesNew.C
+solidProperties/solidMixtureProperties/solidMixtureProperties.C
+
+solidProperties/ash/ash.C
+solidProperties/C/C.C
+solidProperties/CaCO3/CaCO3.C
+
+
+LIB = $(FOAM_LIBBIN)/libthermophysicalProperties
diff --git a/src/thermophysicalModels/properties/solidProperties/Make/options b/src/thermophysicalModels/thermophysicalProperties/Make/options
similarity index 71%
rename from src/thermophysicalModels/properties/solidProperties/Make/options
rename to src/thermophysicalModels/thermophysicalProperties/Make/options
index 848cce789f..bdc8b074c0 100644
--- a/src/thermophysicalModels/properties/solidProperties/Make/options
+++ b/src/thermophysicalModels/thermophysicalProperties/Make/options
@@ -1,2 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
+
+LIB_LIBS = \
+    -lspecie
diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/Ar.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/ArI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/Ar/ArI.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C10H22/C10H22I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C12H26/C12H26I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C13H28/C13H28I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C14H30/C14H30I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C16H34/C16H34I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OH.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OHI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H5OH/C2H5OHI.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6/C2H6I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6O.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6OI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C2H6O/C2H6OI.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6O.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6OI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H6O/C3H6OI.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C3H8/C3H8I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10O.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10OI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C4H10O/C4H10OI.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H14/C6H14I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C6H6/C6H6I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H16/C7H16I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C7H8/C7H8I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H10/C8H10I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C8H18/C8H18I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/C9H20/C9H20I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OH.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OHI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH3OH/CH3OHI.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2O.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2OI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/CH4N2O/CH4N2OI.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
similarity index 96%
rename from src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
index eb211a946f..634007fc1d 100644
--- a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
@@ -31,6 +31,8 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(H2O, 0);
+    addToRunTimeSelectionTable(thermophysicalProperties, H2O,);
+    addToRunTimeSelectionTable(thermophysicalProperties, H2O, dictionary);
     addToRunTimeSelectionTable(liquidProperties, H2O,);
     addToRunTimeSelectionTable(liquidProperties, H2O, dictionary);
 }
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2OI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2OI.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IC8H18/IC8H18I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.thermo b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.thermo
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.thermo
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEA.thermo
diff --git a/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEAI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/IDEA/IDEAI.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/MB/MB.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MB.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/MB/MB.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MB.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/MB/MBI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MBI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/MB/MBI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/MB/MBI.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/N2/N2.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/N2/N2.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/N2/N2I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/N2/N2I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/N2/N2I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/aC10H7CH3/aC10H7CH3I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3I.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/bC10H7CH3/bC10H7CH3I.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8O.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8OI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/iC3H8O/iC3H8OI.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
similarity index 82%
rename from src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
index 49c88103b5..2fc7a6f97b 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
@@ -53,7 +53,7 @@ Foam::liquidProperties::liquidProperties
     scalar delta
 )
 :
-    W_(W),
+    thermophysicalProperties(W),
     Tc_(Tc),
     Pc_(Pc),
     Vc_(Vc),
@@ -69,7 +69,7 @@ Foam::liquidProperties::liquidProperties
 
 Foam::liquidProperties::liquidProperties(const dictionary& dict)
 :
-    W_(readScalar(dict.lookup("W"))),
+    thermophysicalProperties(dict),
     Tc_(readScalar(dict.lookup("Tc"))),
     Pc_(readScalar(dict.lookup("Pc"))),
     Vc_(readScalar(dict.lookup("Vc"))),
@@ -174,91 +174,7 @@ Foam::autoPtr<Foam::liquidProperties> Foam::liquidProperties::New
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalar Foam::liquidProperties::rho(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::pv(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::hl(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::Cp(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::h(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::Cpg(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::mu(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::mug(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::kappa(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::kappag(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::sigma(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::D(scalar p, scalar T) const
-{
-    NotImplemented;
-    return 0;
-}
-
-
-Foam::scalar Foam::liquidProperties::D(scalar p, scalar T, scalar Wb) const
+Foam::scalar Foam::liquidProperties::S(scalar p, scalar T) const
 {
     NotImplemented;
     return 0;
@@ -310,7 +226,7 @@ Foam::scalar Foam::liquidProperties::pvInvert(scalar p) const
 
 void Foam::liquidProperties::readIfPresent(const dictionary &dict)
 {
-    dict.readIfPresent("W", W_);
+    thermophysicalProperties::readIfPresent(dict);
     dict.readIfPresent("Tc", Tc_);
     dict.readIfPresent("Pc", Pc_);
     dict.readIfPresent("Vc", Vc_);
@@ -326,7 +242,8 @@ void Foam::liquidProperties::readIfPresent(const dictionary &dict)
 
 void Foam::liquidProperties::writeData(Ostream& os) const
 {
-    os  << W_ << token::SPACE
+    thermophysicalProperties::writeData(os);
+    os  << token::SPACE
         << Tc_ << token::SPACE
         << Pc_ << token::SPACE
         << Vc_ << token::SPACE
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H
similarity index 82%
rename from src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H
index 2f035a1f87..939a80770a 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H
@@ -25,7 +25,7 @@ Class
     Foam::liquidProperties
 
 Description
-    The thermophysical properties of a liquidProperties
+    The thermophysical properties of a liquid
 
 SourceFiles
     liquidProperties.C
@@ -35,12 +35,7 @@ SourceFiles
 #ifndef liquidProperties_H
 #define liquidProperties_H
 
-#include "scalar.H"
-#include "IOstreams.H"
-#include "typeInfo.H"
-#include "autoPtr.H"
-#include "runTimeSelectionTables.H"
-#include "dictionary.H"
+#include "thermophysicalProperties.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,12 +47,11 @@ namespace Foam
 \*---------------------------------------------------------------------------*/
 
 class liquidProperties
+:
+    public thermophysicalProperties
 {
     // Private data
 
-        //- Molecular weight [kg/kmol]
-        scalar W_;
-
         //- Critical temperature [K]
         scalar Tc_;
 
@@ -137,10 +131,7 @@ public:
         liquidProperties(const dictionary& dict);
 
         //- Construct and return clone
-        virtual autoPtr<liquidProperties> clone() const
-        {
-            return autoPtr<liquidProperties>(new liquidProperties(*this));
-        }
+        virtual autoPtr<liquidProperties> clone() const = 0;
 
 
     // Selectors
@@ -161,20 +152,11 @@ public:
 
         // Physical constants which define the specie
 
-            //- Molecular weight [kg/kmol]
-            inline scalar W() const;
-
             //- No of moles of this species in mixture
             //  Note Mixing of liquidProperties is not currently supported
             //  so Y = 1
             inline scalar Y() const;
 
-            //- Is the equation of state is incompressible i.e. rho != f(p)
-            static const bool incompressible = true;
-
-            //- Is the equation of state is isochoric i.e. rho = const
-            static const bool isochoric = false;
-
             //- Critical temperature [K]
             inline scalar Tc() const;
 
@@ -211,9 +193,6 @@ public:
 
         // Fundamental equation of state properties
 
-            //- Liquid density [kg/m^3]
-            virtual scalar rho(scalar p, scalar T) const;
-
             //- Liquid compressibility rho/p [s^2/m^2]
             //  Note: currently it is assumed the liquid is incompressible
             inline scalar psi(scalar p, scalar T) const;
@@ -226,9 +205,6 @@ public:
 
         // Fundamental thermodynamic properties
 
-            //- Heat capacity at constant pressure [J/(kg K)]
-            virtual scalar Cp(const scalar p, const scalar T) const;
-
             //- Absolute Enthalpy [J/kg]
             inline scalar Ha(const scalar p, const scalar T) const;
 
@@ -239,46 +215,46 @@ public:
             inline scalar Hc() const;
 
             // Entropy [J/(kg K)]
-            // inline scalar S(const scalar p, const scalar T) const;
+            scalar S(const scalar p, const scalar T) const;
 
 
         // Physical properties
 
             //- Vapour pressure [Pa]
-            virtual scalar pv(scalar p, scalar T) const;
+            virtual scalar pv(scalar p, scalar T) const = 0;
 
             //- Heat of vapourisation [J/kg]
-            virtual scalar hl(scalar p, scalar T) const;
+            virtual scalar hl(scalar p, scalar T) const = 0;
 
             //- Liquid enthalpy [J/kg] - reference to 298.15 K
-            virtual scalar h(scalar p, scalar T) const;
+            virtual scalar h(scalar p, scalar T) const = 0;
 
             //- Vapour heat capacity [J/(kg K)]
-            virtual scalar Cpg(scalar p, scalar T) const;
+            virtual scalar Cpg(scalar p, scalar T) const = 0;
 
             //- Liquid viscosity [Pa s]
-            virtual scalar mu(scalar p, scalar T) const;
+            virtual scalar mu(scalar p, scalar T) const = 0;
 
             //- Vapour viscosity [Pa s]
-            virtual scalar mug(scalar p, scalar T) const;
+            virtual scalar mug(scalar p, scalar T) const = 0;
 
             //- Liquid thermal conductivity  [W/(m K)]
-            virtual scalar kappa(scalar p, scalar T) const;
+            virtual scalar kappa(scalar p, scalar T) const = 0;
 
             //- Liquid thermal diffusivity of enthalpy [kg/ms]
             inline scalar alphah(const scalar p, const scalar T) const;
 
             //- Vapour thermal conductivity  [W/(m K)]
-            virtual scalar kappag(scalar p, scalar T) const;
+            virtual scalar kappag(scalar p, scalar T) const = 0;
 
             //- Surface tension [N/m]
-            virtual scalar sigma(scalar p, scalar T) const;
+            virtual scalar sigma(scalar p, scalar T) const = 0;
 
             //- Vapour diffussivity [m2/s]
-            virtual scalar D(scalar p, scalar T) const;
+            virtual scalar D(scalar p, scalar T) const = 0;
 
             //- Vapour diffussivity [m2/s] with specified binary pair
-            virtual scalar D(scalar p, scalar T, scalar Wb) const;
+            virtual scalar D(scalar p, scalar T, scalar Wb) const = 0;
 
             //- Invert the vapour pressure relationship to retrieve the
             //  boiling temperuture as a function of pressure
@@ -306,7 +282,7 @@ public:
         inline void readIfPresent(Liquid& l, const dictionary& dict);
 
         //- Write the function coefficients
-        virtual void writeData(Ostream& os) const;
+        virtual void writeData(Ostream& os) const = 0;;
 
         //- Write the data for each of the property functions
         template<class Liquid>
diff --git a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
similarity index 98%
rename from src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
index fb53db8c44..454116fb11 100644
--- a/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidPropertiesI.H
@@ -29,12 +29,6 @@ inline Foam::scalar Foam::liquidProperties::limit(const scalar T) const
 }
 
 
-inline Foam::scalar Foam::liquidProperties::W() const
-{
-    return W_;
-}
-
-
 inline Foam::scalar Foam::liquidProperties::Y() const
 {
     return 1;
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.C
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.C
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8O.H
diff --git a/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8OI.H
similarity index 100%
rename from src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H
rename to src/thermophysicalModels/thermophysicalProperties/liquidProperties/nC3H8O/nC3H8OI.H
diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.C
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/C/C.C
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.C
diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.H
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/C/C.H
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/C/C.H
diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.C
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.C
diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.H
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/CaCO3/CaCO3.H
diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.C
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/ash/ash.C
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.C
diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.H
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/ash/ash.H
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/ash/ash.H
diff --git a/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
diff --git a/src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.C
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.C
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesI.H
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesI.H
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C
similarity index 100%
rename from src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
rename to src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidPropertiesNew.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
similarity index 100%
rename from src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
rename to src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C
new file mode 100644
index 0000000000..e5613a98bc
--- /dev/null
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "thermophysicalProperties.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(thermophysicalProperties, 0);
+    defineRunTimeSelectionTable(thermophysicalProperties,);
+    defineRunTimeSelectionTable(thermophysicalProperties, dictionary);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::thermophysicalProperties::thermophysicalProperties(scalar W)
+:
+    W_(W)
+{}
+
+
+Foam::thermophysicalProperties::thermophysicalProperties(const dictionary& dict)
+:
+    W_(readScalar(dict.lookup("W")))
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::thermophysicalProperties>
+Foam::thermophysicalProperties::New
+(
+    const word& name
+)
+{
+    if (debug)
+    {
+        InfoInFunction << "Constructing thermophysicalProperties" << endl;
+    }
+
+    ConstructorTable::iterator cstrIter = ConstructorTablePtr_->find(name);
+
+    if (cstrIter == ConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown thermophysicalProperties type "
+            << name << nl << nl
+            << "Valid thermophysicalProperties types are:" << nl
+            << ConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<thermophysicalProperties>(cstrIter()());
+}
+
+
+Foam::autoPtr<Foam::thermophysicalProperties>
+Foam::thermophysicalProperties::New
+(
+    const dictionary& dict
+)
+{
+    if (debug)
+    {
+        InfoInFunction << "Constructing thermophysicalProperties" << endl;
+    }
+
+    const word& thermophysicalPropertiesTypeName = dict.dictName();
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(thermophysicalPropertiesTypeName);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown thermophysicalProperties type "
+            << thermophysicalPropertiesTypeName << nl << nl
+            << "Valid thermophysicalProperties types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<thermophysicalProperties>(cstrIter()(dict));
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::thermophysicalProperties::readIfPresent(const dictionary &dict)
+{
+    dict.readIfPresent("W", W_);
+}
+
+
+void Foam::thermophysicalProperties::writeData(Ostream& os) const
+{
+    os  << W_;
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const thermophysicalProperties& l)
+{
+    l.writeData(os);
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H
new file mode 100644
index 0000000000..98ec171a54
--- /dev/null
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H
@@ -0,0 +1,205 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::thermophysicalProperties
+
+Description
+    Base-class for thermophysical properties of solids, liquids and gases
+    providing an interface compatible with the templated thermodynamics
+    packages.
+
+SourceFiles
+    thermophysicalPropertiesI.H
+    thermophysicalProperties.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef thermophysicalProperties_H
+#define thermophysicalProperties_H
+
+#include "dictionary.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class thermophysicalProperties Declaration
+\*---------------------------------------------------------------------------*/
+
+class thermophysicalProperties
+{
+    // Private data
+
+        //- Molecular weight [kg/kmol]
+        scalar W_;
+
+
+public:
+
+    TypeName("thermophysicalProperties");
+
+
+    // Declare run-time constructor selection tables
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            thermophysicalProperties,
+            ,
+            (),
+            ()
+        );
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            thermophysicalProperties,
+            dictionary,
+            (const dictionary& dict),
+            (dict)
+        );
+
+
+    // Constructors
+
+        //- Construct from molecular weight
+        thermophysicalProperties(scalar W);
+
+        //- Construct from dictionary
+        thermophysicalProperties(const dictionary& dict);
+
+
+    // Selectors
+
+        //- Return a pointer to a new thermophysicalProperties created from name
+        static autoPtr<thermophysicalProperties> New(const word& name);
+
+        //- Return a pointer to a new thermophysicalProperties
+        //  created from dictionary
+        static autoPtr<thermophysicalProperties> New(const dictionary& dict);
+
+
+    //- Destructor
+    virtual ~thermophysicalProperties()
+    {}
+
+
+    // Member Functions
+
+        // Physical constants which define the specie
+
+            //- Molecular weight [kg/kmol]
+            inline scalar W() const;
+
+            //- Is the equation of state is incompressible i.e. rho != f(p)
+            static const bool incompressible = true;
+
+            //- Is the equation of state is isochoric i.e. rho = const
+            static const bool isochoric = false;
+
+            //- Limit the temperature to be in the range Tlow_ to Thigh_
+            inline scalar limit(const scalar T) const;
+
+
+        // Fundamental equation of state properties
+
+            //- Liquid density [kg/m^3]
+            virtual scalar rho(scalar p, scalar T) const = 0;
+
+            //- Liquid compressibility rho/p [s^2/m^2]
+            //  Note: currently it is assumed the liquid is incompressible
+            virtual scalar psi(scalar p, scalar T) const = 0;
+
+            //- Return (Cp - Cv) [J/(kg K]
+            //  Note: currently it is assumed the liquid is incompressible
+            //  so CpMCv 0
+            virtual scalar CpMCv(scalar p, scalar T) const = 0;
+
+
+        // Fundamental thermodynamic properties
+
+            //- Heat capacity at constant pressure [J/(kg K)]
+            virtual scalar Cp(const scalar p, const scalar T) const = 0;
+
+            //- Absolute Enthalpy [J/kg]
+            virtual scalar Ha(const scalar p, const scalar T) const = 0;
+
+            //- Sensible enthalpy [J/kg]
+            virtual scalar Hs(const scalar p, const scalar T) const = 0;
+
+            //- Chemical enthalpy [J/kg]
+            virtual scalar Hc() const = 0;
+
+            // Entropy [J/(kg K)]
+            virtual scalar S(const scalar p, const scalar T) const = 0;
+
+
+        // Physical properties
+
+            //- Liquid viscosity [Pa s]
+            virtual scalar mu(scalar p, scalar T) const = 0;
+
+            //- Liquid thermal conductivity  [W/(m K)]
+            virtual scalar kappa(scalar p, scalar T) const = 0;
+
+            //- Liquid thermal diffusivity of enthalpy [kg/ms]
+            virtual scalar alphah(const scalar p, const scalar T) const = 0;
+
+
+    // I-O
+
+        //- Read and set the properties present it the given dictionary
+        void readIfPresent(const dictionary& dict);
+
+        //- Write the function coefficients
+        virtual void writeData(Ostream& os) const = 0;
+
+        //- Ostream Operator
+        friend Ostream& operator<<
+        (
+            Ostream& os,
+            const thermophysicalProperties& l
+        );
+};
+
+
+Ostream& operator<<(Ostream& os, const thermophysicalProperties& l);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermophysicalPropertiesI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H
new file mode 100644
index 0000000000..b6c04e0062
--- /dev/null
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::thermophysicalProperties::limit(const scalar T) const
+{
+    return T;
+}
+
+
+inline Foam::scalar Foam::thermophysicalProperties::W() const
+{
+    return W_;
+}
+
+
+// ************************************************************************* //

From f6dacfb484b88133c46f4d276336b46ad7e3b8bb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 19 Feb 2017 16:44:00 +0000
Subject: [PATCH 31/40] liquidThermo: rhoThermo instantiated on
 liquidProperties

This allows single, multi-phase and VoF compressible simulations to be performed
with the accurate thermophysical property functions for liquids provided by the
liquidProperty classes.  e.g. in the
multiphase/compressibleInterFoam/laminar/depthCharge2D tutorial water can now be
specified by

thermoType
{
    type            heRhoThermo;
    mixture         pureMixture;
    properties      liquid;
    energy          sensibleInternalEnergy;
}

mixture
{
    H2O;
}

as an alternative to the previous less accurate representation defined by

thermoType
{
    type            heRhoThermo;
    mixture         pureMixture;
    transport       const;
    thermo          hConst;
    equationOfState perfectFluid;
    specie          specie;
    energy          sensibleInternalEnergy;
}

mixture
{
    specie
    {
        molWeight   18.0;
    }
    equationOfState
    {
        R           3000;
        rho0        1027;
    }
    thermodynamics
    {
        Cp          4195;
        Hf          0;
    }
    transport
    {
        mu          3.645e-4;
        Pr          2.289;
    }
}

However the increase in accuracy of the new simpler and more convenient
specification and representation comes at a cost: the NSRDS functions used by
the liquidProperties classes are relatively expensive to evaluate and the
depthCharge2D case takes ~14% longer to run.
---
 src/thermophysicalModels/basic/Make/files     |   1 +
 .../basic/basicThermo/basicThermo.C           |  18 +-
 .../basic/basicThermo/basicThermo.H           |  13 +-
 .../basic/basicThermo/basicThermoTemplates.C  | 188 ++++++++++++------
 .../basic/rhoThermo/liquidThermo.C            |  91 +++++++++
 .../liquidProperties/H2O/H2O.C                |   2 -
 .../liquidProperties/liquidProperties.H       |  11 +-
 .../solidProperties/solidProperties.H         |   2 +-
 .../thermophysicalProperties.H                |   6 -
 .../thermophysicalPropertiesI.H               |   2 +
 .../thermophysicalPropertiesSelector.C        |  61 ++++++
 .../thermophysicalPropertiesSelector.H        | 154 ++++++++++++++
 .../thermophysicalPropertiesSelectorI.H       | 175 ++++++++++++++++
 .../constant/thermophysicalProperties.water   |  16 ++
 14 files changed, 665 insertions(+), 75 deletions(-)
 create mode 100644 src/thermophysicalModels/basic/rhoThermo/liquidThermo.C
 create mode 100644 src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelector.C
 create mode 100644 src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelector.H
 create mode 100644 src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelectorI.H

diff --git a/src/thermophysicalModels/basic/Make/files b/src/thermophysicalModels/basic/Make/files
index 7d10c1c952..83ee06f8bf 100644
--- a/src/thermophysicalModels/basic/Make/files
+++ b/src/thermophysicalModels/basic/Make/files
@@ -6,6 +6,7 @@ psiThermo/psiThermos.C
 
 rhoThermo/rhoThermo.C
 rhoThermo/rhoThermos.C
+rhoThermo/liquidThermo.C
 
 derivedFvPatchFields/fixedEnergy/fixedEnergyFvPatchScalarField.C
 derivedFvPatchFields/gradientEnergy/gradientEnergyFvPatchScalarField.C
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index 9d12c6de9c..a5acf77a32 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -449,14 +449,28 @@ Foam::wordList Foam::basicThermo::splitThermoName
         {
             cmpts[i] = thermoName.substr(beg, end-beg);
             cmpts[i++].replaceAll(">","");
+
+            // If the number of number of components in the name
+            // is greater than nCmpt return an empty list
+            if (i == nCmpt)
+            {
+                return wordList::null();
+            }
         }
         beg = end + 1;
     }
 
+    // If the number of number of components in the name is not equal to nCmpt
+    // return an empty list
+    if (i + 1 != nCmpt)
+    {
+        return wordList::null();
+    }
+
     if (beg < thermoName.size())
     {
         cmpts[i] = thermoName.substr(beg, string::npos);
-        cmpts[i++].replaceAll(">","");
+        cmpts[i].replaceAll(">","");
     }
 
     return cmpts;
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
index c1d299dbb7..5a5593886e 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -135,6 +135,17 @@ public:
 
     // Selectors
 
+        //- Generic lookup for thermodynamics package thermoTypeName
+        template<class Thermo, class Table>
+        static typename Table::iterator lookupThermo
+        (
+            const dictionary& thermoTypeDict,
+            Table* tablePtr,
+            const int nCmpt,
+            const char* cmptNames[],
+            const word& thermoTypeName
+        );
+
         //- Generic lookup for each of the related thermodynamics packages
         template<class Thermo, class Table>
         static typename Table::iterator lookupThermo
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
index c9741c645b..b589708163 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,75 @@ License
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
+template<class Thermo, class Table>
+typename Table::iterator Foam::basicThermo::lookupThermo
+(
+    const dictionary& thermoTypeDict,
+    Table* tablePtr,
+    const int nCmpt,
+    const char* cmptNames[],
+    const word& thermoTypeName
+)
+{
+    // Lookup the thermo package
+    typename Table::iterator cstrIter = tablePtr->find(thermoTypeName);
+
+    // Print error message if package not found in the table
+    if (cstrIter == tablePtr->end())
+    {
+        FatalErrorInFunction
+            << "Unknown " << Thermo::typeName << " type " << nl
+            << "thermoType" << thermoTypeDict << nl << nl
+            << "Valid " << Thermo::typeName << " types are:"
+            << nl << nl;
+
+        // Get the list of all the suitable thermo packages available
+        wordList validThermoTypeNames
+        (
+            tablePtr->sortedToc()
+        );
+
+        // Build a table of the thermo packages constituent parts
+        // Note: row-0 contains the names of constituent parts
+        List<wordList> validThermoTypeNameCmpts
+        (
+            validThermoTypeNames.size() + 1
+        );
+
+        validThermoTypeNameCmpts[0].setSize(nCmpt);
+        forAll(validThermoTypeNameCmpts[0], j)
+        {
+            validThermoTypeNameCmpts[0][j] = cmptNames[j];
+        }
+
+        // Split the thermo package names into their constituent parts
+        // Removing incompatible entries from the list
+        label j = 0;
+        forAll(validThermoTypeNames, i)
+        {
+            wordList names
+            (
+                Thermo::splitThermoName(validThermoTypeNames[i], nCmpt)
+            );
+
+            if (names.size())
+            {
+                validThermoTypeNameCmpts[j++] = names;
+            }
+        }
+        validThermoTypeNameCmpts.setSize(j);
+
+        // Print the table of available packages
+        // in terms of their constituent parts
+        printTable(validThermoTypeNameCmpts, FatalError);
+
+        FatalError<< exit(FatalError);
+    }
+
+    return cstrIter;
+}
+
+
 template<class Thermo, class Table>
 typename Table::iterator Foam::basicThermo::lookupThermo
 (
@@ -34,85 +103,80 @@ typename Table::iterator Foam::basicThermo::lookupThermo
     Table* tablePtr
 )
 {
-    word thermoTypeName;
-
     if (thermoDict.isDict("thermoType"))
     {
         const dictionary& thermoTypeDict(thermoDict.subDict("thermoType"));
 
         Info<< "Selecting thermodynamics package " << thermoTypeDict << endl;
 
-        const int nCmpt = 7;
-        const char* cmptNames[nCmpt] =
+        if (thermoTypeDict.found("properties"))
         {
-            "type",
-            "mixture",
-            "transport",
-            "thermo",
-            "equationOfState",
-            "specie",
-            "energy"
-        };
+            const int nCmpt = 4;
+            const char* cmptNames[nCmpt] =
+            {
+                "type",
+                "mixture",
+                "properties",
+                "energy"
+            };
 
-        // Construct the name of the thermo package from the components
-        thermoTypeName =
-            word(thermoTypeDict.lookup("type")) + '<'
-          + word(thermoTypeDict.lookup("mixture")) + '<'
-          + word(thermoTypeDict.lookup("transport")) + '<'
-          + word(thermoTypeDict.lookup("thermo")) + '<'
-          + word(thermoTypeDict.lookup("equationOfState")) + '<'
-          + word(thermoTypeDict.lookup("specie")) + ">>,"
-          + word(thermoTypeDict.lookup("energy")) + ">>>";
-
-        // Lookup the thermo package
-        typename Table::iterator cstrIter = tablePtr->find(thermoTypeName);
-
-        // Print error message if package not found in the table
-        if (cstrIter == tablePtr->end())
-        {
-            FatalErrorInFunction
-                << "Unknown " << Thermo::typeName << " type " << nl
-                << "thermoType" << thermoTypeDict << nl << nl
-                << "Valid " << Thermo::typeName << " types are:" << nl << nl;
-
-            // Get the list of all the suitable thermo packages available
-            wordList validThermoTypeNames
+            // Construct the name of the thermo package from the components
+            const word thermoTypeName
             (
-                tablePtr->sortedToc()
+                word(thermoTypeDict.lookup("type")) + '<'
+              + word(thermoTypeDict.lookup("mixture")) + '<'
+              + word(thermoTypeDict.lookup("properties")) + ','
+              + word(thermoTypeDict.lookup("energy")) + ">>"
             );
 
-            // Build a table of the thermo packages constituent parts
-            // Note: row-0 contains the names of constituent parts
-            List<wordList> validThermoTypeNameCmpts
+            return lookupThermo<Thermo, Table>
             (
-                validThermoTypeNames.size() + 1
+                thermoTypeDict,
+                tablePtr,
+                nCmpt,
+                cmptNames,
+                thermoTypeName
             );
-
-            validThermoTypeNameCmpts[0].setSize(nCmpt);
-            forAll(validThermoTypeNameCmpts[0], j)
-            {
-                validThermoTypeNameCmpts[0][j] = cmptNames[j];
-            }
-
-            // Split the thermo package names into their constituent parts
-            forAll(validThermoTypeNames, i)
-            {
-                validThermoTypeNameCmpts[i+1] =
-                    Thermo::splitThermoName(validThermoTypeNames[i], nCmpt);
-            }
-
-            // Print the table of available packages
-            // in terms of their constituent parts
-            printTable(validThermoTypeNameCmpts, FatalError);
-
-            FatalError<< exit(FatalError);
         }
+        else
+        {
+            const int nCmpt = 7;
+            const char* cmptNames[nCmpt] =
+            {
+                "type",
+                "mixture",
+                "transport",
+                "thermo",
+                "equationOfState",
+                "specie",
+                "energy"
+            };
 
-        return cstrIter;
+            // Construct the name of the thermo package from the components
+            const word thermoTypeName
+            (
+                word(thermoTypeDict.lookup("type")) + '<'
+              + word(thermoTypeDict.lookup("mixture")) + '<'
+              + word(thermoTypeDict.lookup("transport")) + '<'
+              + word(thermoTypeDict.lookup("thermo")) + '<'
+              + word(thermoTypeDict.lookup("equationOfState")) + '<'
+              + word(thermoTypeDict.lookup("specie")) + ">>,"
+              + word(thermoTypeDict.lookup("energy")) + ">>>"
+            );
+
+            return lookupThermo<Thermo, Table>
+            (
+                thermoTypeDict,
+                tablePtr,
+                nCmpt,
+                cmptNames,
+                thermoTypeName
+            );
+        }
     }
     else
     {
-        thermoTypeName = word(thermoDict.lookup("thermoType"));
+        const word thermoTypeName(thermoDict.lookup("thermoType"));
 
         Info<< "Selecting thermodynamics package " << thermoTypeName << endl;
 
diff --git a/src/thermophysicalModels/basic/rhoThermo/liquidThermo.C b/src/thermophysicalModels/basic/rhoThermo/liquidThermo.C
new file mode 100644
index 0000000000..c023c50683
--- /dev/null
+++ b/src/thermophysicalModels/basic/rhoThermo/liquidThermo.C
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "rhoThermo.H"
+#include "heRhoThermo.H"
+#include "pureMixture.H"
+#include "thermo.H"
+#include "sensibleEnthalpy.H"
+#include "sensibleInternalEnergy.H"
+
+#include "thermophysicalPropertiesSelector.H"
+#include "liquidProperties.H"
+
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
+
+typedef heRhoThermo
+<
+    rhoThermo,
+    pureMixture
+    <
+        species::thermo
+        <
+            thermophysicalPropertiesSelector<liquidProperties>,
+            sensibleInternalEnergy
+        >
+    >
+> heRhoThermopureMixtureliquidProperties;
+
+defineTemplateTypeNameAndDebugWithName
+(
+    heRhoThermopureMixtureliquidProperties,
+    "heRhoThermo<pureMixture<liquid,sensibleInternalEnergy>>",
+    0
+);
+
+addToRunTimeSelectionTable
+(
+    basicThermo,
+    heRhoThermopureMixtureliquidProperties,
+    fvMesh
+);
+
+addToRunTimeSelectionTable
+(
+    fluidThermo,
+    heRhoThermopureMixtureliquidProperties,
+    fvMesh
+);
+
+addToRunTimeSelectionTable
+(
+    rhoThermo,
+    heRhoThermopureMixtureliquidProperties,
+    fvMesh
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
index 634007fc1d..eb211a946f 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/H2O/H2O.C
@@ -31,8 +31,6 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(H2O, 0);
-    addToRunTimeSelectionTable(thermophysicalProperties, H2O,);
-    addToRunTimeSelectionTable(thermophysicalProperties, H2O, dictionary);
     addToRunTimeSelectionTable(liquidProperties, H2O,);
     addToRunTimeSelectionTable(liquidProperties, H2O, dictionary);
 }
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H
index 939a80770a..7df742adca 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.H
@@ -85,7 +85,7 @@ class liquidProperties
 
 public:
 
-    TypeName("liquidProperties");
+    TypeName("liquid");
 
 
     // Declare run-time constructor selection tables
@@ -148,6 +148,15 @@ public:
     {}
 
 
+    // Static data
+
+        //- Is the equation of state is incompressible i.e. rho != f(p)
+        static const bool incompressible = true;
+
+        //- Is the equation of state is isochoric i.e. rho = const
+        static const bool isochoric = false;
+
+
     // Member Functions
 
         // Physical constants which define the specie
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H
index 652c81d8fd..dce26f383e 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H
@@ -72,7 +72,7 @@ class solidProperties
 public:
 
     //- Runtime type information
-    TypeName("solidProperties");
+    TypeName("solid");
 
 
     // Declare run-time constructor selection tables
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H
index 98ec171a54..f44237ed70 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.H
@@ -115,12 +115,6 @@ public:
             //- Molecular weight [kg/kmol]
             inline scalar W() const;
 
-            //- Is the equation of state is incompressible i.e. rho != f(p)
-            static const bool incompressible = true;
-
-            //- Is the equation of state is isochoric i.e. rho = const
-            static const bool isochoric = false;
-
             //- Limit the temperature to be in the range Tlow_ to Thigh_
             inline scalar limit(const scalar T) const;
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H
index b6c04e0062..87b99ce8e3 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalPropertiesI.H
@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
 inline Foam::scalar Foam::thermophysicalProperties::limit(const scalar T) const
 {
     return T;
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelector.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelector.C
new file mode 100644
index 0000000000..59607a8160
--- /dev/null
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelector.C
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "thermophysicalPropertiesSelector.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ThermophysicalProperties>
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::
+thermophysicalPropertiesSelector
+(
+    const word& name
+)
+:
+    propertiesPtr_(ThermophysicalProperties::New(name))
+{}
+
+
+template<class ThermophysicalProperties>
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::
+thermophysicalPropertiesSelector
+(
+    const dictionary& dict
+)
+{
+    const word name(dict.first()->keyword());
+
+    if (dict.isDict(name))
+    {
+        propertiesPtr_ = ThermophysicalProperties::New(dict.subDict(name));
+    }
+    else
+    {
+        propertiesPtr_ = ThermophysicalProperties::New(name);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelector.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelector.H
new file mode 100644
index 0000000000..690e4a9505
--- /dev/null
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelector.H
@@ -0,0 +1,154 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::thermophysicalPropertiesSelector
+
+Description
+    Wrapper class providing run-time selection of thermophysicalProperties
+    for the templated thermodynamics packages.
+
+SourceFiles
+    thermophysicalPropertiesSelectorI.H
+    thermophysicalPropertiesSelector.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef thermophysicalPropertiesSelector_H
+#define thermophysicalPropertiesSelector_H
+
+#include "thermophysicalProperties.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class thermophysicalPropertiesSelector Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ThermophysicalProperties>
+class thermophysicalPropertiesSelector
+{
+    // Private member data
+
+        autoPtr<ThermophysicalProperties> propertiesPtr_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from name
+        thermophysicalPropertiesSelector(const word& name);
+
+        //- Construct from dictionary
+        thermophysicalPropertiesSelector(const dictionary& dict);
+
+
+    // Static data
+
+        //- Is the equation of state is incompressible i.e. rho != f(p)
+        static const bool incompressible =
+            ThermophysicalProperties::incompressible;
+
+        //- Is the equation of state is isochoric i.e. rho = const
+        static const bool isochoric =
+            ThermophysicalProperties::isochoric;
+
+
+    // Member Functions
+
+        // Physical constants which define the specie
+
+            //- Molecular weight [kg/kmol]
+            inline scalar W() const;
+
+            //- Limit the temperature to be in the range Tlow_ to Thigh_
+            inline scalar limit(const scalar T) const;
+
+
+        // Fundamental equation of state properties
+
+            //- Liquid density [kg/m^3]
+            inline scalar rho(scalar p, scalar T) const;
+
+            //- Liquid compressibility rho/p [s^2/m^2]
+            //  Note: currently it is assumed the liquid is incompressible
+            inline scalar psi(scalar p, scalar T) const;
+
+            //- Return (Cp - Cv) [J/(kg K]
+            //  Note: currently it is assumed the liquid is incompressible
+            //  so CpMCv 0
+            inline scalar CpMCv(scalar p, scalar T) const;
+
+
+        // Fundamental thermodynamic properties
+
+            //- Heat capacity at constant pressure [J/(kg K)]
+            inline scalar Cp(const scalar p, const scalar T) const;
+
+            //- Absolute Enthalpy [J/kg]
+            inline scalar Ha(const scalar p, const scalar T) const;
+
+            //- Sensible enthalpy [J/kg]
+            inline scalar Hs(const scalar p, const scalar T) const;
+
+            //- Chemical enthalpy [J/kg]
+            inline scalar Hc() const;
+
+            // Entropy [J/(kg K)]
+            inline scalar S(const scalar p, const scalar T) const;
+
+
+        // Physical properties
+
+            //- Liquid viscosity [Pa s]
+            inline scalar mu(scalar p, scalar T) const;
+
+            //- Liquid thermal conductivity  [W/(m K)]
+            inline scalar kappa(scalar p, scalar T) const;
+
+            //- Liquid thermal diffusivity of enthalpy [kg/ms]
+            inline scalar alphah(const scalar p, const scalar T) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermophysicalPropertiesSelectorI.H"
+
+#ifdef NoRepository
+    #include "thermophysicalPropertiesSelector.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelectorI.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelectorI.H
new file mode 100644
index 0000000000..870aa1dbed
--- /dev/null
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalPropertiesSelector/thermophysicalPropertiesSelectorI.H
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::W() const
+{
+    return propertiesPtr_->W();
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::limit
+(
+    const scalar T
+) const
+{
+    return propertiesPtr_->limit(T);
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::rho
+(
+    scalar p,
+    scalar T
+) const
+{
+    return propertiesPtr_->rho(p, T);
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::psi
+(
+    scalar p,
+    scalar T
+) const
+{
+    return propertiesPtr_->psi(p, T);
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::CpMCv
+(
+    scalar p,
+    scalar T
+) const
+{
+    return propertiesPtr_->CpMCv(p, T);
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::Cp
+(
+    scalar p,
+    scalar T
+) const
+{
+    return propertiesPtr_->Cp(p, T);
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::Ha
+(
+    scalar p,
+    scalar T
+) const
+{
+    return propertiesPtr_->Ha(p, T);
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::Hs
+(
+    scalar p,
+    scalar T
+) const
+{
+    return propertiesPtr_->Hs(p, T);
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::Hc() const
+{
+    return propertiesPtr_->Hc();
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::S
+(
+    scalar p,
+    scalar T
+) const
+{
+    return propertiesPtr_->S(p, T);
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::mu
+(
+    scalar p,
+    scalar T
+) const
+{
+    return propertiesPtr_->mu(p, T);
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::kappa
+(
+    scalar p,
+    scalar T
+) const
+{
+    return propertiesPtr_->kappa(p, T);
+}
+
+
+template<class ThermophysicalProperties>
+inline Foam::scalar
+Foam::thermophysicalPropertiesSelector<ThermophysicalProperties>::alphah
+(
+    scalar p,
+    scalar T
+) const
+{
+    return propertiesPtr_->alphah(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
index 8c1db784a4..8e896f49c6 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water
@@ -15,6 +15,21 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    properties      liquid;
+    energy          sensibleInternalEnergy;
+}
+
+mixture
+{
+    H2O;
+}
+
+
+/*
 thermoType
 {
     type            heRhoThermo;
@@ -48,6 +63,7 @@ mixture
         Pr          2.289;
     }
 }
+*/
 
 
 // ************************************************************************* //

From e5ecc28891e0213a8d310ef146f0db5aa98859dd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 20 Feb 2017 15:30:07 +0000
Subject: [PATCH 32/40] liquidMixtureProperties: Updated documentation

---
 .../liquidMixtureProperties.H                  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
index 09f37540a8..d726a93dce 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidMixtureProperties/liquidMixtureProperties.H
@@ -31,17 +31,11 @@ Description
     \verbatim
         <parentDictionary>
         {
-            H2O
-            {
-                defaultCoeffs   yes;     // employ default coefficients
-            }
+            H2O; // employ default coefficients
+
             C7H16
             {
-                defaultCoeffs   no;
-                C7H16Coeffs
-                {
-                    ... user defined properties for C7H16
-                }
+                // ... user defined properties for C7H16
             }
         }
     \endverbatim
@@ -57,11 +51,9 @@ See also
 #ifndef liquidMixtureProperties_H
 #define liquidMixtureProperties_H
 
-#include "word.H"
-#include "scalarField.H"
-#include "PtrList.H"
 #include "liquidProperties.H"
-#include "autoPtr.H"
+#include "PtrList.H"
+#include "scalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From a06cd912d8b9884fdde9489c6170858a07b9f2bd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 20 Feb 2017 15:30:25 +0000
Subject: [PATCH 33/40] solidMixtureProperties: Updated documentation, removed
 unused functions and corrected remaining

---
 .../solidMixtureProperties.C                  | 31 ++++++------------
 .../solidMixtureProperties.H                  | 32 ++++++-------------
 2 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
index df9a4c1f0c..18fa9faa73 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.C
@@ -88,40 +88,29 @@ Foam::autoPtr<Foam::solidMixtureProperties> Foam::solidMixtureProperties::New
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalarField Foam::solidMixtureProperties::X(const scalarField& Y) const
+Foam::scalar Foam::solidMixtureProperties::rho(const scalarField& Y) const
 {
-    scalarField X(Y.size());
-    scalar rhoInv = 0.0;
-    forAll(X, i)
-    {
-        rhoInv += Y[i]/properties_[i].rho();
-        X[i] = Y[i]/properties_[i].rho();
-    }
+    scalar rrho = 0;
 
-    tmp<scalarField> tfld(X/rhoInv);
-    return tfld();
-}
-
-
-Foam::scalar Foam::solidMixtureProperties::rho(const scalarField& X) const
-{
-    scalar val = 0.0;
     forAll(properties_, i)
     {
-        val += properties_[i].rho()*X[i];
+        rrho += Y[i]/properties_[i].rho();
     }
-    return val;
+
+    return 1/rrho;
 }
 
 
 Foam::scalar Foam::solidMixtureProperties::Cp(const scalarField& Y) const
 {
-    scalar val = 0.0;
+    scalar Cp = 0;
+
     forAll(properties_, i)
     {
-        val += properties_[i].Cp()*Y[i];
+        Cp += Y[i]*properties_[i].Cp();
     }
-    return val;
+
+    return Cp;
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
index 2d34f771b8..a9cdfa732c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidMixtureProperties/solidMixtureProperties.H
@@ -31,17 +31,11 @@ Description
     \verbatim
         <parentDictionary>
         {
-            C
-            {
-                defaultCoeffs   yes;     // employ default coefficients
-            }
+            C;
+
             ash
             {
-                defaultCoeffs   no;
-                ashCoeffs
-                {
-                    ... user defined properties for ash
-                }
+                //... user defined properties for ash
             }
         }
     \endverbatim
@@ -58,10 +52,9 @@ See also
 #ifndef solidMixtureProperties_H
 #define solidMixtureProperties_H
 
-#include "scalarField.H"
-#include "PtrList.H"
 #include "solidProperties.H"
-#include "autoPtr.H"
+#include "PtrList.H"
+#include "scalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -134,19 +127,12 @@ public:
             return components_.size();
         }
 
-
-        //- Returns the mass fractions, given mole fractions
-        scalarField Y(const scalarField& X) const;
-
-        //- Returns the mole fractions, given mass fractions
-        scalarField X(const scalarField& Y) const;
-
         //- Calculate the mixture density [kg/m^3] as a function of
-        //  volume fractions
-        scalar rho(const scalarField& X) const;
+        //  mass fractions
+        scalar rho(const scalarField& Y) const;
 
-        //- Calculate the mixture heat capacity [J/(kg K)] as a function
-        //  of mass fractions
+        //- Calculate the mixture heat capacity [J/(kg K)] as a function of
+        //  mass fractions
         scalar Cp(const scalarField& Y) const;
 };
 

From bec7091e21c4290e538fdb2243704ef49bf43fb1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 21 Feb 2017 11:59:49 +0000
Subject: [PATCH 34/40] chemkinToFoam: Increase the precision of the
 thermophysical coefficient written

---
 .../utilities/thermophysical/chemkinToFoam/chemkinToFoam.C   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
index b919ecd88d..ca34cdf0f6 100644
--- a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
+++ b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,6 +42,9 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    // Increase the precision of the output for JANAF coefficients
+    Ostream::defaultPrecision(10);
+
     argList::validArgs.append("CHEMKINFile");
     argList::validArgs.append("CHEMKINThermodynamicsFile");
     argList::validArgs.append("CHEMKINTransport");

From 5991e30fc17ea1d2a61272475d6067759fdf8630 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 22 Feb 2017 13:20:15 +0000
Subject: [PATCH 35/40] functionObjects::fieldCoordinateSystemTransform: added
 coordinateSystem sub-dict and updated the description

Patch contributed by Bruno Santos
Resolves bug-report https://bugs.openfoam.org/view.php?id=2454
---
 .../fieldCoordinateSystemTransform.C                |  4 ++--
 .../fieldCoordinateSystemTransform.H                | 13 +++++++++----
 .../postProcessingDict                              | 10 +++++++---
 .../coordinateRotation/coordinateRotationNew.C      |  4 +---
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
index 4d16100f92..5a60ff859e 100644
--- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
+++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ fieldCoordinateSystemTransform
 :
     fvMeshFunctionObject(name, runTime, dict),
     fieldSet_(),
-    coordSys_(mesh_, dict)
+    coordSys_(mesh_, dict.subDict("coordinateSystem"))
 {
     read(dict);
 
diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
index 2ad43e3ec6..c644bc0acc 100644
--- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
+++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,11 +45,16 @@ Description
             UMean
             UPrime2Mean
         );
+
         coordinateSystem
         {
-            origin  (0.001  0       0);
-            e1      (1      0.15    0);
-            e3      (0      0      -1);
+            origin  (0.001 0 0);
+            coordinateRotation
+            {
+                type        axesRotation;
+                e1      (1      0.15    0);
+                e3      (0      0      -1);
+            }
         }
     }
     \endverbatim
diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict b/src/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
index 72ab4a8329..32451af5f5 100644
--- a/src/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
+++ b/src/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
@@ -40,9 +40,13 @@ functions
 
         coordinateSystem
         {
-            origin  (0.001  0       0);
-            e1      (1      0.15    0);
-            e3      (0      0      -1);
+            origin  (0 0 0);
+            coordinateRotation
+            {
+                type    axesRotation;
+                e1      (1  0.15  0);
+                e3      (0  0    -1);
+            }
         }
     }
 }
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
index 02b111038b..e595206f0d 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,6 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
         )   << "Unknown coordinateRotation type "
             << rotType << nl << nl
             << "Valid coordinateRotation types are :" <<  nl
-            << "[default: axes ]"
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
@@ -87,7 +86,6 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
         )   << "Unknown coordinateRotation type "
             << rotType << nl << nl
             << "Valid coordinateRotation types are :" <<  nl
-            << "[default: axes ]"
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }

From 12dd3c9c6b58dd63df4c99cbfc0d69eee25f6d15 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 22 Feb 2017 13:20:49 +0000
Subject: [PATCH 36/40] GeometricField: corrected assignment to tmp which wraps
 a non-tmp

---
 .../GeometricField/GeometricField.C           | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 91f4c9bf7c..e1a56f957d 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1164,11 +1164,18 @@ void Foam::GeometricField<Type, PatchField, GeoMesh>::operator=
 
     this->dimensions() = gf.dimensions();
 
-    // Transfer the storage from the tmp
-    primitiveFieldRef().transfer
-    (
-        const_cast<Field<Type>&>(gf.primitiveField())
-    );
+    if (tgf.isTmp())
+    {
+        // Transfer the storage from the tmp
+        primitiveFieldRef().transfer
+        (
+            const_cast<Field<Type>&>(gf.primitiveField())
+        );
+    }
+    else
+    {
+        primitiveFieldRef() = gf.primitiveField();
+    }
 
     boundaryFieldRef() = gf.boundaryField();
 

From e5cc374d8ed68b94a3fa598886a6cb33042435fb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 22 Feb 2017 15:34:13 +0000
Subject: [PATCH 37/40] MULES: Adjust limiter only at boundaries for which the
 field value is fixed

Resolves bug-report https://bugs.openfoam.org/view.php?id=2470
---
 .../fvMatrices/solvers/MULES/CMULESTemplates.C        |  2 +-
 .../fvMatrices/solvers/MULES/MULESTemplates.C         | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
index 34ee43bede..b9ffcc9bc4 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
@@ -249,7 +249,7 @@ void Foam::MULES::limiterCorr
                 psiMinn[pfCelli] = min(psiMinn[pfCelli], psiPNf[pFacei]);
             }
         }
-        else
+        else if (psiPf.fixesValue())
         {
             forAll(phiCorrPf, pFacei)
             {
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 743cb8eae5..675e4a3bd6 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -195,6 +195,11 @@ void Foam::MULES::limiter
         MULEScontrols.lookupOrDefault<scalar>("smoothLimiter", 0)
     );
 
+    const scalar extremaCoeff
+    (
+        MULEScontrols.lookupOrDefault<scalar>("extremaCoeff", 0)
+    );
+
     const scalarField& psi0 = psi.oldTime();
 
     const labelUList& owner = mesh.owner();
@@ -286,7 +291,7 @@ void Foam::MULES::limiter
                 psiMinn[pfCelli] = min(psiMinn[pfCelli], psiPNf[pFacei]);
             }
         }
-        else
+        else if (psiPf.fixesValue())
         {
             forAll(phiCorrPf, pFacei)
             {
@@ -316,8 +321,8 @@ void Foam::MULES::limiter
         }
     }
 
-    psiMaxn = min(psiMaxn, psiMax);
-    psiMinn = max(psiMinn, psiMin);
+    psiMaxn = min(psiMaxn + extremaCoeff*(psiMax - psiMin), psiMax);
+    psiMinn = max(psiMinn - extremaCoeff*(psiMax - psiMin), psiMin);
 
     if (smoothLimiter > SMALL)
     {

From c393b268a51fd4cfb96738bb4badf43b58f040fd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 23 Feb 2017 12:03:50 +0000
Subject: [PATCH 38/40] MULES: Adjust limiter only at boundaries for which the
 field value is fixed

Resolves bug-report https://bugs.openfoam.org/view.php?id=2470
---
 .../fvMatrices/solvers/MULES/CMULESTemplates.C         | 10 ++++++++++
 .../fvMatrices/solvers/MULES/MULESTemplates.C          | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
index b9ffcc9bc4..e55889eaa3 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
@@ -259,6 +259,16 @@ void Foam::MULES::limiterCorr
                 psiMinn[pfCelli] = min(psiMinn[pfCelli], psiPf[pFacei]);
             }
         }
+        else
+        {
+            forAll(phiCorrPf, pFacei)
+            {
+                const label pfCelli = pFaceCells[pFacei];
+
+                psiMaxn[pfCelli] = max(psiMaxn[pfCelli], psiMax);
+                psiMinn[pfCelli] = min(psiMinn[pfCelli], psiMin);
+            }
+        }
 
         forAll(phiCorrPf, pFacei)
         {
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 675e4a3bd6..4ad5686625 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -301,6 +301,16 @@ void Foam::MULES::limiter
                 psiMinn[pfCelli] = min(psiMinn[pfCelli], psiPf[pFacei]);
             }
         }
+        else
+        {
+            forAll(phiCorrPf, pFacei)
+            {
+                const label pfCelli = pFaceCells[pFacei];
+
+                psiMaxn[pfCelli] = max(psiMaxn[pfCelli], psiMax);
+                psiMinn[pfCelli] = min(psiMinn[pfCelli], psiMin);
+            }
+        }
 
         forAll(phiCorrPf, pFacei)
         {

From a1c8cde310f48925143781a940811a5fca8a87c2 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 24 Feb 2017 11:18:01 +0000
Subject: [PATCH 39/40] rhoSimpleFoam: added support for compressible liquid
 flows

rhoSimpleFoam now instantiates the lower-level fluidThermo which instantiates
either a psiThermo or rhoThermo according to the 'type' specification in
thermophysicalProperties, e.g.

thermoType
{
    type            hePsiThermo;
    mixture         pureMixture;
    transport       sutherland;
    thermo          janaf;
    equationOfState perfectGas;
    specie          specie;
    energy          sensibleInternalEnergy;
}

instantiates a psiThermo for a perfect gas with JANAF thermodynamics, whereas

thermoType
{
    type            heRhoThermo;
    mixture         pureMixture;
    properties      liquid;
    energy          sensibleInternalEnergy;
}

mixture
{
    H2O;
}

instantiates a rhoThermo for water, see new tutorial
compressible/rhoSimpleFoam/squareBendLiq.

In order to support complex equations of state the pressure can no longer be
unlimited and rhoSimpleFoam now limits the pressure rather than the density to
handle start-up more robustly.

For backward compatibility 'rhoMin' and 'rhoMax' can still be used in the SIMPLE
sub-dictionary of fvSolution which are converted into 'pMax' and 'pMin' but it
is better to set either 'pMax' and 'pMin' directly or use the more convenient
'pMinFactor' and 'pMinFactor' from which 'pMax' and 'pMin' are calculated using
the fixed boundary pressure or reference pressure e.g.

SIMPLE
{
    nNonOrthogonalCorrectors 0;

    pMinFactor      0.1;
    pMaxFactor      1.5;

    transonic       yes;
    consistent      yes;

    residualControl
    {
        p               1e-3;
        U               1e-4;
        e               1e-3;
        "(k|epsilon|omega)" 1e-3;
    }
}
---
 .../compressible/rhoSimpleFoam/createFields.H |  33 +---
 .../solvers/compressible/rhoSimpleFoam/pEqn.H |  22 ++-
 .../compressible/rhoSimpleFoam/pcEqn.H        |  20 ++-
 .../rhoPorousSimpleFoam/createFields.H        |  44 +----
 .../rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H  |  15 +-
 .../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C |   7 +-
 .../rhoSimpleFoam/rhoSimpleFoam.C             |   5 +-
 .../system/fvSchemes                          |   4 +-
 .../system/fvSolution                         |   6 +-
 .../CompressibleTurbulenceModel.H             |  15 +-
 .../TurbulenceModel/TurbulenceModel.H         |   6 +-
 src/finiteVolume/Make/files                   |   1 +
 .../general/findRefCell/findRefCell.C         |  14 +-
 .../general/findRefCell/findRefCell.H         |  10 +-
 .../general/pressureControl/pressureControl.C | 155 ++++++++++++++++++
 .../general/pressureControl/pressureControl.H | 108 ++++++++++++
 .../pressureControl/pressureControlI.H        |  40 +++++
 .../angledDuctExplicit/system/fvSolution      |   4 +-
 .../angledDuctImplicit/system/fvSolution      |   4 +-
 .../system/fvSolution                         |   4 +-
 .../squareBend/system/fvSolution              |   5 +-
 .../rhoSimpleFoam/squareBendLiq/0/T           |  42 +++++
 .../rhoSimpleFoam/squareBendLiq/0/U           |  42 +++++
 .../rhoSimpleFoam/squareBendLiq/0/alphat      |  43 +++++
 .../rhoSimpleFoam/squareBendLiq/0/epsilon     |  47 ++++++
 .../rhoSimpleFoam/squareBendLiq/0/k           |  44 +++++
 .../rhoSimpleFoam/squareBendLiq/0/nut         |  45 +++++
 .../rhoSimpleFoam/squareBendLiq/0/p           |  39 +++++
 .../constant/thermophysicalProperties         |  31 ++++
 .../constant/turbulenceProperties             |  30 ++++
 .../squareBendLiq/system/blockMeshDict        | 127 ++++++++++++++
 .../squareBendLiq/system/controlDict          |  51 ++++++
 .../squareBendLiq/system/decomposeParDict     |  45 +++++
 .../squareBendLiq/system/fvSchemes            |  59 +++++++
 .../squareBendLiq/system/fvSolution           |  71 ++++++++
 35 files changed, 1115 insertions(+), 123 deletions(-)
 create mode 100644 src/finiteVolume/cfdTools/general/pressureControl/pressureControl.C
 create mode 100644 src/finiteVolume/cfdTools/general/pressureControl/pressureControl.H
 create mode 100644 src/finiteVolume/cfdTools/general/pressureControl/pressureControlI.H
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/T
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/U
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/alphat
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/epsilon
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/k
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/nut
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/p
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/thermophysicalProperties
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/controlDict
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/decomposeParDict
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSchemes
 create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSolution

diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index e8c2ce6d54..4671347b66 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -1,10 +1,10 @@
 Info<< "Reading thermophysical properties\n" << endl;
 
-autoPtr<psiThermo> pThermo
+autoPtr<fluidThermo> pThermo
 (
-    psiThermo::New(mesh)
+    fluidThermo::New(mesh)
 );
-psiThermo& thermo = pThermo();
+fluidThermo& thermo = pThermo();
 thermo.validate(args.executable(), "h", "e");
 
 volScalarField rho
@@ -38,35 +38,10 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
-
-label pRefCell = 0;
-scalar pRefValue = 0.0;
-setRefCell(p, simple.dict(), pRefCell, pRefValue);
+pressureControl pressureControl(p, rho, simple.dict());
 
 mesh.setFluxRequired(p.name());
 
-dimensionedScalar rhoMax
-(
-    dimensionedScalar::lookupOrDefault
-    (
-        "rhoMax",
-        simple.dict(),
-        dimDensity,
-        GREAT
-    )
-);
-
-dimensionedScalar rhoMin
-(
-    dimensionedScalar::lookupOrDefault
-    (
-        "rhoMin",
-        simple.dict(),
-        dimDensity,
-        0
-    )
-);
-
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence
 (
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index e46f2a6691..06fa890c05 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -30,7 +30,11 @@
             // Relax the pressure equation to ensure diagonal-dominance
             pEqn.relax();
 
-            pEqn.setReference(pRefCell, pRefValue);
+            pEqn.setReference
+            (
+                pressureControl.refCell(),
+                pressureControl.refValue()
+            );
 
             pEqn.solve();
 
@@ -60,7 +64,11 @@
                 fvOptions(psi, p, rho.name())
             );
 
-            pEqn.setReference(pRefCell, pRefValue);
+            pEqn.setReference
+            (
+                pressureControl.refCell(),
+                pressureControl.refValue()
+            );
 
             pEqn.solve();
 
@@ -81,6 +89,8 @@
     U.correctBoundaryConditions();
     fvOptions.correct(U);
 
+    pressureControl.limit(p);
+
     // For closed-volume cases adjust the pressure and density levels
     // to obey overall mass continuity
     if (closedVolume)
@@ -89,16 +99,12 @@
             /fvc::domainIntegrate(psi);
     }
 
+    p.correctBoundaryConditions();
+
     rho = thermo.rho();
-    rho = max(rho, rhoMin);
-    rho = min(rho, rhoMax);
 
     if (!simple.transonic())
     {
         rho.relax();
     }
-
-    Info<< "rho max/min : "
-        << max(rho).value() << " "
-        << min(rho).value() << endl;
 }
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
index 67b962f805..0dbde82960 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
@@ -40,7 +40,11 @@ if (simple.transonic())
         // Relax the pressure equation to maintain diagonal dominance
         pEqn.relax();
 
-        pEqn.setReference(pRefCell, pRefValue);
+        pEqn.setReference
+        (
+            pressureControl.refCell(),
+            pressureControl.refValue()
+        );
 
         pEqn.solve();
 
@@ -75,7 +79,11 @@ else
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.setReference(pRefCell, pRefValue);
+        pEqn.setReference
+        (
+            pressureControl.refCell(),
+            pressureControl.refValue()
+        );
 
         pEqn.solve();
 
@@ -97,6 +105,8 @@ U = HbyA - rAtU*fvc::grad(p);
 U.correctBoundaryConditions();
 fvOptions.correct(U);
 
+pressureControl.limit(p);
+
 // For closed-volume cases adjust the pressure and density levels
 // to obey overall mass continuity
 if (closedVolume)
@@ -105,14 +115,12 @@ if (closedVolume)
         /fvc::domainIntegrate(psi);
 }
 
+p.correctBoundaryConditions();
+
 // Recalculate density from the relaxed pressure
 rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
 
 if (!simple.transonic())
 {
     rho.relax();
 }
-
-Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
index 5daef0c2de..4671347b66 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
@@ -1,10 +1,10 @@
 Info<< "Reading thermophysical properties\n" << endl;
 
-autoPtr<rhoThermo> pThermo
+autoPtr<fluidThermo> pThermo
 (
-    rhoThermo::New(mesh)
+    fluidThermo::New(mesh)
 );
-rhoThermo& thermo = pThermo();
+fluidThermo& thermo = pThermo();
 thermo.validate(args.executable(), "h", "e");
 
 volScalarField rho
@@ -38,46 +38,10 @@ volVectorField U
 
 #include "compressibleCreatePhi.H"
 
-
-label pRefCell = 0;
-scalar pRefValue = 0.0;
-setRefCell(p, simple.dict(), pRefCell, pRefValue);
+pressureControl pressureControl(p, rho, simple.dict());
 
 mesh.setFluxRequired(p.name());
 
-dimensionedScalar rhoMax
-(
-    dimensionedScalar::lookupOrDefault
-    (
-        "rhoMax",
-        simple.dict(),
-        dimDensity,
-        GREAT
-    )
-);
-
-dimensionedScalar rhoMin
-(
-    dimensionedScalar::lookupOrDefault
-    (
-        "rhoMin",
-        simple.dict(),
-        dimDensity,
-        0
-    )
-);
-
-dimensionedScalar pMin
-(
-    dimensionedScalar::lookupOrDefault
-    (
-        "pMin",
-        simple.dict(),
-        dimPressure,
-        10
-    )
-);
-
 Info<< "Creating turbulence model\n" << endl;
 autoPtr<compressible::turbulenceModel> turbulence
 (
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
index ca8725b499..4167f80e59 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
@@ -48,7 +48,11 @@
 
         fvScalarMatrix& pEqn = tpEqn.ref();
 
-        pEqn.setReference(pRefCell, pRefValue);
+        pEqn.setReference
+        (
+            pressureControl.refCell(),
+            pressureControl.refValue()
+        );
 
         pEqn.solve();
 
@@ -75,6 +79,8 @@
     U.correctBoundaryConditions();
     fvOptions.correct(U);
 
+    pressureControl.limit(p);
+
     // For closed-volume cases adjust the pressure and density levels
     // to obey overall mass continuity
     if (closedVolume)
@@ -83,13 +89,6 @@
             /fvc::domainIntegrate(psi);
     }
 
-    p = max(p, pMin);
-
     rho = thermo.rho();
-    rho = max(rho, rhoMin);
-    rho = min(rho, rhoMax);
     rho.relax();
-    Info<< "rho max/min : "
-        << max(rho).value() << " "
-        << min(rho).value() << endl;
 }
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index 6cca40e2c0..29839274e8 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,11 +31,12 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "rhoThermo.H"
+#include "fluidThermo.H"
 #include "turbulentFluidThermoModel.H"
+#include "simpleControl.H"
+#include "pressureControl.H"
 #include "fvOptions.H"
 #include "IOporosityModelList.H"
-#include "simpleControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index 4a3cdf8e01..200e620eef 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,9 +30,10 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "psiThermo.H"
+#include "fluidThermo.H"
 #include "turbulentFluidThermoModel.H"
 #include "simpleControl.H"
+#include "pressureControl.H"
 #include "fvOptions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/etc/templates/compressibleInflowOutflow/system/fvSchemes b/etc/templates/compressibleInflowOutflow/system/fvSchemes
index 9986456cf7..ad7ca94ca6 100644
--- a/etc/templates/compressibleInflowOutflow/system/fvSchemes
+++ b/etc/templates/compressibleInflowOutflow/system/fvSchemes
@@ -44,9 +44,9 @@ divSchemes
     div(phi,e)      $turbulence;
     div(phi,h)      $turbulence;
     div(phi,K)      $turbulence;
-    div(phi,Ekp)    $turbulence; 
+    div(phi,Ekp)    $turbulence;
 
-    div(phid,p)     bounded Gauss upwind;
+    div(phid,p)     Gauss upwind;
     div((phi|interpolate(rho)),p)  bounded Gauss upwind;
 
     div(((rho*nuEff)*dev2(T(grad(U)))))    Gauss linear;
diff --git a/etc/templates/compressibleInflowOutflow/system/fvSolution b/etc/templates/compressibleInflowOutflow/system/fvSolution
index 80579478d3..d20f03588b 100644
--- a/etc/templates/compressibleInflowOutflow/system/fvSolution
+++ b/etc/templates/compressibleInflowOutflow/system/fvSolution
@@ -43,8 +43,8 @@ SIMPLE
     }
 
     nNonOrthogonalCorrectors 0;
-    rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.1;
-    rhoMax          rhoMax [ 1 -3 0 0 0 ] 1.5;
+    pMinFactor      0.1;
+    pMaxFactor      1.5;
 }
 
 relaxationFactors
@@ -56,7 +56,7 @@ relaxationFactors
     }
     equations
     {
-     	U               0.7;
+        U               0.7;
         "(e|h)"         0.7;
         "(k|epsilon|omega)" 0.7;
     }
diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
index 763303447e..07b32950d7 100644
--- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -115,6 +115,19 @@ public:
             return this->transport_.mu(patchi);
         }
 
+        //- Return the laminar viscosity
+        virtual tmp<volScalarField> nu() const
+        {
+            return this->transport_.mu()/this->rho_;
+        }
+
+        //- Return the laminar viscosity on patchi
+        virtual tmp<scalarField> nu(const label patchi) const
+        {
+            return
+                this->transport_.mu(patchi)/this->rho_.boundaryField()[patchi];
+        }
+
         //- Return the turbulence dynamic viscosity
         virtual tmp<volScalarField> mut() const
         {
diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
index bff236d486..61e0ac3d7f 100644
--- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -158,13 +158,13 @@ public:
         }
 
         //- Return the laminar viscosity
-        tmp<volScalarField> nu() const
+        virtual tmp<volScalarField> nu() const
         {
             return transport_.nu();
         }
 
         //- Return the laminar viscosity on patchi
-        tmp<scalarField> nu(const label patchi) const
+        virtual tmp<scalarField> nu(const label patchi) const
         {
             return transport_.nu(patchi);
         }
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 2d7fbce130..8f9122b58e 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -402,6 +402,7 @@ $(general)/constrainHbyA/constrainHbyA.C
 $(general)/adjustPhi/adjustPhi.C
 $(general)/bound/bound.C
 $(general)/CorrectPhi/correctUphiBCs.C
+$(general)/pressureControl/pressureControl.C
 
 solutionControl = $(general)/solutionControl
 $(solutionControl)/solutionControl/solutionControl.C
diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
index 0d24e83a7b..136fdda595 100644
--- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
+++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void Foam::setRefCell
+bool Foam::setRefCell
 (
     const volScalarField& field,
     const volScalarField& fieldRef,
@@ -109,11 +109,17 @@ void Foam::setRefCell
         }
 
         refValue = readScalar(dict.lookup(refValueName));
+
+        return true;
+    }
+    else
+    {
+        return false;
     }
 }
 
 
-void Foam::setRefCell
+bool Foam::setRefCell
 (
     const volScalarField& field,
     const dictionary& dict,
@@ -122,7 +128,7 @@ void Foam::setRefCell
     const bool forceReference
 )
 {
-    setRefCell(field, field, dict, refCelli, refValue, forceReference);
+    return setRefCell(field, field, dict, refCelli, refValue, forceReference);
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H
index 8a9d3d100a..1532c718e7 100644
--- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H
+++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,8 +46,8 @@ namespace Foam
 
 //- If the field fieldRef needs referencing find the reference cell nearest
 //  (in index) to the given cell looked-up for field, but which is not on a
-//  cyclic, symmetry or processor patch.
-void setRefCell
+//  cyclic, symmetry or processor patch and return true, otherwise return false.
+bool setRefCell
 (
     const volScalarField& field,
     const volScalarField& fieldRef,
@@ -59,8 +59,8 @@ void setRefCell
 
 //- If the field needs referencing find the reference cell nearest
 //  (in index) to the given cell looked-up for field, but which is not on a
-//  cyclic, symmetry or processor patch.
-void setRefCell
+//  cyclic, symmetry or processor patch and return true, otherwise return false.
+bool setRefCell
 (
     const volScalarField& field,
     const dictionary& dict,
diff --git a/src/finiteVolume/cfdTools/general/pressureControl/pressureControl.C b/src/finiteVolume/cfdTools/general/pressureControl/pressureControl.C
new file mode 100644
index 0000000000..101126a5e8
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/pressureControl/pressureControl.C
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "pressureControl.H"
+#include "findRefCell.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::pressureControl::pressureControl
+(
+    const volScalarField& p,
+    const volScalarField& rho,
+    const dictionary& dict
+)
+:
+    refCell_(0),
+    refValue_(0),
+    pMax_("pMax", dimPressure, 0),
+    pMin_("pMin", dimPressure, GREAT)
+{
+    if (setRefCell(p, dict, refCell_, refValue_))
+    {
+        pMax_.value() = refValue_;
+        pMin_.value() = refValue_;
+    }
+
+    const volScalarField::Boundary& pbf = p.boundaryField();
+    const volScalarField::Boundary& rhobf = rho.boundaryField();
+
+    scalar rhoRefMax = -GREAT;
+    scalar rhoRefMin = GREAT;
+    bool rhoLimits = false;
+
+    forAll(pbf, patchi)
+    {
+        if (pbf[patchi].fixesValue())
+        {
+            rhoLimits = true;
+
+            pMax_.value() = max(pMax_.value(), max(pbf[patchi]));
+            pMin_.value() = min(pMin_.value(), min(pbf[patchi]));
+
+            rhoRefMax = max(rhoRefMax, max(rhobf[patchi]));
+            rhoRefMin = min(rhoRefMin, min(rhobf[patchi]));
+        }
+    }
+
+    if (dict.found("pMax"))
+    {
+        pMax_.value() = readScalar(dict.lookup("pMax"));
+    }
+    else if (dict.found("pMaxFactor"))
+    {
+        const scalar pMaxFactor(readScalar(dict.lookup("pMaxFactor")));
+        pMax_ *= pMaxFactor;
+    }
+    else if (dict.found("rhoMax"))
+    {
+        // For backward-compatibility infer the pMax from rhoMax
+
+        IOWarningInFunction(dict)
+            << "'rhoMax' specified rather than 'pMax' or 'pMaxFactor'" << nl
+            << "    This is supported for backward-compatibility but "
+               "'pMax' or 'pMaxFactor' are more reliable." << endl;
+
+        if (!rhoLimits)
+        {
+            FatalIOErrorInFunction(dict)
+                << "'rhoMax' specified rather than 'pMaxFactor'" << nl
+                << "    but the corresponding reference density cannot"
+                   " be evaluated from the boundary conditions." << nl
+                << "Please specify 'pMaxFactor' rather than 'rhoMax'"
+                << exit(FatalError);
+        }
+
+        dimensionedScalar rhoMax("rhoMax", dimDensity, dict);
+
+        pMax_ *= max(rhoMax.value()/rhoRefMax, 1);
+    }
+
+    if (dict.found("pMin"))
+    {
+        pMin_.value() = readScalar(dict.lookup("pMin"));
+    }
+    else if (dict.found("pMinFactor"))
+    {
+        const scalar pMinFactor(readScalar(dict.lookup("pMinFactor")));
+        pMin_ *= pMinFactor;
+    }
+    else if (dict.found("rhoMin"))
+    {
+        // For backward-compatibility infer the pMin from rhoMin
+
+        IOWarningInFunction(dict)
+            << "'rhoMin' specified rather than 'pMin' or 'pMinFactor'" << nl
+            << "    This is supported for backward-compatibility but"
+               "'pMin' or 'pMinFactor' are more reliable." << endl;
+
+        if (!rhoLimits)
+        {
+            FatalIOErrorInFunction(dict)
+                << "'rhoMin' specified rather than 'pMinFactor'" << nl
+                << "    but the corresponding reference density cannot"
+                   " be evaluated from the boundary conditions." << nl
+                << "Please specify 'pMinFactor' rather than 'rhoMin'"
+                << exit(FatalError);
+        }
+
+        dimensionedScalar rhoMin("rhoMin", dimDensity, dict);
+
+        pMin_ *= min(rhoMin.value()/rhoRefMin, 1);
+    }
+
+    Info<< "pressureControl" << nl
+        << "    pMax/pMin " << pMax_.value() << " " << pMin_.value()
+        << nl << endl;
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::pressureControl::limit(volScalarField& p) const
+{
+    Info<< "pressureControl: p max/min "
+        << max(p).value() << " "
+        << min(p).value() << endl;
+
+    p = max(p, pMin_);
+    p = min(p, pMax_);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/pressureControl/pressureControl.H b/src/finiteVolume/cfdTools/general/pressureControl/pressureControl.H
new file mode 100644
index 0000000000..19bd053d43
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/pressureControl/pressureControl.H
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::pressureControl
+
+Description
+    Provides controls for the pressure reference is closed-volume simulations
+    and a general method for limiting the pressure during the startup of
+    steady-state simulations.
+
+SourceFiles
+    pressureControlI.H
+    pressureControl.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pressureControl_H
+#define pressureControl_H
+
+#include "dimensionedScalar.H"
+#include "volFieldsFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class pressureControl Declaration
+\*---------------------------------------------------------------------------*/
+
+class pressureControl
+{
+    // Private data
+
+        //- Optional cell in which the reference pressure is set
+        label refCell_;
+
+        //- Optional pressure reference level
+        scalar refValue_;
+
+        //- Pressure lower-limit
+        dimensionedScalar pMax_;
+
+        //- Pressure upper-limit
+        dimensionedScalar pMin_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from the SIMPLE/PIMPLE sub-dictionary
+        pressureControl
+        (
+            const volScalarField& p,
+            const volScalarField& rho,
+            const dictionary& dict
+        );
+
+
+    // Member Functions
+
+        //- Return the cell in which the reference pressure is set
+        inline label refCell() const;
+
+        //- Return the pressure reference level
+        inline scalar refValue() const;
+
+        //- Limit the pressure
+        void limit(volScalarField& p) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "pressureControlI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/pressureControl/pressureControlI.H b/src/finiteVolume/cfdTools/general/pressureControl/pressureControlI.H
new file mode 100644
index 0000000000..6548d43455
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/pressureControl/pressureControlI.H
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::label Foam::pressureControl::refCell() const
+{
+    return refCell_;
+}
+
+
+inline Foam::scalar Foam::pressureControl::refValue() const
+{
+    return refValue_;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
index 9eee4c23fb..4b7b15b927 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
@@ -54,8 +54,8 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    rhoMin          0.5;
-    rhoMax          1.5;
+    pMinFactor      0.5;
+    pMaxFactor      1.5;
 
     residualControl
     {
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
index 8699fd7095..421197bf13 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
@@ -48,8 +48,8 @@ SIMPLE
 {
     nUCorrectors        2;
     nNonOrthogonalCorrectors 0;
-    rhoMin              0.5;
-    rhoMax              2.0;
+    pMinFactor          0.5;
+    pMaxFactor          2.0;
 
     residualControl
     {
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
index a054853c3e..25619f1f3f 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/system/fvSolution
@@ -54,8 +54,8 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    rhoMin          0.4;
-    rhoMax          1.5;
+    pMinFactor      0.4;
+    pMaxFactor      1.5;
 
     residualControl
     {
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
index 3855d4cb05..2ffe1fe4be 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
@@ -39,8 +39,8 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    rhoMin          0.1;
-    rhoMax          1.0;
+    pMinFactor      0.1;
+    pMaxFactor      1.5;
     transonic       yes;
     consistent      yes;
 
@@ -60,7 +60,6 @@ relaxationFactors
     fields
     {
         p               1;
-        rho             1;
     }
     equations
     {
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/T b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/T
new file mode 100644
index 0000000000..2df93ba37e
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/T
@@ -0,0 +1,42 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    Default_Boundary_Region
+    {
+        type            fixedValue;
+        value           uniform 350;
+    }
+
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/U b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/U
new file mode 100644
index 0000000000..99e3c1d635
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/U
@@ -0,0 +1,42 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    Default_Boundary_Region
+    {
+        type            noSlip;
+    }
+    inlet
+    {
+        type            flowRateInletVelocity;
+        massFlowRate    constant 5;
+        rhoInlet        1000;    // Guess for rho
+    }
+    outlet
+    {
+        type            inletOutlet;
+        value           uniform (0 0 0);
+        inletValue      uniform (0 0 0);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/alphat b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/alphat
new file mode 100644
index 0000000000..3a6625042c
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/alphat
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    Default_Boundary_Region
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           uniform 0;
+    }
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/epsilon b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/epsilon
new file mode 100644
index 0000000000..71b9c782d1
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/epsilon
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   uniform 200;
+
+boundaryField
+{
+    Default_Boundary_Region
+    {
+        type            epsilonWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 200;
+    }
+    inlet
+    {
+        type            turbulentMixingLengthDissipationRateInlet;
+        mixingLength    0.005;
+        value           uniform 200;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 200;
+        value           uniform 200;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/k b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/k
new file mode 100644
index 0000000000..7ee52f8dbf
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/k
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    Default_Boundary_Region
+    {
+        type            kqRWallFunction;
+        value           uniform 1;
+    }
+    inlet
+    {
+        type            turbulentIntensityKineticEnergyInlet;
+        intensity       0.05;
+        value           uniform 1;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/nut b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/nut
new file mode 100644
index 0000000000..ac8d562f40
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/nut
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    Default_Boundary_Region
+    {
+        type            nutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/p b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/p
new file mode 100644
index 0000000000..5e0d23f65f
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/0/p
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 1e5;
+
+boundaryField
+{
+    Default_Boundary_Region
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/thermophysicalProperties b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/thermophysicalProperties
new file mode 100644
index 0000000000..426ab72116
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/thermophysicalProperties
@@ -0,0 +1,31 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    properties      liquid;
+    energy          sensibleInternalEnergy;
+}
+
+mixture
+{
+    H2O;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties
new file mode 100644
index 0000000000..cd2daf8229
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties
@@ -0,0 +1,30 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  RAS;
+
+RAS
+{
+    RASModel        kEpsilon;
+
+    turbulence      on;
+
+    printCoeffs     on;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict
new file mode 100644
index 0000000000..9bec6a9547
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/blockMeshDict
@@ -0,0 +1,127 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.001;
+
+vertices
+(
+    // front-plane: z = +25mm
+    // inlet region
+    (   -50  25   25)           // pt 0
+    (     0  25   25)           // pt 1
+    (   -50  75   25)           // pt 2
+    (     0  75   25)           // pt 3
+    // outlet region
+    (  -500 -75   25)           // pt 4
+    (     0 -75   25)           // pt 5
+    (  -500 -25   25)           // pt 6
+    (     0 -25   25)           // pt 7
+    // bend mid-points
+    (    25   0   25)           // pt 8
+    (    75   0   25)           // pt 9
+    // back-plane: z = -25mm
+    // inlet region
+    (   -50  25   -25)          // pt 0 + 10
+    (     0  25   -25)          // pt 1 + 10
+    (   -50  75   -25)          // pt 2 + 10
+    (     0  75   -25)          // pt 3 + 10
+    // outlet region
+    (  -500 -75   -25)          // pt 4 + 10
+    (     0 -75   -25)          // pt 5 + 10
+    (  -500 -25   -25)          // pt 7 + 10
+    (     0 -25   -25)          // pt 8 + 10
+    // bend mid-points
+    (    25   0   -25)          // pt 8 + 10
+    (    75   0   -25)          // pt 9 + 10
+);
+
+blocks
+(
+    hex (0 1 11 10  2 3 13 12) inlet  ( 20 20 20)  simpleGrading (1 1 1)
+    hex (4 5 15 14  6 7 17 16) outlet (200 20 20)  simpleGrading (1 1 1)
+
+    hex (1 8 18 11  3 9 19 13) bend1  ( 30 20 20)  simpleGrading (1 1 1)
+    hex (5 9 19 15  7 8 18 17) bend2  ( 30 20 20)  simpleGrading (1 1 1)
+);
+
+edges
+(
+   // block 2
+   arc  1  8  ( 17.678  17.678  25)
+   arc 11 18  ( 17.678  17.678 -25)
+   arc  3  9  ( 53.033  53.033  25)
+   arc 13 19  ( 53.033  53.033 -25)
+   // block 3
+   arc  7  8  ( 17.678  -17.678  25)
+   arc 17 18  ( 17.678  -17.678 -25)
+   arc  5  9  ( 53.033  -53.033  25)
+   arc 15 19  ( 53.033  -53.033 -25)
+);
+
+boundary
+(
+        // is there no way of defining all my 'defaultFaces' to be 'wall'?
+    Default_Boundary_Region
+    {
+        type wall;
+        faces
+        (
+            // block0
+            ( 0 1 3 2 )
+            ( 11 10 12 13 )
+            ( 0 10 11 1 )
+            ( 2 3 13 12 )
+            // block1
+            ( 4 5 7 6 )
+            ( 15 14 16 17 )
+            ( 4 14 15 5 )
+            ( 6 7 17 16 )
+            // block2
+            ( 1 8 9 3 )
+            ( 18 11 13 19 )
+            ( 3 9 19 13 )
+            ( 1 11 18 8 )
+            // block3
+            ( 5 9 8 7 )
+            ( 19 15 17 18 )
+            ( 5 15 19 9 )
+            ( 7 8 18 17 )
+        );
+    }
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 2 12 10)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (4 6 16 14)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/controlDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/controlDict
new file mode 100644
index 0000000000..edddd719e6
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/controlDict
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     rhoSimpleFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         500;
+
+deltaT          1;
+
+writeControl    timeStep;
+
+writeInterval   100;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+graphFormat     raw;
+
+runTimeModifiable true;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/decomposeParDict b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/decomposeParDict
new file mode 100644
index 0000000000..9e844a62ba
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/decomposeParDict
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 8;
+
+method          hierarchical;
+
+simpleCoeffs
+{
+    n               (8 1 1);
+    delta           0.001;
+}
+
+hierarchicalCoeffs
+{
+    n               (4 2 1);
+    delta           0.001;
+    order           xyz;
+}
+
+manualCoeffs
+{
+    dataFile        "";
+}
+
+distributed     no;
+
+roots           ( );
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSchemes b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSchemes
new file mode 100644
index 0000000000..c68f548c95
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSchemes
@@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default             steadyState;
+}
+
+gradSchemes
+{
+    default             Gauss linear;
+
+    limited             cellLimited Gauss linear 1;
+}
+
+divSchemes
+{
+    default             none;
+
+    div(phi,U)          bounded Gauss linearUpwind limited;
+    div(phi,e)          bounded Gauss linearUpwind limited;
+    div(phi,epsilon)    bounded Gauss linearUpwind limited;
+    div(phi,k)          bounded Gauss linearUpwind limited;
+    div(phi,Ekp)        bounded Gauss linearUpwind limited;
+
+    div(((rho*nuEff)*dev2(T(grad(U)))))      Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSolution
new file mode 100644
index 0000000000..3b30d4ebe5
--- /dev/null
+++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/system/fvSolution
@@ -0,0 +1,71 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          GAMG;
+        smoother        GaussSeidel;
+
+        tolerance       1e-7;
+        relTol          0.1;
+    }
+
+    "(U|e|k|epsilon)"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+
+        tolerance       1e-7;
+        relTol          0.1;
+    }
+}
+
+SIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+    pMinFactor      0.1;
+    pMaxFactor      1.5;
+
+    transonic       no;
+    consistent      no;
+
+    residualControl
+    {
+        p               1e-4;
+        U               1e-4;
+        "(k|omega|epsilon|e|h)" 1e-3;
+    }
+}
+
+relaxationFactors
+{
+    fields
+    {
+        p               0.3;
+    }
+    equations
+    {
+        U               0.7;
+        e               0.7;
+        k               0.7;
+        epsilon         0.7;
+    }
+}
+
+// ************************************************************************* //

From 7d6845defaa6f0840e68ebf239d024fa0d739127 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 24 Feb 2017 16:20:06 +0000
Subject: [PATCH 40/40] rhoSimpleFoam: Added support for transonic flow of
 liquids and real gases

Both stardard SIMPLE and the SIMPLEC (using the 'consistent' option in
fvSolution) are now supported for both subsonic and transonic flow of all
fluid types.
---
 .../solvers/compressible/rhoSimpleFoam/pEqn.H | 15 +++++++++------
 .../compressible/rhoSimpleFoam/pcEqn.H        | 19 +++++++++----------
 .../squareBend/system/fvSolution              |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index 06fa890c05..5f092ada2f 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -8,20 +8,23 @@
 
     if (simple.transonic())
     {
+        surfaceScalarField phiHbyA("phiHbyA", fvc::flux(rho*HbyA));
+        surfaceScalarField rhof(fvc::interpolate(rho));
+        MRF.makeRelative(rhof, phiHbyA);
+
         surfaceScalarField phid
         (
             "phid",
-            fvc::interpolate(psi)
-           *fvc::flux(HbyA)
+            (fvc::interpolate(psi)/rhof)*phiHbyA
         );
-
-        MRF.makeRelative(fvc::interpolate(psi), phid);
+        phiHbyA -= fvc::interpolate(p)*phid;
 
         while (simple.correctNonOrthogonal())
         {
             fvScalarMatrix pEqn
             (
-                fvm::div(phid, p)
+                fvc::div(phiHbyA)
+              + fvm::div(phid, p)
               - fvm::laplacian(rhorAUf, p)
               ==
                 fvOptions(psi, p, rho.name())
@@ -40,7 +43,7 @@
 
             if (simple.finalNonOrthogonalIter())
             {
-                phi == pEqn.flux();
+                phi = phiHbyA + pEqn.flux();
             }
         }
     }
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
index 0dbde82960..af2005febd 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H
@@ -7,20 +7,19 @@ bool closedVolume = false;
 
 if (simple.transonic())
 {
+    surfaceScalarField phiHbyA("phiHbyA", fvc::flux(rho*HbyA));
+    surfaceScalarField rhof(fvc::interpolate(rho));
+    MRF.makeRelative(rhof, phiHbyA);
+
     surfaceScalarField phid
     (
         "phid",
-        fvc::interpolate(psi)
-       *fvc::flux(HbyA)
+        (fvc::interpolate(psi)/rhof)*phiHbyA
     );
 
-    MRF.makeRelative(fvc::interpolate(psi), phid);
-
-    surfaceScalarField phic
-    (
-        "phic",
+    phiHbyA +=
         fvc::interpolate(rho*(rAtU - rAU))*fvc::snGrad(p)*mesh.magSf()
-    );
+      - fvc::interpolate(p)*phid;
 
     HbyA -= (rAU - rAtU)*fvc::grad(p);
 
@@ -31,7 +30,7 @@ if (simple.transonic())
         fvScalarMatrix pEqn
         (
             fvm::div(phid, p)
-          + fvc::div(phic)
+          + fvc::div(phiHbyA)
           - fvm::laplacian(rhorAtU, p)
          ==
             fvOptions(psi, p, rho.name())
@@ -50,7 +49,7 @@ if (simple.transonic())
 
         if (simple.finalNonOrthogonalIter())
         {
-            phi == phic + pEqn.flux();
+            phi = phiHbyA + pEqn.flux();
         }
     }
 }
diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
index 2ffe1fe4be..03707f600d 100644
--- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
+++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/fvSolution
@@ -40,7 +40,7 @@ SIMPLE
 {
     nNonOrthogonalCorrectors 0;
     pMinFactor      0.1;
-    pMaxFactor      1.5;
+    pMaxFactor      2;
     transonic       yes;
     consistent      yes;