Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Conflicts:
	tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/0/p
	tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/changeDictionaryDict
	tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/H2O
	tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/T
	tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/U
	tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/air
	tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/alphat
	tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/k
	tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/mut
	tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/omega
	tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/p
	tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/polyMesh/boundary

tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/boundary

@@ -38,6 +38,7 @@ FoamFile
     frontAndBack
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          8000;
         startFace       8140;
     }

tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution

@@ -24,6 +24,7 @@ solvers
         tolerance       0;
         relTol          0.1;
     }
+
     rhoFinal
     {
         solver          PCG;
@@ -31,6 +32,7 @@ solvers
         tolerance       1e-4;
         relTol          0;
     }
+
     p
     {
         solver           GAMG;
@@ -81,8 +83,8 @@ PIMPLE
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     momentumPredictor yes;
-    rhoMin          rhoMin [1 -3 0 0 0] 0.1;
-    rhoMax          rhoMax [1 -3 0 0 0] 1.5;
+    rhoMin          0.1;
+    rhoMax          1.5;
 
     maxCo           0.5;
     rDeltaTSmoothingCoeff 0.1;

tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/polyMesh/boundary

@@ -20,12 +20,14 @@ FoamFile
     back
     {
         type            symmetryPlane;
+        inGroups        1(symmetryPlane);
         nFaces          9340;
         startFace       265900;
     }
     front
     {
         type            symmetryPlane;
+        inGroups        1(symmetryPlane);
         nFaces          9340;
         startFace       275240;
     }

tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution

@@ -25,7 +25,6 @@ solvers
         relTol          0.1;
     }
 
