From 00f7b44fa11dc9821037f63168f54d6784c62719 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 5 Nov 2013 15:22:35 +0000
Subject: [PATCH] ENH: Tutorial updates

---
 .../les/flameSpreadWaterSuppressionPanel/0/T  |   2 +
 .../0/pyrolysisRegion/T                       |   2 +
 .../constant/pyrolysisZones                   |  37 ++-
 .../constant/reactingCloud1Properties         | 230 ------------------
 .../constant/surfaceFilmProperties            |  80 +-----
 .../constant/pyrolysisZones                   |  34 ++-
 .../constant/reactingCloud1Properties         | 135 ----------
 .../smallPoolFire2D/constant/pyrolysisZones   |  29 +--
 .../constant/reactingCloud1Properties         | 135 ----------
 .../smallPoolFire3D/constant/pyrolysisZones   |  29 +--
 .../constant/reactingCloud1Properties         | 136 -----------
 .../constant/reactingCloud1Properties         |  10 -
 .../constant/coalCloud1Properties             |   4 -
 .../constant/limestoneCloud1Properties        |   3 -
 .../constant/reactingCloud1Properties         |   6 -
 .../constant/reactingCloud1Properties         |   6 -
 .../constant/reactingCloud1Properties         |   6 -
 .../constant/reactingCloud1Properties         |  10 -
 .../aachenBomb/constant/sprayCloudProperties  |  11 +-
 19 files changed, 78 insertions(+), 827 deletions(-)

diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
index c7614c8c273..98bf184dec1 100755
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
@@ -49,6 +49,8 @@ boundaryField
     region0_to_pyrolysisRegion_coupledWall
     {
         type            filmPyrolysisRadiativeCoupledMixed;
+        pyrolysisRegion pyrolysisRegion;
+        filmRegion      filmRegion;
         Tnbr            T;
         kappa           fluidThermo;
         QrNbr           none;
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
index 2664855cf3c..2212e48d7c3 100755
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
@@ -34,6 +34,8 @@ boundaryField
     region0_to_pyrolysisRegion_coupledWall
     {
         type            filmPyrolysisRadiativeCoupledMixed;
+        pyrolysisRegion pyrolysisRegion;
+        filmRegion      filmRegion;
         Tnbr            T;
         kappa           solidThermo;
         kappaName       none;
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
index f4ba9724e72..d988145a1ce 100755
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
@@ -15,32 +15,29 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-1
-(
- pyrolysis
- {
-     active          true;
+pyrolysis
+{
+    active          true;
 
-     pyrolysisModel  reactingOneDim;
+    pyrolysisModel  reactingOneDim;
 
-     regionName pyrolysisRegion;
+    regionName pyrolysisRegion;
 
-     reactingOneDimCoeffs
-     {
-         filmCoupled     true;
+    reactingOneDimCoeffs
+    {
+        filmCoupled     true;
 
-         gasHSource      true;
-         QrHSource       false;
+        gasHSource      true;
+        QrHSource       false;
 
-         radFluxName     Qr;
+        radFluxName     Qr;
 
-         moveMesh        false; // true;
-         minimumDelta    1e-6;
+        moveMesh        false; // true;
+        minimumDelta    1e-6;
 
-         useChemistrySolvers    true;
-     }
- }
+        useChemistrySolvers    true;
+    }
+}
 
-)
 
-// ************************************************************************* //
\ No newline at end of file
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
index 330a418c283..1f9b1416c03 100755
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/reactingCloud1Properties
@@ -18,237 +18,7 @@ FoamFile
 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 none;//coneInjection;
-
-    dispersionModel none;
-
-    patchInteractionModel standardWallInteraction;
-
-    heatTransferModel none;
-
-    compositionModel singlePhaseMixture;
-
-    phaseChangeModel none;
-
-    surfaceFilmModel thermoSurfaceFilm;
-
-    radiation       off;
-
-    coneNozzleInjectionCoeffs
-    {
-        massTotal       massTotal [ 1 0 0 0 0 ] 0.0005;
-        parcelBasisType mass;
-        SOI             0.001;
-        duration        10; //0.005;
-        position        ( 0. 0.0 0.0 );
-        direction       ( 0 -1 0 );
-        parcelsPerSecond 10000;
-        //flowRateProfile  constant 0.01;
-        flowRateProfile  constant 0.01;
-        Umag            constant 50;
-        thetaInner      constant 0;
-        thetaOuter      constant 30;
-
-        parcelPDF
-        {
-            pdfType         RosinRammler;
-            RosinRammlerPDF
-            {
-                minValue        5e-05;
-                maxValue        0.0001;
-                //            d               ( 7.5e-05 );
-                d               7.5e-05;
-                //            n               ( 0.5 );
-                n               0.5;
-            }
-        }
-    }
-
-    coneInjectionCoeffs
-    {
-        SOI             1055.00;//800.000;
-        duration        1000.00;//1800.000;
-        //    positionsFile   "reactingCloud1Positions";
-        //    axesFile        "reactingCloud1Axes";
-        positionAxis
-            (
-             ( (  -2.13360    4.47040     -1.52400)  (    0 -1 0 ) )
-             ( (  -1.52400    4.47040     -1.52400)  (    0 -1 0 ) )
-             ( (  -0.91440    4.47040     -1.52400)  (    0 -1 0 ) )
-             ( (  -0.30480    4.47040     -1.52400)  (    0 -1 0 ) )
-             ( (   0.30480    4.47040     -1.52400)  (    0 -1 0 ) )
-             ( (   0.91440    4.47040     -1.52400)  (    0 -1 0 ) )
-             ( (   1.52400    4.47040     -1.52400)  (    0 -1 0 ) )
-             ( (   2.13360    4.47040     -1.52400)  (    0 -1 0 ) )
-
-             ( (  -2.13360    4.47040     -0.91440)  (    0 -1 0 ) )
-             ( (  -1.52400    4.47040     -0.91440)  (    0 -1 0 ) )
-             ( (  -0.91440    4.47040     -0.91440)  (    0 -1 0 ) )
-             ( (  -0.30480    4.47040     -0.91440)  (    0 -1 0 ) )
-             ( (   0.30480    4.47040     -0.91440)  (    0 -1 0 ) )
-             ( (   0.91440    4.47040     -0.91440)  (    0 -1 0 ) )
-             ( (   1.52400    4.47040     -0.91440)  (    0 -1 0 ) )
-             ( (   2.13360    4.47040     -0.91440)  (    0 -1 0 ) )
-
-             ( (  -2.13360    4.47040     -0.30480)  (    0 -1 0 ) )
-             ( (  -1.52400    4.47040     -0.30480)  (    0 -1 0 ) )
-             ( (  -0.91440    4.47040     -0.30480)  (    0 -1 0 ) )
-             ( (  -0.30480    4.47040     -0.30480)  (    0 -1 0 ) )
-             ( (   0.30480    4.47040     -0.30480)  (    0 -1 0 ) )
-             ( (   0.91440    4.47040     -0.30480)  (    0 -1 0 ) )
-             ( (   1.52400    4.47040     -0.30480)  (    0 -1 0 ) )
-             ( (   2.13360    4.47040     -0.30480)  (    0 -1 0 ) )
-
-             ( (  -2.13360    4.47040      0.30480)  (    0 -1 0 ) )
-             ( (  -1.52400    4.47040      0.30480)  (    0 -1 0 ) )
-             ( (  -0.91440    4.47040      0.30480)  (    0 -1 0 ) )
-             ( (  -0.30480    4.47040      0.30480)  (    0 -1 0 ) )
-             ( (   0.30480    4.47040      0.30480)  (    0 -1 0 ) )
-             ( (   0.91440    4.47040      0.30480)  (    0 -1 0 ) )
-             ( (   1.52400    4.47040      0.30480)  (    0 -1 0 ) )
-             ( (   2.13360    4.47040      0.30480)  (    0 -1 0 ) )
-
-             ( (  -2.13360    4.47040      0.91440)  (    0 -1 0 ) )
-             ( (  -1.52400    4.47040      0.91440)  (    0 -1 0 ) )
-             ( (  -0.91440    4.47040      0.91440)  (    0 -1 0 ) )
-             ( (  -0.30480    4.47040      0.91440)  (    0 -1 0 ) )
-             ( (   0.30480    4.47040      0.91440)  (    0 -1 0 ) )
-             ( (   0.91440    4.47040      0.91440)  (    0 -1 0 ) )
-             ( (   1.52400    4.47040      0.91440)  (    0 -1 0 ) )
-             ( (   2.13360    4.47040      0.91440)  (    0 -1 0 ) )
-
-             ( (  -2.13360    4.47040      1.52400)  (    0 -1 0 ) )
-             ( (  -1.52400    4.47040      1.52400)  (    0 -1 0 ) )
-             ( (  -0.91440    4.47040      1.52400)  (    0 -1 0 ) )
-             ( (  -0.30480    4.47040      1.52400)  (    0 -1 0 ) )
-             ( (   0.30480    4.47040      1.52400)  (    0 -1 0 ) )
-             ( (   0.91440    4.47040      1.52400)  (    0 -1 0 ) )
-             ( (   1.52400    4.47040      1.52400)  (    0 -1 0 ) )
-             ( (   2.13360    4.47040      1.52400)  (    0 -1 0 ) )
-         );
-
-        //massTotal is the total for all injectors
-        massTotal       1211.35; //kg over 1000 seconds (0.1 gpm/ft2)
-        //massTotal       3634.05; //kg over 1000 seconds (0.3 gpm/ft2)
-
-        parcelsPerInjector 30000;
-        parcelsPerSecond 500;
-        parcelBasisType mass;
-        flowRateProfile  constant 0.1;
-        Umag            constant 2.0;
-        thetaInner      constant 5;
-        thetaOuter      constant 120;
-
-        sizeDistribution
-        {
-            type         uniform;
-            uniformDistribution
-            {
-                minValue        0.001;
-                maxValue        0.002;
-                d               ( 7.5e-05 );
-                n               ( 0.5 );
-            }
-        }
-    }
-
-
-    standardWallInteractionCoeffs
-    {
-        type            escape;//stick;//rebound;
-    }
-
-    RanzMarshallCoeffs
-    {
-        // thermal shielding
-        BirdCorrection  true;
-    }
-
-    singlePhaseMixtureCoeffs
-    {
-        phases
-        (
-            liquid
-            {
-                H2O          1;
-            }
-        );
-    }
-
-    thermoSurfaceFilmCoeffs
-    {
-        interactionType splashBai;
-        deltaWet        0.0002;
-        Adry            2630;
-        Awet            1320;
-        Cf              0.6;
-    }
-
-}
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
index 05847fabf5c..36489e7d47f 100755
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
@@ -23,30 +23,32 @@ regionName      filmRegion;
 
 thermoSingleLayerCoeffs
 {
-    thermoModel singleComponent;
+    filmThermoModel liquid;
+    liquidCoeffs
+    {
+        useReferenceValues  no;
+        liquid          H2O;
+    }
+    filmViscosityModel  liquid;
 
     hydrophilic     no;
     deltaWet        1e-4;
 
-    liquid      H2O;
-
-    turbulence  laminar;
+    turbulence      laminar;
     laminarCoeffs
     {
-        Cf          0.005;
+        Cf              0.005;
     }
 
     radiationModel  none;
     standardRadiationCoeffs
     {
-        //deltaMi 1e-6;
         beta     0.75;
         kappaBar 0.25;
     }
 
     upperSurfaceModels
     {
-
         heatTransferModel constant;
         constantCoeffs
         {
@@ -63,70 +65,14 @@ thermoSingleLayerCoeffs
         }
     }
 
+    injectionModels
+    ();
+
     forces
     (
-        surfaceShear
         thermocapillary
-        //contactAngle
     );
 
-    surfaceShearCoeffs
-    {
-        Cf          0.005;
-    }
-
-    contactAngleCoeffs
-    {
-        Ccf             0.085;
-        contactAngleDistribution
-        {
-            type            normal;
-            normalDistribution
-            {
-                minValue        50;
-                maxValue        100;
-                expectation     75;
-                variance        100;
-            }
-        }
-        zeroForcePatches
-        ();
-    }
-
-    injectionModels
-    (
-        //curvatureSeparation
-        //drippingInjection
-    );
-
-    curvatureSeparationCoeffs
-    {
-        definedPatchRadii
-        (
-            ("(cube[0-9][0-9]_side[0-9]_to_cube[0-9][0-9]_side[0-9])" 0)
-        );
-    }
-
-    drippingInjectionCoeffs
-    {
-        cloudName    reactingCloud1;
-        deltaStable  0;
-
-        particlesPerParcel 100.0;
-
-        parcelDistribution
-        {
-            type         RosinRammler;
-            RosinRammlerDistribution
-            {
-                minValue        5e-04;
-                maxValue        0.0012;
-                d               7.5e-05;
-                n               0.5;
-            }
-        }
-    }
-
     phaseChangeModel standardPhaseChange;
 
     standardPhaseChangeCoeffs
@@ -135,4 +81,4 @@ thermoSingleLayerCoeffs
         deltaMin        1e-8;
         L               1.0;
     }
-}
\ No newline at end of file
+}
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pyrolysisZones b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pyrolysisZones
index 1c0c248345d..92922644ede 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/pyrolysisZones
@@ -15,29 +15,27 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-1
-(
-    pyrolysis
-    {
-        active          true;
-
-        pyrolysisModel  reactingOneDim;
+pyrolysis
+{
+    active          true;
 
-        regionName      panelRegion;
+    pyrolysisModel  reactingOneDim;
 
-        reactingOneDimCoeffs
-        {
-            gasHSource      false; //Energy source term due to pyrolysis gas
-            QrHSource       false; //Energy source term due in depht radiation
-            minimumDelta    1e-12;
+    regionName      panelRegion;
 
-            reactionDeltaMin 1e-12;
+    reactingOneDimCoeffs
+    {
+        gasHSource      false; //Energy source term due to pyrolysis gas
+        QrHSource       false; //Energy source term due in depht radiation
+        minimumDelta    1e-12;
 
-            moveMesh        false;
-        }
+        reactionDeltaMin 1e-12;
 
-        infoOutput      true;
+        moveMesh        false;
     }
-)
+
+    infoOutput      true;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties
index 87e8b7ae0dd..1f9b1416c03 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties
@@ -18,142 +18,7 @@ FoamFile
 solution
 {
     active          false;
-    coupled         yes;
-    transient       yes;
-    cellValueSourceCorrection yes;
-    maxCo           0.3;
-
-    sourceTerms
-    {
-        schemes
-        {
-            rho             explicit 1;
-            U               explicit 1;
-            Yi              explicit 1;
-            h               explicit 1;
-            radiation       explicit 1;
-        }
-    }
-
-    interpolationSchemes
-    {
-        rho             cell;
-        U               cellPoint;
-        mu              cell;
-        T               cell;
-        Cp              cell;
-        p               cell;
-    }
-
-    integrationSchemes
-    {
-        U               Euler;
-        T               analytical;
-    }
 }
 
-constantProperties
-{
-    rho0            1000;
-    T0              300;
-    Cp0             4187;
-
-    youngsModulus   1e9;
-    poissonsRatio   0.35;
-
-    epsilon0        1;
-    f0              0.5;
-
-    constantVolume  false;
-}
-
-subModels
-{
-    particleForces
-    {
-        sphereDrag;
-        gravity;
-    }
-
-    injectionModel  coneInjection;
-
-    dispersionModel none;
-
-    patchInteractionModel standardWallInteraction;
-
-    heatTransferModel none;
-
-    compositionModel singlePhaseMixture;
-
-    phaseChangeModel none;
-
-    stochasticCollisionModel 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/pyrolysisZones b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisZones
index d5ebc6e44ef..d61f60c7299 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/pyrolysisZones
@@ -15,28 +15,25 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-1
-(
-    pyrolysis
-    {
+pyrolysis
+{
+    active          false;
 
-        active          false;
+    pyrolysisModel  none;
 
-        pyrolysisModel  none;
+    regionName      panelRegion;
 
-        regionName      panelRegion;
+    reactingOneDimCoeffs
+    {
+        radFluxName     Qr;
 
-        reactingOneDimCoeffs
-        {
-            radFluxName     Qr;
+        minimumDelta    1e-8;
 
-            minimumDelta    1e-8;
+        moveMesh        false;
+    }
 
-            moveMesh        false;
-        }
+    infoOutput      false;
+}
 
-        infoOutput      false;
-    }
-)
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties
index 87e8b7ae0dd..1f9b1416c03 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties
@@ -18,142 +18,7 @@ FoamFile
 solution
 {
     active          false;
-    coupled         yes;
-    transient       yes;
-    cellValueSourceCorrection yes;
-    maxCo           0.3;
-
-    sourceTerms
-    {
-        schemes
-        {
-            rho             explicit 1;
-            U               explicit 1;
-            Yi              explicit 1;
-            h               explicit 1;
-            radiation       explicit 1;
-        }
-    }
-
-    interpolationSchemes
-    {
-        rho             cell;
-        U               cellPoint;
-        mu              cell;
-        T               cell;
-        Cp              cell;
-        p               cell;
-    }
-
-    integrationSchemes
-    {
-        U               Euler;
-        T               analytical;
-    }
 }
 
-constantProperties
-{
-    rho0            1000;
-    T0              300;
-    Cp0             4187;
-
-    youngsModulus   1e9;
-    poissonsRatio   0.35;
-
-    epsilon0        1;
-    f0              0.5;
-
-    constantVolume  false;
-}
-
-subModels
-{
-    particleForces
-    {
-        sphereDrag;
-        gravity;
-    }
-
-    injectionModel  coneInjection;
-
-    dispersionModel none;
-
-    patchInteractionModel standardWallInteraction;
-
-    heatTransferModel none;
-
-    compositionModel singlePhaseMixture;
-
-    phaseChangeModel none;
-
-    stochasticCollisionModel 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/pyrolysisZones b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisZones
index d5ebc6e44ef..d61f60c7299 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/pyrolysisZones
@@ -15,28 +15,25 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-1
-(
-    pyrolysis
-    {
+pyrolysis
+{
+    active          false;
 
-        active          false;
+    pyrolysisModel  none;
 
-        pyrolysisModel  none;
+    regionName      panelRegion;
 
-        regionName      panelRegion;
+    reactingOneDimCoeffs
+    {
+        radFluxName     Qr;
 
-        reactingOneDimCoeffs
-        {
-            radFluxName     Qr;
+        minimumDelta    1e-8;
 
-            minimumDelta    1e-8;
+        moveMesh        false;
+    }
 
-            moveMesh        false;
-        }
+    infoOutput      false;
+}
 
-        infoOutput      false;
-    }
-)
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties
index 87e8b7ae0dd..c6da25f550a 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties
@@ -18,142 +18,6 @@ FoamFile
 solution
 {
     active          false;
-    coupled         yes;
-    transient       yes;
-    cellValueSourceCorrection yes;
-    maxCo           0.3;
-
-    sourceTerms
-    {
-        schemes
-        {
-            rho             explicit 1;
-            U               explicit 1;
-            Yi              explicit 1;
-            h               explicit 1;
-            radiation       explicit 1;
-        }
-    }
-
-    interpolationSchemes
-    {
-        rho             cell;
-        U               cellPoint;
-        mu              cell;
-        T               cell;
-        Cp              cell;
-        p               cell;
-    }
-
-    integrationSchemes
-    {
-        U               Euler;
-        T               analytical;
-    }
-}
-
-constantProperties
-{
-    rho0            1000;
-    T0              300;
-    Cp0             4187;
-
-    youngsModulus   1e9;
-    poissonsRatio   0.35;
-
-    epsilon0        1;
-    f0              0.5;
-
-    constantVolume  false;
-}
-
-subModels
-{
-    particleForces
-    {
-        sphereDrag;
-        gravity;
-    }
-
-    injectionModel  coneInjection;
-
-    dispersionModel none;
-
-    patchInteractionModel standardWallInteraction;
-
-    heatTransferModel none;
-
-    compositionModel singlePhaseMixture;
-
-    phaseChangeModel none;
-
-    stochasticCollisionModel 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/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index c3e3442c2fb..da40e40ec4f 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -65,16 +65,6 @@ constantProperties
     T0              350;
     Cp0             4100;
 
-    youngsModulus   1e9;
-    poissonsRatio   0.35;
-
-    epsilon0        1;
-    f0              0.5;
-
-    TDevol          273;
-    LDevol          0;
-    hRetentionCoeff 1;
-
     constantVolume  false;
 }
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index e1643953428..1f79c8850e7 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -59,10 +59,6 @@ constantProperties
     rho0            1000;
     T0              300;
     Cp0             4187;
-
-    youngsModulus   2e9;
-    poissonsRatio   0.35;
-
     epsilon0        1;
     f0              0.5;
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index 36b287137d9..e4e324de84a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -59,9 +59,6 @@ constantProperties
     T0              300;
     Cp0             900;
 
-    youngsModulus   40e9;
-    poissonsRatio   0.25;
-
     epsilon0        1;
     f0              0.5;
 }
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
index 6e01c75332b..8486354e795 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
@@ -59,12 +59,6 @@ constantProperties
     T0              300;
     Cp0             4187;
 
-    youngsModulus   1e9;
-    poissonsRatio   0.35;
-
-    epsilon0        1;
-    f0              0.5;
-
     constantVolume  false;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
index 4e8221412f1..c9d32f44680 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
@@ -59,12 +59,6 @@ constantProperties
     T0              300;
     Cp0             4187;
 
-    youngsModulus   1e9;
-    poissonsRatio   0.35;
-
-    epsilon0        1;
-    f0              0.5;
-
     constantVolume  false;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
index e38561ee8fa..8edec046fd7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
@@ -59,12 +59,6 @@ constantProperties
     T0              300;
     Cp0             4187;
 
-    youngsModulus   1e9;
-    poissonsRatio   0.35;
-
-    epsilon0        1;
-    f0              0.5;
-
     constantVolume  false;
 }
 
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index c3e3442c2fb..da40e40ec4f 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -65,16 +65,6 @@ constantProperties
     T0              350;
     Cp0             4100;
 
-    youngsModulus   1e9;
-    poissonsRatio   0.35;
-
-    epsilon0        1;
-    f0              0.5;
-
-    TDevol          273;
-    LDevol          0;
-    hRetentionCoeff 1;
-
     constantVolume  false;
 }
 
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
index 4d9cfe27110..d1523c217ce 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
@@ -58,17 +58,10 @@ constantProperties
 {
     T0              320;
 
-    // place holders for rho0, Cp0 and sigma0
-    // - reset from liquid props using T0
+    // place holders for rho0 and Cp0
+    // - reset from liquid properties using T0
     rho0            1000;
     Cp0             4187;
-    sigma0          0.02;
-
-    youngsModulus   1e9;
-    poissonsRatio   0.35;
-
-    epsilon0        1;
-    f0              0.5;
 
     constantVolume  false;
 }
-- 
GitLab