tutorials/heatTransfer, lagrangian: replaced the icoPolynomial with perfectGas for air

and with perfectFluid for water.  These choices are more accurate and easier to
specify than icoPolynomial and provide correct mixing.

tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/thermophysicalProperties

@@ -19,35 +19,32 @@ thermoType
 {
     type            heRhoThermo;
     mixture         pureMixture;
-    transport       polynomial;
+    transport       sutherland;
-    thermo          hPolynomial;
+    thermo          janaf;
-    equationOfState icoPolynomial;
+    equationOfState perfectGas;
     specie          specie;
     energy          sensibleInternalEnergy;
 }
 
 mixture
 {
-    // coefficients for air
-
     specie
     {
-        molWeight       28.85;
+        nMoles          1;
-    }
+        molWeight       28.9596;
-    equationOfState
-    {
-        rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
     }
     thermodynamics
     {
-        Hf              0;
+        Tlow            200;
-        Sf              0;
+        Thigh           3500;
-        CpCoeffs<8>     ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
+        Tcommon         1000;
+        highCpCoeffs    ( 3.57304 -7.24383e-04 1.67022e-06 -1.26501e-10 -4.20580e-13 -1047.41 3.12431 );
+        lowCpCoeffs     ( 3.09589 1.22835e-03 -4.14267e-07 6.56910e-11 -3.87021e-15 -983.191 5.34161 );
     }
     transport
     {
-        muCoeffs<8>     ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
+        As              1.67212e-06;
-        kappaCoeffs<8>  ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
+        Ts              170.672;
     }
 }
 

tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/thermophysicalProperties

@@ -18,37 +18,35 @@ thermoType
 {
     type            heRhoThermo;
     mixture         pureMixture;
-    transport       polynomial;
+    transport       const;
-    thermo          hPolynomial;
+    thermo          eConst;
-    equationOfState icoPolynomial;
+    equationOfState perfectFluid;
     specie          specie;
     energy          sensibleInternalEnergy;
 }
 
