diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ft b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4
similarity index 98%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ft
rename to tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4
index d84a10a7d653e81a04ca98eb08c8cc7cce4e2099..0b1e0de832de26e3b346ee85c47d3188e7e9bd37 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/ft
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/CH4
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      ft;
+    object      CH4;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2 b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2
new file mode 100644
index 0000000000000000000000000000000000000000..d03d685b405a00e177a447500e24432f60173ec9
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/N2
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      N2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.76699;
+
+boundaryField
+{
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    sides
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    base
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0;
+    }
+    frontBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2 b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2
new file mode 100644
index 0000000000000000000000000000000000000000..b433139678f169ca2a8d21e89b1d262721cfc6f7
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/O2
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      O2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.23301;
+
+boundaryField
+{
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    sides
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    base
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0;
+    }
+    frontBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/fu b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault
old mode 100644
new mode 100755
similarity index 86%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/fu
rename to tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault
index 8451b3a9efb36e534d3d2faef0f86bc0363d8f27..9536e7a9f2e144881e276b928aff2533ec9bf383
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/fu
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/Ydefault
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      fu;
+    object      Ydefault;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -21,26 +21,29 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
+    base
     {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
+        type            zeroGradient;
     }
-    sides
+
+    outlet
     {
         type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    base
-    {
-        type            zeroGradient;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     inlet
     {
         type            fixedValue;
-        value           uniform 1.0;
+        value           uniform 0;
+    }
+
+    sides
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
     }
     frontBack
     {
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/SpeciesTable b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/SpeciesTable
deleted file mode 100644
index e387970281a9821705966649484bbf24343832d7..0000000000000000000000000000000000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/SpeciesTable
+++ /dev/null
@@ -1,491 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      SpeciesTable;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-fields
-1
-(
-
-{
-    name            ft;
-    min             0;
-    max             1;
-    N               100;
-}
-
-)
-;
-output
-5
-(
-
-{
-    name            CH4;
-}
-
-
-{
-    name            CO2;
-}
-
-
-{
-    name            H2O;
-}
-
-
-{
-    name            CO;
-}
-
-
-{
-    name            soot;
-}
-
-)
-;
-values
-6
-(
-
-101
-(
-0.001
-0.011
-0.021
-0.031
-0.041
-0.051
-0.061
-0.071
-0.081
-0.091
-0.101
-0.111
-0.121
-0.131
-0.141
-0.151
-0.161
-0.171
-0.181
-0.191
-0.201
-0.211
-0.221
-0.231
-0.241
-0.251
-0.261
-0.271
-0.281
-0.291
-0.301
-0.311
-0.321
-0.331
-0.341
-0.351
-0.361
-0.371
-0.381
-0.391
-0.401
-0.411
-0.421
-0.431
-0.441
-0.451
-0.461
-0.471
-0.481
-0.491
-0.501
-0.511
-0.521
-0.531
-0.541
-0.551
-0.561
-0.571
-0.581
-0.591
-0.601
-0.611
-0.621
-0.631
-0.641
-0.651
-0.661
-0.671
-0.681
-0.691
-0.701
-0.711
-0.721
-0.731
-0.741
-0.751
-0.761
-0.771
-0.781
-0.791
-0.801
-0.811
-0.821
-0.831
-0.841
-0.851
-0.861
-0.871
-0.881
-0.891
-0.901
-0.911
-0.921
-0.931
-0.941
-0.951
-0.961
-0.971
-0.981
-0.991
-0.999
-)
-
-
-101
-(
-0
-0
-0
-0
-0
-0
-0.0105883
-0.0285208
-0.0461843
-0.0635849
-0.0807284
-0.0976204
-0.114266
-0.130672
-0.146842
-0.162782
-0.178496
-0.193989
-0.209266
-0.224332
-0.23919
-0.253845
-0.268301
-0.282563
-0.296633
-0.310517
-0.324216
-0.337736
-0.35108
-0.364251
-0.377252
-0.390087
-0.402759
-0.415271
-0.427625
-0.439826
-0.451876
-0.463777
-0.475532
-0.487144
-0.498616
-0.50995
-0.521148
-0.532214
-0.543149
-0.553955
-0.564635
-0.575191
-0.585626
-0.595941
-0.606138
-0.61622
-0.626187
-0.636044
-0.64579
-0.655428
-0.66496
-0.674387
-0.683712
-0.692935
-0.702059
-0.711085
-0.720014
-0.728849
-0.73759
-0.74624
-0.754799
-0.763269
-0.771652
-0.779948
-0.788159
-0.796287
-0.804332
-0.812297
-0.820181
-0.827987
-0.835715
-0.843367
-0.850943
-0.858445
-0.865875
-0.873232
-0.880518
-0.887735
-0.894882
-0.901961
-0.908974
-0.91592
-0.922802
-0.929619
-0.936373
-0.943064
-0.949694
-0.956263
-0.962772
-0.969222
-0.975614
-0.981948
-0.988226
-0.994448
-0.999385
-)
-
-
-101
-(
-0.00200328
-0.0213922
-0.0396804
-0.0569589
-0.0733092
-0.088804
-0.0940165
-0.0923125
-0.0906341
-0.0889806
-0.0873516
-0.0857465
-0.0841647
-0.0826058
-0.0810693
-0.0795547
-0.0780615
-0.0765893
-0.0751376
-0.073706
-0.0722942
-0.0709016
-0.0695279
-0.0681728
-0.0668357
-0.0655165
-0.0642147
-0.06293
-0.0616621
-0.0604105
-0.0591751
-0.0579555
-0.0567514
-0.0555625
-0.0543885
-0.0532292
-0.0520842
-0.0509534
-0.0498363
-0.0487329
-0.0476428
-0.0465658
-0.0455017
-0.0444503
-0.0434112
-0.0423844
-0.0413695
-0.0403664
-0.0393749
-0.0383948
-0.0374258
-0.0364678
-0.0355206
-0.0345841
-0.033658
-0.0327421
-0.0318364
-0.0309406
-0.0300546
-0.0291781
-0.0283112
-0.0274535
-0.026605
-0.0257655
-0.0249349
-0.024113
-0.0232997
-0.0224948
-0.0216983
-0.0209099
-0.0201297
-0.0193573
-0.0185928
-0.0178361
-0.0170869
-0.0163452
-0.0156108
-0.0148837
-0.0141638
-0.0134509
-0.0127449
-0.0120458
-0.0113535
-0.0106678
-0.00998859
-0.00931588
-0.00864953
-0.00798947
-0.00733558
-0.0066878
-0.00604604
-0.00541021
-0.00478022
-0.00415601
-0.00353749
-0.00292458
-0.00231721
-0.00171531
-0.00111879
-0.000527591
-5.8413e-05
-)
-
-
-101
-(
-0.00400655
-0.0427844
-0.0793607
-0.113918
-0.146618
-0.177608
-0.188033
-0.184625
-0.181268
-0.177961
-0.174703
-0.171493
-0.168329
-0.165212
-0.162139
-0.159109
-0.156123
-0.153179
-0.150275
-0.147412
-0.144588
-0.141803
-0.139056
-0.136346
-0.133671
-0.131033
-0.128429
-0.12586
-0.123324
-0.120821
-0.11835
-0.115911
-0.113503
-0.111125
-0.108777
-0.106458
-0.104168
-0.101907
-0.0996727
-0.0974658
-0.0952856
-0.0931317
-0.0910035
-0.0889006
-0.0868225
-0.0847688
-0.082739
-0.0807328
-0.0787498
-0.0767895
-0.0748516
-0.0729356
-0.0710413
-0.0691682
-0.067316
-0.0654843
-0.0636728
-0.0618812
-0.0601091
-0.0583563
-0.0566223
-0.054907
-0.05321
-0.051531
-0.0498697
-0.0482259
-0.0465993
-0.0449896
-0.0433965
-0.0418198
-0.0402593
-0.0387147
-0.0371857
-0.0356721
-0.0341737
-0.0326903
-0.0312216
-0.0297674
-0.0283276
-0.0269018
-0.0254899
-0.0240917
-0.022707
-0.0213355
-0.0199772
-0.0186318
-0.0172991
-0.0159789
-0.0146712
-0.0133756
-0.0120921
-0.0108204
-0.00956045
-0.00831202
-0.00707498
-0.00584917
-0.00463443
-0.00343062
-0.00223758
-0.00105518
-0.000116826
-)
-
-101{0}
-101{0}
-)
-;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/additionalControls b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/additionalControls
new file mode 100644
index 0000000000000000000000000000000000000000..af372fbcbec69d98d26ebbc0e17c1158c3590e12
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/additionalControls
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      additionalControls;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvePrimaryRegion true;
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/b b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/chemistryProperties
similarity index 66%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/b
rename to tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/chemistryProperties
index 242f45c9433d5e0c38dbd781351fee02196f2582..fca4f15a5cacd9815e78fb5fd469bb34807f1c5e 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/b
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/chemistryProperties
@@ -9,36 +9,21 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      b;
+    class       dictionary;
+    location    "constant";
+    object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 0 0 0 0 0 0];
+psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
 
-internalField   uniform 0;
+chemistry       off;
 
-boundaryField
-{
-    outlet
-    {
-        type            zeroGradient;
-    }
-    sides
-    {
-        type            zeroGradient;
-    }
-    base
-    {
-        type            zeroGradient;
-    }
-    inlet
-    {
-        type            zeroGradient;
-    }
+turbulentReaction off;
 
-}
+chemistrySolver noChemistrySolver;
+
+initialChemicalTimeStep 1e-07;
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisProperties
new file mode 100644
index 0000000000000000000000000000000000000000..3dfb0fbe7153e173cdc5c627b55078ced053771f
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisProperties
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      binary;
+    class       dictionary;
+    location    "constant";
+    object      pyrolysisProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+active          false;
+
+pyrolysisModel  none;
+
+regionName      panelRegion;
+
+reactingOneDimCoeffs
+{
+    filmCoupled     false;
+
+    radFluxName     Qr;
+
+    minimumDelta    1e-8;
+
+    moveMesh        false;
+}
+
+infoOutput      false;
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
index d7b2c3f4e38267cd4802f7d1d330a0f10753ff63..8d7ce6f129074f9c5a1e8cc7a9236559f352a060 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/radiationProperties
@@ -49,7 +49,7 @@ constantAbsorptionEmissionCoeffs
 
 greyMeanAbsorptionEmissionCoeffs
 {
-    lookUpTableFileName     "SpeciesTable";
+    lookUpTableFileName     none;
 
     EhrrCoeff                0.0;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties
new file mode 100644
index 0000000000000000000000000000000000000000..f975d237d38c9a9f91f615b90996e21d78a04924
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties
@@ -0,0 +1,165 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      reactingCloud1Properties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solution
+{
+    active          false;
+    coupled         yes;
+    transient       yes;
+    cellValueSourceCorrection yes;
+
+    sourceTerms
+    {
+        schemes
+        {
+            rho             explicit 1;
+            U               explicit 1;
+            Yi              explicit 1;
+            hs              explicit 1;
+        }
+    }
+
+    interpolationSchemes
+    {
+        rho             cell;
+        U               cellPoint;
+        mu              cell;
+        T               cell;
+        Cp              cell;
+        p               cell;
+    }
+
+    integrationSchemes
+    {
+        U               Euler;
+        T               analytical;
+    }
+}
+
+constantProperties
+{
+    parcelTypeId    1;
+
+    rhoMin          1e-15;
+    TMin            200;
+    pMin            1000;
+    minParticleMass 1e-15;
+
+    rho0            1000;
+    T0              300;
+    Cp0             4187;
+
+    youngsModulus   1e9;
+    poissonsRatio   0.35;
+
+    epsilon0        1;
+    f0              0.5;
+    Pr              0.7;
+    Tvap            273;
+    Tbp             373;
+
+    constantVolume  false;
+}
+
+subModels
+{
+    particleForces
+    {
+        sphereDrag;
+        gravity;
+    }
+
+    injectionModel  coneInjection;
+
+    dispersionModel none;
+
+    patchInteractionModel standardWallInteraction;
+
+    heatTransferModel none;
+
+    compositionModel singlePhaseMixture;
+
+    phaseChangeModel none;
+
+    surfaceFilmModel thermoSurfaceFilm;
+
+    radiation       off;
+
+    coneInjectionCoeffs
+    {
+        SOI             0.000;
+        duration        20.000;
+        positionAxis
+        (
+            ((0.3 0.35 1.45) (0 0 -1))
+            ((0.6 0.35 1.45) (0 0 -1))
+        );
+
+        massTotal       10;
+        parcelsPerInjector 20000;
+        parcelsPerSecond 500;
+        parcelBasisType mass;
+        flowRateProfile constant 0.1;
+        Umag            constant 3.0;
+        thetaInner      constant 0;
+        thetaOuter      constant 45;
+
+        sizeDistribution
+        {
+            type         RosinRammler;
+            RosinRammlerDistribution
+            {
+                minValue        5e-04;
+                maxValue        0.0012;
+                d               7.5e-05;
+                n               0.5;
+            }
+        }
+    }
+
+    standardWallInteractionCoeffs
+    {
+        type            rebound;
+    }
+
+    singlePhaseMixtureCoeffs
+    {
+        phases
+        (
+            liquid
+            {
+                H2O          1;
+            }
+        );
+    }
+
+    thermoSurfaceFilmCoeffs
+    {
+        interactionType splashBai;
+        deltaWet        0.0005;
+        Adry            2630;
+        Awet            1320;
+        Cf              0.6;
+    }
+}
+
+
+cloudFunctions
+{}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions
new file mode 100644
index 0000000000000000000000000000000000000000..c174cf789ecfdfbaf6128592efbd6123e013f690
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactions
@@ -0,0 +1,17 @@
+species
+(
+    O2
+    H2O
+    CH4
+    CO2
+    N2
+);
+
+reactions
+{
+    propaneReaction
+    {
+        type         irreversibleinfiniteReaction;
+        reaction     "CH4 + 2O2 = CO2 + 2H2O";
+    }
+}
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/surfaceFilmProperties
new file mode 100644
index 0000000000000000000000000000000000000000..db5db22ec3ca2858880cd1644c582b526a90019d
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/surfaceFilmProperties
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      SurfaceFilmProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+surfaceFilmModel none;
+
+regionName      none;
+
+active          false;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermo.compressibleGas
new file mode 100644
index 0000000000000000000000000000000000000000..367faadefd70ebf2c4d580105ef0ea3a76dc4dad
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermo.compressibleGas
@@ -0,0 +1,126 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermo.compressibleGas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+O2
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    thermodynamics
+    {
+        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 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+H2O
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    thermodynamics
+    {
+        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 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+CH4
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       16.0428;
+    }
+    thermodynamics
+    {
+        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 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+CO2
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       44.01;
+    }
+    thermodynamics
+    {
+        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 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+N2
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    thermodynamics
+    {
+        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 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
index 021d55435533c1b0946c50504e9f63b1d864a44a..f593a1dd1264a63aebc98419d9edacb6369ef97f 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
@@ -15,79 +15,23 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hsPsiMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
+thermoType hsPsiMixtureThermo<singleStepReactingMixture<gasThermoPhysics>>;
 
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 17.1271;
+inertSpecie N2;
+fuel        CH4;
 
-stoichiometricOxygenFuelMassRatio stoichiometricOxygenFuelMassRatio [ 0 0 0 0 0 0 0 ] 4;
+chemistryReader foamChemistryReader;
 
-qFuel           qFuel [ 0 2 -2 0 0 0 0 ] 5.00264e+07;
+foamChemistryFile "$FOAM_CASE/constant/reactions";
 
-fuel
-{
-    specie
-    {
-        nMoles          1;
-        molWeight       16.0428;
-    }
-    thermodynamics
-    {
-        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 );
-    }
-    transport
-    {
-        As              1.67212e-06;
-        Ts              170.672;
-    }
-}
+foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas";
 
-oxidant
+liquids
 {
-    specie
-    {
-        nMoles          1;
-        molWeight       28.8504;
-    }
-    thermodynamics
-    {
-        Tlow            200;
-        Thigh           6000;
-        Tcommon         1000;
-        highCpCoeffs    ( 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 );
-        lowCpCoeffs     ( 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 );
-    }
-    transport
-    {
-        As              1.67212e-06;
-        Ts              170.672;
-    }
-}
+    liquidComponents
+    ();
 
-burntProducts
-{
-specie
-{
-    nMoles          1;
-    molWeight       27.6334;
+    H2O             H2O defaultCoeffs;
 }
-thermodynamics
-{
-    Tlow            200;
-    Thigh           6000;
-    Tcommon         1000;
-    highCpCoeffs    ( 3.0602 0.00182422 -5.93878e-07 8.93807e-11 -4.97595e-15 -10998.7 5.32209 );
-    lowCpCoeffs     ( 3.54628 0.000378279 2.02797e-07 9.31602e-10 -6.84016e-13 -11102.1 2.90098 );
-}
-transport
-{
-    As              1.67212e-06;
-    Ts              170.672;
-}
-}
-
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
index 4402f372524239fd37cf34718cfb27eff9b5beb2..5c8063431d1ba700472f497ecd6d10701c8368fe 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSchemes
@@ -30,11 +30,13 @@ divSchemes
     default         none;
     div(phi,U)      Gauss limitedLinear 1;
     div(phi,k)      Gauss limitedLinear 1;
-    flux(phi,ft)    Gauss limitedLinear01 1;
-    div(phi,ft_b_h) Gauss multivariateSelection
+    div(phi,Yi_hs)  Gauss multivariateSelection
     {
-        fu              limitedLinear01 1;
-        ft              limitedLinear01 1;
+        O2              limitedLinear01 1;
+        CH4             limitedLinear01 1;
+        N2              limitedLinear01 1;
+        H2O             limitedLinear01 1;
+        CO2             limitedLinear01 1;
         hs              limitedLinear 1;
     };
     div((muEff*dev2(T(grad(U))))) Gauss linear;
@@ -44,7 +46,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear uncorrected;
+    default         Gauss linear corrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
index 10c1c27de7506d06df5735086d5f8661e0aa782f..5a7b7a980a4652f368af9e122b3f3b8f93119d90 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/fvSolution
@@ -53,16 +53,16 @@ solvers
     };
 
 
-    "(U|ft|fu|k|hs)"
+    "(U|Yi|k|hs)"
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
+        solver          PBiCG;
+        preconditioner  DILU;
         tolerance       1e-7;
         relTol          0.1;
         nSweeps         1;
     };
 
-    "(U|ft|fu|k|hs)Final"
+    "(U|Yi|k|hs)Final"
     {
         $U;
         tolerance       1e-7;
@@ -100,4 +100,10 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+relaxationFactors
+{
+    "(U|k).*"                   1;
+    "(C3H8|O2|H2O|CO2|hs).*"    0.9;
+}
+
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ft b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4
similarity index 98%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ft
rename to tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4
index d24a5478e180909c4c274b78b140437fb0b7b837..219f5ffe6097a249e767bbdd3b62f1a617d6458a 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ft
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/CH4
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      ft;
+    object      CH4;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2 b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2
new file mode 100644
index 0000000000000000000000000000000000000000..c1511f982799e593750ece78b3d4eb87c811a581
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/N2
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      N2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.76699;
+
+boundaryField
+{
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    sides
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    base
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2 b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2
new file mode 100644
index 0000000000000000000000000000000000000000..b433139678f169ca2a8d21e89b1d262721cfc6f7
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/O2
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      O2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.23301;
+
+boundaryField
+{
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    sides
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    base
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0;
+    }
+    frontBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/fu b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault
old mode 100644
new mode 100755
similarity index 86%
rename from tutorials/combustion/fireFoam/les/smallPoolFire3D/0/fu
rename to tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault
index 8782fc3987226248544dff0e07fd18506d70013f..bc81b33f523e33c8b03b6404dcf7419a659d9379
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/fu
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/Ydefault
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      fu;
+    object      Ydefault;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -21,28 +21,30 @@ internalField   uniform 0;
 
 boundaryField
 {
-    outlet
+    base
     {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
+        type            zeroGradient;
     }
-    sides
+
+    outlet
     {
         type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    base
-    {
-        type            zeroGradient;
+        inletValue      $internalField;
+        value           $internalField;
     }
+
     inlet
     {
         type            fixedValue;
-        value           uniform 1.0;
+        value           uniform 0;
     }
 
+    sides
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
 }
 
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/SpeciesTable b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/SpeciesTable
deleted file mode 100644
index e387970281a9821705966649484bbf24343832d7..0000000000000000000000000000000000000000
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/SpeciesTable
+++ /dev/null
@@ -1,491 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      SpeciesTable;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-fields
-1
-(
-
-{
-    name            ft;
-    min             0;
-    max             1;
-    N               100;
-}
-
-)
-;
-output
-5
-(
-
-{
-    name            CH4;
-}
-
-
-{
-    name            CO2;
-}
-
-
-{
-    name            H2O;
-}
-
-
-{
-    name            CO;
-}
-
-
-{
-    name            soot;
-}
-
-)
-;
-values
-6
-(
-
-101
-(
-0.001
-0.011
-0.021
-0.031
-0.041
-0.051
-0.061
-0.071
-0.081
-0.091
-0.101
-0.111
-0.121
-0.131
-0.141
-0.151
-0.161
-0.171
-0.181
-0.191
-0.201
-0.211
-0.221
-0.231
-0.241
-0.251
-0.261
-0.271
-0.281
-0.291
-0.301
-0.311
-0.321
-0.331
-0.341
-0.351
-0.361
-0.371
-0.381
-0.391
-0.401
-0.411
-0.421
-0.431
-0.441
-0.451
-0.461
-0.471
-0.481
-0.491
-0.501
-0.511
-0.521
-0.531
-0.541
-0.551
-0.561
-0.571
-0.581
-0.591
-0.601
-0.611
-0.621
-0.631
-0.641
-0.651
-0.661
-0.671
-0.681
-0.691
-0.701
-0.711
-0.721
-0.731
-0.741
-0.751
-0.761
-0.771
-0.781
-0.791
-0.801
-0.811
-0.821
-0.831
-0.841
-0.851
-0.861
-0.871
-0.881
-0.891
-0.901
-0.911
-0.921
-0.931
-0.941
-0.951
-0.961
-0.971
-0.981
-0.991
-0.999
-)
-
-
-101
-(
-0
-0
-0
-0
-0
-0
-0.0105883
-0.0285208
-0.0461843
-0.0635849
-0.0807284
-0.0976204
-0.114266
-0.130672
-0.146842
-0.162782
-0.178496
-0.193989
-0.209266
-0.224332
-0.23919
-0.253845
-0.268301
-0.282563
-0.296633
-0.310517
-0.324216
-0.337736
-0.35108
-0.364251
-0.377252
-0.390087
-0.402759
-0.415271
-0.427625
-0.439826
-0.451876
-0.463777
-0.475532
-0.487144
-0.498616
-0.50995
-0.521148
-0.532214
-0.543149
-0.553955
-0.564635
-0.575191
-0.585626
-0.595941
-0.606138
-0.61622
-0.626187
-0.636044
-0.64579
-0.655428
-0.66496
-0.674387
-0.683712
-0.692935
-0.702059
-0.711085
-0.720014
-0.728849
-0.73759
-0.74624
-0.754799
-0.763269
-0.771652
-0.779948
-0.788159
-0.796287
-0.804332
-0.812297
-0.820181
-0.827987
-0.835715
-0.843367
-0.850943
-0.858445
-0.865875
-0.873232
-0.880518
-0.887735
-0.894882
-0.901961
-0.908974
-0.91592
-0.922802
-0.929619
-0.936373
-0.943064
-0.949694
-0.956263
-0.962772
-0.969222
-0.975614
-0.981948
-0.988226
-0.994448
-0.999385
-)
-
-
-101
-(
-0.00200328
-0.0213922
-0.0396804
-0.0569589
-0.0733092
-0.088804
-0.0940165
-0.0923125
-0.0906341
-0.0889806
-0.0873516
-0.0857465
-0.0841647
-0.0826058
-0.0810693
-0.0795547
-0.0780615
-0.0765893
-0.0751376
-0.073706
-0.0722942
-0.0709016
-0.0695279
-0.0681728
-0.0668357
-0.0655165
-0.0642147
-0.06293
-0.0616621
-0.0604105
-0.0591751
-0.0579555
-0.0567514
-0.0555625
-0.0543885
-0.0532292
-0.0520842
-0.0509534
-0.0498363
-0.0487329
-0.0476428
-0.0465658
-0.0455017
-0.0444503
-0.0434112
-0.0423844
-0.0413695
-0.0403664
-0.0393749
-0.0383948
-0.0374258
-0.0364678
-0.0355206
-0.0345841
-0.033658
-0.0327421
-0.0318364
-0.0309406
-0.0300546
-0.0291781
-0.0283112
-0.0274535
-0.026605
-0.0257655
-0.0249349
-0.024113
-0.0232997
-0.0224948
-0.0216983
-0.0209099
-0.0201297
-0.0193573
-0.0185928
-0.0178361
-0.0170869
-0.0163452
-0.0156108
-0.0148837
-0.0141638
-0.0134509
-0.0127449
-0.0120458
-0.0113535
-0.0106678
-0.00998859
-0.00931588
-0.00864953
-0.00798947
-0.00733558
-0.0066878
-0.00604604
-0.00541021
-0.00478022
-0.00415601
-0.00353749
-0.00292458
-0.00231721
-0.00171531
-0.00111879
-0.000527591
-5.8413e-05
-)
-
-
-101
-(
-0.00400655
-0.0427844
-0.0793607
-0.113918
-0.146618
-0.177608
-0.188033
-0.184625
-0.181268
-0.177961
-0.174703
-0.171493
-0.168329
-0.165212
-0.162139
-0.159109
-0.156123
-0.153179
-0.150275
-0.147412
-0.144588
-0.141803
-0.139056
-0.136346
-0.133671
-0.131033
-0.128429
-0.12586
-0.123324
-0.120821
-0.11835
-0.115911
-0.113503
-0.111125
-0.108777
-0.106458
-0.104168
-0.101907
-0.0996727
-0.0974658
-0.0952856
-0.0931317
-0.0910035
-0.0889006
-0.0868225
-0.0847688
-0.082739
-0.0807328
-0.0787498
-0.0767895
-0.0748516
-0.0729356
-0.0710413
-0.0691682
-0.067316
-0.0654843
-0.0636728
-0.0618812
-0.0601091
-0.0583563
-0.0566223
-0.054907
-0.05321
-0.051531
-0.0498697
-0.0482259
-0.0465993
-0.0449896
-0.0433965
-0.0418198
-0.0402593
-0.0387147
-0.0371857
-0.0356721
-0.0341737
-0.0326903
-0.0312216
-0.0297674
-0.0283276
-0.0269018
-0.0254899
-0.0240917
-0.022707
-0.0213355
-0.0199772
-0.0186318
-0.0172991
-0.0159789
-0.0146712
-0.0133756
-0.0120921
-0.0108204
-0.00956045
-0.00831202
-0.00707498
-0.00584917
-0.00463443
-0.00343062
-0.00223758
-0.00105518
-0.000116826
-)
-
-101{0}
-101{0}
-)
-;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/additionalControls b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/additionalControls
new file mode 100644
index 0000000000000000000000000000000000000000..af372fbcbec69d98d26ebbc0e17c1158c3590e12
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/additionalControls
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      additionalControls;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvePrimaryRegion true;
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/b b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
similarity index 63%
rename from tutorials/combustion/fireFoam/les/smallPoolFire2D/0/b
rename to tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
index 69d723a7e10054813556b11c8e44bee2d23f9853..fca4f15a5cacd9815e78fb5fd469bb34807f1c5e 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/b
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/chemistryProperties
@@ -9,39 +9,21 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      b;
+    class       dictionary;
+    location    "constant";
+    object      chemistryProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 0 0 0 0 0 0];
+psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
 
-internalField   uniform 0;
+chemistry       off;
 
-boundaryField
-{
-    outlet
-    {
-        type            zeroGradient;
-    }
-    sides
-    {
-        type            zeroGradient;
-    }
-    base
-    {
-        type            zeroGradient;
-    }
-    inlet
-    {
-        type            zeroGradient;
-    }
-    frontBack
-    {
-        type            empty;
-    }
-}
+turbulentReaction off;
+
+chemistrySolver noChemistrySolver;
+
+initialChemicalTimeStep 1e-07;
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisProperties
new file mode 100644
index 0000000000000000000000000000000000000000..3dfb0fbe7153e173cdc5c627b55078ced053771f
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisProperties
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      binary;
+    class       dictionary;
+    location    "constant";
+    object      pyrolysisProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+active          false;
+
+pyrolysisModel  none;
+
+regionName      panelRegion;
+
+reactingOneDimCoeffs
+{
+    filmCoupled     false;
+
+    radFluxName     Qr;
+
+    minimumDelta    1e-8;
+
+    moveMesh        false;
+}
+
+infoOutput      false;
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
index e48fc02f42e395678b75379c7cd5fe89fbd056aa..ff2d2c0d2448835c63d4971b6363928ce3b9a7fd 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
@@ -50,7 +50,7 @@ constantAbsorptionEmissionCoeffs
 
 greyMeanAbsorptionEmissionCoeffs
 {
-    lookUpTableFileName     "SpeciesTable";
+    lookUpTableFileName      none;
 
     EhrrCoeff                0.0;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties
new file mode 100644
index 0000000000000000000000000000000000000000..f975d237d38c9a9f91f615b90996e21d78a04924
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties
@@ -0,0 +1,165 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      reactingCloud1Properties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solution
+{
+    active          false;
+    coupled         yes;
+    transient       yes;
+    cellValueSourceCorrection yes;
+
+    sourceTerms
+    {
+        schemes
+        {
+            rho             explicit 1;
+            U               explicit 1;
+            Yi              explicit 1;
+            hs              explicit 1;
+        }
+    }
+
+    interpolationSchemes
+    {
+        rho             cell;
+        U               cellPoint;
+        mu              cell;
+        T               cell;
+        Cp              cell;
+        p               cell;
+    }
+
+    integrationSchemes
+    {
+        U               Euler;
+        T               analytical;
+    }
+}
+
+constantProperties
+{
+    parcelTypeId    1;
+
+    rhoMin          1e-15;
+    TMin            200;
+    pMin            1000;
+    minParticleMass 1e-15;
+
+    rho0            1000;
+    T0              300;
+    Cp0             4187;
+
+    youngsModulus   1e9;
+    poissonsRatio   0.35;
+
+    epsilon0        1;
+    f0              0.5;
+    Pr              0.7;
+    Tvap            273;
+    Tbp             373;
+
+    constantVolume  false;
+}
+
+subModels
+{
+    particleForces
+    {
+        sphereDrag;
+        gravity;
+    }
+
+    injectionModel  coneInjection;
+
+    dispersionModel none;
+
+    patchInteractionModel standardWallInteraction;
+
+    heatTransferModel none;
+
+    compositionModel singlePhaseMixture;
+
+    phaseChangeModel none;
+
+    surfaceFilmModel thermoSurfaceFilm;
+
+    radiation       off;
+
+    coneInjectionCoeffs
+    {
+        SOI             0.000;
+        duration        20.000;
+        positionAxis
+        (
+            ((0.3 0.35 1.45) (0 0 -1))
+            ((0.6 0.35 1.45) (0 0 -1))
+        );
+
+        massTotal       10;
+        parcelsPerInjector 20000;
+        parcelsPerSecond 500;
+        parcelBasisType mass;
+        flowRateProfile constant 0.1;
+        Umag            constant 3.0;
+        thetaInner      constant 0;
+        thetaOuter      constant 45;
+
+        sizeDistribution
+        {
+            type         RosinRammler;
+            RosinRammlerDistribution
+            {
+                minValue        5e-04;
+                maxValue        0.0012;
+                d               7.5e-05;
+                n               0.5;
+            }
+        }
+    }
+
+    standardWallInteractionCoeffs
+    {
+        type            rebound;
+    }
+
+    singlePhaseMixtureCoeffs
+    {
+        phases
+        (
+            liquid
+            {
+                H2O          1;
+            }
+        );
+    }
+
+    thermoSurfaceFilmCoeffs
+    {
+        interactionType splashBai;
+        deltaWet        0.0005;
+        Adry            2630;
+        Awet            1320;
+        Cf              0.6;
+    }
+}
+
+
+cloudFunctions
+{}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactions b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactions
new file mode 100644
index 0000000000000000000000000000000000000000..c174cf789ecfdfbaf6128592efbd6123e013f690
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactions
@@ -0,0 +1,17 @@
+species
+(
+    O2
+    H2O
+    CH4
+    CO2
+    N2
+);
+
+reactions
+{
+    propaneReaction
+    {
+        type         irreversibleinfiniteReaction;
+        reaction     "CH4 + 2O2 = CO2 + 2H2O";
+    }
+}
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/surfaceFilmProperties
new file mode 100644
index 0000000000000000000000000000000000000000..db5db22ec3ca2858880cd1644c582b526a90019d
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/surfaceFilmProperties
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      SurfaceFilmProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+surfaceFilmModel none;
+
+regionName      none;
+
+active          false;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermo.compressibleGas b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermo.compressibleGas
new file mode 100644
index 0000000000000000000000000000000000000000..367faadefd70ebf2c4d580105ef0ea3a76dc4dad
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermo.compressibleGas
@@ -0,0 +1,126 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermo.compressibleGas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+O2
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       31.9988;
+    }
+    thermodynamics
+    {
+        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 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+H2O
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+    thermodynamics
+    {
+        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 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+CH4
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       16.0428;
+    }
+    thermodynamics
+    {
+        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 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+CO2
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       44.01;
+    }
+    thermodynamics
+    {
+        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 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
+
+N2
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       28.0134;
+    }
+    thermodynamics
+    {
+        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 );
+    }
+    transport
+    {
+        As              1.67212e-06;
+        Ts              170.672;
+    }
+}
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
index 9060c18a70884fe51828e299fff28f54435f5828..f593a1dd1264a63aebc98419d9edacb6369ef97f 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
@@ -15,79 +15,23 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hsPsiMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
+thermoType hsPsiMixtureThermo<singleStepReactingMixture<gasThermoPhysics>>;
 
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 17.1271;
+inertSpecie N2;
+fuel        CH4;
 
-stoichiometricOxygenFuelMassRatio stoichiometricOxygenFuelMassRatio [ 0 0 0 0 0 0 0 ] 4;
+chemistryReader foamChemistryReader;
 
-qFuel           qFuel [ 0 2 -2 0 0 0 0 ] 5.00264e+07;
+foamChemistryFile "$FOAM_CASE/constant/reactions";
 
-fuel
-{
-    specie
-    {
-        nMoles          1;
-        molWeight       16.0428;
-    }
-    thermodynamics
-    {
-        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 );
-    }
-    transport
-    {
-        As              1.67212e-06;
-        Ts              170.672;
-    }
-}
+foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas";
 
-oxidant
+liquids
 {
-    specie
-    {
-        nMoles          1;
-        molWeight       28.8504;
-    }
-    thermodynamics
-    {
-        Tlow            200;
-        Thigh           6000;
-        Tcommon         1000;
-        highCpCoeffs    ( 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 );
-        lowCpCoeffs     ( 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 );
-    }
-    transport
-    {
-        As              1.67212e-06;
-        Ts              170.672;
-    }
-}
+    liquidComponents
+    ();
 
-burntProducts
-{
-    specie
-    {
-        nMoles          1;
-        molWeight       27.6334;
-    }
-    thermodynamics
-    {
-        Tlow            200;
-        Thigh           6000;
-        Tcommon         1000;
-        highCpCoeffs    ( 3.0602 0.00182422 -5.93878e-07 8.93807e-11 -4.97595e-15 -10998.7 5.32209 );
-        lowCpCoeffs     ( 3.54628 0.000378279 2.02797e-07 9.31602e-10 -6.84016e-13 -11102.1 2.90098 );
-    }
-    transport
-    {
-        As              1.67212e-06;
-        Ts              170.672;
-    }
+    H2O             H2O defaultCoeffs;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
index ce3527c1531bec417a2d889e396378ba1c874924..eed3d8330130d88618267aa02db972201d58dc95 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
@@ -30,12 +30,14 @@ divSchemes
     default        none;
     div(phi,U)      Gauss linear;
     div(phi,k)      Gauss limitedLinear 0.1;
-    flux(phi,ft)    Gauss limitedLinear01 0.1;
-    div(phi,ft_b_h) Gauss multivariateSelection
+    div(phi,Yi_hs) Gauss multivariateSelection
     {
-        fu              limitedLinear 0.1;
-        ft              limitedLinear 0.1;
-        hs              limitedLinear 0.1;
+        O2              limitedLinear01 1;
+        CH4             limitedLinear01 1;
+        N2              limitedLinear01 1;
+        H2O             limitedLinear01 1;
+        CO2             limitedLinear01 1;
+        hs              limitedLinear 1;
     };
     div((muEff*dev2(T(grad(U))))) Gauss linear;
     div(phiU,p)     Gauss linear;
@@ -44,7 +46,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear uncorrected;
+    default         Gauss linear corrected;
 }
 
 interpolationSchemes
@@ -54,7 +56,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         uncorrected;
+    default         corrected;
 }
 
 fluxRequired
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
index ef95fada40f1ed14d204e24830c26b5e5b397720..37e6164a4f57aa1753948a1ae5a798e1d7f473c1 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
@@ -45,16 +45,16 @@ solvers
     };
 
 
-    "(U|ft|fu|k|hs)"
+    "(U|Yi|k|hs)"
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
+        solver          PBiCG;
+        preconditioner  DILU;
         tolerance       1e-7;
         relTol          0.1;
         nSweeps         1;
     };
 
-    "(U|ft|fu|k|hs)Final"
+    "(U|Yi|k|hs)Final"
     {
         $U;
         tolerance       1e-8;
@@ -85,10 +85,16 @@ solvers
 
 PIMPLE
 {
-    momentumPredictor no;
+    momentumPredictor yes;
     nOuterCorrectors  1;
     nCorrectors       1;
     nNonOrthogonalCorrectors 0;
 }
 
+relaxationFactors
+{
+    "(U|k).*"                   1;
+    "(C3H8|O2|H2O|CO2|hs).*"    0.9;
+}
+
 // ************************************************************************* //