Merged reactingParcelFilmFoam into reactingParcelFoam

The combined solver includes the most advanced and general functionality from
each solver including:

    Continuous phase
    Lagrangian multiphase parcels
    Optional film
    Continuous and Lagrangian phase reactions
    Radiation
    Strong buoyancy force support by solving for p_rgh

The reactingParcelFoam and reactingParcelFilmFoam tutorials have been combined
and updated.

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/additionalControls

@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      additionalControls;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvePrimaryRegion false; // true;
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/additionalControls

@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      additionalControls;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvePrimaryRegion true; // false; // true;
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p

@@ -23,17 +23,22 @@ boundaryField
 {
     fuel
     {
-        type            zeroGradient;
+        type            calculated;
+        value           $internalField;
     }
+
     air
     {
-        type            zeroGradient;
+        type            calculated;
+        value           $internalField;
     }
+
     outlet
     {
-        type            totalPressure;
-        p0              $internalField;
+        type            calculated;
+        value           $internalField;
     }
+
     frontAndBack
     {
         type            empty;

tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh

@@ -1,20 +1,47 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      additionalControls;
+    class       volScalarField;
+    location    "0";
+    object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-solvePrimaryRegion true; // false; // true;
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 1e5;
+
+boundaryField
+{
+    fuel
+    {
+        type            fixedFluxPressure;
+    }
+
+    air
+    {
+        type            fixedFluxPressure;
+    }
+
+    outlet
+    {
+        type            prghTotalPressure;
+        p0              $internalField;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution

@@ -22,7 +22,7 @@ solvers
         solver          diagonal;
     }
 
-    p
+    p_rgh
     {
         solver          GAMG;
         tolerance       1e-6;
@@ -30,9 +30,9 @@ solvers
         smoother        GaussSeidel;
     }
 
-    pFinal
+    p_rghFinal
     {
-        $p;
+        $p_rgh;
         relTol           0;
     }
 

tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties

@@ -14,11 +14,11 @@ FoamFile
     object      scalarListList;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// (x y z) (u v w) d rho mDot T Cp (Y0..Y2)
+// (x y z) (u v w) d rho mDot T Cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
 (
-    (0 1.95 -0.2) (0 -5 0) 0.001 1000 0.002 300 4200 (1)
-    (0 1.95    0) (0 -5 0) 0.001 1000 0.002 300 4200 (1)
-    (0 1.95  0.2) (0 -5 0) 0.001 1000 0.002 300 4200 (1)
+    (0 1.95 -0.2) (0 -5 0) 0.001 1000 0.002 300 4200 (0 1 0) () (1) ()
+    (0 1.95    0) (0 -5 0) 0.001 1000 0.002 300 4200 (0 1 0) () (1) ()
+    (0 1.95  0.2) (0 -5 0) 0.001 1000 0.002 300 4200 (0 1 0) () (1) ()
 );
 
 

tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties

@@ -74,7 +74,7 @@ subModels
     {
         model1
         {
-            type            reactingLookupTableInjection;
+            type            reactingMultiphaseLookupTableInjection;
             massTotal       0.5;
             parcelBasisType mass;
             SOI             0;
@@ -91,10 +91,14 @@ subModels
 
     heatTransferModel none;
 
-    compositionModel singlePhaseMixture;
+    compositionModel singleMixtureFraction;
 
     phaseChangeModel none;
 
+    devolatilisationModel none;
+
+    surfaceReactionModel none;
+
     stochasticCollisionModel none;
 
     surfaceFilmModel thermoSurfaceFilm;
@@ -106,15 +110,24 @@ subModels
         type            rebound;
     }
 
-    singlePhaseMixtureCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
+            gas
+            {
+            }
             liquid
             {
-                H2O          1;
+                H2O         1;
+            }
+            solid
+            {
             }
         );
+        YGasTot0        0;
+        YLiquidTot0     1;
+        YSolidTot0      0;
     }
 
     thermoSurfaceFilmCoeffs

tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict

@@ -15,9 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     reactingParcelFilmFoam;
+application     reactingParcelFoam;
 
-startFrom       latestTime; // startTime;
+startFrom       latestTime;
 
 startTime       0;
 

tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution

@@ -97,10 +97,6 @@ PIMPLE
 
 relaxationFactors
 {
-    fields
-    {
-        ".*Final"       1;
-    }
     equations
     {
         ".*Final"       1;

tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "1";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -23,33 +22,42 @@ boundaryField
 {
     walls
     {
-        type            zeroGradient;
+        type            calculated;
+        value           $internalField;
     }
+
     inlet
     {
-        type            zeroGradient;
+        type            calculated;
+        value           $internalField;
     }
+
     outlet
     {
-        type            fixedValue;
-        value           uniform 100000;
+        type            calculated;
+        value           $internalField;
     }
+
     cycLeft_half0
     {
         type            cyclic;
     }
+
     cycRight_half0
     {
         type            cyclic;
     }
+
     frontAndBack
     {
         type            empty;
     }
+
     cycLeft_half1
     {
         type            cyclic;
     }
+
     cycRight_half1
     {
         type            cyclic;

tutorials/lagrangian/reactingParcelFoam/filter/0.orig/p_rgh

@@ -0,0 +1,66 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 100000;
+
+boundaryField
+{
+    walls
+    {
+        type            fixedFluxPressure;
+    }
+
+    inlet
+    {
+        type            fixedFluxPressure;
+    }
+
+    outlet
+    {
+        type            prghPressure;
+        p               uniform 100000;
+    }
+
+    cycLeft_half0
+    {
+        type            cyclic;
+    }
+
+    cycRight_half0
+    {
+        type            cyclic;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+
+    cycLeft_half1
+    {
+        type            cyclic;
+    }
+
+    cycRight_half1
+    {
+        type            cyclic;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/filter/Allrun

@@ -5,6 +5,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 restore0Dir
+
+# create mesh
 runApplication blockMesh
 
 # create sets

tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution

@@ -47,7 +47,7 @@ solvers
         relTol          0;
     }
 
-    p
+    p_rgh
     {
         solver          GAMG;
         tolerance       0;
@@ -55,9 +55,9 @@ solvers
         smoother        GaussSeidel;
     }
 
-    pFinal
+    p_rghFinal
     {
-        $p;
+        $p_rgh;
         tolerance       1e-06;
         relTol          0;
     }

tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties

@@ -112,10 +112,14 @@ subModels
 
     heatTransferModel none;
 
-    compositionModel singlePhaseMixture;
+    compositionModel singleMixtureFraction;
 
     phaseChangeModel none;
 
+    devolatilisationModel none;
+
+    surfaceReactionModel none;
+
     stochasticCollisionModel none;
 
     surfaceFilmModel thermoSurfaceFilm;
@@ -127,15 +131,24 @@ subModels
         type            rebound;
     }
 
-    singlePhaseMixtureCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
+            gas
+            {
+            }
             liquid
             {
                 H2O          1;
             }
+            solid
+            {
+            }
         );
+        YGasTot0        0;
+        YLiquidTot0     1;
+        YSolidTot0      0;
     }
 
     thermoSurfaceFilmCoeffs

tutorials/lagrangian/reactingParcelFoam/hotBoxes/patchify.setSet

@@ -25,6 +25,6 @@ faceSet cubeFaceSet add boxToFace (0.399 0.599 0.399) (0.601 0.601 0.601)
 faceSet cubeFaceSet add boxToFace (0.399 0.399 0.399) (0.601 0.401 0.601)
 cellSet cubeFacesCells new faceToCell cubeFaceSet owner
 faceZoneSet cubeFaces new setsToFaceZone cubeFaceSet cubeFacesCells
-faceSet floorFaces new boxToFace (-0.001 -0.001 -0.001) (1.001 1.001 0.001)
-cellSet floorCells new faceToCell floorFaces owner
-faceZoneSet floorFaces new setsToFaceZone floorFaces floorCells
+faceSet FloorFaces new boxToFace (-0.001 -0.001 -0.001) (1.001 1.001 0.001)
+cellSet floorCells new faceToCell FloorFaces owner
+faceZoneSet floorFaces new setsToFaceZone FloorFaces floorCells

tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     reactingParcelFilmFoam;
+application     reactingParcelFoam;
 
 startForm       latestTime;
 

tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution

@@ -78,10 +78,6 @@ PIMPLE
 
 relaxationFactors
 {
-    fields
-    {
-        ".*Final"       1;
-    }
     equations
     {
         ".*Final"       1;

tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p

@@ -25,22 +25,28 @@ boundaryField
     {
         type            symmetryPlane;
     }
+
     front
     {
         type            symmetryPlane;
     }
+
     inlet
     {
-        type            zeroGradient;
+        type            calculated;
+        value           $internalField;
     }
+
     outlet
     {
-        type            fixedValue;
-        value           uniform 100000;
+        type            calculated;
+        value           $internalField;
     }
+
     walls
     {
-        type            zeroGradient;
+        type            calculated;
+        value           $internalField;
     }
 }
 

tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p_rgh

@@ -1,20 +1,52 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      additionalControls;
+    class       volScalarField;
+    location    "0";
+    object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-solvePrimaryRegion true;
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 100000;
+
+boundaryField
+{
+    back
+    {
+        type            symmetryPlane;
+    }
+
+    front
+    {
+        type            symmetryPlane;
+    }
+
+    inlet
+    {
+        type            fixedFluxPressure;
+    }
+
+    outlet
+    {
+        type            prghPressure;
+        p               uniform 100000;
+    }
+
+    walls
+    {
+        type            fixedFluxPressure;
+    }
+}
+
 
 // ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution

@@ -47,7 +47,7 @@ solvers
         relTol          0;
     }
 
-    p
+    p_rgh
     {
         solver          GAMG;
         tolerance       0;
@@ -56,9 +56,9 @@ solvers
         maxIter         20;
     }
 
-    pFinal
+    p_rghFinal
     {
-        $p;
+        $p_rgh;
         tolerance       1e-06;
         relTol          0;
     }