diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties index 89589bf816..adc7a1f4ed 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties @@ -25,34 +25,49 @@ stoichiometricAirFuelMassRatio // ft = 0.0352993 // Tad = 1650.1 -fuel fuel 1 44.0962 - 100 5000 1000 - 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 - 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 - 1.67212e-06 170.672; +//fuel fuel 1 44.0962 +// 100 5000 1000 +// 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 +// 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 +// 1.67212e-06 170.672; -oxidant oxidant 1 28.8504 - 100 6000 1000 - 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 - 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 - 1.67212e-06 170.672; +//oxidant oxidant 1 28.8504 +// 100 6000 1000 +// 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 +// 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 +// 1.67212e-06 170.672; -reactants reactants 1 29.2068 - 100 5000 1000 - 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 - 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 - 1.67212e-06 170.672; +reactants +{ + nMoles 1; + molWeight 29.2068; + Tlow 100; + Thigh 5000; + Tcommon 1000; + highCpCoeffs (3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241); + lowCpCoeffs (3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856); + As 1.67212e-06; + Ts 170.672; +} -burntProducts burntProducts 1 28.3233 - 100 6000 1000 - 3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104 - 3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188 - 1.67212e-06 170.672; +//burntProducts burntProducts 1 28.3233 +// 100 6000 1000 +// 3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104 +// 3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188 +// 1.67212e-06 170.672; + +products +{ + nMoles 1; + molWeight 28.5396; + Tlow 100; + Thigh 5000; + Tcommon 1000; + highCpCoeffs (3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744); + lowCpCoeffs (3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336); + As 1.67212e-06; + Ts 170.672; +} -products products 1 28.5396 - 100 5000 1000 - 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 - 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 - 1.67212e-06 170.672; // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties index 89589bf816..8852a4895e 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties @@ -21,38 +21,30 @@ thermoType stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675; -// phi = 0.57 -// ft = 0.0352993 -// Tad = 1650.1 +reactants +{ + nMoles 1; + molWeight 29.2068; + Tlow 100; + Thigh 5000; + Tcommon 1000; + highCpCoeffs (3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241); + lowCpCoeffs (3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856); + As 1.67212e-06; + Ts 170.672; +} -fuel fuel 1 44.0962 - 100 5000 1000 - 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 - 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 - 1.67212e-06 170.672; - -oxidant oxidant 1 28.8504 - 100 6000 1000 - 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 - 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 - 1.67212e-06 170.672; - -reactants reactants 1 29.2068 - 100 5000 1000 - 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 - 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 - 1.67212e-06 170.672; - -burntProducts burntProducts 1 28.3233 - 100 6000 1000 - 3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104 - 3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188 - 1.67212e-06 170.672; - -products products 1 28.5396 - 100 5000 1000 - 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 - 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 - 1.67212e-06 170.672; +products +{ + nMoles 1; + molWeight 28.5396; + Tlow 100; + Thigh 5000; + Tcommon 1000; + highCpCoeffs (3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744); + lowCpCoeffs (3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336); + As 1.67212e-06; + Ts 170.672; +} // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties index 606d7f335f..65ea213b7d 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties @@ -19,15 +19,30 @@ thermoType hhuMixtureThermo>>>>; -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/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties index 3f8c932b2b..686497a1c7 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties @@ -17,7 +17,15 @@ FoamFile thermoType hPsiThermo>>>>; -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/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties index 9b994f0e6d..0bd26dd166 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties @@ -17,7 +17,15 @@ FoamFile thermoType hPsiThermo>>>>; -mixture air 1 28.9 1007 0 1.84e-05 0.7; +mixture +{ + nMoles 1; + molWeight 28.9; + Cp 1007; + Hf 0; + Mu 1.84e-05; + Pr 0.7; +} // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties index 4b6d7fef8d..246d366f4f 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties @@ -17,7 +17,15 @@ FoamFile thermoType hPsiThermo>>>>; -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/rhoSimplecFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties index 3f8c932b2b..686497a1c7 100644 --- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties @@ -17,7 +17,15 @@ FoamFile thermoType hPsiThermo>>>>; -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/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.inp b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.inp index 9473b7e8fa..931071dabe 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.inp +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.inp @@ -1,22 +1,28 @@ species -6 ( -N2 -O2 -CH4 -H2 -CO2 -H2O -) -; + N2 + O2 + CH4 + H2 + CO2 + H2O +); reactions -2 -( -irreversibleArrheniusReaction - CH4 + 2O2^1.0 = CO2 + 2H2O^1.0 - (7e+06 0 10063.8) -irreversibleArrheniusReaction - H2 + 0.5O2^1.0 = H2O - (4.74342e+12 0 10063.8) -); +{ + irreversibleArrheniusReaction + { + reaction "CH4 + 2O2^1.0 = CO2 + 2H2O^1.0"; + A 7e+06; + beta 0; + Ta 10063.8; + } + irreversibleArrheniusReaction + { + reaction "H2 + 0.5O2^1.0 = H2O"; + A 4.74342e+12; + beta 0; + Ta 10063.8; + } +} + diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties index e8a86473f7..72af7caca0 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties @@ -32,7 +32,10 @@ liquids H2O ); - H2O H2O defaultCoeffs; + H2O + { + defaultCoeffs yes; + } } solids @@ -43,8 +46,14 @@ solids ash ); - C C defaultCoeffs; - ash ash defaultCoeffs; + C + { + defaultCoeffs yes; + } + ash + { + defaultCoeffs yes; + } } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactions index f1c604b507..0e11adc360 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactions +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactions @@ -5,5 +5,5 @@ species ); reactions -( -); +{} + diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties index 271188f6f8..1426d6c27b 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/thermophysicalProperties @@ -32,7 +32,10 @@ liquids H2O ); - H2O H2O defaultCoeffs; + H2O + { + defaultCoeffs yes; + } } solids diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactions b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactions index f1c604b507..0e11adc360 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactions +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactions @@ -5,5 +5,5 @@ species ); reactions -( -); +{} + diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly index 16729ac9d9..1da21f4cc6 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly @@ -1,5 +1,9 @@ -( -N2 N2 1 28.0134 +N2 +{ + nMoles 1; + molWeight 28.0134; + Hf 0; + Sf 0; rhoPolynomial ( 3.8936E+00 @@ -10,9 +14,7 @@ N2 N2 1 28.0134 0 0 0 - ) - 0.0 // Heat of formation - 0.0 // Standard entropy + ); cpPolynomial ( 9.7908E+02 @@ -23,7 +25,7 @@ N2 N2 1 28.0134 0 0 0 - ) + ); muPolynomial ( 1.5068E-06 @@ -34,7 +36,7 @@ N2 N2 1 28.0134 0 0 0 - ) + ); kappaPolynomial ( 3.1494E-03 @@ -45,55 +47,16 @@ N2 N2 1 28.0134 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 + ); +} + + +H2O +{ + nMoles 1; + molWeight 18.0153; + Hf -1.3423e07; + Sf 1.0482e04; rhoPolynomial ( 2.5039E+00 @@ -104,9 +67,7 @@ H2O H2O 1 18.0153 0 0 0 - ) - -1.3423e07 // Heat of formation [J/kg] - 1.0482e04 // Standard entropy [J/kg/K] + ); cpPolynomial ( 1.5631E+03 @@ -117,7 +78,7 @@ H2O H2O 1 18.0153 0 0 0 - ) + ); muPolynomial ( 1.5068E-06 @@ -128,7 +89,7 @@ H2O H2O 1 18.0153 0 0 0 - ) + ); kappaPolynomial ( 3.7972E-03 @@ -139,8 +100,16 @@ H2O H2O 1 18.0153 0 0 0 - ) -air air 1 28.85 + ); +} + + +air +{ + nMoles 1; + molWeight 28.85; + Hf 0.0; + Sf 0.0; rhoPolynomial ( 4.0097E+00 @@ -151,9 +120,7 @@ air air 1 28.85 0 0 0 - ) - 0.0 - 0.0 + ); cpPolynomial ( 9.4876E+02 @@ -164,7 +131,7 @@ air air 1 28.85 0 0 0 - ) + ); muPolynomial ( 1.5061E-06 @@ -175,7 +142,7 @@ air air 1 28.85 0 0 0 - ) + ); kappaPolynomial ( 2.5219E-03 @@ -186,6 +153,6 @@ air air 1 28.85 0 0 0 - ) -) + ); +} diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties index 271188f6f8..0c8e174053 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/thermophysicalProperties @@ -32,7 +32,10 @@ liquids H2O ); - H2O H2O defaultCoeffs; + H2O + { + defaultCoeffs yes; + } } solids diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties index bddd3c5458..a93fdf20b6 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties @@ -32,7 +32,10 @@ liquids H2O ); - H2O H2O defaultCoeffs; + H2O + { + defaultCoeffs yes; + } } solids