-
 mixture
 {
-    // coefficients for water
-
     specie
     {
-        molWeight       18;
+        molWeight   18;
     }
     equationOfState
     {
-        rhoCoeffs<8>    ( 1000 0 0 0 0 0 0 0 );
+        R           3000;
+        rho0        1027;
     }
     thermodynamics
     {
-        Hf              0;
+        Cv          4195;
-        Sf              0;
+        Hf          0;
-        CpCoeffs<8>     ( 4183 0 0 0 0 0 0 0 );
     }
     transport
     {
-        muCoeffs<8>     ( 0.001 0 0 0 0 0 0 0 );
+        mu          3.645e-4;
-        kappaCoeffs<8>  ( 0.58  0 0 0 0 0 0 0 );
+        Pr          2.289;
     }
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly

@@ -1,109 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-
-species
-(
-    N2
-    O2
-    H2O
-);
-
-N2
-{
-    specie
-    {
-        molWeight       28.0134;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>    ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8> ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
-    }
-}
-
-O2
-{
-    specie
-    {
-        molWeight       31.9988;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>    ( 834.84 0.29297 -0.00014959 3.4143e-07 -2.2786e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8> ( 0.00016082 8.5301e-05 -1.4998e-08 0 0 0 0 0 );
-    }
-}
-
-H2O
-{
-    specie
-    {
-        molWeight       18.0153;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              -13423000;
-        Sf              10482;
-        CpCoeffs<8>    ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8> ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
-    }
-}
-
-air
-{
-    specie
-    {
-        molWeight       28.85;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>    ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>    ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
-        kappaCoeffs<8> ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties

@@ -19,14 +19,16 @@ thermoType
 {
     type            heRhoThermo;
     mixture         multiComponentMixture;
-    transport       polynomial;
+    transport       sutherland;
-    thermo          hPolynomial;
+    thermo          janaf;
-    energy          sensibleInternalEnergy;
+    energy          sensibleEnthalpy;
-    equationOfState icoPolynomial;
+    equationOfState perfectGas;
     specie          specie;
 }
 
-#include "thermo.incompressiblePoly"
+#include "speciesThermo"
+
+inertSpecie     N2;
 
 liquids
 {
@@ -36,7 +38,5 @@ liquids
 solids
 {}
 
-inertSpecie     N2;
-
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution

@@ -70,13 +70,13 @@ solvers
         relTol          0;
     }
 
-    e
+    h
     {
         $Yi;
         relTol          0.1;
     }
 
-    eFinal
+    hFinal
     {
         $Yi;
     }

tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermo.incompressiblePoly

@@ -1,108 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-
-species
-(
-    air
-    H2O
-);
-
-N2
-{
-    specie
-    {
-        molWeight       28.0134;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>   ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>    ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8> ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
-    }
-}
-
-O2
-{
-    specie
-    {
-        molWeight       31.9988;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>   ( 4.4475 -0.018805 3.6667e-05 -3.3323e-08 1.141e-11 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>    ( 834.84 0.29297 -0.00014959 3.4143e-07 -2.2786e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8> ( 0.00016082 8.5301e-05 -1.4998e-08 0 0 0 0 0 );
-    }
-}
-
-H2O
-{
-    specie
-    {
-        molWeight       18.0153;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>   ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              -13423000;
-        Sf              10482;
-        CpCoeffs<8>    ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>    ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8> ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
-    }
-}
-
-air
-{
-    specie
-    {
-        molWeight       28.85;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>   ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>    ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>    ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
-        kappaCoeffs<8> ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties

@@ -19,14 +19,14 @@ thermoType
 {
     type            heRhoThermo;
     mixture         multiComponentMixture;
-    transport       polynomial;
+    transport       sutherland;
-    thermo          hPolynomial;
+    thermo          janaf;
-    energy          sensibleInternalEnergy;
+    energy          sensibleEnthalpy;
-    equationOfState icoPolynomial;
+    equationOfState perfectGas;
     specie          specie;
 }
 
-#include "thermo.incompressiblePoly"
+#include "speciesThermo"
 
 inertSpecie     air;
 

tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution

@@ -71,13 +71,13 @@ solvers
         relTol          0;
     }
 
-    e
+    h
     {
         $Yi;
         relTol          0.1;
     }
 
-    eFinal
+    hFinal
     {
         $Yi;
     }

tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly

@@ -1,85 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-
-species
-(
-    air
-    H2O
-);
-
-N2
-{
-    specie
-    {
-        molWeight       28.0134;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>    ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>     ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8>  ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
-    }
-}
-
-H2O
-{
-    specie
-    {
-        molWeight       18.0153;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>    ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              -13423000;
-        Sf              10482;
-        CpCoeffs<8>     ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8>  ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
-    }
-}
-
-air
-{
-    specie
-    {
-        molWeight       28.85;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>     ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>     ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
-        kappaCoeffs<8>  ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties

@@ -19,14 +19,14 @@ thermoType
 {
     type            heRhoThermo;
     mixture         multiComponentMixture;
-    transport       polynomial;
+    transport       sutherland;
-    thermo          hPolynomial;
+    thermo          janaf;
-    energy          sensibleInternalEnergy;
+    energy          sensibleEnthalpy;
-    equationOfState icoPolynomial;
+    equationOfState perfectGas;
     specie          specie;
 }
 
-#include "thermo.incompressiblePoly"
+#include "speciesThermo"
 
 inertSpecie     air;
 

tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution

@@ -66,13 +66,13 @@ solvers
         relTol          0;
     }
 
-    e
+    h
     {
         $Yi;
         relTol          0.1;
     }
 
-    eFinal
+    hFinal
     {
         $Yi;
     }

tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly

@@ -1,85 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-
-species
-(
-    air
-    H2O
-);
-
-N2
-{
-    specie
-    {
-        molWeight       28.0134;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>    ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>     ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8>  ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
-    }
-}
-
-H2O
-{
-    specie
-    {
-        molWeight       18.0153;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>    ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              -13423000;
-        Sf              10482;
-        CpCoeffs<8>     ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8>  ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
-    }
-}
-
-air
-{
-    specie
-    {
-        molWeight       28.85;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>     ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>     ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
-        kappaCoeffs<8>  ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties

@@ -19,14 +19,14 @@ thermoType
 {
     type            heRhoThermo;
     mixture         multiComponentMixture;
-    transport       polynomial;
+    transport       sutherland;
-    thermo          hPolynomial;
+    thermo          janaf;
-    energy          sensibleInternalEnergy;
+    energy          sensibleEnthalpy;
-    equationOfState icoPolynomial;
+    equationOfState perfectGas;
     specie          specie;
 }
 
-#include "thermo.incompressiblePoly"
+#include "speciesThermo"
 
 inertSpecie     air;
 

tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution

@@ -78,5 +78,13 @@ PIMPLE
     maxDeltaT       1;
 }
 
+relaxationFactors
+{
+    equations
+    {
+        ".*"        1;
+    }
+}
+
 
 // ************************************************************************* //

tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly

@@ -1,85 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-
-species
-(
-    air
-    H2O
-);
-
-N2
-{
-    specie
-    {
-        molWeight       28.0134;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>    ( 3.8936 -0.016463 3.2101e-05 -2.9174e-08 9.9889e-12 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>     ( 979.08 0.41787 -0.0011761 1.6742e-06 -7.2559e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8>  ( 0.0031494 8.4997e-05 -1.2621e-08 0 0 0 0 0 );
-    }
-}
-
-H2O
-{
-    specie
-    {
-        molWeight       18.0153;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>    ( 2.5039 -0.010587 2.0643e-05 -1.8761e-08 6.4237e-12 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              -13423000;
-        Sf              10482;
-        CpCoeffs<8>     ( 1563.1 1.604 -0.0029334 3.2168e-06 -1.1571e-09 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>     ( 1.5068e-06 6.1598e-08 -1.8188e-11 0 0 0 0 0 );
-        kappaCoeffs<8>  ( 0.0037972 0.00015336 -1.1859e-08 0 0 0 0 0 );
-    }
-}
-
-air
-{
-    specie
-    {
-        molWeight       28.85;
-    }
-    equationOfState
-    {
-        rhoCoeffs<8>    ( 4.0097 -0.016954 3.3057e-05 -3.0042e-08 1.0286e-11 0 0 0 );
-    }
-    thermodynamics
-    {
-        Hf              0;
-        Sf              0;
-        CpCoeffs<8>     ( 948.76 0.39171 -0.00095999 1.393e-06 -6.2029e-10 0 0 0 );
-    }
-    transport
-    {
-        muCoeffs<8>     ( 1.5061e-06 6.16e-08 -1.819e-11 0 0 0 0 0 );
-        kappaCoeffs<8>  ( 0.0025219 8.506e-05 -1.312e-08 0 0 0 0 0 );
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties

@@ -19,14 +19,14 @@ thermoType
 {
     type            heRhoThermo;
     mixture         multiComponentMixture;
-    transport       polynomial;
+    transport       sutherland;
-    thermo          hPolynomial;
+    thermo          janaf;
     energy          sensibleEnthalpy;
-    equationOfState icoPolynomial;
+    equationOfState perfectGas;
     specie          specie;
 }
 
-#include "thermo.incompressiblePoly"
+#include "speciesThermo"
 
 inertSpecie     air;