-//    "(p|.*Final)"
     p
     {
         solver           GAMG;
@@ -68,8 +67,8 @@ PIMPLE
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     momentumPredictor yes;
-    rhoMin          rhoMin [1 -3 0 0 0] 0.1;
-    rhoMax          rhoMax [1 -3 0 0 0] 1.5;
+    rhoMin          0.1;
+    rhoMax          1.5;
 
     maxCo           5;
     rDeltaTSmoothingCoeff 1;

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/changeDictionaryDict

@@ -1,37 +0,0 @@
-/*--------------------------------*- 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       dictionary;
-    object      changeDictionaryDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dictionaryReplacement
-{
-    U
-    {
-        boundaryField
-        {
-            inletCentral
-            {
-                ~volumetricFlowRate;
-                massFlowRate    constant 0.00379;
-            }
-            inletSides
-            {
-                ~volumetricFlowRate;
-                massFlowRate  constant 0.00832;
-            }
-        }
-    }
-}
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/chemistryProperties

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-psiChemistryModel ODEChemistryModel<gasThermoPhysics>;
+rhoChemistryModel ODEChemistryModel<gasThermoPhysics>;
 
 chemistry       off;
 

tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/combustionProperties

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  PaSR<psiChemistryCombustion>;
+combustionModel  PaSR<rhoChemistryCombustion>;
 
 active  false;
 

tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary

@@ -26,6 +26,7 @@ FoamFile
     frontAndBack
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          800;
         startFace       840;
     }

tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties

@@ -66,6 +66,8 @@ constantProperties
     Pr              0.7;
     Tvap            273;
     Tbp             373;
+    LDevol          0;
+    hRetentionCoeff 1;
 
     constantVolume  false;
 }
@@ -107,10 +109,14 @@ subModels
 
     heatTransferModel RanzMarshall;
 
-    compositionModel singlePhaseMixture;
+    compositionModel singleMixtureFraction;
 
     phaseChangeModel liquidEvaporation;
 
+    devolatilisationModel none;
+
+    surfaceReactionModel none;
+
     surfaceFilmModel none;
 
     radiation       off;
@@ -125,15 +131,24 @@ subModels
         BirdCorrection  true;
     }
 
-    singlePhaseMixtureCoeffs
+    singleMixtureFractionCoeffs
     {
         phases
         (
+            gas
+            {
+            }
             liquid
             {
                 H2O          1;
             }
+            solid
+            {
+            }
         );
+        YGasTot0        0;
+        YLiquidTot0     1;
+        YSolidTot0      0;
     }
 
     liquidEvaporationCoeffs

tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hePsiReactionThermo<reactingMixture<gasThermoPhysics>>;
+thermoType      heRhoReactionThermo<reactingMixture<gasThermoPhysics>>;
 
 chemistryReader foamChemistryReader;
 

tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes

@@ -36,7 +36,7 @@ divSchemes
     div(phi,epsilon) Gauss upwind;
     div(U)          Gauss linear;
     div((muEff*dev2(T(grad(U))))) Gauss linear;
-    div(phi,Yi_hs)  Gauss upwind;
+    div(phi,Yi_h)  Gauss upwind;
 }
 
 laplacianSchemes

tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution

@@ -76,16 +76,21 @@ solvers
 PIMPLE
 {
     transonic       no;
+    nOuterCorrectors 1;
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     momentumPredictor yes;
 }
 
+additional
+{
+    solveSpecies    true;
+}
+
 relaxationFactors
 {
     fields
     {
-        ".*Final"       1;
     }
     equations
     {

tutorials/lagrangian/reactingParcelFoam/filter/constant/polyMesh/boundary

@@ -38,6 +38,7 @@ FoamFile
     cycLeft_half0
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          20;
         startFace       3506;
         matchTolerance  0.0001;
@@ -46,6 +47,7 @@ FoamFile
     cycLeft_half1
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          20;
         startFace       3526;
         matchTolerance  0.0001;
@@ -54,6 +56,7 @@ FoamFile
     cycRight_half0
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          20;
         startFace       3546;
         matchTolerance  0.0001;
@@ -62,6 +65,7 @@ FoamFile
     cycRight_half1
     {
         type            cyclic;
+        inGroups        1(cyclic);
         nFaces          20;
         startFace       3566;
         matchTolerance  0.0001;
@@ -70,6 +74,7 @@ FoamFile
     frontAndBack
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          3440;
         startFace       3586;
     }

tutorials/lagrangian/reactingParcelFoam/filter/constant/reactions

@@ -7,4 +7,3 @@ species
 
 reactions
 {}
-

tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties

@@ -16,6 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
+dpdt no;
 
 chemistryReader foamChemistryReader;
 

tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     porousExplicitSourceReactingParcelFoam;
+application     reactingParcelFoam;
 
 startFrom       startTime;
 

tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution

@@ -85,14 +85,12 @@ PIMPLE
 
 additional
 {
-    pressureWorkTimeDerivative false;
 }
 
 relaxationFactors
 {
     fields
     {
-        ".*Final"       1;
     }
     equations
     {

tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/polyMesh/boundary

@@ -38,12 +38,14 @@ FoamFile
     back
     {
         type            symmetryPlane;
+        inGroups        1(symmetryPlane);
         nFaces          25;
         startFace       400;
     }
     front
     {
         type            symmetryPlane;
+        inGroups        1(symmetryPlane);
         nFaces          25;
         startFace       425;
     }

tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactions

@@ -6,4 +6,3 @@ species
 
 reactions
 {}
-

tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/thermophysicalProperties

@@ -16,6 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 thermoType      heRhoReactionThermo<reactingMixture<icoPoly8ThermoPhysics>>;
+dpdt no;
 
 chemistryReader foamChemistryReader;
 

tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/controlDict

@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     porousExplicitSourceReactingParcelFoam;
+application     reactingParcelFoam;
 
 startFoam       startTime;
 

tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution

@@ -84,14 +84,12 @@ PIMPLE
 
 additional
 {
-    pressureWorkTimeDerivative false;
 }
 
 relaxationFactors
 {
     fields
     {
-        ".*"       1;
     }
     equations
     {