From 265ed0f0336988b6ab35e95e321aaf0db76ac784 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 12 Oct 2010 14:15:11 +0100
Subject: [PATCH] ENH: Updated tutorial thermo props

---
 .../constant/thermophysicalProperties         |   5 +-
 .../constant/thermo.compressibleGas           | 110 ++++++--
 .../constant/thermophysicalProperties         |  12 +-
 .../constant/thermophysicalProperties         |  18 +-
 .../constant/thermophysicalProperties         |  12 +-
 .../constant/thermophysicalProperties         |  13 +-
 .../constant/thermophysicalProperties         |  12 +-
 .../constant/thermophysicalProperties         |  13 +-
 .../constant/thermophysicalProperties         |  12 +-
 .../constant/thermophysicalProperties         |  12 +-
 .../constant/thermophysicalProperties         |  12 +-
 .../constant/thermophysicalProperties         |  12 +-
 .../prism/constant/thermophysicalProperties   |  12 +-
 .../hotRoom/constant/thermophysicalProperties |  14 +-
 .../constant/thermophysicalProperties         |  14 +-
 .../hotRoom/constant/thermophysicalProperties |  14 +-
 .../hotRadiationRoom/0/G                      |   8 +-
 .../constant/thermophysicalProperties         |  14 +-
 .../constant/thermophysicalProperties         |  14 +-
 .../bottomAir/thermophysicalProperties        |  14 +-
 .../constant/topAir/thermophysicalProperties  |  14 +-
 .../bottomAir/thermophysicalProperties        |  14 +-
 .../constant/topAir/thermophysicalProperties  |  14 +-
 .../bottomAir/thermophysicalProperties        |  14 +-
 .../constant/topAir/thermophysicalProperties  |  14 +-
 .../simplifiedSiwek/chemkin/foam.dat          | 129 ++++++---
 .../filter/constant/thermo.incompressiblePoly | 256 +++++-------------
 .../constant/thermo.incompressiblePoly        | 256 +++++-------------
 .../evaporationTest/chemkin/foam.dat          |  75 +++--
 .../evaporationTest/chemkin/foam.inp          |   7 +-
 .../hotBoxes/chemkin/foam.dat                 |  75 +++--
 .../multipleBoxes/chemkin/foam.dat            |  75 +++--
 .../constant/thermophysicalProperties         |   5 +-
 33 files changed, 743 insertions(+), 552 deletions(-)

diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties
index 42fa0ce32ac..ba1621ceecb 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties
@@ -27,7 +27,10 @@ liquidComponents ( C7H16 );
 
 liquidProperties
 {
-    C7H16           C7H16 defaultCoeffs;
+    C7H16
+    {
+        defaultCoeffs   yes;
+    }
 }
 
 
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
index 9b202c3435f..26629101fde 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermo.compressibleGas
@@ -1,28 +1,84 @@
-(
-O2 O2   1   31.9988
-    200 5000    1000
-    3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
-    3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
-    1.67212e-06 170.672
-H2O H2O 1   18.0153
-    200 5000    1000
-    2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
-    3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
-    1.67212e-06 170.672
-CH4 CH4   1   16.0428
-    200 6000    1000
-    1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937
-    5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132
-    1.67212e-06 170.672
-CO2 CO2 1   44.01
-    200 5000    1000
-    4.45362 0.00314017 -1.27841e-06 2.394e-10 -1.66903e-14 -48967 -0.955396
-    2.27572 0.00992207 -1.04091e-05 6.86669e-09 -2.11728e-12 -48373.1 10.1885
-    1.67212e-06 170.672
-N2 N2   1   28.0134
-    200 5000    1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
-    1.67212e-06 170.672
-)
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermo.compressibleGas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
+    lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
+    lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+CH4
+{
+    nMoles          1;
+    molWeight       16.0428;
+    Tlow            200;
+    Thigh           6000;
+    Tcommon         1000;
+    highCpCoeffs    ( 1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937 );
+    lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+CO2
+{
+    nMoles          1;
+    molWeight       44.01;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 4.45362 0.00314017 -1.27841e-06 2.394e-10 -1.66903e-14 -48967 -0.955396 );
+    lowCpCoeffs     ( 2.27572 0.00992207 -1.04091e-05 6.86669e-09 -2.11728e-12 -48373.1 10.1885 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+    lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
index 4cf1dd6e3c7..b1b76de85a5 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.96 1004.5 0 1.458e-06 110.4;
+mixture
+{
+    nMoles          1;
+    molWeight       28.96;
+    Cp              1004.5;
+    Hf              0;
+    As              1.458e-06;
+    Ts              110.4;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
index e30c05b865f..29cc46bb602 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@@ -19,12 +19,18 @@ Pr              0.72;
 
 thermoType      ePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
 
-mixture         N2
-     1 28.01348
-     100 10000 1000
-     2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 -923.93753 5.8718221
-     3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 -1046.9637 2.9674391
-     1.458e-06 110;
+mixture
+{
+    nMoles          1;
+    molWeight       28.01348;
+    Tlow            100;
+    Thigh           10000;
+    Tcommon         1000;
+    highCpCoeffs    ( 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 -923.93753 5.8718221 );
+    lowCpCoeffs     ( 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 -1046.9637 2.9674391 );
+    As              1.458e-06;
+    Ts              110;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
index 071a9b22582..e29c4ca7b7d 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
@@ -15,12 +15,20 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType     ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 // Note: these are the properties for a "normalised" inviscid gas
 //       for which the speed of sound is 1 m/s at a temperature of 1K
 //       and gamma = 7/5
-mixture         normalisedGas 1 11640.3 2.5 0 0 1;
+mixture
+{
+    nMoles          1;
+    molWeight       11640.3;
+    Cp              2.5;
+    Hf              0;
+    Mu              0;
+    Pr              1;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
index 28dcabbacb8..86e3e2bb1b4 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,7 +17,16 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         normalisedGas 1 11640.3 2.5 0 0 1;
+mixture
+{
+    // normalised gas
+    nMoles          1;
+    molWeight       11640.3;
+    Cp              2.5;
+    Hf              0;
+    Mu              0;
+    Pr              1;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
index 87220ff9802..16a5a98e21c 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.96 1004.5 2.544e+06 0 1;
+mixture
+{
+    nMoles          1;
+    molWeight       28.96;
+    Cp              1004.5;
+    Hf              2.544e+06;
+    Mu              0;
+    Pr              1;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
index 28dcabbacb8..86e3e2bb1b4 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,7 +17,16 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         normalisedGas 1 11640.3 2.5 0 0 1;
+mixture
+{
+    // normalised gas
+    nMoles          1;
+    molWeight       11640.3;
+    Cp              2.5;
+    Hf              0;
+    Mu              0;
+    Pr              1;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
index 3f8c932b2be..3eded969aad 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1007 0 1.4792e-06 116;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1007;
+    Hf              0;
+    As              1.4792e-06;
+    Ts              116;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
index ef759742f1c..bdaf26e9fd2 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -20,7 +20,15 @@ thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<
 // Note: these are the properties for a "normalised" inviscid gas
 //       for which the speed of sound is 1 m/s at a temperature of 1K
 //       and gamma = 7/5
-mixture         normalisedGas 1 11640.31 2.5 0 0 1;
+mixture
+{
+    nMoles          1;
+    molWeight       11640.3;
+    Cp              2.5;
+    Hf              0;
+    Mu              0;
+    Pr              1;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
index 11ece501941..e723a52bbed 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 717.5 0 0 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cv              717.5;
+    Hf              0;
+    Mu              0;
+    Pr              0.7;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
index b380e7875de..b0992ad6727 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 717.5 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cv              717.5;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
index b380e7875de..b0992ad6727 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,7 +17,15 @@ FoamFile
 
 thermoType      ePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 717.5 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cv              717.5;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
index 7cf6079e48c..3684941cfb0 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,9 +17,17 @@ FoamFile
 
 thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
-
 pRef            100000;
 
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
index b592ca2d1c8..88958cde6c3 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.96 1004.4 0 1.831e-05 0.705;
+mixture
+{
+    nMoles          1;
+    molWeight       28.96;
+    Cp              1004.4;
+    Hf              0;
+    Mu              1.831e-05;
+    Pr              0.705;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
index 0378a7f78cf..3d044d0d77a 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,9 +17,17 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
-
 pRef            100000;
 
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
index 928afaeb565..d49a1b712b7 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
@@ -25,7 +25,7 @@ boundaryField
         type            MarshakRadiation;
         T               T;
         emissivity      1;
-//        value           uniform 0;
+        value           uniform 0;
     }
 
     fixedWalls
@@ -33,7 +33,7 @@ boundaryField
         type            MarshakRadiation;
         T               T;
         emissivity      1;
-//        value           uniform 0;
+        value           uniform 0;
     }
 
     ceiling
@@ -41,7 +41,7 @@ boundaryField
         type            MarshakRadiation;
         T               T;
         emissivity      1;
- //       value           uniform 0;
+        value           uniform 0;
     }
 
     box
@@ -49,7 +49,7 @@ boundaryField
         type            MarshakRadiation;
         T               T;
         emissivity      1;
-//        value           uniform 0;
+        value           uniform 0;
     }
 }
 
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
index 0378a7f78cf..3d044d0d77a 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,9 +17,17 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
-
 pRef            100000;
 
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
index 0378a7f78cf..3d044d0d77a 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,9 +17,17 @@ FoamFile
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
-
 pRef            100000;
 
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index 64a74514b8b..c849bd357ad 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/bottomAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index 64a74514b8b..dad4948bd22 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/topAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index 64a74514b8b..c849bd357ad 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/bottomAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
index 64a74514b8b..dad4948bd22 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/topAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index 64a74514b8b..c849bd357ad 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/bottomAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index 64a74514b8b..dad4948bd22 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,12 +10,22 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant/topAir";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
-mixture         air 1 28.9 1000 0 1.8e-05 0.7;
+mixture
+{
+    nMoles          1;
+    molWeight       28.9;
+    Cp              1000;
+    Hf              0;
+    Mu              1.8e-05;
+    Pr              0.7;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.dat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.dat
index b3a1716ea5c..3d936eed4f6 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.dat
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.dat
@@ -1,32 +1,97 @@
-(
-CO2 CO2	1	44.01
-    0	5000	1000
-    3.85746 0.00441437 -2.21481e-06 5.2349e-10 -4.72084e-14 -48759.2 2.27164
-    2.35677 0.0089846 -7.12356e-06 2.45919e-09 -1.437e-13 -48372 9.90105
-	1.67212e-06	170.672
-CH4 CH4	1	16.043
-    0	5000	1000
-    0.0748515 0.0133909 -5.73286e-06 1.22293e-09 -1.01815e-13 -9468.34 18.4373
-    5.14988 -0.013671 4.91801e-05 -4.84743e-08 1.66694e-11 -10246.6 -4.6413
-	1.67212e-06	170.672
-H2 H2	1	2.01594
-    0	5000	1000
-    3.33728 -4.94025e-05 4.99457e-07 -1.79566e-10 2.00255e-14 -950.159 -3.20502
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-	1.67212e-06	170.672
-H2O H2O	1	18.0153
-    0	5000	1000
-    3.03399 0.00217692 -1.64073e-07 -9.7042e-11 1.68201e-14 -30004.3 4.96677
-    4.19864 -0.00203643 6.5204e-06 -5.48797e-09 1.77198e-12 -30293.7 -0.849032
-	1.67212e-06	170.672
-O2 O2	1	31.9988
-    0	5000	1000
-    3.28254 0.00148309 -7.57967e-07 2.09471e-10 -2.16718e-14 -1088.46 5.45323
-    3.78246 -0.00299673 9.8473e-06 -9.6813e-09 3.24373e-12 -1063.94 3.65768
-	1.67212e-06	170.672
-N2 N2	1	28.0134
-    0	5000	1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44485e-12 -1020.9 3.95037
-	1.67212e-06	170.672
-)
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      foam.dat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+CO2
+{
+    nMoles          1;
+    molWeight       44.01;
+    Tlow            0;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 3.85746 0.00441437 -2.21481e-06 5.2349e-10 -4.72084e-14 -48759.2 2.27164 );
+    lowCpCoeffs     ( 2.35677 0.0089846 -7.12356e-06 2.45919e-09 -1.437e-13 -48372 9.90105 );
+    As              1.67212e-06;
+    Ts              170.6;
+}
+
+CH4
+{
+    nMoles          1;
+    molWeight       16.043;
+    Tlow            0;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 0.0748515 0.0133909 -5.73286e-06 1.22293e-09 -1.01815e-13 -9468.34 18.4373 );
+    lowCpCoeffs     ( 5.14988 -0.013671 4.91801e-05 -4.84743e-08 1.66694e-11 -10246.6 -4.6413 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2
+{
+    nMoles          1;
+    molWeight       2.01594;
+    Tlow            0;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 3.33728 -4.94025e-05 4.99457e-07 -1.79566e-10 2.00255e-14 -950.159 -3.20502 );
+    lowCpCoeffs     ( 2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301 );
+    As              1.67212e-06;
+    TS              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    Tlow            0;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 3.03399 0.00217692 -1.64073e-07 -9.7042e-11 1.68201e-14 -30004.3 4.96677 );
+    lowCpCoeffs     ( 4.19864 -0.00203643 6.5204e-06 -5.48797e-09 1.77198e-12 -30293.7 -0.849032 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    Tlow            0;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 3.28254 0.00148309 -7.57967e-07 2.09471e-10 -2.16718e-14 -1088.46 5.45323 );
+    lowCpCoeffs     ( 3.78246 -0.00299673 9.8473e-06 -9.6813e-09 3.24373e-12 -1063.94 3.65768 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    Tlow            0;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+    lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44485e-12 -1020.9 3.95037 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
index 16729ac9d90..7dda21bd8bf 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermo.incompressiblePoly
@@ -1,191 +1,67 @@
-(
-N2 N2   1   28.0134
-    rhoPolynomial
-    (
-        3.8936E+00
-       -1.6463E-02
-        3.2101E-05
-       -2.9174E-08
-        9.9889E-12
-        0
-        0
-        0
-    )
-    0.0                                 // Heat of formation
-    0.0                                 // Standard entropy
-    cpPolynomial
-    (
-        9.7908E+02
-        4.1787E-01
-       -1.1761E-03
-        1.6742E-06
-       -7.2559E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        3.1494E-03
-        8.4997E-05
-       -1.2621E-08
-        0
-        0
-        0
-        0
-        0
-    )
-O2 O2   1   31.9988
-    rhoPolynomial
-    (
-        4.4475E+00
-       -1.8805E-02
-        3.6667E-05
-       -3.3323E-08
-        1.1410E-11
-        0
-        0
-        0
-    )
-    0.0                                 // Heat of formation
-    0.0                                 // Standard entropy
-    cpPolynomial
-    (
-        8.3484E+02
-        2.9297E-01
-       -1.4959E-04
-        3.4143E-07
-       -2.2786E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        1.6082E-04
-        8.5301E-05
-       -1.4998E-08
-        0
-        0
-        0
-        0
-        0
-    )
-H2O H2O 1   18.0153
-    rhoPolynomial
-    (
-        2.5039E+00
-       -1.0587E-02
-        2.0643E-05
-       -1.8761E-08
-        6.4237E-12
-        0
-        0
-        0
-    )
-   -1.3423e07                                // Heat of formation [J/kg]
-    1.0482e04                                // Standard entropy [J/kg/K]
-    cpPolynomial
-    (
-        1.5631E+03
-        1.6040E+00
-       -2.9334E-03
-        3.2168E-06
-       -1.1571E-09
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        3.7972E-03
-        1.5336E-04
-       -1.1859E-08
-        0
-        0
-        0
-        0
-        0
-    )
-air air 1   28.85
-    rhoPolynomial
-    (
-        4.0097E+00
-       -1.6954E-02
-        3.3057E-05
-       -3.0042E-08
-        1.0286E-11
-        0
-        0
-        0
-    )
-    0.0
-    0.0
-    cpPolynomial
-    (
-        9.4876E+02
-        3.9171E-01
-       -9.5999E-04
-        1.3930E-06
-       -6.2029E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5061E-06
-        6.1600E-08
-       -1.8190E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        2.5219E-03
-        8.5060E-05
-       -1.3120E-08
-        0
-        0
-        0
-        0
-        0
-    )
-)
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermo.incompressiblePoly;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    Hf              0;
+    Sf              0;
+    rhoPolynomial   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
+    cpPolynomial    ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
+    muPolynomial    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+    kappaPolynomial ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
+}
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    Hf              0;
+    Sf              0;
+    rhoPolynomial   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
+    cpPolynomial    ( 834.84 0.29297 -0.00014959 3.4143e-07 -2.2786e-10 0 0 0 );
+    muPolynomial    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+    kappaPolynomial ( 0.00016082 8.5301e-05 -1.4998e-08 0 0 0 0 0 );
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    Hf              -13423000;
+    Sf              10482;
+    rhoPolynomial   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
+    cpPolynomial    ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
+    muPolynomial    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+    kappaPolynomial ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
+}
+
+air
+{
+    nMoles          1;
+    molWeight       28.85;
+    Hf              0;
+    Sf              0;
+    rhoPolynomial   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
+    cpPolynomial    ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+    muPolynomial    ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
+    kappaPolynomial ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
index 16729ac9d90..7dda21bd8bf 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly
@@ -1,191 +1,67 @@
-(
-N2 N2   1   28.0134
-    rhoPolynomial
-    (
-        3.8936E+00
-       -1.6463E-02
-        3.2101E-05
-       -2.9174E-08
-        9.9889E-12
-        0
-        0
-        0
-    )
-    0.0                                 // Heat of formation
-    0.0                                 // Standard entropy
-    cpPolynomial
-    (
-        9.7908E+02
-        4.1787E-01
-       -1.1761E-03
-        1.6742E-06
-       -7.2559E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        3.1494E-03
-        8.4997E-05
-       -1.2621E-08
-        0
-        0
-        0
-        0
-        0
-    )
-O2 O2   1   31.9988
-    rhoPolynomial
-    (
-        4.4475E+00
-       -1.8805E-02
-        3.6667E-05
-       -3.3323E-08
-        1.1410E-11
-        0
-        0
-        0
-    )
-    0.0                                 // Heat of formation
-    0.0                                 // Standard entropy
-    cpPolynomial
-    (
-        8.3484E+02
-        2.9297E-01
-       -1.4959E-04
-        3.4143E-07
-       -2.2786E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        1.6082E-04
-        8.5301E-05
-       -1.4998E-08
-        0
-        0
-        0
-        0
-        0
-    )
-H2O H2O 1   18.0153
-    rhoPolynomial
-    (
-        2.5039E+00
-       -1.0587E-02
-        2.0643E-05
-       -1.8761E-08
-        6.4237E-12
-        0
-        0
-        0
-    )
-   -1.3423e07                                // Heat of formation [J/kg]
-    1.0482e04                                // Standard entropy [J/kg/K]
-    cpPolynomial
-    (
-        1.5631E+03
-        1.6040E+00
-       -2.9334E-03
-        3.2168E-06
-       -1.1571E-09
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5068E-06
-        6.1598E-08
-       -1.8188E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        3.7972E-03
-        1.5336E-04
-       -1.1859E-08
-        0
-        0
-        0
-        0
-        0
-    )
-air air 1   28.85
-    rhoPolynomial
-    (
-        4.0097E+00
-       -1.6954E-02
-        3.3057E-05
-       -3.0042E-08
-        1.0286E-11
-        0
-        0
-        0
-    )
-    0.0
-    0.0
-    cpPolynomial
-    (
-        9.4876E+02
-        3.9171E-01
-       -9.5999E-04
-        1.3930E-06
-       -6.2029E-10
-        0
-        0
-        0
-    )
-    muPolynomial
-    (
-        1.5061E-06
-        6.1600E-08
-       -1.8190E-11
-        0
-        0
-        0
-        0
-        0
-    )
-    kappaPolynomial
-    (
-        2.5219E-03
-        8.5060E-05
-       -1.3120E-08
-        0
-        0
-        0
-        0
-        0
-    )
-)
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermo.incompressiblePoly;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    Hf              0;
+    Sf              0;
+    rhoPolynomial   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
+    cpPolynomial    ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
+    muPolynomial    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+    kappaPolynomial ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
+}
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    Hf              0;
+    Sf              0;
+    rhoPolynomial   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
+    cpPolynomial    ( 834.84 0.29297 -0.00014959 3.4143e-07 -2.2786e-10 0 0 0 );
+    muPolynomial    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+    kappaPolynomial ( 0.00016082 8.5301e-05 -1.4998e-08 0 0 0 0 0 );
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    Hf              -13423000;
+    Sf              10482;
+    rhoPolynomial   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
+    cpPolynomial    ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
+    muPolynomial    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
+    kappaPolynomial ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
+}
+
+air
+{
+    nMoles          1;
+    molWeight       28.85;
+    Hf              0;
+    Sf              0;
+    rhoPolynomial   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
+    cpPolynomial    ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+    muPolynomial    ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
+    kappaPolynomial ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.dat
index 36ef3243121..f74ea677514 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.dat
@@ -1,17 +1,58 @@
-(
-O2 O2   1   31.9988
-    200 5000    1000
-    3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
-    3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
-    1.67212e-06 170.672
-H2O H2O 1   18.0153
-    200 5000    1000
-    2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
-    3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
-    1.67212e-06 170.672
-N2 N2   1   28.0134
-    200 5000    1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
-    1.67212e-06 170.672
-)
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      foam.dat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
+    lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
+    lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+    lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.inp b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.inp
index 80d66f62c04..84c3df95ee9 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.inp
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/chemkin/foam.inp
@@ -3,9 +3,8 @@ species
     O2
     H2O
     N2
-)
-;
+);
 
 reactions
-(
-);
+{}
+
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/foam.dat
index 36ef3243121..f74ea677514 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/chemkin/foam.dat
@@ -1,17 +1,58 @@
-(
-O2 O2   1   31.9988
-    200 5000    1000
-    3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
-    3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
-    1.67212e-06 170.672
-H2O H2O 1   18.0153
-    200 5000    1000
-    2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
-    3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
-    1.67212e-06 170.672
-N2 N2   1   28.0134
-    200 5000    1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
-    1.67212e-06 170.672
-)
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      foam.dat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
+    lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
+    lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+    lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/foam.dat b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/foam.dat
index 36ef3243121..caa9aacfac7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/foam.dat
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/chemkin/foam.dat
@@ -1,17 +1,58 @@
-(
-O2 O2   1   31.9988
-    200 5000    1000
-    3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
-    3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
-    1.67212e-06 170.672
-H2O H2O 1   18.0153
-    200 5000    1000
-    2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
-    3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
-    1.67212e-06 170.672
-N2 N2   1   28.0134
-    200 5000    1000
-    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
-    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
-    1.67212e-06 170.672
-)
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.thermoChemDicts                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      foam.dat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+O2
+{
+    nMoles          1;
+    molWeight       31.9988;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917 );
+    lowCpCoeffs     ( 3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+H2O
+{
+    nMoles          1;
+    molWeight       18.0153;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282 );
+    lowCpCoeffs     ( 3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023 );
+    As              1.67212e-06;
+    Ts              170.672;
+}
+
+N2
+{
+    nMoles          1;
+    molWeight       28.0134;
+    Tlow            200;
+    Thigh           5000;
+    Tcommon         1000;
+    highCpCoeffs    ( 2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053 );
+    lowCpCoeffs     ( 3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037 );
+    As              1.67212e-06;
+    TS              170.672;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/thermophysicalProperties
index bddd3c54584..93311e4820d 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/thermophysicalProperties
@@ -32,7 +32,10 @@ liquids
         H2O
     );
 
-    H2O             H2O defaultCoeffs;
+    H2O
+    {
+        defaultCoeffs   yes;
+    }
 }
 
 solids
-- 
GitLab