From 0ebd122b0a816c2ba1397bd63978043a38acd172 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 8 Aug 2015 14:30:06 +0100
Subject: [PATCH 01/70] polyMeshFromShapeMesh: Set patch-face to corresponding
 cell-face Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1818

---
 src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 9a3e69faf5..62c1877fc1 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -328,9 +328,7 @@ void Foam::polyMesh::setTopology
 
             const label cellInside = curPatchFaceCells[faceI];
 
-            faces_[nFaces] = curFace;
-
-            // get faces of the cell inside
+            // Get faces of the cell inside
             const faceList& facesOfCellInside = cellsFaceShapes[cellInside];
 
             bool found = false;
@@ -366,6 +364,9 @@ void Foam::polyMesh::setTopology
 
                     found = true;
 
+                    // Set the patch face to corresponding cell-face
+                    faces_[nFaces] = facesOfCellInside[cellFaceI];
+
                     cells[cellInside][cellFaceI] = nFaces;
 
                     break;

From a1b528af61b0937044ae87510af7eb04685cc331 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Sat, 8 Aug 2015 17:50:38 +0100
Subject: [PATCH 02/70]     Corrected names of compounds in thermoData to use
 upper/lower     case in accordance with standard symbols for chemical
 elements.     For example, Cl for Chlorine (not CL), Ar for Argon (not AL),
 Al, Ne, Si, Pb, etc

---
 etc/thermoData/thermoData | 492 +++++++++++++++++++-------------------
 1 file changed, 246 insertions(+), 246 deletions(-)

diff --git a/etc/thermoData/thermoData b/etc/thermoData/thermoData
index 057c9557fc..dddc4e85f7 100644
--- a/etc/thermoData/thermoData
+++ b/etc/thermoData/thermoData
@@ -152,7 +152,7 @@ Pb-
         lowCpCoeffs     ( 2.5 0 0 0 0 17762.3 8.23513 );
     }
 }
-GeCL4
+GeCl4
 {
     specie
     {
@@ -536,7 +536,7 @@ F2O-__FOF-
         lowCpCoeffs     ( 4.64786 0.0100535 -1.79176e-05 1.47983e-08 -4.6499e-12 -25825.4 3.76539 );
     }
 }
-CCL
+CCl
 {
     specie
     {
@@ -552,7 +552,7 @@ CCL
         lowCpCoeffs     ( 3.76699 -0.00149298 9.61147e-06 -1.27138e-08 5.2737e-12 50911.8 5.66471 );
     }
 }
-ALCL+
+AlCl+
 {
     specie
     {
@@ -584,7 +584,7 @@ C20H36O2_EtLinolea
         lowCpCoeffs     ( -1.31454 0.212235 -8.58818e-05 -3.39348e-08 2.87278e-11 -71080.7 58.9753 );
     }
 }
-CL2O__Cl-O-Cl
+Cl2O__Cl-O-Cl
 {
     specie
     {
@@ -616,7 +616,7 @@ C6H8O_3,4DiMeFuran
         lowCpCoeffs     ( 2.41515 0.0320931 4.3306e-05 -8.36935e-08 3.70127e-11 -14574.6 14.9425 );
     }
 }
-NH4CLO4(II)
+NH4ClO4(II)
 {
     specie
     {
@@ -904,7 +904,7 @@ C60
         lowCpCoeffs     ( -33.5791 0.428444 -0.000317123 4.75463e-08 2.76777e-11 304651 148.329 );
     }
 }
-HCL
+HCl
 {
     specie
     {
@@ -1000,7 +1000,7 @@ HNO2_equil__ATcT
         lowCpCoeffs     ( 3.21416 0.00812778 1.65999e-06 -9.52815e-09 4.87131e-12 -10783.1 9.822 );
     }
 }
-FeCL3(L)
+FeCl3(L)
 {
     specie
     {
@@ -1016,7 +1016,7 @@ FeCL3(L)
         lowCpCoeffs     ( 16.1029 0 0 0 0 -48492 -67.1135 );
     }
 }
-C3H2BR2__1,3_Dib
+C3H2Br2__1,3_Dib
 {
     specie
     {
@@ -1048,7 +1048,7 @@ C4H8N8O8_HMX
         lowCpCoeffs     ( 8.14013 0.0833154 2.72628e-05 -9.98161e-08 4.69226e-11 16398.6 -3.22779 );
     }
 }
-SnCL4
+SnCl4
 {
     specie
     {
@@ -1112,7 +1112,7 @@ PS
         lowCpCoeffs     ( 3.4687 0.00449701 -8.42505e-06 7.47111e-09 -2.51772e-12 18049.7 7.36114 );
     }
 }
-BCL3
+BCl3
 {
     specie
     {
@@ -1416,7 +1416,7 @@ C2H4O2_HG(O)OCH3
         lowCpCoeffs     ( 5.96757 -0.00938085 7.07648e-05 -8.29932e-08 3.13523e-11 -44871 0.750341 );
     }
 }
-B3O3CL3
+B3O3Cl3
 {
     specie
     {
@@ -1432,7 +1432,7 @@ B3O3CL3
         lowCpCoeffs     ( 3.59422 0.0505755 -4.66182e-05 1.48922e-08 5.70497e-13 -199700 12.0898 );
     }
 }
-C3CL4_PerClAllene
+C3Cl4_PerClAllene
 {
     specie
     {
@@ -1448,7 +1448,7 @@ C3CL4_PerClAllene
         lowCpCoeffs     ( 2.89989 0.0562603 -9.46435e-05 7.87159e-08 -2.55213e-11 13576.3 15.0009 );
     }
 }
-AL2O3(L)
+Al2O3(L)
 {
     specie
     {
@@ -1592,7 +1592,7 @@ C2Cl3F3_FC-113A
         lowCpCoeffs     ( 2.5428 0.0608765 -8.62331e-05 6.07755e-08 -1.7269e-11 -94117.6 15.9691 );
     }
 }
-C12H9CL
+C12H9Cl
 {
     specie
     {
@@ -1672,7 +1672,7 @@ C8H7_C6H4CH=CH2
         lowCpCoeffs     ( 1.17831 0.0340766 5.85066e-05 -1.10953e-07 4.95223e-11 46141.5 23.6053 );
     }
 }
-MgCLF
+MgClF
 {
     specie
     {
@@ -1992,7 +1992,7 @@ C4H6__1,2-butadi
         lowCpCoeffs     ( 2.90828 0.0179025 2.61487e-05 -4.81599e-08 2.11296e-11 17592.9 12.3118 );
     }
 }
-CuCL
+CuCl
 {
     specie
     {
@@ -2024,7 +2024,7 @@ SO-
         lowCpCoeffs     ( 3.65351 0.00228026 -2.55566e-06 1.37405e-09 -2.7867e-13 -13915.6 5.50813 );
     }
 }
-PbCL2
+PbCl2
 {
     specie
     {
@@ -2168,7 +2168,7 @@ SB(CH3)2
         lowCpCoeffs     ( 4.74742 0.012719 1.70266e-05 -2.86489e-08 1.20242e-11 15230.4 7.86383 );
     }
 }
-BF2CL
+BF2Cl
 {
     specie
     {
@@ -2248,7 +2248,7 @@ C4H6O2_Crotonic_ac
         lowCpCoeffs     ( 3.40323 0.0269846 2.63698e-05 -5.87467e-08 2.69692e-11 -46024.4 13.1928 );
     }
 }
-BOCL
+BOCl
 {
     specie
     {
@@ -2392,7 +2392,7 @@ C5H11,pentyl
         lowCpCoeffs     ( 7.17405 0.00380923 0.00010438 -1.39635e-07 5.60398e-11 2528.72 -1.18869 );
     }
 }
-ALBr2
+AlBr2
 {
     specie
     {
@@ -2472,7 +2472,7 @@ HS2__RRHO
         lowCpCoeffs     ( 2.96324 0.00855502 -1.00388e-05 6.25269e-09 -1.52826e-12 51449.8 11.58 );
     }
 }
-AL
+Al
 {
     specie
     {
@@ -2680,7 +2680,7 @@ PH2-
         lowCpCoeffs     ( 3.95759 -0.000728834 5.13055e-06 -3.73172e-09 8.41295e-13 -2300.28 2.15723 );
     }
 }
-C12H5O3CL4_DOH2
+C12H5O3Cl4_DOH2
 {
     specie
     {
@@ -2728,7 +2728,7 @@ C22H44O2_Behenic
         lowCpCoeffs     ( 25.149 -0.0104152 0.000584232 -7.54109e-07 2.97753e-10 -112513 -54.9776 );
     }
 }
-AL2
+Al2
 {
     specie
     {
@@ -3064,7 +3064,7 @@ HCNO+_Fulminic_cat
         lowCpCoeffs     ( 1.1113 0.0257273 -3.99372e-05 3.18403e-08 -9.91911e-12 145418 15.4371 );
     }
 }
-CH3CL
+CH3Cl
 {
     specie
     {
@@ -3224,7 +3224,7 @@ C8H18(L)_isooctane
         lowCpCoeffs     ( 17.5199 0.0157484 7.35947e-05 -6.10398e-10 4.70619e-13 -37742.3 -68.3211 );
     }
 }
-CBrCL2F___11B1
+CBrCl2F___11B1
 {
     specie
     {
@@ -3464,7 +3464,7 @@ Si+
         lowCpCoeffs     ( 4.23261 -0.00743109 1.31426e-05 -1.07436e-08 3.34175e-12 148410 -2.74005 );
     }
 }
-SiCL4
+SiCl4
 {
     specie
     {
@@ -3512,7 +3512,7 @@ SiO2(b-qz)
         lowCpCoeffs     ( 29.6202 -0.0476273 2.62543e-05 0 0 -122857 -156.169 );
     }
 }
-FeCL2(S)
+FeCl2(S)
 {
     specie
     {
@@ -3624,7 +3624,7 @@ C4H4N2_PYRIMIDINE
         lowCpCoeffs     ( 1.63714 0.0119774 6.83832e-05 -1.0465e-07 4.42186e-11 22212.5 18.6564 );
     }
 }
-C3BR3_Allene_Rad.
+C3Br3_Allene_Rad.
 {
     specie
     {
@@ -3672,7 +3672,7 @@ H2O+
         lowCpCoeffs     ( 4.02466 -0.00108851 5.13577e-06 -4.40028e-09 1.40727e-12 116896 0.699969 );
     }
 }
-Fe2CL6
+Fe2Cl6
 {
     specie
     {
@@ -3720,7 +3720,7 @@ BI2
         lowCpCoeffs     ( 3.3065 0.0158184 -2.88094e-05 2.45287e-08 -7.96353e-12 27157.1 14.9424 );
     }
 }
-C2HCLF_1,1-CLF
+C2HClF_1,1-ClF
 {
     specie
     {
@@ -3752,7 +3752,7 @@ Mg2F4
         lowCpCoeffs     ( 1.51049 0.0696575 -0.000139294 1.2747e-07 -4.37228e-11 -209218 16.3106 );
     }
 }
-C6H2CL3O_RAD
+C6H2Cl3O_RAD
 {
     specie
     {
@@ -3816,7 +3816,7 @@ BiF2
         lowCpCoeffs     ( 3.10494 0.0151822 -2.53454e-05 1.9977e-08 -6.06776e-12 -25510.8 13.5101 );
     }
 }
-ALH3(a)_hexagonal
+AlH3(a)_hexagonal
 {
     specie
     {
@@ -4040,7 +4040,7 @@ C8H12_3,6-Dimeth
         lowCpCoeffs     ( 3.35348 0.0295908 8.59569e-05 -1.33332e-07 5.53072e-11 3491.85 11.6563 );
     }
 }
-CCL2F-CHF2
+CCl2F-CHF2
 {
     specie
     {
@@ -4248,7 +4248,7 @@ Ca+
         lowCpCoeffs     ( 2.5 0 0 0 0 92324.2 5.07768 );
     }
 }
-FeCL2
+FeCl2
 {
     specie
     {
@@ -4280,7 +4280,7 @@ C12H8_Acenaphtyl
         lowCpCoeffs     ( -2.14922 0.0589101 6.42492e-05 -1.41294e-07 6.47477e-11 28938 33.6791 );
     }
 }
-PF3CL2
+PF3Cl2
 {
     specie
     {
@@ -4328,7 +4328,7 @@ O2_singlet
         lowCpCoeffs     ( 3.78535 -0.00321929 1.12323e-05 -1.17254e-08 4.1766e-12 10292.3 3.2732 );
     }
 }
-ALF+
+AlF+
 {
     specie
     {
@@ -4728,7 +4728,7 @@ CO2-
         lowCpCoeffs     ( 2.49677 0.00870769 -4.87281e-06 -4.90572e-10 9.38694e-13 -42687.4 9.97856 );
     }
 }
-PCL3
+PCl3
 {
     specie
     {
@@ -4984,7 +4984,7 @@ F2H-____FHF-
         lowCpCoeffs     ( 3.32548 0.00415755 3.33684e-06 -7.76225e-09 3.38752e-12 -87832.1 7.32348 );
     }
 }
-C6H3CL3O_TriClPhen
+C6H3Cl3O_TriClPhen
 {
     specie
     {
@@ -5608,7 +5608,7 @@ C2H2FCl_1,1-FCl
         lowCpCoeffs     ( 0.912416 0.0311142 -3.24491e-05 1.67416e-08 -3.16508e-12 -21292.1 20.903 );
     }
 }
-AL(L)
+Al(L)
 {
     specie
     {
@@ -5784,7 +5784,7 @@ C3F7_CF3CF*CF3_M
         lowCpCoeffs     ( 3.14242 0.0603443 -6.17598e-05 2.7938e-08 -4.02551e-12 -165147 16.6898 );
     }
 }
-C12H4CL6O2_BIFENYL
+C12H4Cl6O2_BIFENYL
 {
     specie
     {
@@ -5832,7 +5832,7 @@ CH2OH+
         lowCpCoeffs     ( 3.54817 -0.00288791 2.98391e-05 -3.33578e-08 1.20141e-11 85029.7 7.01729 );
     }
 }
-PCL2-
+PCl2-
 {
     specie
     {
@@ -6232,7 +6232,7 @@ C10H20_3-decene-
         lowCpCoeffs     ( 2.73154 0.0788863 2.51642e-05 -8.5251e-08 3.92428e-11 -20689.8 25.7334 );
     }
 }
-C3H5Cl__CHCL=CHCH3
+C3H5Cl__CHCl=CHCH3
 {
     specie
     {
@@ -6360,7 +6360,7 @@ C
         lowCpCoeffs     ( 2.55424 -0.000321538 7.33792e-07 -7.32235e-10 2.66521e-13 85442.7 4.53131 );
     }
 }
-PbCL3
+PbCl3
 {
     specie
     {
@@ -6584,7 +6584,7 @@ C12H7_Acenaphtynyl
         lowCpCoeffs     ( -2.23704 0.0620074 4.69636e-05 -1.20874e-07 5.68319e-11 60886.8 33.8046 );
     }
 }
-C5H3CL3_CY-1,2,4CL
+C5H3Cl3_CY-1,2,4Cl
 {
     specie
     {
@@ -6616,7 +6616,7 @@ C3D6_Cyclopropan
         lowCpCoeffs     ( -1.18501 0.0361683 -2.53517e-06 -2.83415e-08 1.57552e-11 2767.63 26.5463 );
     }
 }
-CL2O2
+Cl2O2
 {
     specie
     {
@@ -6648,7 +6648,7 @@ PH3+
         lowCpCoeffs     ( 2.49088 0.00917665 -7.25623e-06 4.81735e-09 -1.58795e-12 115032 9.37716 );
     }
 }
-MgAL2O4(cr)
+MgAl2O4(cr)
 {
     specie
     {
@@ -6696,7 +6696,7 @@ NO3
         lowCpCoeffs     ( 2.17359 0.0104903 1.10473e-05 -2.81562e-08 1.36584e-11 7812.91 14.6022 );
     }
 }
-SiCL
+SiCl
 {
     specie
     {
@@ -6760,7 +6760,7 @@ C6H4O2__O=C6H4=O
         lowCpCoeffs     ( 0.856753 0.0415771 4.09304e-06 -4.07329e-08 2.08924e-11 -16679.3 21.4023 );
     }
 }
-C2H3CLO2
+C2H3ClO2
 {
     specie
     {
@@ -6808,7 +6808,7 @@ Hg(L)
         lowCpCoeffs     ( 3.68613 -0.000884371 -2.58545e-06 8.12482e-09 -5.52476e-12 -1050.3 -11.5403 );
     }
 }
-C12H4CL5O2_Radic
+C12H4Cl5O2_Radic
 {
     specie
     {
@@ -6920,7 +6920,7 @@ C4H8O2_Butyricacid
         lowCpCoeffs     ( 6.55569 0.00119881 9.25041e-05 -1.19594e-07 4.69862e-11 -57428.4 3.36227 );
     }
 }
-CF3-CHCLF__FC-124
+CF3-CHClF__FC-124
 {
     specie
     {
@@ -6952,7 +6952,7 @@ Ag
         lowCpCoeffs     ( 2.5 0 0 0 0 33520 6.56282 );
     }
 }
-ALF2
+AlF2
 {
     specie
     {
@@ -7048,7 +7048,7 @@ C5H10__2MB-3-ene
         lowCpCoeffs     ( 7.22291 -0.00273953 0.000104969 -1.31727e-07 5.12971e-11 -6107.68 -1.8469 );
     }
 }
-C2BR5
+C2Br5
 {
     specie
     {
@@ -7080,7 +7080,7 @@ C6H2Cl3O3_BiCy
         lowCpCoeffs     ( 0.82596 0.0897047 -8.89846e-05 3.66349e-08 -3.29896e-12 -36.1541 24.2683 );
     }
 }
-CBrCLF2
+CBrClF2
 {
     specie
     {
@@ -7128,7 +7128,7 @@ C8H5_C6H5-CC*
         lowCpCoeffs     ( 1.77838 0.0324194 3.85016e-05 -8.03842e-08 3.6269e-11 76600.4 19.3639 );
     }
 }
-COHCL2___Radical
+COHCl2___Radical
 {
     specie
     {
@@ -7208,7 +7208,7 @@ C12H20O10_Cellobi
         lowCpCoeffs     ( 8.32198 0.0628814 0.000271753 -4.29459e-07 1.80191e-10 -174415 -4.13432 );
     }
 }
-C5H7CL
+C5H7Cl
 {
     specie
     {
@@ -7560,7 +7560,7 @@ CO2_cy__C(OO)
         lowCpCoeffs     ( 3.18456 0.00536293 2.20597e-06 -8.41227e-09 4.16779e-12 21632.5 8.74099 );
     }
 }
-PbCL4
+PbCl4
 {
     specie
     {
@@ -7592,7 +7592,7 @@ C20H40O2_etStearat
         lowCpCoeffs     ( -2.70218 0.226825 -8.75531e-05 -4.39254e-08 3.47715e-11 -101728 60.8589 );
     }
 }
-PCL
+PCl
 {
     specie
     {
@@ -7640,7 +7640,7 @@ C2Cl4_Tetrachlor
         lowCpCoeffs     ( 3.11949 0.0449195 -7.36241e-05 5.96895e-08 -1.89904e-11 -4918.58 12.6542 );
     }
 }
-ALO-
+AlO-
 {
     specie
     {
@@ -7752,7 +7752,7 @@ CHF3__FLUOROFORM
         lowCpCoeffs     ( 2.73539 0.00872479 1.74822e-05 -3.21505e-08 1.41695e-11 -84684 12.488 );
     }
 }
-BrCL
+BrCl
 {
     specie
     {
@@ -8184,7 +8184,7 @@ C6H10O5_Levogluco
         lowCpCoeffs     ( 1.02548 0.0539526 5.79178e-05 -1.24491e-07 5.63562e-11 -97953 24.8253 );
     }
 }
-PFCL-
+PFCl-
 {
     specie
     {
@@ -8248,7 +8248,7 @@ s-1-C10H7C*O
         lowCpCoeffs     ( 0.247025 0.0623078 3.25269e-05 -9.98773e-08 4.79264e-11 18078.8 27.46 );
     }
 }
-CH2CLF__GC-31
+CH2ClF__GC-31
 {
     specie
     {
@@ -8344,7 +8344,7 @@ C4H8_Cyclobutan
         lowCpCoeffs     ( 3.14397 -0.00504252 0.000120645 -1.5841e-07 6.38394e-11 1919.48 10.6618 );
     }
 }
-DCL
+DCl
 {
     specie
     {
@@ -8584,7 +8584,7 @@ C8H15_1-octenyl-
         lowCpCoeffs     ( 3.9658 0.0500732 4.58634e-05 -9.55246e-08 4.20969e-11 9477.34 19.0962 );
     }
 }
-SiCL3
+SiCl3
 {
     specie
     {
@@ -8952,7 +8952,7 @@ Cr7C3(S)
         lowCpCoeffs     ( 1.2648 0.135086 -0.000236887 1.97375e-07 -6.14407e-11 -23973 -14.4012 );
     }
 }
-FeCL
+FeCl
 {
     specie
     {
@@ -9064,7 +9064,7 @@ C6H7+_C5H4-1-CH3
         lowCpCoeffs     ( -1.46109 0.0501602 -1.7565e-05 -1.40099e-08 9.74331e-12 119212 31.9146 );
     }
 }
-PFCL2
+PFCl2
 {
     specie
     {
@@ -9176,7 +9176,7 @@ SB(s)
         lowCpCoeffs     ( 2.12274 0.00603818 -1.41051e-05 1.52518e-08 -5.38507e-12 -804.253 -7.91696 );
     }
 }
-CCLF2
+CClF2
 {
     specie
     {
@@ -9528,7 +9528,7 @@ NO2+
         lowCpCoeffs     ( 3.56214 0.00343629 -1.19401e-07 -1.31592e-09 5.01139e-13 114780 7.19236 );
     }
 }
-C2H3CL
+C2H3Cl
 {
     specie
     {
@@ -9576,7 +9576,7 @@ Fe(CO)5
         lowCpCoeffs     ( 1.32844 0.114541 -0.00022444 2.11015e-07 -7.45587e-11 -91425.7 19.3738 );
     }
 }
-CHCLF
+CHClF
 {
     specie
     {
@@ -9768,7 +9768,7 @@ Cr3C2(S)
         lowCpCoeffs     ( -1.6814 0.0744936 -0.00012215 9.39506e-08 -2.71337e-11 -12169 2.29813 );
     }
 }
-PCL5
+PCl5
 {
     specie
     {
@@ -9832,7 +9832,7 @@ C6H5NO_Nitrosobe
         lowCpCoeffs     ( 1.68039 0.0292539 5.20478e-05 -9.72307e-08 4.29288e-11 21733.6 20.1972 );
     }
 }
-CCLF3___FC-13
+CClF3___FC-13
 {
     specie
     {
@@ -9992,7 +9992,7 @@ C10H8__AZULENE
         lowCpCoeffs     ( -0.627409 0.0405369 8.4064e-05 -1.5093e-07 6.63559e-11 31574.8 30.3043 );
     }
 }
-PF2CL3
+PF2Cl3
 {
     specie
     {
@@ -10024,7 +10024,7 @@ C8_linear_triplet
         lowCpCoeffs     ( 3.14179 0.0514027 -7.82216e-05 6.51159e-08 -2.18045e-11 179419 5.9977 );
     }
 }
-CCL3O*
+CCl3O*
 {
     specie
     {
@@ -10088,7 +10088,7 @@ C3H6O2_EthylFormat
         lowCpCoeffs     ( 5.59041 0.00242724 6.61618e-05 -8.61264e-08 3.38174e-11 -47569.9 4.84087 );
     }
 }
-C6HCL3OH__3-YL_RAD
+C6HCl3OH__3-YL_RAD
 {
     specie
     {
@@ -10136,7 +10136,7 @@ CCl3
         lowCpCoeffs     ( 2.66358 0.0271296 -4.42403e-05 3.46851e-08 -1.05867e-11 6882.02 14.1173 );
     }
 }
-GeCL3
+GeCl3
 {
     specie
     {
@@ -10168,7 +10168,7 @@ C14H6N6O12_HNS
         lowCpCoeffs     ( 7.35142 0.152248 -3.6908e-06 -1.32914e-07 7.04139e-11 19976 6.96546 );
     }
 }
-SiHCL3
+SiHCl3
 {
     specie
     {
@@ -10456,7 +10456,7 @@ C2H2_acetylene
         lowCpCoeffs     ( 0.80868 0.0233616 -3.55172e-05 2.80153e-08 -8.50075e-12 26429 13.9397 );
     }
 }
-ALF3
+AlF3
 {
     specie
     {
@@ -10952,7 +10952,7 @@ C2H2O2__HOCCOH
         lowCpCoeffs     ( 4.39325 0.0178016 -1.81564e-05 1.11665e-08 -2.9637e-12 -5323.32 9.51277 );
     }
 }
-C2HCLF2-1,1
+C2HClF2-1,1
 {
     specie
     {
@@ -10968,7 +10968,7 @@ C2HCLF2-1,1
         lowCpCoeffs     ( 2.04804 0.0295909 -2.80654e-05 1.12979e-08 -1.01686e-12 -41870.5 17.0867 );
     }
 }
-ClO2___CLOO*___H
+ClO2___ClOO*___H
 {
     specie
     {
@@ -10984,7 +10984,7 @@ ClO2___CLOO*___H
         lowCpCoeffs     ( 4.26695 0.00747999 -1.15233e-05 9.93421e-09 -3.48897e-12 10707.3 7.19227 );
     }
 }
-SO2CL2
+SO2Cl2
 {
     specie
     {
@@ -11496,7 +11496,7 @@ C5H8O2_MeCrotanoat
         lowCpCoeffs     ( 5.79381 0.0245644 3.60443e-05 -6.23879e-08 2.61793e-11 -44636.7 4.57237 );
     }
 }
-PFCL4
+PFCl4
 {
     specie
     {
@@ -11992,7 +11992,7 @@ D2O2
         lowCpCoeffs     ( 3.99336 0.00303683 1.02968e-05 -1.60577e-08 6.83692e-12 -18743.3 5.12865 );
     }
 }
-CHCL=CH*
+CHCl=CH*
 {
     specie
     {
@@ -12104,7 +12104,7 @@ C4H4__1-butene-3
         lowCpCoeffs     ( 1.37369 0.0288801 -1.46864e-05 -3.91045e-09 4.78134e-12 33063.3 17.5941 );
     }
 }
-HCLO2
+HClO2
 {
     specie
     {
@@ -12200,7 +12200,7 @@ O+
         lowCpCoeffs     ( 2.5 0 0 0 0 187935 4.39338 );
     }
 }
-C12H5CL4O3_Rad
+C12H5Cl4O3_Rad
 {
     specie
     {
@@ -12264,7 +12264,7 @@ C2H5O_CH3CH*OH
         lowCpCoeffs     ( 4.22283 0.00512175 3.48387e-05 -4.91944e-08 2.01184e-11 -8356.22 8.01676 );
     }
 }
-C3H3Cl_3CyCLPropen
+C3H3Cl_3CyClPropen
 {
     specie
     {
@@ -12312,7 +12312,7 @@ BH
         lowCpCoeffs     ( 3.54452 -0.000231822 -1.32913e-07 2.13394e-09 -1.32335e-12 52920.3 0.530536 );
     }
 }
-B2CL4
+B2Cl4
 {
     specie
     {
@@ -12664,7 +12664,7 @@ C4H6O2_Diacetyl
         lowCpCoeffs     ( 5.68608 0.0155041 3.82144e-05 -5.99463e-08 2.47932e-11 -41762.7 4.02905 );
     }
 }
-AL2O2
+Al2O2
 {
     specie
     {
@@ -12760,7 +12760,7 @@ Cr(OH)6
         lowCpCoeffs     ( -5.65718 0.136404 -0.000222736 1.74482e-07 -5.23661e-11 -125010 44.361 );
     }
 }
-MgCL+
+MgCl+
 {
     specie
     {
@@ -12872,7 +12872,7 @@ SbCl_singlet
         lowCpCoeffs     ( 2.4133 0.0128929 -2.44407e-05 1.98759e-08 -5.99572e-12 20273.6 13.1774 );
     }
 }
-C2HBR4_1,1,1,2
+C2HBr4_1,1,1,2
 {
     specie
     {
@@ -12984,7 +12984,7 @@ C2H5O-__Ethoxy_a
         lowCpCoeffs     ( 3.88372 0.00362649 3.51129e-05 -4.19768e-08 1.49671e-11 -23727.9 7.57799 );
     }
 }
-C12H4CL5O2_2p,4,
+C12H4Cl5O2_2p,4,
 {
     specie
     {
@@ -13144,7 +13144,7 @@ C5H11,t-pentyl
         lowCpCoeffs     ( 6.44629 -0.00954232 0.000137892 -1.69242e-07 6.53098e-11 1508.39 5.43062 );
     }
 }
-PCL2
+PCl2
 {
     specie
     {
@@ -13464,7 +13464,7 @@ C6H
         lowCpCoeffs     ( 0.905835 0.0607761 -0.000112134 1.02799e-07 -3.57814e-11 118105 17.5981 );
     }
 }
-C2CL3_RAD
+C2Cl3_RAD
 {
     specie
     {
@@ -13512,7 +13512,7 @@ CH2Br-CH2Br
         lowCpCoeffs     ( 4.62116 0.00941442 3.26665e-05 -5.17217e-08 2.19246e-11 -6503.17 9.40527 );
     }
 }
-ALH2
+AlH2
 {
     specie
     {
@@ -14184,7 +14184,7 @@ C2H3O_Oxyrane_Rad
         lowCpCoeffs     ( 3.58349 -0.00602276 6.32427e-05 -8.18541e-08 3.30445e-11 18568.1 9.59726 );
     }
 }
-S2CL
+S2Cl
 {
     specie
     {
@@ -14232,7 +14232,7 @@ NOH+_cation
         lowCpCoeffs     ( 4.08416 -0.00241926 1.18224e-05 -1.16756e-08 3.86465e-12 138736 4.14404 );
     }
 }
-C3H2CL2__1,2_Dic
+C3H2Cl2__1,2_Dic
 {
     specie
     {
@@ -14344,7 +14344,7 @@ C2HF2__CHF=CF(E)
         lowCpCoeffs     ( 3.0869 0.0160213 -7.49407e-06 -3.65235e-09 3.19176e-12 -6672.08 11.5974 );
     }
 }
-AL2O3(a)
+Al2O3(a)
 {
     specie
     {
@@ -14776,7 +14776,7 @@ Fe
         lowCpCoeffs     ( 1.70744 0.0106339 -2.76118e-05 2.80918e-08 -1.0122e-11 49184.4 9.80811 );
     }
 }
-C2BR
+C2Br
 {
     specie
     {
@@ -14904,7 +14904,7 @@ s-1,5-C6H4__trans
         lowCpCoeffs     ( 0.221633 0.0581529 -7.13934e-05 4.76726e-08 -1.28753e-11 60806.5 22.325 );
     }
 }
-CHBR
+CHBr
 {
     specie
     {
@@ -15048,7 +15048,7 @@ PO3
         lowCpCoeffs     ( 4.76937 0.00784394 3.34335e-06 -1.31052e-08 6.59556e-12 -55973.8 4.98978 );
     }
 }
-PF4CL
+PF4Cl
 {
     specie
     {
@@ -15288,7 +15288,7 @@ C32H13_OVALENYL
         lowCpCoeffs     ( -9.14252 0.178117 4.87162e-05 -2.22438e-07 1.09692e-10 74571.6 65.7092 );
     }
 }
-C2CL2
+C2Cl2
 {
     specie
     {
@@ -15576,7 +15576,7 @@ ClO3___Chlorate
         lowCpCoeffs     ( 1.54804 0.0255914 -3.27199e-05 1.9253e-08 -4.18676e-12 20946.5 18.7937 );
     }
 }
-AL(cr)
+Al(cr)
 {
     specie
     {
@@ -15656,7 +15656,7 @@ Mo(cr)
         lowCpCoeffs     ( 1.32884 0.00982554 -2.1093e-05 2.0951e-08 -7.60703e-12 -684.365 -6.29287 );
     }
 }
-AL2O2+
+Al2O2+
 {
     specie
     {
@@ -15704,7 +15704,7 @@ NH2F
         lowCpCoeffs     ( 4.43076 -0.00700448 3.24294e-05 -3.55242e-08 1.30599e-11 -10252.6 3.29678 );
     }
 }
-C2H4Cl_betaCLEthyl
+C2H4Cl_betaClEthyl
 {
     specie
     {
@@ -15784,7 +15784,7 @@ CO+
         lowCpCoeffs     ( 3.77062 -0.00201773 4.61082e-06 -2.99175e-09 6.06065e-13 149007 3.3813 );
     }
 }
-CH2CL2
+CH2Cl2
 {
     specie
     {
@@ -15896,7 +15896,7 @@ C12H8O2
         lowCpCoeffs     ( -1.48215 0.0751205 3.87198e-05 -1.19145e-07 5.69743e-11 -9056.11 32.9719 );
     }
 }
-CBRF3_FREON_1301
+CBrF3_FREON_1301
 {
     specie
     {
@@ -15976,7 +15976,7 @@ C18H34_1-Octadecy
         lowCpCoeffs     ( -11.646 0.27397 -0.000297994 2.01809e-07 -5.91668e-11 -21318 96.8119 );
     }
 }
-C2HCL
+C2HCl
 {
     specie
     {
@@ -16136,7 +16136,7 @@ Ge2
         lowCpCoeffs     ( 1.86915 0.0207355 -4.51129e-05 4.06077e-08 -1.32217e-11 55553.6 15.6846 );
     }
 }
-C2H4O2CL2
+C2H4O2Cl2
 {
     specie
     {
@@ -16200,7 +16200,7 @@ C12H8Cl2O2_6,6-(
         lowCpCoeffs     ( -5.72669 0.155871 -0.000158005 7.90551e-08 -1.57801e-11 -31851.6 56.0168 );
     }
 }
-AL(OH)2
+Al(OH)2
 {
     specie
     {
@@ -16216,7 +16216,7 @@ AL(OH)2
         lowCpCoeffs     ( 3.1217 0.0208986 -2.3495e-05 1.23528e-08 -2.11959e-12 -62732.6 11.1282 );
     }
 }
-CF2H-CCLF2_FC-124A
+CF2H-CClF2_FC-124A
 {
     specie
     {
@@ -16408,7 +16408,7 @@ C4H
         lowCpCoeffs     ( 0.938093 0.038592 -6.86755e-05 6.13265e-08 -2.08966e-11 92312.3 16.501 );
     }
 }
-CLCLO
+Cl2O
 {
     specie
     {
@@ -16504,7 +16504,7 @@ C7H10_cyC5H9-CCH
         lowCpCoeffs     ( 2.86273 0.0238049 8.02798e-05 -1.24667e-07 5.24739e-11 17577.4 16.0168 );
     }
 }
-ClO2___OCLO___HF
+ClO2___OClO___HF
 {
     specie
     {
@@ -16584,7 +16584,7 @@ NH2OH+
         lowCpCoeffs     ( 3.72525 0.00417577 9.81141e-06 -1.38336e-08 5.37208e-12 101394 6.30909 );
     }
 }
-MgCL
+MgCl
 {
     specie
     {
@@ -16824,7 +16824,7 @@ PH+
         lowCpCoeffs     ( 4.69912 -0.0050137 8.44515e-06 -5.45911e-09 1.2742e-12 146096 -1.93635 );
     }
 }
-C2HCL4_CHCl2-CCL2
+C2HCl4_CHCl2-CCl2
 {
     specie
     {
@@ -17256,7 +17256,7 @@ BF2
         lowCpCoeffs     ( 3.76866 0.00206633 8.29846e-06 -1.31415e-08 5.49423e-12 -61332.3 7.37107 );
     }
 }
-NH4CL(II)
+NH4Cl(II)
 {
     specie
     {
@@ -17304,7 +17304,7 @@ C7H5NO_Benzoxazole
         lowCpCoeffs     ( -0.249438 0.0355983 5.64045e-05 -1.10126e-07 4.93628e-11 1629.13 28.0949 );
     }
 }
-Cu3CL3
+Cu3Cl3
 {
     specie
     {
@@ -17944,7 +17944,7 @@ C10H10_3-meIndene
         lowCpCoeffs     ( 1.10114 0.0421733 8.14199e-05 -1.45129e-07 6.32748e-11 18168 22.5602 );
     }
 }
-C2H5CLO2
+C2H5ClO2
 {
     specie
     {
@@ -18120,7 +18120,7 @@ MgO(cr)
         lowCpCoeffs     ( 78.7549 -0.528711 0.00124188 -1.22847e-06 4.37279e-10 -81264.3 -328.879 );
     }
 }
-C3H3Cl_CH2CL-CCH
+C3H3Cl_CH2Cl-CCH
 {
     specie
     {
@@ -18184,7 +18184,7 @@ CBr4
         lowCpCoeffs     ( 5.10359 0.0339593 -6.24045e-05 5.36484e-08 -1.7571e-11 9691.51 1.31944 );
     }
 }
-BAO(G)
+BaO(G)
 {
     specie
     {
@@ -18328,7 +18328,7 @@ NITROPROPYLENE_C
         lowCpCoeffs     ( 3.65176 0.0201896 3.27505e-05 -5.72328e-08 2.41049e-11 -972.583 11.8667 );
     }
 }
-BCL
+BCl
 {
     specie
     {
@@ -18504,7 +18504,7 @@ Br2(cr)
         lowCpCoeffs     ( 9.12519 -0.0826112 0.000699829 -2.40834e-06 3.21096e-09 -3304.08 -30.1719 );
     }
 }
-CLO3F
+ClO3F
 {
     specie
     {
@@ -18632,7 +18632,7 @@ T_Tritium__(g)
         lowCpCoeffs     ( 2.5 -4.39695e-07 2.02543e-09 -2.95668e-12 1.35888e-15 26119.9 1.19728 );
     }
 }
-NH4CLO4(I)
+NH4ClO4(I)
 {
     specie
     {
@@ -18696,7 +18696,7 @@ CNN+
         lowCpCoeffs     ( 3.93138 0.0075873 -8.55735e-06 5.55474e-09 -1.58157e-12 196345 4.04892 );
     }
 }
-C4CL6_Butadiene
+C4Cl6_Butadiene
 {
     specie
     {
@@ -18760,7 +18760,7 @@ CH5N2__CH2*NHNH2
         lowCpCoeffs     ( 2.31544 0.0218627 -3.68464e-06 -1.3271e-08 8.00413e-12 30774.4 15.0726 );
     }
 }
-PF2CL
+PF2Cl
 {
     specie
     {
@@ -18920,7 +18920,7 @@ MgF2(cr)I
         lowCpCoeffs     ( 3.15877 0.00196088 0.000105362 -2.77411e-07 2.08833e-10 -136720 -14.3472 );
     }
 }
-C6H5CL+_Chlorobe
+C6H5Cl+_Chlorobe
 {
     specie
     {
@@ -19080,7 +19080,7 @@ CH2=CH-NO2_Nitroe
         lowCpCoeffs     ( 2.75939 0.0170696 2.37368e-05 -4.77983e-08 2.14793e-11 1843.4 14.6556 );
     }
 }
-C3HCL3__TriClAllen
+C3HCl3__TriClAllen
 {
     specie
     {
@@ -19256,7 +19256,7 @@ C4H6O_H3CCH2CH=C
         lowCpCoeffs     ( 3.2361 0.0232109 2.16181e-05 -4.71002e-08 2.13586e-11 -12724.9 12.9611 );
     }
 }
-SCL2
+SCl2
 {
     specie
     {
@@ -19400,7 +19400,7 @@ C4H8O_2-Butanone
         lowCpCoeffs     ( 6.61978 0.00851848 5.10322e-05 -6.58433e-08 2.4911e-11 -31525.2 -1.09485 );
     }
 }
-C2H4Cl_alfaCLEthyl
+C2H4Cl_alfaClEthyl
 {
     specie
     {
@@ -19480,7 +19480,7 @@ MgBr2(L)
         lowCpCoeffs     ( 12.0272 0 0 0 0 -63633.8 -52.4664 );
     }
 }
-BCL+
+BCl+
 {
     specie
     {
@@ -19512,7 +19512,7 @@ CHNH2-__anion__H
         lowCpCoeffs     ( 1.8202 0.0153201 -1.1192e-05 4.57191e-09 -7.44802e-13 40235.2 14.2819 );
     }
 }
-CHBrCL2__FC-20B1
+CHBrCl2__FC-20B1
 {
     specie
     {
@@ -19624,7 +19624,7 @@ CH3N__(H2C=NH)
         lowCpCoeffs     ( 4.79303 -0.0126842 5.69767e-05 -6.34985e-08 2.37023e-11 9413.86 1.10278 );
     }
 }
-HALO2
+HAlO2
 {
     specie
     {
@@ -19656,7 +19656,7 @@ HCN
         lowCpCoeffs     ( 2.25901 0.010051 -1.33515e-05 1.0092e-08 -3.0088e-12 14590.3 8.91632 );
     }
 }
-ALO2
+AlO2
 {
     specie
     {
@@ -19672,7 +19672,7 @@ ALO2
         lowCpCoeffs     ( 4.34295 0.00865076 -8.91493e-06 3.12927e-09 9.49015e-14 -6256.26 5.43603 );
     }
 }
-HOCL
+HOCl
 {
     specie
     {
@@ -19752,7 +19752,7 @@ C6H11I_IodocyHexan
         lowCpCoeffs     ( 4.95589 0.00624026 0.00013695 -1.85304e-07 7.45516e-11 -8647.49 9.04456 );
     }
 }
-CL-
+Cl-
 {
     specie
     {
@@ -19832,7 +19832,7 @@ C7H7_Quadri_Base
         lowCpCoeffs     ( -0.865668 0.0202947 0.000109981 -1.75784e-07 7.63992e-11 68615.1 31.45 );
     }
 }
-CBRCL3_Bromotric
+CBrCl3_Bromotric
 {
     specie
     {
@@ -19848,7 +19848,7 @@ CBRCL3_Bromotric
         lowCpCoeffs     ( 2.8408 0.0425731 -7.69558e-05 6.54734e-08 -2.13015e-11 -7238.49 12.5268 );
     }
 }
-CCL3F___FC-11
+CCl3F___FC-11
 {
     specie
     {
@@ -20008,7 +20008,7 @@ FeSO4(S)
         lowCpCoeffs     ( 1.36573 0.0529862 -7.03486e-05 4.90952e-08 -1.44139e-11 -113945 -6.31021 );
     }
 }
-C2BR4
+C2Br4
 {
     specie
     {
@@ -20056,7 +20056,7 @@ CH3-NH-NH-CH3_Sy
         lowCpCoeffs     ( 5.41669 0.00250625 7.35471e-05 -9.60749e-08 3.79945e-11 10565.4 3.29279 );
     }
 }
-DOBR
+DOBr
 {
     specie
     {
@@ -20120,7 +20120,7 @@ C4__triplet
         lowCpCoeffs     ( 3.68513 0.0184223 -3.11974e-05 2.9645e-08 -1.07298e-11 125759 5.42249 );
     }
 }
-SI2H6__Disilane
+Si2H6__Disilane
 {
     specie
     {
@@ -20168,7 +20168,7 @@ C3H2F3_CF3-CH=CH*
         lowCpCoeffs     ( 0.681987 0.0469264 -4.86401e-05 2.2047e-08 -2.75415e-12 -47231.4 22.9561 );
     }
 }
-CL2
+Cl2
 {
     specie
     {
@@ -20184,7 +20184,7 @@ CL2
         lowCpCoeffs     ( 2.73638 0.00783526 -1.45105e-05 1.25731e-08 -4.13247e-12 -1058.8 9.44557 );
     }
 }
-AL2O+
+Al2O+
 {
     specie
     {
@@ -20264,7 +20264,7 @@ COH
         lowCpCoeffs     ( 4.36381 -0.00535204 2.31955e-05 -2.66109e-08 1.02712e-11 25010.9 2.98106 );
     }
 }
-C4CL2
+C4Cl2
 {
     specie
     {
@@ -20328,7 +20328,7 @@ C5H10,cyclo-
         lowCpCoeffs     ( 3.70339 -0.0115575 0.000164113 -2.0937e-07 8.31059e-11 -10938.9 11.9773 );
     }
 }
-DOCL
+DOCl
 {
     specie
     {
@@ -20408,7 +20408,7 @@ NO
         lowCpCoeffs     ( 4.2186 -0.00463988 1.10443e-05 -9.34056e-09 2.80555e-12 9845.1 2.28061 );
     }
 }
-NO2CL
+NO2Cl
 {
     specie
     {
@@ -20488,7 +20488,7 @@ C6H9I-3-iodo
         lowCpCoeffs     ( 3.97475 0.0142793 0.000103556 -1.4999e-07 6.192e-11 5835.6 13.0713 );
     }
 }
-FeCL3
+FeCl3
 {
     specie
     {
@@ -20536,7 +20536,7 @@ C22H18_(C10H7CH2)2
         lowCpCoeffs     ( -9.01278 0.205116 -0.000183057 1.10357e-07 -3.44709e-11 28550.4 69.335 );
     }
 }
-C2HCL5
+C2HCl5
 {
     specie
     {
@@ -20568,7 +20568,7 @@ C3H3+_CH2=C=CH+
         lowCpCoeffs     ( 1.5491 0.0233307 -1.70274e-05 4.66368e-09 2.21539e-13 143166 13.7174 );
     }
 }
-CCL4
+CCl4
 {
     specie
     {
@@ -20840,7 +20840,7 @@ ZrN(cr)
         lowCpCoeffs     ( -1.60329 0.0435534 -0.000102727 1.12384e-07 -4.61701e-11 -45399.9 4.48755 );
     }
 }
-ALF
+AlF
 {
     specie
     {
@@ -20936,7 +20936,7 @@ MgI2
         lowCpCoeffs     ( 5.47324 0.0105458 -2.22792e-05 2.12039e-08 -7.48636e-12 -22593.5 4.23281 );
     }
 }
-C2CL
+C2Cl
 {
     specie
     {
@@ -21240,7 +21240,7 @@ CF-
         lowCpCoeffs     ( 2.67417 0.00577946 -7.7641e-06 5.08964e-09 -1.30782e-12 22801.9 8.08085 );
     }
 }
-C5H8CL
+C5H8Cl
 {
     specie
     {
@@ -21352,7 +21352,7 @@ K(cr)
         lowCpCoeffs     ( -2.08951 0.061632 -0.000240732 3.27256e-07 0 -636.098 9.11737 );
     }
 }
-ALO2-
+AlO2-
 {
     specie
     {
@@ -21576,7 +21576,7 @@ C3HCl2OH
         lowCpCoeffs     ( 3.1571 0.0399226 -4.67896e-05 2.89518e-08 -7.27289e-12 -2951.93 14.6502 );
     }
 }
-NOCL
+NOCl
 {
     specie
     {
@@ -21656,7 +21656,7 @@ CBr3__Radical
         lowCpCoeffs     ( 4.24875 0.0227424 -3.912e-05 3.19712e-08 -1.00758e-11 25938.1 10.3538 );
     }
 }
-CLF5
+ClF5
 {
     specie
     {
@@ -22040,7 +22040,7 @@ ZrC(cr)
         lowCpCoeffs     ( -1.12575 0.0338354 -6.64955e-05 6.40913e-08 -2.42647e-11 -24347.1 2.77083 );
     }
 }
-CCL2F
+CCl2F
 {
     specie
     {
@@ -22392,7 +22392,7 @@ C3H4N__CH3-CH*-CN
         lowCpCoeffs     ( 2.90886 0.021025 -3.11711e-06 -1.06743e-08 5.98989e-12 25029.2 12.2021 );
     }
 }
-PFCL
+PFCl
 {
     specie
     {
@@ -22520,7 +22520,7 @@ C3H6O3_Trioxane
         lowCpCoeffs     ( 3.55244 0.00170629 9.91147e-05 -1.31999e-07 5.26422e-11 -59030.2 10.6185 );
     }
 }
-ALH
+AlH
 {
     specie
     {
@@ -22760,7 +22760,7 @@ D
         lowCpCoeffs     ( 2.5 0 0 0 0 25921.3 0.591714 );
     }
 }
-C2CL2F4_CF3CFCL2
+C2Cl2F4_CF3CFCl2
 {
     specie
     {
@@ -22808,7 +22808,7 @@ SbCl2
         lowCpCoeffs     ( 3.26046 0.00813469 -5.31504e-06 -1.00842e-09 1.59478e-12 -13161.4 13.0106 );
     }
 }
-AL2O3
+Al2O3
 {
     specie
     {
@@ -22936,7 +22936,7 @@ C3H6_propylene
         lowCpCoeffs     ( 3.83464 0.00329079 5.05228e-05 -6.66251e-08 2.63707e-11 788.717 7.53408 );
     }
 }
-FeCL3(s)
+FeCl3(s)
 {
     specie
     {
@@ -23096,7 +23096,7 @@ HNNH-__trans
         lowCpCoeffs     ( 3.03932 0.00358025 8.30143e-06 -1.1908e-08 4.60611e-12 29701.1 8.63197 );
     }
 }
-SbCL5
+SbCl5
 {
     specie
     {
@@ -23240,7 +23240,7 @@ C9H18O6_TATP
         lowCpCoeffs     ( -1.19327 0.16895 -0.000171505 1.01467e-07 -2.60451e-11 -53390.5 23.2901 );
     }
 }
-C12H5CL4O2_RAD
+C12H5Cl4O2_RAD
 {
     specie
     {
@@ -23448,7 +23448,7 @@ P2
         lowCpCoeffs     ( 2.9606 0.00385561 -2.87398e-06 -3.19976e-10 8.10023e-13 16290.7 8.34523 );
     }
 }
-CBR3CL__TriBromo
+CBr3Cl__TriBromo
 {
     specie
     {
@@ -23480,7 +23480,7 @@ C6H3_CH2=C=C=C=C=C
         lowCpCoeffs     ( 1.50089 0.0545902 -7.88221e-05 6.27969e-08 -2.00769e-11 84913.4 17.6237 );
     }
 }
-CLF3
+ClF3
 {
     specie
     {
@@ -23592,7 +23592,7 @@ C3H4O2_AcrylAcid
         lowCpCoeffs     ( 1.24227 0.0300699 -1.48207e-06 -2.42738e-08 1.33122e-11 -40866.8 21.9243 );
     }
 }
-CHFCLBr
+CHFClBr
 {
     specie
     {
@@ -23608,7 +23608,7 @@ CHFCLBr
         lowCpCoeffs     ( 2.84647 0.0204936 -1.70059e-05 4.11372e-09 9.31157e-13 -29280.4 15.0637 );
     }
 }
-ALCL
+AlCl
 {
     specie
     {
@@ -23704,7 +23704,7 @@ CH3C(CH3)2CH3
         lowCpCoeffs     ( 3.56479 0.0290185 5.00307e-05 -8.66302e-08 3.72524e-11 -22877.4 6.73829 );
     }
 }
-GeCL2____triplet
+GeCl2____triplet
 {
     specie
     {
@@ -23720,7 +23720,7 @@ GeCL2____triplet
         lowCpCoeffs     ( 4.11513 0.0153508 -3.27832e-05 3.13345e-08 -1.10726e-11 10627.5 10.2028 );
     }
 }
-CL2O7
+Cl2O7
 {
     specie
     {
@@ -23768,7 +23768,7 @@ C8H7N__o-ToluoNitr
         lowCpCoeffs     ( 2.05214 0.038168 4.22551e-05 -8.69955e-08 3.87533e-11 20059 19.5286 );
     }
 }
-CLNC_biradical
+ClNC_biradical
 {
     specie
     {
@@ -23832,7 +23832,7 @@ NITRO-PENTANE
         lowCpCoeffs     ( 4.00704 0.0229727 0.000104023 -1.55574e-07 6.44329e-11 -22634.2 13.9587 );
     }
 }
-AR
+Ar
 {
     specie
     {
@@ -23928,7 +23928,7 @@ Na2O(a)
         lowCpCoeffs     7 { 0 };
     }
 }
-FeCL2(L)
+FeCl2(L)
 {
     specie
     {
@@ -23960,7 +23960,7 @@ Na2O(c)
         lowCpCoeffs     ( 2.1367 0.0391996 -8.50796e-05 8.70574e-08 -3.22937e-11 -51645.5 -11.76 );
     }
 }
-CF3-CHCL2__HF123
+CF3-CHCl2__HF123
 {
     specie
     {
@@ -24088,7 +24088,7 @@ C3H7_i-propyl
         lowCpCoeffs     ( 5.47421 -0.00842537 8.04608e-05 -9.49288e-08 3.59831e-11 9049.39 3.40542 );
     }
 }
-ALOH
+AlOH
 {
     specie
     {
@@ -24280,7 +24280,7 @@ C8H18,n-octane
         lowCpCoeffs     ( 12.5245 -0.0101019 0.000221993 -2.84864e-07 1.1241e-10 -29843.4 -19.711 );
     }
 }
-C12H6CL4O2
+C12H6Cl4O2
 {
     specie
     {
@@ -24408,7 +24408,7 @@ C12H10_biphenyl
         lowCpCoeffs     ( 0.1946 0.053526 8.55001e-05 -1.63904e-07 7.29976e-11 19002.1 27.2149 );
     }
 }
-NH4CL(III)
+NH4Cl(III)
 {
     specie
     {
@@ -24424,7 +24424,7 @@ NH4CL(III)
         lowCpCoeffs     ( 1.70591 0.0307824 -4.40956e-05 4.81013e-08 -1.91059e-11 -38502.2 -3.73732 );
     }
 }
-SO2FCL
+SO2FCl
 {
     specie
     {
@@ -24632,7 +24632,7 @@ C7H5(NO2)3_(TNT)
         lowCpCoeffs     ( 3.19573 0.086222 -2.31687e-05 -4.31208e-08 2.63453e-11 -1609.11 15.4068 );
     }
 }
-C2H5CL
+C2H5Cl
 {
     specie
     {
@@ -24696,7 +24696,7 @@ CH3C
         lowCpCoeffs     ( 3.59147 -6.65568e-05 2.69433e-05 -3.438e-08 1.35235e-11 59929.5 5.96528 );
     }
 }
-CH2CL
+CH2Cl
 {
     specie
     {
@@ -24856,7 +24856,7 @@ NCN
         lowCpCoeffs     ( 2.79808 0.0100009 -9.59242e-06 4.75566e-09 -1.04349e-12 53857.5 8.6213 );
     }
 }
-CHBR2
+CHBr2
 {
     specie
     {
@@ -24904,7 +24904,7 @@ CH3-_anion
         lowCpCoeffs     ( 4.35455 -0.00541267 2.17109e-05 -1.94567e-08 5.95104e-12 15405.2 -0.727196 );
     }
 }
-MgAL2O4(L)
+MgAl2O4(L)
 {
     specie
     {
@@ -25096,7 +25096,7 @@ C12H9,o-bipheny
         lowCpCoeffs     ( 0.407668 0.0542795 7.12516e-05 -1.44404e-07 6.48498e-11 48535.2 28.1981 );
     }
 }
-CLF
+ClF
 {
     specie
     {
@@ -25160,7 +25160,7 @@ N2O+
         lowCpCoeffs     ( 3.28691 0.00740222 -4.86664e-06 7.32928e-10 2.98234e-13 159103 7.40137 );
     }
 }
-CLCN
+ClCN
 {
     specie
     {
@@ -25688,7 +25688,7 @@ C3H3Cl_Chloro-Al
         lowCpCoeffs     ( 2.17406 0.0233296 -8.27347e-06 -8.72361e-09 6.26711e-12 19487 15.7635 );
     }
 }
-BFCL
+BFCl
 {
     specie
     {
@@ -25960,7 +25960,7 @@ C2H4F_beta-Fluor
         lowCpCoeffs     ( 4.38589 0.00444185 2.81593e-05 -3.89282e-08 1.56056e-11 -9031.77 6.2837 );
     }
 }
-AL(OH)3
+Al(OH)3
 {
     specie
     {
@@ -26024,7 +26024,7 @@ H6F6
         lowCpCoeffs     ( 4.76645 0.0786031 -0.000121157 9.36149e-08 -2.78945e-11 -221172 12.5468 );
     }
 }
-GeCL2____singlet
+GeCl2____singlet
 {
     specie
     {
@@ -26056,7 +26056,7 @@ C3H6_cyclo-
         lowCpCoeffs     ( 2.83279 -0.00521029 9.29583e-05 -1.22753e-07 4.99191e-11 5195.2 10.8306 );
     }
 }
-ALO+
+AlO+
 {
     specie
     {
@@ -26264,7 +26264,7 @@ H2O(L)
         lowCpCoeffs     ( 72.5575 -0.662445 0.00256199 -4.36592e-06 2.78179e-09 -41886.5 -288.28 );
     }
 }
-CBr2CLF___11B3
+CBr2ClF___11B3
 {
     specie
     {
@@ -26520,7 +26520,7 @@ N2O3
         lowCpCoeffs     ( 5.81084 0.0143331 -1.96209e-05 1.73061e-08 -6.46554e-12 8191.84 1.20461 );
     }
 }
-CL
+Cl
 {
     specie
     {
@@ -26536,7 +26536,7 @@ CL
         lowCpCoeffs     ( 2.26062 0.00154154 -6.80284e-07 -1.59973e-09 1.15417e-12 13855.3 6.57021 );
     }
 }
-Cl2C=C=CCL(O*)
+Cl2C=C=CCl(O*)
 {
     specie
     {
@@ -26584,7 +26584,7 @@ CrO
         lowCpCoeffs     ( 3.18819 0.00146295 3.31396e-06 -6.66294e-09 3.11838e-12 21611.6 10.0817 );
     }
 }
-ALCL3
+AlCl3
 {
     specie
     {
@@ -26616,7 +26616,7 @@ C4H3_E-1yl_Radical
         lowCpCoeffs     ( 0.554264 0.0386185 -4.70818e-05 3.0624e-08 -7.90588e-12 63797.5 21.0542 );
     }
 }
-COCL2
+COCl2
 {
     specie
     {
@@ -27272,7 +27272,7 @@ C4H5__1,3-Butadi
         lowCpCoeffs     ( 2.00881 0.0250341 4.4793e-06 -2.6399e-08 1.34433e-11 36207 15.9914 );
     }
 }
-MgCL2(L)
+MgCl2(L)
 {
     specie
     {
@@ -27320,7 +27320,7 @@ CH3+
         lowCpCoeffs     ( 4.73044 -0.0086626 3.12269e-05 -3.13569e-08 1.09957e-11 131270 -3.03198 );
     }
 }
-ALBr3
+AlBr3
 {
     specie
     {
@@ -27448,7 +27448,7 @@ HPO
         lowCpCoeffs     ( 4.13953 -0.00375644 2.10092e-05 -2.45888e-08 9.33164e-12 -12480.7 5.14556 );
     }
 }
-FeOCL(cr)
+FeOCl(cr)
 {
     specie
     {
@@ -27784,7 +27784,7 @@ CrO3
         lowCpCoeffs     ( 2.2336 0.0241281 -3.23842e-05 2.06088e-08 -5.05776e-12 -40222.5 13.7496 );
     }
 }
-BOCL2
+BOCl2
 {
     specie
     {
@@ -27800,7 +27800,7 @@ BOCL2
         lowCpCoeffs     ( 2.39602 0.0242258 -3.58262e-05 2.65234e-08 -7.85785e-12 -45009.4 15.654 );
     }
 }
-Fe2CL4
+Fe2Cl4
 {
     specie
     {
@@ -28344,7 +28344,7 @@ CD2_Deutherometh
         lowCpCoeffs     ( 3.55503 0.00336947 -3.5028e-06 4.99693e-09 -2.45123e-12 44827.3 3.42741 );
     }
 }
-C2H2CL2_1,1-
+C2H2Cl2_1,1-
 {
     specie
     {
@@ -28360,7 +28360,7 @@ C2H2CL2_1,1-
         lowCpCoeffs     ( 1.09096 0.0338226 -4.14124e-05 2.66328e-08 -6.88458e-12 -1247.49 19.9996 );
     }
 }
-BFCL2
+BFCl2
 {
     specie
     {
@@ -28504,7 +28504,7 @@ C3H2(1)_HCC-CH**
         lowCpCoeffs     ( 2.87527 0.0199236 -2.41971e-05 1.66378e-08 -4.69231e-12 96819.2 8.88674 );
     }
 }
-HALO
+HAlO
 {
     specie
     {
@@ -28776,7 +28776,7 @@ C6H7_1,3,5_Linear
         lowCpCoeffs     ( 2.82605 0.0348405 1.31407e-05 -4.6882e-08 2.29961e-11 49458.2 17.0295 );
     }
 }
-HCLO4
+HClO4
 {
     specie
     {
@@ -28872,7 +28872,7 @@ N2-
         lowCpCoeffs     ( 3.87906 -0.00316855 8.46825e-06 -7.28826e-09 2.18785e-12 21755.2 3.12725 );
     }
 }
-BCL2+
+BCl2+
 {
     specie
     {
@@ -29016,7 +29016,7 @@ NH4NO3_gas
         lowCpCoeffs     ( 4.14853 0.0269825 -9.75933e-06 -6.09907e-09 4.33965e-12 -30074.6 8.49838 );
     }
 }
-CL+
+Cl+
 {
     specie
     {
@@ -29128,7 +29128,7 @@ F2O+__FOF+
         lowCpCoeffs     ( 2.46499 0.0109177 -1.05316e-05 4.05496e-09 -3.04762e-13 154795 13.2086 );
     }
 }
-ALF2-
+AlF2-
 {
     specie
     {
@@ -29320,7 +29320,7 @@ C10H8O__Naphtol
         lowCpCoeffs     ( -2.08768 0.07681 -1.53593e-05 -4.04658e-08 2.3376e-11 -6290.56 34.3331 );
     }
 }
-ALH3
+AlH3
 {
     specie
     {
@@ -29384,7 +29384,7 @@ s-1,2,3,5-C6H2Cl4
         lowCpCoeffs     ( 2.48196 0.0655633 -5.95894e-05 2.22036e-08 -1.43435e-12 -5391.51 16.9276 );
     }
 }
-CCL2F2_FREON-12
+CCl2F2_FREON-12
 {
     specie
     {
@@ -29704,7 +29704,7 @@ CH3S_Radical
         lowCpCoeffs     ( 2.56437 0.0115796 -4.5012e-06 -5.02342e-10 6.95253e-13 13370.6 11.2505 );
     }
 }
-CHFCL2___FC-21
+CHFCl2___FC-21
 {
     specie
     {
@@ -30200,7 +30200,7 @@ C2H2Br2_trans
         lowCpCoeffs     ( 3.8637 0.016965 -3.41692e-06 -1.08161e-08 6.58651e-12 10083.8 10.913 );
     }
 }
-SiCL2
+SiCl2
 {
     specie
     {
@@ -30440,7 +30440,7 @@ C4F8_CY
         lowCpCoeffs     ( -6.40876 0.117788 -0.000157354 1.1578e-07 -3.71123e-11 -184189 56.1863 );
     }
 }
-CHCL3_Chloroform
+CHCl3_Chloroform
 {
     specie
     {
@@ -30584,7 +30584,7 @@ CH3-NH-NH2
         lowCpCoeffs     ( 3.36546 0.00916487 4.07415e-05 -6.18271e-08 2.62064e-11 11498.2 9.75315 );
     }
 }
-SCL
+SCl
 {
     specie
     {
@@ -31224,7 +31224,7 @@ C24H17
         lowCpCoeffs     ( -16.409 0.226724 -0.000140015 -2.78751e-09 2.47131e-11 70999.3 110.51 );
     }
 }
-BCL2
+BCl2
 {
     specie
     {
@@ -31464,7 +31464,7 @@ CI
         lowCpCoeffs     ( 1.89139 0.0167386 -3.68508e-05 3.50616e-08 -1.22019e-11 67533.2 14.609 );
     }
 }
-C12H6CL2O2
+C12H6Cl2O2
 {
     specie
     {
@@ -31512,7 +31512,7 @@ C13H10O__Benzoph
         lowCpCoeffs     ( 2.03306 0.0530785 0.000104699 -1.89967e-07 8.33778e-11 4094.98 22.7448 );
     }
 }
-C2H2CL2_Equilibriu
+C2H2Cl2_Equilibriu
 {
     specie
     {
@@ -31544,7 +31544,7 @@ HNO2+_cis____HF2
         lowCpCoeffs     ( 2.63706 0.0102578 -5.14296e-06 -5.04116e-10 9.47515e-13 120845 12.4287 );
     }
 }
-CBR
+CBr
 {
     specie
     {
@@ -31624,7 +31624,7 @@ H2Sn(C2H5)2
         lowCpCoeffs     ( 5.22643 0.0383917 2.00663e-05 -5.18249e-08 2.32704e-11 3442.92 7.61235 );
     }
 }
-AL2O3(b)
+Al2O3(b)
 {
     specie
     {
@@ -31672,7 +31672,7 @@ MgSiO3(III)
         lowCpCoeffs     7 { 0 };
     }
 }
-C5H7CL2
+C5H7Cl2
 {
     specie
     {
@@ -31736,7 +31736,7 @@ HCCNO2
         lowCpCoeffs     ( 1.34403 0.0333183 -3.93939e-05 2.41125e-08 -5.90505e-12 31935.8 18.7891 );
     }
 }
-S2CL2
+S2Cl2
 {
     specie
     {
@@ -31944,7 +31944,7 @@ C4H9O_DiEthyl_Et
         lowCpCoeffs     ( 7.25386 -0.000750391 0.000104998 -1.35171e-07 5.26869e-11 -8118.19 -0.573033 );
     }
 }
-C2BR6
+C2Br6
 {
     specie
     {
@@ -32248,7 +32248,7 @@ C4H8O2_DIOXANE
         lowCpCoeffs     ( 4.81265 -0.00385996 0.000125372 -1.60862e-07 6.33257e-11 -37571.3 6.04153 );
     }
 }
-ALO
+AlO
 {
     specie
     {
@@ -32392,7 +32392,7 @@ NO2-
         lowCpCoeffs     ( 3.09784 0.00370486 5.92941e-06 -1.09497e-08 4.62722e-12 -24155.4 9.48237 );
     }
 }
-C2HBR4_1,1,2,2
+C2HBr4_1,1,2,2
 {
     specie
     {
@@ -32424,7 +32424,7 @@ F2+
         lowCpCoeffs     ( 3.96417 -0.000599836 4.03663e-06 -4.74261e-09 1.76772e-12 181724 2.80862 );
     }
 }
-CF2CL-CHCLF_123a
+CF2Cl-CHClF_123a
 {
     specie
     {
@@ -32456,7 +32456,7 @@ COOH
         lowCpCoeffs     ( 2.92208 0.00762454 3.29884e-06 -1.07135e-08 5.11587e-12 -23028.2 11.2926 );
     }
 }
-CH3COCL_Acetyl-CL
+CH3COCl_Acetyl-Cl
 {
     specie
     {
@@ -32472,7 +32472,7 @@ CH3COCL_Acetyl-CL
         lowCpCoeffs     ( 3.9884 0.0126777 7.80939e-06 -1.82292e-08 7.97984e-12 -30830 8.16676 );
     }
 }
-NE
+Ne
 {
     specie
     {
@@ -33048,7 +33048,7 @@ C2H5O-__CH3C*HOH-
         lowCpCoeffs     ( 2.73686 0.0206277 -7.16876e-06 -3.02068e-09 2.28832e-12 -6393.69 12.5982 );
     }
 }
-C12H4CL6O2__tric
+C12H4Cl6O2__tric
 {
     specie
     {
@@ -33064,7 +33064,7 @@ C12H4CL6O2__tric
         lowCpCoeffs     ( 3.28452 0.141319 -0.000138658 5.99059e-08 -7.31751e-12 -30439.2 19.9985 );
     }
 }
-COCL
+COCl
 {
     specie
     {
@@ -33400,7 +33400,7 @@ C4H10_isobutane
         lowCpCoeffs     ( 4.45479 0.00826059 8.29886e-05 -1.14648e-07 4.6457e-11 -18459.4 4.92741 );
     }
 }
-C12H5CL5O2_PD
+C12H5Cl5O2_PD
 {
     specie
     {
@@ -33592,7 +33592,7 @@ MgSO4(I)
         lowCpCoeffs     7 { 0 };
     }
 }
-C2HFCL2_equilibr
+C2HFCl2_equilibr
 {
     specie
     {
@@ -33800,7 +33800,7 @@ C18H36O2_etPalmita
         lowCpCoeffs     ( 0.607765 0.187616 -4.8932e-05 -5.75354e-08 3.32268e-11 -96555.9 43.5519 );
     }
 }
-COFCL
+COFCl
 {
     specie
     {
@@ -33896,7 +33896,7 @@ C6H6+_Benzene_ion
         lowCpCoeffs     ( -2.36188 0.050756 -2.00023e-05 -1.27434e-08 9.63134e-12 116788 33.7617 );
     }
 }
-BRCN
+BrCN
 {
     specie
     {
@@ -33976,7 +33976,7 @@ C8H7___i-styryl
         lowCpCoeffs     ( 0.595576 0.0431716 3.39695e-05 -8.55153e-08 4.02635e-11 41975.6 25.7012 );
     }
 }
-GeCL
+GeCl
 {
     specie
     {
@@ -33992,7 +33992,7 @@ GeCL
         lowCpCoeffs     ( 2.72445 0.00895175 -1.25463e-05 6.75349e-09 -1.04008e-12 7190.16 11.8835 );
     }
 }
-CHCLF2__HCFC-22
+CHClF2__HCFC-22
 {
     specie
     {
@@ -34632,7 +34632,7 @@ C19H36O2_meOleic
         lowCpCoeffs     ( 1.03901 0.189498 -4.90209e-05 -6.24649e-08 3.76956e-11 -82267.1 52.4855 );
     }
 }
-MgCL2
+MgCl2
 {
     specie
     {
@@ -34696,7 +34696,7 @@ C6H6_1,3-Butadie
         lowCpCoeffs     ( 0.744284 0.0472659 -2.19464e-05 -9.84219e-09 9.27386e-12 39556.6 21.8138 );
     }
 }
-MgCL2(cr)
+MgCl2(cr)
 {
     specie
     {
@@ -34744,7 +34744,7 @@ GeS2(II)(s)
         lowCpCoeffs     ( 5.26457 0.0158411 -3.14864e-05 3.00355e-08 -1.04866e-11 -17420.7 -22.3062 );
     }
 }
-AL2O
+Al2O
 {
     specie
     {
@@ -34792,7 +34792,7 @@ Mg2SiO4(L)
         lowCpCoeffs     7 { 0 };
     }
 }
-SCL2+
+SCl2+
 {
     specie
     {
@@ -34888,7 +34888,7 @@ C2Cl5___Pentachl
         lowCpCoeffs     ( 3.91975 0.0549683 -9.27441e-05 7.45661e-08 -2.32158e-11 -284.949 13.3912 );
     }
 }
-C2BR3
+C2Br3
 {
     specie
     {
@@ -35048,7 +35048,7 @@ C8H7___1,3,5,7_Cy
         lowCpCoeffs     ( 0.221489 0.0439671 3.08077e-05 -8.02318e-08 3.77773e-11 58455.7 25.8576 );
     }
 }
-PBS(cr)__GALENA
+PbS(cr)__GALENA
 {
     specie
     {
@@ -35208,7 +35208,7 @@ C4H6Cl2_1,4-DiCl
         lowCpCoeffs     ( 4.62931 0.0213074 4.38339e-05 -8.04356e-08 3.58875e-11 -8812.42 12.3975 );
     }
 }
-CHBr2CL
+CHBr2Cl
 {
     specie
     {
@@ -35272,7 +35272,7 @@ ClC2H4OH__ATcT_C
         lowCpCoeffs     ( 3.29693 0.0155882 2.61101e-05 -4.87089e-08 2.16773e-11 -33904.2 13.6163 );
     }
 }
-ALBr
+AlBr
 {
     specie
     {
@@ -35336,7 +35336,7 @@ Na2O
         lowCpCoeffs     ( 4.47778 0.0141517 -2.77158e-05 2.4968e-08 -8.46423e-12 -3756.21 3.92862 );
     }
 }
-CHCL
+CHCl
 {
     specie
     {
@@ -35416,7 +35416,7 @@ C4F6_CycloButene
         lowCpCoeffs     ( 4.2381 0.0498 -4.01139e-05 9.85389e-09 1.49299e-12 -148774 8.3064 );
     }
 }
-C24CL12_Coronene
+C24Cl12_Coronene
 {
     specie
     {
@@ -35672,7 +35672,7 @@ C7H8__1,6-diyne
         lowCpCoeffs     ( 2.65094 0.0475342 -6.58275e-06 -2.70985e-08 1.531e-11 44797.6 14.6492 );
     }
 }
-CHCL2
+CHCl2
 {
     specie
     {
@@ -35784,7 +35784,7 @@ B3O3F3
         lowCpCoeffs     ( 2.25601 0.046567 -3.26831e-05 1.27816e-09 5.045e-12 -289030 16.0606 );
     }
 }
-PbCL
+PbCl
 {
     specie
     {
@@ -35832,7 +35832,7 @@ C10_linear_triple
         lowCpCoeffs     ( 3.4855 0.0640662 -9.35342e-05 7.56085e-08 -2.48799e-11 206209 10.6203 );
     }
 }
-C2CL2F4__FC-114
+C2Cl2F4__FC-114
 {
     specie
     {
@@ -35928,7 +35928,7 @@ C7H5NS_Benzothiaz
         lowCpCoeffs     ( -0.923877 0.0491355 1.97405e-05 -7.21022e-08 3.54777e-11 22598.7 30.7415 );
     }
 }
-ALCL2
+AlCl2
 {
     specie
     {
@@ -36200,7 +36200,7 @@ HNO3+
         lowCpCoeffs     ( 0.696075 0.0308976 -4.05429e-05 2.68505e-08 -7.08467e-12 122156 22.6095 );
     }
 }
-CCLF
+CClF
 {
     specie
     {
@@ -36408,12 +36408,12 @@ C3H7NO3_NPN
         lowCpCoeffs     ( 4.69954 0.0174527 6.53066e-05 -9.90515e-08 4.08918e-11 -24608.3 11.0308 );
     }
 }
-AIR
+air
 {
     specie
     {
         nMoles          1;
-        molWeight       0;
+        molWeight       28.9644;
     }
     thermodynamics
     {
@@ -36808,7 +36808,7 @@ CH2O+_Fornald_cati
         lowCpCoeffs     ( 2.99008 0.00405957 7.18536e-06 -1.01674e-08 3.74118e-12 112947 8.64302 );
     }
 }
-C12H6CL2O
+C12H6Cl2O
 {
     specie
     {
@@ -36952,7 +36952,7 @@ Na2O(L)
         lowCpCoeffs     7 { 0 };
     }
 }
-CH2BRCOOH
+CH2BrCOOH
 {
     specie
     {

From e39f88299d7eaac8ae506ea1646c3a42b5497924 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Sat, 8 Aug 2015 17:50:38 +0100
Subject: [PATCH 03/70]     Corrected names of compounds in thermoData to use
 upper/lower     case in accordance with standard symbols for chemical
 elements.     For example, Cl for Chlorine (not CL), Ar for Argon (not AR),
 Al, Ne, Si, Pb, etc

---
 etc/thermoData/thermoData | 492 +++++++++++++++++++-------------------
 1 file changed, 246 insertions(+), 246 deletions(-)

diff --git a/etc/thermoData/thermoData b/etc/thermoData/thermoData
index 057c9557fc..dddc4e85f7 100644
--- a/etc/thermoData/thermoData
+++ b/etc/thermoData/thermoData
@@ -152,7 +152,7 @@ Pb-
         lowCpCoeffs     ( 2.5 0 0 0 0 17762.3 8.23513 );
     }
 }
-GeCL4
+GeCl4
 {
     specie
     {
@@ -536,7 +536,7 @@ F2O-__FOF-
         lowCpCoeffs     ( 4.64786 0.0100535 -1.79176e-05 1.47983e-08 -4.6499e-12 -25825.4 3.76539 );
     }
 }
-CCL
+CCl
 {
     specie
     {
@@ -552,7 +552,7 @@ CCL
         lowCpCoeffs     ( 3.76699 -0.00149298 9.61147e-06 -1.27138e-08 5.2737e-12 50911.8 5.66471 );
     }
 }
-ALCL+
+AlCl+
 {
     specie
     {
@@ -584,7 +584,7 @@ C20H36O2_EtLinolea
         lowCpCoeffs     ( -1.31454 0.212235 -8.58818e-05 -3.39348e-08 2.87278e-11 -71080.7 58.9753 );
     }
 }
-CL2O__Cl-O-Cl
+Cl2O__Cl-O-Cl
 {
     specie
     {
@@ -616,7 +616,7 @@ C6H8O_3,4DiMeFuran
         lowCpCoeffs     ( 2.41515 0.0320931 4.3306e-05 -8.36935e-08 3.70127e-11 -14574.6 14.9425 );
     }
 }
-NH4CLO4(II)
+NH4ClO4(II)
 {
     specie
     {
@@ -904,7 +904,7 @@ C60
         lowCpCoeffs     ( -33.5791 0.428444 -0.000317123 4.75463e-08 2.76777e-11 304651 148.329 );
     }
 }
-HCL
+HCl
 {
     specie
     {
@@ -1000,7 +1000,7 @@ HNO2_equil__ATcT
         lowCpCoeffs     ( 3.21416 0.00812778 1.65999e-06 -9.52815e-09 4.87131e-12 -10783.1 9.822 );
     }
 }
-FeCL3(L)
+FeCl3(L)
 {
     specie
     {
@@ -1016,7 +1016,7 @@ FeCL3(L)
         lowCpCoeffs     ( 16.1029 0 0 0 0 -48492 -67.1135 );
     }
 }
-C3H2BR2__1,3_Dib
+C3H2Br2__1,3_Dib
 {
     specie
     {
@@ -1048,7 +1048,7 @@ C4H8N8O8_HMX
         lowCpCoeffs     ( 8.14013 0.0833154 2.72628e-05 -9.98161e-08 4.69226e-11 16398.6 -3.22779 );
     }
 }
-SnCL4
+SnCl4
 {
     specie
     {
@@ -1112,7 +1112,7 @@ PS
         lowCpCoeffs     ( 3.4687 0.00449701 -8.42505e-06 7.47111e-09 -2.51772e-12 18049.7 7.36114 );
     }
 }
-BCL3
+BCl3
 {
     specie
     {
@@ -1416,7 +1416,7 @@ C2H4O2_HG(O)OCH3
         lowCpCoeffs     ( 5.96757 -0.00938085 7.07648e-05 -8.29932e-08 3.13523e-11 -44871 0.750341 );
     }
 }
-B3O3CL3
+B3O3Cl3
 {
     specie
     {
@@ -1432,7 +1432,7 @@ B3O3CL3
         lowCpCoeffs     ( 3.59422 0.0505755 -4.66182e-05 1.48922e-08 5.70497e-13 -199700 12.0898 );
     }
 }
-C3CL4_PerClAllene
+C3Cl4_PerClAllene
 {
     specie
     {
@@ -1448,7 +1448,7 @@ C3CL4_PerClAllene
         lowCpCoeffs     ( 2.89989 0.0562603 -9.46435e-05 7.87159e-08 -2.55213e-11 13576.3 15.0009 );
     }
 }
-AL2O3(L)
+Al2O3(L)
 {
     specie
     {
@@ -1592,7 +1592,7 @@ C2Cl3F3_FC-113A
         lowCpCoeffs     ( 2.5428 0.0608765 -8.62331e-05 6.07755e-08 -1.7269e-11 -94117.6 15.9691 );
     }
 }
-C12H9CL
+C12H9Cl
 {
     specie
     {
@@ -1672,7 +1672,7 @@ C8H7_C6H4CH=CH2
         lowCpCoeffs     ( 1.17831 0.0340766 5.85066e-05 -1.10953e-07 4.95223e-11 46141.5 23.6053 );
     }
 }
-MgCLF
+MgClF
 {
     specie
     {
@@ -1992,7 +1992,7 @@ C4H6__1,2-butadi
         lowCpCoeffs     ( 2.90828 0.0179025 2.61487e-05 -4.81599e-08 2.11296e-11 17592.9 12.3118 );
     }
 }
-CuCL
+CuCl
 {
     specie
     {
@@ -2024,7 +2024,7 @@ SO-
         lowCpCoeffs     ( 3.65351 0.00228026 -2.55566e-06 1.37405e-09 -2.7867e-13 -13915.6 5.50813 );
     }
 }
-PbCL2
+PbCl2
 {
     specie
     {
@@ -2168,7 +2168,7 @@ SB(CH3)2
         lowCpCoeffs     ( 4.74742 0.012719 1.70266e-05 -2.86489e-08 1.20242e-11 15230.4 7.86383 );
     }
 }
-BF2CL
+BF2Cl
 {
     specie
     {
@@ -2248,7 +2248,7 @@ C4H6O2_Crotonic_ac
         lowCpCoeffs     ( 3.40323 0.0269846 2.63698e-05 -5.87467e-08 2.69692e-11 -46024.4 13.1928 );
     }
 }
-BOCL
+BOCl
 {
     specie
     {
@@ -2392,7 +2392,7 @@ C5H11,pentyl
         lowCpCoeffs     ( 7.17405 0.00380923 0.00010438 -1.39635e-07 5.60398e-11 2528.72 -1.18869 );
     }
 }
-ALBr2
+AlBr2
 {
     specie
     {
@@ -2472,7 +2472,7 @@ HS2__RRHO
         lowCpCoeffs     ( 2.96324 0.00855502 -1.00388e-05 6.25269e-09 -1.52826e-12 51449.8 11.58 );
     }
 }
-AL
+Al
 {
     specie
     {
@@ -2680,7 +2680,7 @@ PH2-
         lowCpCoeffs     ( 3.95759 -0.000728834 5.13055e-06 -3.73172e-09 8.41295e-13 -2300.28 2.15723 );
     }
 }
-C12H5O3CL4_DOH2
+C12H5O3Cl4_DOH2
 {
     specie
     {
@@ -2728,7 +2728,7 @@ C22H44O2_Behenic
         lowCpCoeffs     ( 25.149 -0.0104152 0.000584232 -7.54109e-07 2.97753e-10 -112513 -54.9776 );
     }
 }
-AL2
+Al2
 {
     specie
     {
@@ -3064,7 +3064,7 @@ HCNO+_Fulminic_cat
         lowCpCoeffs     ( 1.1113 0.0257273 -3.99372e-05 3.18403e-08 -9.91911e-12 145418 15.4371 );
     }
 }
-CH3CL
+CH3Cl
 {
     specie
     {
@@ -3224,7 +3224,7 @@ C8H18(L)_isooctane
         lowCpCoeffs     ( 17.5199 0.0157484 7.35947e-05 -6.10398e-10 4.70619e-13 -37742.3 -68.3211 );
     }
 }
-CBrCL2F___11B1
+CBrCl2F___11B1
 {
     specie
     {
@@ -3464,7 +3464,7 @@ Si+
         lowCpCoeffs     ( 4.23261 -0.00743109 1.31426e-05 -1.07436e-08 3.34175e-12 148410 -2.74005 );
     }
 }
-SiCL4
+SiCl4
 {
     specie
     {
@@ -3512,7 +3512,7 @@ SiO2(b-qz)
         lowCpCoeffs     ( 29.6202 -0.0476273 2.62543e-05 0 0 -122857 -156.169 );
     }
 }
-FeCL2(S)
+FeCl2(S)
 {
     specie
     {
@@ -3624,7 +3624,7 @@ C4H4N2_PYRIMIDINE
         lowCpCoeffs     ( 1.63714 0.0119774 6.83832e-05 -1.0465e-07 4.42186e-11 22212.5 18.6564 );
     }
 }
-C3BR3_Allene_Rad.
+C3Br3_Allene_Rad.
 {
     specie
     {
@@ -3672,7 +3672,7 @@ H2O+
         lowCpCoeffs     ( 4.02466 -0.00108851 5.13577e-06 -4.40028e-09 1.40727e-12 116896 0.699969 );
     }
 }
-Fe2CL6
+Fe2Cl6
 {
     specie
     {
@@ -3720,7 +3720,7 @@ BI2
         lowCpCoeffs     ( 3.3065 0.0158184 -2.88094e-05 2.45287e-08 -7.96353e-12 27157.1 14.9424 );
     }
 }
-C2HCLF_1,1-CLF
+C2HClF_1,1-ClF
 {
     specie
     {
@@ -3752,7 +3752,7 @@ Mg2F4
         lowCpCoeffs     ( 1.51049 0.0696575 -0.000139294 1.2747e-07 -4.37228e-11 -209218 16.3106 );
     }
 }
-C6H2CL3O_RAD
+C6H2Cl3O_RAD
 {
     specie
     {
@@ -3816,7 +3816,7 @@ BiF2
         lowCpCoeffs     ( 3.10494 0.0151822 -2.53454e-05 1.9977e-08 -6.06776e-12 -25510.8 13.5101 );
     }
 }
-ALH3(a)_hexagonal
+AlH3(a)_hexagonal
 {
     specie
     {
@@ -4040,7 +4040,7 @@ C8H12_3,6-Dimeth
         lowCpCoeffs     ( 3.35348 0.0295908 8.59569e-05 -1.33332e-07 5.53072e-11 3491.85 11.6563 );
     }
 }
-CCL2F-CHF2
+CCl2F-CHF2
 {
     specie
     {
@@ -4248,7 +4248,7 @@ Ca+
         lowCpCoeffs     ( 2.5 0 0 0 0 92324.2 5.07768 );
     }
 }
-FeCL2
+FeCl2
 {
     specie
     {
@@ -4280,7 +4280,7 @@ C12H8_Acenaphtyl
         lowCpCoeffs     ( -2.14922 0.0589101 6.42492e-05 -1.41294e-07 6.47477e-11 28938 33.6791 );
     }
 }
-PF3CL2
+PF3Cl2
 {
     specie
     {
@@ -4328,7 +4328,7 @@ O2_singlet
         lowCpCoeffs     ( 3.78535 -0.00321929 1.12323e-05 -1.17254e-08 4.1766e-12 10292.3 3.2732 );
     }
 }
-ALF+
+AlF+
 {
     specie
     {
@@ -4728,7 +4728,7 @@ CO2-
         lowCpCoeffs     ( 2.49677 0.00870769 -4.87281e-06 -4.90572e-10 9.38694e-13 -42687.4 9.97856 );
     }
 }
-PCL3
+PCl3
 {
     specie
     {
@@ -4984,7 +4984,7 @@ F2H-____FHF-
         lowCpCoeffs     ( 3.32548 0.00415755 3.33684e-06 -7.76225e-09 3.38752e-12 -87832.1 7.32348 );
     }
 }
-C6H3CL3O_TriClPhen
+C6H3Cl3O_TriClPhen
 {
     specie
     {
@@ -5608,7 +5608,7 @@ C2H2FCl_1,1-FCl
         lowCpCoeffs     ( 0.912416 0.0311142 -3.24491e-05 1.67416e-08 -3.16508e-12 -21292.1 20.903 );
     }
 }
-AL(L)
+Al(L)
 {
     specie
     {
@@ -5784,7 +5784,7 @@ C3F7_CF3CF*CF3_M
         lowCpCoeffs     ( 3.14242 0.0603443 -6.17598e-05 2.7938e-08 -4.02551e-12 -165147 16.6898 );
     }
 }
-C12H4CL6O2_BIFENYL
+C12H4Cl6O2_BIFENYL
 {
     specie
     {
@@ -5832,7 +5832,7 @@ CH2OH+
         lowCpCoeffs     ( 3.54817 -0.00288791 2.98391e-05 -3.33578e-08 1.20141e-11 85029.7 7.01729 );
     }
 }
-PCL2-
+PCl2-
 {
     specie
     {
@@ -6232,7 +6232,7 @@ C10H20_3-decene-
         lowCpCoeffs     ( 2.73154 0.0788863 2.51642e-05 -8.5251e-08 3.92428e-11 -20689.8 25.7334 );
     }
 }
-C3H5Cl__CHCL=CHCH3
+C3H5Cl__CHCl=CHCH3
 {
     specie
     {
@@ -6360,7 +6360,7 @@ C
         lowCpCoeffs     ( 2.55424 -0.000321538 7.33792e-07 -7.32235e-10 2.66521e-13 85442.7 4.53131 );
     }
 }
-PbCL3
+PbCl3
 {
     specie
     {
@@ -6584,7 +6584,7 @@ C12H7_Acenaphtynyl
         lowCpCoeffs     ( -2.23704 0.0620074 4.69636e-05 -1.20874e-07 5.68319e-11 60886.8 33.8046 );
     }
 }
-C5H3CL3_CY-1,2,4CL
+C5H3Cl3_CY-1,2,4Cl
 {
     specie
     {
@@ -6616,7 +6616,7 @@ C3D6_Cyclopropan
         lowCpCoeffs     ( -1.18501 0.0361683 -2.53517e-06 -2.83415e-08 1.57552e-11 2767.63 26.5463 );
     }
 }
-CL2O2
+Cl2O2
 {
     specie
     {
@@ -6648,7 +6648,7 @@ PH3+
         lowCpCoeffs     ( 2.49088 0.00917665 -7.25623e-06 4.81735e-09 -1.58795e-12 115032 9.37716 );
     }
 }
-MgAL2O4(cr)
+MgAl2O4(cr)
 {
     specie
     {
@@ -6696,7 +6696,7 @@ NO3
         lowCpCoeffs     ( 2.17359 0.0104903 1.10473e-05 -2.81562e-08 1.36584e-11 7812.91 14.6022 );
     }
 }
-SiCL
+SiCl
 {
     specie
     {
@@ -6760,7 +6760,7 @@ C6H4O2__O=C6H4=O
         lowCpCoeffs     ( 0.856753 0.0415771 4.09304e-06 -4.07329e-08 2.08924e-11 -16679.3 21.4023 );
     }
 }
-C2H3CLO2
+C2H3ClO2
 {
     specie
     {
@@ -6808,7 +6808,7 @@ Hg(L)
         lowCpCoeffs     ( 3.68613 -0.000884371 -2.58545e-06 8.12482e-09 -5.52476e-12 -1050.3 -11.5403 );
     }
 }
-C12H4CL5O2_Radic
+C12H4Cl5O2_Radic
 {
     specie
     {
@@ -6920,7 +6920,7 @@ C4H8O2_Butyricacid
         lowCpCoeffs     ( 6.55569 0.00119881 9.25041e-05 -1.19594e-07 4.69862e-11 -57428.4 3.36227 );
     }
 }
-CF3-CHCLF__FC-124
+CF3-CHClF__FC-124
 {
     specie
     {
@@ -6952,7 +6952,7 @@ Ag
         lowCpCoeffs     ( 2.5 0 0 0 0 33520 6.56282 );
     }
 }
-ALF2
+AlF2
 {
     specie
     {
@@ -7048,7 +7048,7 @@ C5H10__2MB-3-ene
         lowCpCoeffs     ( 7.22291 -0.00273953 0.000104969 -1.31727e-07 5.12971e-11 -6107.68 -1.8469 );
     }
 }
-C2BR5
+C2Br5
 {
     specie
     {
@@ -7080,7 +7080,7 @@ C6H2Cl3O3_BiCy
         lowCpCoeffs     ( 0.82596 0.0897047 -8.89846e-05 3.66349e-08 -3.29896e-12 -36.1541 24.2683 );
     }
 }
-CBrCLF2
+CBrClF2
 {
     specie
     {
@@ -7128,7 +7128,7 @@ C8H5_C6H5-CC*
         lowCpCoeffs     ( 1.77838 0.0324194 3.85016e-05 -8.03842e-08 3.6269e-11 76600.4 19.3639 );
     }
 }
-COHCL2___Radical
+COHCl2___Radical
 {
     specie
     {
@@ -7208,7 +7208,7 @@ C12H20O10_Cellobi
         lowCpCoeffs     ( 8.32198 0.0628814 0.000271753 -4.29459e-07 1.80191e-10 -174415 -4.13432 );
     }
 }
-C5H7CL
+C5H7Cl
 {
     specie
     {
@@ -7560,7 +7560,7 @@ CO2_cy__C(OO)
         lowCpCoeffs     ( 3.18456 0.00536293 2.20597e-06 -8.41227e-09 4.16779e-12 21632.5 8.74099 );
     }
 }
-PbCL4
+PbCl4
 {
     specie
     {
@@ -7592,7 +7592,7 @@ C20H40O2_etStearat
         lowCpCoeffs     ( -2.70218 0.226825 -8.75531e-05 -4.39254e-08 3.47715e-11 -101728 60.8589 );
     }
 }
-PCL
+PCl
 {
     specie
     {
@@ -7640,7 +7640,7 @@ C2Cl4_Tetrachlor
         lowCpCoeffs     ( 3.11949 0.0449195 -7.36241e-05 5.96895e-08 -1.89904e-11 -4918.58 12.6542 );
     }
 }
-ALO-
+AlO-
 {
     specie
     {
@@ -7752,7 +7752,7 @@ CHF3__FLUOROFORM
         lowCpCoeffs     ( 2.73539 0.00872479 1.74822e-05 -3.21505e-08 1.41695e-11 -84684 12.488 );
     }
 }
-BrCL
+BrCl
 {
     specie
     {
@@ -8184,7 +8184,7 @@ C6H10O5_Levogluco
         lowCpCoeffs     ( 1.02548 0.0539526 5.79178e-05 -1.24491e-07 5.63562e-11 -97953 24.8253 );
     }
 }
-PFCL-
+PFCl-
 {
     specie
     {
@@ -8248,7 +8248,7 @@ s-1-C10H7C*O
         lowCpCoeffs     ( 0.247025 0.0623078 3.25269e-05 -9.98773e-08 4.79264e-11 18078.8 27.46 );
     }
 }
-CH2CLF__GC-31
+CH2ClF__GC-31
 {
     specie
     {
@@ -8344,7 +8344,7 @@ C4H8_Cyclobutan
         lowCpCoeffs     ( 3.14397 -0.00504252 0.000120645 -1.5841e-07 6.38394e-11 1919.48 10.6618 );
     }
 }
-DCL
+DCl
 {
     specie
     {
@@ -8584,7 +8584,7 @@ C8H15_1-octenyl-
         lowCpCoeffs     ( 3.9658 0.0500732 4.58634e-05 -9.55246e-08 4.20969e-11 9477.34 19.0962 );
     }
 }
-SiCL3
+SiCl3
 {
     specie
     {
@@ -8952,7 +8952,7 @@ Cr7C3(S)
         lowCpCoeffs     ( 1.2648 0.135086 -0.000236887 1.97375e-07 -6.14407e-11 -23973 -14.4012 );
     }
 }
-FeCL
+FeCl
 {
     specie
     {
@@ -9064,7 +9064,7 @@ C6H7+_C5H4-1-CH3
         lowCpCoeffs     ( -1.46109 0.0501602 -1.7565e-05 -1.40099e-08 9.74331e-12 119212 31.9146 );
     }
 }
-PFCL2
+PFCl2
 {
     specie
     {
@@ -9176,7 +9176,7 @@ SB(s)
         lowCpCoeffs     ( 2.12274 0.00603818 -1.41051e-05 1.52518e-08 -5.38507e-12 -804.253 -7.91696 );
     }
 }
-CCLF2
+CClF2
 {
     specie
     {
@@ -9528,7 +9528,7 @@ NO2+
         lowCpCoeffs     ( 3.56214 0.00343629 -1.19401e-07 -1.31592e-09 5.01139e-13 114780 7.19236 );
     }
 }
-C2H3CL
+C2H3Cl
 {
     specie
     {
@@ -9576,7 +9576,7 @@ Fe(CO)5
         lowCpCoeffs     ( 1.32844 0.114541 -0.00022444 2.11015e-07 -7.45587e-11 -91425.7 19.3738 );
     }
 }
-CHCLF
+CHClF
 {
     specie
     {
@@ -9768,7 +9768,7 @@ Cr3C2(S)
         lowCpCoeffs     ( -1.6814 0.0744936 -0.00012215 9.39506e-08 -2.71337e-11 -12169 2.29813 );
     }
 }
-PCL5
+PCl5
 {
     specie
     {
@@ -9832,7 +9832,7 @@ C6H5NO_Nitrosobe
         lowCpCoeffs     ( 1.68039 0.0292539 5.20478e-05 -9.72307e-08 4.29288e-11 21733.6 20.1972 );
     }
 }
-CCLF3___FC-13
+CClF3___FC-13
 {
     specie
     {
@@ -9992,7 +9992,7 @@ C10H8__AZULENE
         lowCpCoeffs     ( -0.627409 0.0405369 8.4064e-05 -1.5093e-07 6.63559e-11 31574.8 30.3043 );
     }
 }
-PF2CL3
+PF2Cl3
 {
     specie
     {
@@ -10024,7 +10024,7 @@ C8_linear_triplet
         lowCpCoeffs     ( 3.14179 0.0514027 -7.82216e-05 6.51159e-08 -2.18045e-11 179419 5.9977 );
     }
 }
-CCL3O*
+CCl3O*
 {
     specie
     {
@@ -10088,7 +10088,7 @@ C3H6O2_EthylFormat
         lowCpCoeffs     ( 5.59041 0.00242724 6.61618e-05 -8.61264e-08 3.38174e-11 -47569.9 4.84087 );
     }
 }
-C6HCL3OH__3-YL_RAD
+C6HCl3OH__3-YL_RAD
 {
     specie
     {
@@ -10136,7 +10136,7 @@ CCl3
         lowCpCoeffs     ( 2.66358 0.0271296 -4.42403e-05 3.46851e-08 -1.05867e-11 6882.02 14.1173 );
     }
 }
-GeCL3
+GeCl3
 {
     specie
     {
@@ -10168,7 +10168,7 @@ C14H6N6O12_HNS
         lowCpCoeffs     ( 7.35142 0.152248 -3.6908e-06 -1.32914e-07 7.04139e-11 19976 6.96546 );
     }
 }
-SiHCL3
+SiHCl3
 {
     specie
     {
@@ -10456,7 +10456,7 @@ C2H2_acetylene
         lowCpCoeffs     ( 0.80868 0.0233616 -3.55172e-05 2.80153e-08 -8.50075e-12 26429 13.9397 );
     }
 }
-ALF3
+AlF3
 {
     specie
     {
@@ -10952,7 +10952,7 @@ C2H2O2__HOCCOH
         lowCpCoeffs     ( 4.39325 0.0178016 -1.81564e-05 1.11665e-08 -2.9637e-12 -5323.32 9.51277 );
     }
 }
-C2HCLF2-1,1
+C2HClF2-1,1
 {
     specie
     {
@@ -10968,7 +10968,7 @@ C2HCLF2-1,1
         lowCpCoeffs     ( 2.04804 0.0295909 -2.80654e-05 1.12979e-08 -1.01686e-12 -41870.5 17.0867 );
     }
 }
-ClO2___CLOO*___H
+ClO2___ClOO*___H
 {
     specie
     {
@@ -10984,7 +10984,7 @@ ClO2___CLOO*___H
         lowCpCoeffs     ( 4.26695 0.00747999 -1.15233e-05 9.93421e-09 -3.48897e-12 10707.3 7.19227 );
     }
 }
-SO2CL2
+SO2Cl2
 {
     specie
     {
@@ -11496,7 +11496,7 @@ C5H8O2_MeCrotanoat
         lowCpCoeffs     ( 5.79381 0.0245644 3.60443e-05 -6.23879e-08 2.61793e-11 -44636.7 4.57237 );
     }
 }
-PFCL4
+PFCl4
 {
     specie
     {
@@ -11992,7 +11992,7 @@ D2O2
         lowCpCoeffs     ( 3.99336 0.00303683 1.02968e-05 -1.60577e-08 6.83692e-12 -18743.3 5.12865 );
     }
 }
-CHCL=CH*
+CHCl=CH*
 {
     specie
     {
@@ -12104,7 +12104,7 @@ C4H4__1-butene-3
         lowCpCoeffs     ( 1.37369 0.0288801 -1.46864e-05 -3.91045e-09 4.78134e-12 33063.3 17.5941 );
     }
 }
-HCLO2
+HClO2
 {
     specie
     {
@@ -12200,7 +12200,7 @@ O+
         lowCpCoeffs     ( 2.5 0 0 0 0 187935 4.39338 );
     }
 }
-C12H5CL4O3_Rad
+C12H5Cl4O3_Rad
 {
     specie
     {
@@ -12264,7 +12264,7 @@ C2H5O_CH3CH*OH
         lowCpCoeffs     ( 4.22283 0.00512175 3.48387e-05 -4.91944e-08 2.01184e-11 -8356.22 8.01676 );
     }
 }
-C3H3Cl_3CyCLPropen
+C3H3Cl_3CyClPropen
 {
     specie
     {
@@ -12312,7 +12312,7 @@ BH
         lowCpCoeffs     ( 3.54452 -0.000231822 -1.32913e-07 2.13394e-09 -1.32335e-12 52920.3 0.530536 );
     }
 }
-B2CL4
+B2Cl4
 {
     specie
     {
@@ -12664,7 +12664,7 @@ C4H6O2_Diacetyl
         lowCpCoeffs     ( 5.68608 0.0155041 3.82144e-05 -5.99463e-08 2.47932e-11 -41762.7 4.02905 );
     }
 }
-AL2O2
+Al2O2
 {
     specie
     {
@@ -12760,7 +12760,7 @@ Cr(OH)6
         lowCpCoeffs     ( -5.65718 0.136404 -0.000222736 1.74482e-07 -5.23661e-11 -125010 44.361 );
     }
 }
-MgCL+
+MgCl+
 {
     specie
     {
@@ -12872,7 +12872,7 @@ SbCl_singlet
         lowCpCoeffs     ( 2.4133 0.0128929 -2.44407e-05 1.98759e-08 -5.99572e-12 20273.6 13.1774 );
     }
 }
-C2HBR4_1,1,1,2
+C2HBr4_1,1,1,2
 {
     specie
     {
@@ -12984,7 +12984,7 @@ C2H5O-__Ethoxy_a
         lowCpCoeffs     ( 3.88372 0.00362649 3.51129e-05 -4.19768e-08 1.49671e-11 -23727.9 7.57799 );
     }
 }
-C12H4CL5O2_2p,4,
+C12H4Cl5O2_2p,4,
 {
     specie
     {
@@ -13144,7 +13144,7 @@ C5H11,t-pentyl
         lowCpCoeffs     ( 6.44629 -0.00954232 0.000137892 -1.69242e-07 6.53098e-11 1508.39 5.43062 );
     }
 }
-PCL2
+PCl2
 {
     specie
     {
@@ -13464,7 +13464,7 @@ C6H
         lowCpCoeffs     ( 0.905835 0.0607761 -0.000112134 1.02799e-07 -3.57814e-11 118105 17.5981 );
     }
 }
-C2CL3_RAD
+C2Cl3_RAD
 {
     specie
     {
@@ -13512,7 +13512,7 @@ CH2Br-CH2Br
         lowCpCoeffs     ( 4.62116 0.00941442 3.26665e-05 -5.17217e-08 2.19246e-11 -6503.17 9.40527 );
     }
 }
-ALH2
+AlH2
 {
     specie
     {
@@ -14184,7 +14184,7 @@ C2H3O_Oxyrane_Rad
         lowCpCoeffs     ( 3.58349 -0.00602276 6.32427e-05 -8.18541e-08 3.30445e-11 18568.1 9.59726 );
     }
 }
-S2CL
+S2Cl
 {
     specie
     {
@@ -14232,7 +14232,7 @@ NOH+_cation
         lowCpCoeffs     ( 4.08416 -0.00241926 1.18224e-05 -1.16756e-08 3.86465e-12 138736 4.14404 );
     }
 }
-C3H2CL2__1,2_Dic
+C3H2Cl2__1,2_Dic
 {
     specie
     {
@@ -14344,7 +14344,7 @@ C2HF2__CHF=CF(E)
         lowCpCoeffs     ( 3.0869 0.0160213 -7.49407e-06 -3.65235e-09 3.19176e-12 -6672.08 11.5974 );
     }
 }
-AL2O3(a)
+Al2O3(a)
 {
     specie
     {
@@ -14776,7 +14776,7 @@ Fe
         lowCpCoeffs     ( 1.70744 0.0106339 -2.76118e-05 2.80918e-08 -1.0122e-11 49184.4 9.80811 );
     }
 }
-C2BR
+C2Br
 {
     specie
     {
@@ -14904,7 +14904,7 @@ s-1,5-C6H4__trans
         lowCpCoeffs     ( 0.221633 0.0581529 -7.13934e-05 4.76726e-08 -1.28753e-11 60806.5 22.325 );
     }
 }
-CHBR
+CHBr
 {
     specie
     {
@@ -15048,7 +15048,7 @@ PO3
         lowCpCoeffs     ( 4.76937 0.00784394 3.34335e-06 -1.31052e-08 6.59556e-12 -55973.8 4.98978 );
     }
 }
-PF4CL
+PF4Cl
 {
     specie
     {
@@ -15288,7 +15288,7 @@ C32H13_OVALENYL
         lowCpCoeffs     ( -9.14252 0.178117 4.87162e-05 -2.22438e-07 1.09692e-10 74571.6 65.7092 );
     }
 }
-C2CL2
+C2Cl2
 {
     specie
     {
@@ -15576,7 +15576,7 @@ ClO3___Chlorate
         lowCpCoeffs     ( 1.54804 0.0255914 -3.27199e-05 1.9253e-08 -4.18676e-12 20946.5 18.7937 );
     }
 }
-AL(cr)
+Al(cr)
 {
     specie
     {
@@ -15656,7 +15656,7 @@ Mo(cr)
         lowCpCoeffs     ( 1.32884 0.00982554 -2.1093e-05 2.0951e-08 -7.60703e-12 -684.365 -6.29287 );
     }
 }
-AL2O2+
+Al2O2+
 {
     specie
     {
@@ -15704,7 +15704,7 @@ NH2F
         lowCpCoeffs     ( 4.43076 -0.00700448 3.24294e-05 -3.55242e-08 1.30599e-11 -10252.6 3.29678 );
     }
 }
-C2H4Cl_betaCLEthyl
+C2H4Cl_betaClEthyl
 {
     specie
     {
@@ -15784,7 +15784,7 @@ CO+
         lowCpCoeffs     ( 3.77062 -0.00201773 4.61082e-06 -2.99175e-09 6.06065e-13 149007 3.3813 );
     }
 }
-CH2CL2
+CH2Cl2
 {
     specie
     {
@@ -15896,7 +15896,7 @@ C12H8O2
         lowCpCoeffs     ( -1.48215 0.0751205 3.87198e-05 -1.19145e-07 5.69743e-11 -9056.11 32.9719 );
     }
 }
-CBRF3_FREON_1301
+CBrF3_FREON_1301
 {
     specie
     {
@@ -15976,7 +15976,7 @@ C18H34_1-Octadecy
         lowCpCoeffs     ( -11.646 0.27397 -0.000297994 2.01809e-07 -5.91668e-11 -21318 96.8119 );
     }
 }
-C2HCL
+C2HCl
 {
     specie
     {
@@ -16136,7 +16136,7 @@ Ge2
         lowCpCoeffs     ( 1.86915 0.0207355 -4.51129e-05 4.06077e-08 -1.32217e-11 55553.6 15.6846 );
     }
 }
-C2H4O2CL2
+C2H4O2Cl2
 {
     specie
     {
@@ -16200,7 +16200,7 @@ C12H8Cl2O2_6,6-(
         lowCpCoeffs     ( -5.72669 0.155871 -0.000158005 7.90551e-08 -1.57801e-11 -31851.6 56.0168 );
     }
 }
-AL(OH)2
+Al(OH)2
 {
     specie
     {
@@ -16216,7 +16216,7 @@ AL(OH)2
         lowCpCoeffs     ( 3.1217 0.0208986 -2.3495e-05 1.23528e-08 -2.11959e-12 -62732.6 11.1282 );
     }
 }
-CF2H-CCLF2_FC-124A
+CF2H-CClF2_FC-124A
 {
     specie
     {
@@ -16408,7 +16408,7 @@ C4H
         lowCpCoeffs     ( 0.938093 0.038592 -6.86755e-05 6.13265e-08 -2.08966e-11 92312.3 16.501 );
     }
 }
-CLCLO
+Cl2O
 {
     specie
     {
@@ -16504,7 +16504,7 @@ C7H10_cyC5H9-CCH
         lowCpCoeffs     ( 2.86273 0.0238049 8.02798e-05 -1.24667e-07 5.24739e-11 17577.4 16.0168 );
     }
 }
-ClO2___OCLO___HF
+ClO2___OClO___HF
 {
     specie
     {
@@ -16584,7 +16584,7 @@ NH2OH+
         lowCpCoeffs     ( 3.72525 0.00417577 9.81141e-06 -1.38336e-08 5.37208e-12 101394 6.30909 );
     }
 }
-MgCL
+MgCl
 {
     specie
     {
@@ -16824,7 +16824,7 @@ PH+
         lowCpCoeffs     ( 4.69912 -0.0050137 8.44515e-06 -5.45911e-09 1.2742e-12 146096 -1.93635 );
     }
 }
-C2HCL4_CHCl2-CCL2
+C2HCl4_CHCl2-CCl2
 {
     specie
     {
@@ -17256,7 +17256,7 @@ BF2
         lowCpCoeffs     ( 3.76866 0.00206633 8.29846e-06 -1.31415e-08 5.49423e-12 -61332.3 7.37107 );
     }
 }
-NH4CL(II)
+NH4Cl(II)
 {
     specie
     {
@@ -17304,7 +17304,7 @@ C7H5NO_Benzoxazole
         lowCpCoeffs     ( -0.249438 0.0355983 5.64045e-05 -1.10126e-07 4.93628e-11 1629.13 28.0949 );
     }
 }
-Cu3CL3
+Cu3Cl3
 {
     specie
     {
@@ -17944,7 +17944,7 @@ C10H10_3-meIndene
         lowCpCoeffs     ( 1.10114 0.0421733 8.14199e-05 -1.45129e-07 6.32748e-11 18168 22.5602 );
     }
 }
-C2H5CLO2
+C2H5ClO2
 {
     specie
     {
@@ -18120,7 +18120,7 @@ MgO(cr)
         lowCpCoeffs     ( 78.7549 -0.528711 0.00124188 -1.22847e-06 4.37279e-10 -81264.3 -328.879 );
     }
 }
-C3H3Cl_CH2CL-CCH
+C3H3Cl_CH2Cl-CCH
 {
     specie
     {
@@ -18184,7 +18184,7 @@ CBr4
         lowCpCoeffs     ( 5.10359 0.0339593 -6.24045e-05 5.36484e-08 -1.7571e-11 9691.51 1.31944 );
     }
 }
-BAO(G)
+BaO(G)
 {
     specie
     {
@@ -18328,7 +18328,7 @@ NITROPROPYLENE_C
         lowCpCoeffs     ( 3.65176 0.0201896 3.27505e-05 -5.72328e-08 2.41049e-11 -972.583 11.8667 );
     }
 }
-BCL
+BCl
 {
     specie
     {
@@ -18504,7 +18504,7 @@ Br2(cr)
         lowCpCoeffs     ( 9.12519 -0.0826112 0.000699829 -2.40834e-06 3.21096e-09 -3304.08 -30.1719 );
     }
 }
-CLO3F
+ClO3F
 {
     specie
     {
@@ -18632,7 +18632,7 @@ T_Tritium__(g)
         lowCpCoeffs     ( 2.5 -4.39695e-07 2.02543e-09 -2.95668e-12 1.35888e-15 26119.9 1.19728 );
     }
 }
-NH4CLO4(I)
+NH4ClO4(I)
 {
     specie
     {
@@ -18696,7 +18696,7 @@ CNN+
         lowCpCoeffs     ( 3.93138 0.0075873 -8.55735e-06 5.55474e-09 -1.58157e-12 196345 4.04892 );
     }
 }
-C4CL6_Butadiene
+C4Cl6_Butadiene
 {
     specie
     {
@@ -18760,7 +18760,7 @@ CH5N2__CH2*NHNH2
         lowCpCoeffs     ( 2.31544 0.0218627 -3.68464e-06 -1.3271e-08 8.00413e-12 30774.4 15.0726 );
     }
 }
-PF2CL
+PF2Cl
 {
     specie
     {
@@ -18920,7 +18920,7 @@ MgF2(cr)I
         lowCpCoeffs     ( 3.15877 0.00196088 0.000105362 -2.77411e-07 2.08833e-10 -136720 -14.3472 );
     }
 }
-C6H5CL+_Chlorobe
+C6H5Cl+_Chlorobe
 {
     specie
     {
@@ -19080,7 +19080,7 @@ CH2=CH-NO2_Nitroe
         lowCpCoeffs     ( 2.75939 0.0170696 2.37368e-05 -4.77983e-08 2.14793e-11 1843.4 14.6556 );
     }
 }
-C3HCL3__TriClAllen
+C3HCl3__TriClAllen
 {
     specie
     {
@@ -19256,7 +19256,7 @@ C4H6O_H3CCH2CH=C
         lowCpCoeffs     ( 3.2361 0.0232109 2.16181e-05 -4.71002e-08 2.13586e-11 -12724.9 12.9611 );
     }
 }
-SCL2
+SCl2
 {
     specie
     {
@@ -19400,7 +19400,7 @@ C4H8O_2-Butanone
         lowCpCoeffs     ( 6.61978 0.00851848 5.10322e-05 -6.58433e-08 2.4911e-11 -31525.2 -1.09485 );
     }
 }
-C2H4Cl_alfaCLEthyl
+C2H4Cl_alfaClEthyl
 {
     specie
     {
@@ -19480,7 +19480,7 @@ MgBr2(L)
         lowCpCoeffs     ( 12.0272 0 0 0 0 -63633.8 -52.4664 );
     }
 }
-BCL+
+BCl+
 {
     specie
     {
@@ -19512,7 +19512,7 @@ CHNH2-__anion__H
         lowCpCoeffs     ( 1.8202 0.0153201 -1.1192e-05 4.57191e-09 -7.44802e-13 40235.2 14.2819 );
     }
 }
-CHBrCL2__FC-20B1
+CHBrCl2__FC-20B1
 {
     specie
     {
@@ -19624,7 +19624,7 @@ CH3N__(H2C=NH)
         lowCpCoeffs     ( 4.79303 -0.0126842 5.69767e-05 -6.34985e-08 2.37023e-11 9413.86 1.10278 );
     }
 }
-HALO2
+HAlO2
 {
     specie
     {
@@ -19656,7 +19656,7 @@ HCN
         lowCpCoeffs     ( 2.25901 0.010051 -1.33515e-05 1.0092e-08 -3.0088e-12 14590.3 8.91632 );
     }
 }
-ALO2
+AlO2
 {
     specie
     {
@@ -19672,7 +19672,7 @@ ALO2
         lowCpCoeffs     ( 4.34295 0.00865076 -8.91493e-06 3.12927e-09 9.49015e-14 -6256.26 5.43603 );
     }
 }
-HOCL
+HOCl
 {
     specie
     {
@@ -19752,7 +19752,7 @@ C6H11I_IodocyHexan
         lowCpCoeffs     ( 4.95589 0.00624026 0.00013695 -1.85304e-07 7.45516e-11 -8647.49 9.04456 );
     }
 }
-CL-
+Cl-
 {
     specie
     {
@@ -19832,7 +19832,7 @@ C7H7_Quadri_Base
         lowCpCoeffs     ( -0.865668 0.0202947 0.000109981 -1.75784e-07 7.63992e-11 68615.1 31.45 );
     }
 }
-CBRCL3_Bromotric
+CBrCl3_Bromotric
 {
     specie
     {
@@ -19848,7 +19848,7 @@ CBRCL3_Bromotric
         lowCpCoeffs     ( 2.8408 0.0425731 -7.69558e-05 6.54734e-08 -2.13015e-11 -7238.49 12.5268 );
     }
 }
-CCL3F___FC-11
+CCl3F___FC-11
 {
     specie
     {
@@ -20008,7 +20008,7 @@ FeSO4(S)
         lowCpCoeffs     ( 1.36573 0.0529862 -7.03486e-05 4.90952e-08 -1.44139e-11 -113945 -6.31021 );
     }
 }
-C2BR4
+C2Br4
 {
     specie
     {
@@ -20056,7 +20056,7 @@ CH3-NH-NH-CH3_Sy
         lowCpCoeffs     ( 5.41669 0.00250625 7.35471e-05 -9.60749e-08 3.79945e-11 10565.4 3.29279 );
     }
 }
-DOBR
+DOBr
 {
     specie
     {
@@ -20120,7 +20120,7 @@ C4__triplet
         lowCpCoeffs     ( 3.68513 0.0184223 -3.11974e-05 2.9645e-08 -1.07298e-11 125759 5.42249 );
     }
 }
-SI2H6__Disilane
+Si2H6__Disilane
 {
     specie
     {
@@ -20168,7 +20168,7 @@ C3H2F3_CF3-CH=CH*
         lowCpCoeffs     ( 0.681987 0.0469264 -4.86401e-05 2.2047e-08 -2.75415e-12 -47231.4 22.9561 );
     }
 }
-CL2
+Cl2
 {
     specie
     {
@@ -20184,7 +20184,7 @@ CL2
         lowCpCoeffs     ( 2.73638 0.00783526 -1.45105e-05 1.25731e-08 -4.13247e-12 -1058.8 9.44557 );
     }
 }
-AL2O+
+Al2O+
 {
     specie
     {
@@ -20264,7 +20264,7 @@ COH
         lowCpCoeffs     ( 4.36381 -0.00535204 2.31955e-05 -2.66109e-08 1.02712e-11 25010.9 2.98106 );
     }
 }
-C4CL2
+C4Cl2
 {
     specie
     {
@@ -20328,7 +20328,7 @@ C5H10,cyclo-
         lowCpCoeffs     ( 3.70339 -0.0115575 0.000164113 -2.0937e-07 8.31059e-11 -10938.9 11.9773 );
     }
 }
-DOCL
+DOCl
 {
     specie
     {
@@ -20408,7 +20408,7 @@ NO
         lowCpCoeffs     ( 4.2186 -0.00463988 1.10443e-05 -9.34056e-09 2.80555e-12 9845.1 2.28061 );
     }
 }
-NO2CL
+NO2Cl
 {
     specie
     {
@@ -20488,7 +20488,7 @@ C6H9I-3-iodo
         lowCpCoeffs     ( 3.97475 0.0142793 0.000103556 -1.4999e-07 6.192e-11 5835.6 13.0713 );
     }
 }
-FeCL3
+FeCl3
 {
     specie
     {
@@ -20536,7 +20536,7 @@ C22H18_(C10H7CH2)2
         lowCpCoeffs     ( -9.01278 0.205116 -0.000183057 1.10357e-07 -3.44709e-11 28550.4 69.335 );
     }
 }
-C2HCL5
+C2HCl5
 {
     specie
     {
@@ -20568,7 +20568,7 @@ C3H3+_CH2=C=CH+
         lowCpCoeffs     ( 1.5491 0.0233307 -1.70274e-05 4.66368e-09 2.21539e-13 143166 13.7174 );
     }
 }
-CCL4
+CCl4
 {
     specie
     {
@@ -20840,7 +20840,7 @@ ZrN(cr)
         lowCpCoeffs     ( -1.60329 0.0435534 -0.000102727 1.12384e-07 -4.61701e-11 -45399.9 4.48755 );
     }
 }
-ALF
+AlF
 {
     specie
     {
@@ -20936,7 +20936,7 @@ MgI2
         lowCpCoeffs     ( 5.47324 0.0105458 -2.22792e-05 2.12039e-08 -7.48636e-12 -22593.5 4.23281 );
     }
 }
-C2CL
+C2Cl
 {
     specie
     {
@@ -21240,7 +21240,7 @@ CF-
         lowCpCoeffs     ( 2.67417 0.00577946 -7.7641e-06 5.08964e-09 -1.30782e-12 22801.9 8.08085 );
     }
 }
-C5H8CL
+C5H8Cl
 {
     specie
     {
@@ -21352,7 +21352,7 @@ K(cr)
         lowCpCoeffs     ( -2.08951 0.061632 -0.000240732 3.27256e-07 0 -636.098 9.11737 );
     }
 }
-ALO2-
+AlO2-
 {
     specie
     {
@@ -21576,7 +21576,7 @@ C3HCl2OH
         lowCpCoeffs     ( 3.1571 0.0399226 -4.67896e-05 2.89518e-08 -7.27289e-12 -2951.93 14.6502 );
     }
 }
-NOCL
+NOCl
 {
     specie
     {
@@ -21656,7 +21656,7 @@ CBr3__Radical
         lowCpCoeffs     ( 4.24875 0.0227424 -3.912e-05 3.19712e-08 -1.00758e-11 25938.1 10.3538 );
     }
 }
-CLF5
+ClF5
 {
     specie
     {
@@ -22040,7 +22040,7 @@ ZrC(cr)
         lowCpCoeffs     ( -1.12575 0.0338354 -6.64955e-05 6.40913e-08 -2.42647e-11 -24347.1 2.77083 );
     }
 }
-CCL2F
+CCl2F
 {
     specie
     {
@@ -22392,7 +22392,7 @@ C3H4N__CH3-CH*-CN
         lowCpCoeffs     ( 2.90886 0.021025 -3.11711e-06 -1.06743e-08 5.98989e-12 25029.2 12.2021 );
     }
 }
-PFCL
+PFCl
 {
     specie
     {
@@ -22520,7 +22520,7 @@ C3H6O3_Trioxane
         lowCpCoeffs     ( 3.55244 0.00170629 9.91147e-05 -1.31999e-07 5.26422e-11 -59030.2 10.6185 );
     }
 }
-ALH
+AlH
 {
     specie
     {
@@ -22760,7 +22760,7 @@ D
         lowCpCoeffs     ( 2.5 0 0 0 0 25921.3 0.591714 );
     }
 }
-C2CL2F4_CF3CFCL2
+C2Cl2F4_CF3CFCl2
 {
     specie
     {
@@ -22808,7 +22808,7 @@ SbCl2
         lowCpCoeffs     ( 3.26046 0.00813469 -5.31504e-06 -1.00842e-09 1.59478e-12 -13161.4 13.0106 );
     }
 }
-AL2O3
+Al2O3
 {
     specie
     {
@@ -22936,7 +22936,7 @@ C3H6_propylene
         lowCpCoeffs     ( 3.83464 0.00329079 5.05228e-05 -6.66251e-08 2.63707e-11 788.717 7.53408 );
     }
 }
-FeCL3(s)
+FeCl3(s)
 {
     specie
     {
@@ -23096,7 +23096,7 @@ HNNH-__trans
         lowCpCoeffs     ( 3.03932 0.00358025 8.30143e-06 -1.1908e-08 4.60611e-12 29701.1 8.63197 );
     }
 }
-SbCL5
+SbCl5
 {
     specie
     {
@@ -23240,7 +23240,7 @@ C9H18O6_TATP
         lowCpCoeffs     ( -1.19327 0.16895 -0.000171505 1.01467e-07 -2.60451e-11 -53390.5 23.2901 );
     }
 }
-C12H5CL4O2_RAD
+C12H5Cl4O2_RAD
 {
     specie
     {
@@ -23448,7 +23448,7 @@ P2
         lowCpCoeffs     ( 2.9606 0.00385561 -2.87398e-06 -3.19976e-10 8.10023e-13 16290.7 8.34523 );
     }
 }
-CBR3CL__TriBromo
+CBr3Cl__TriBromo
 {
     specie
     {
@@ -23480,7 +23480,7 @@ C6H3_CH2=C=C=C=C=C
         lowCpCoeffs     ( 1.50089 0.0545902 -7.88221e-05 6.27969e-08 -2.00769e-11 84913.4 17.6237 );
     }
 }
-CLF3
+ClF3
 {
     specie
     {
@@ -23592,7 +23592,7 @@ C3H4O2_AcrylAcid
         lowCpCoeffs     ( 1.24227 0.0300699 -1.48207e-06 -2.42738e-08 1.33122e-11 -40866.8 21.9243 );
     }
 }
-CHFCLBr
+CHFClBr
 {
     specie
     {
@@ -23608,7 +23608,7 @@ CHFCLBr
         lowCpCoeffs     ( 2.84647 0.0204936 -1.70059e-05 4.11372e-09 9.31157e-13 -29280.4 15.0637 );
     }
 }
-ALCL
+AlCl
 {
     specie
     {
@@ -23704,7 +23704,7 @@ CH3C(CH3)2CH3
         lowCpCoeffs     ( 3.56479 0.0290185 5.00307e-05 -8.66302e-08 3.72524e-11 -22877.4 6.73829 );
     }
 }
-GeCL2____triplet
+GeCl2____triplet
 {
     specie
     {
@@ -23720,7 +23720,7 @@ GeCL2____triplet
         lowCpCoeffs     ( 4.11513 0.0153508 -3.27832e-05 3.13345e-08 -1.10726e-11 10627.5 10.2028 );
     }
 }
-CL2O7
+Cl2O7
 {
     specie
     {
@@ -23768,7 +23768,7 @@ C8H7N__o-ToluoNitr
         lowCpCoeffs     ( 2.05214 0.038168 4.22551e-05 -8.69955e-08 3.87533e-11 20059 19.5286 );
     }
 }
-CLNC_biradical
+ClNC_biradical
 {
     specie
     {
@@ -23832,7 +23832,7 @@ NITRO-PENTANE
         lowCpCoeffs     ( 4.00704 0.0229727 0.000104023 -1.55574e-07 6.44329e-11 -22634.2 13.9587 );
     }
 }
-AR
+Ar
 {
     specie
     {
@@ -23928,7 +23928,7 @@ Na2O(a)
         lowCpCoeffs     7 { 0 };
     }
 }
-FeCL2(L)
+FeCl2(L)
 {
     specie
     {
@@ -23960,7 +23960,7 @@ Na2O(c)
         lowCpCoeffs     ( 2.1367 0.0391996 -8.50796e-05 8.70574e-08 -3.22937e-11 -51645.5 -11.76 );
     }
 }
-CF3-CHCL2__HF123
+CF3-CHCl2__HF123
 {
     specie
     {
@@ -24088,7 +24088,7 @@ C3H7_i-propyl
         lowCpCoeffs     ( 5.47421 -0.00842537 8.04608e-05 -9.49288e-08 3.59831e-11 9049.39 3.40542 );
     }
 }
-ALOH
+AlOH
 {
     specie
     {
@@ -24280,7 +24280,7 @@ C8H18,n-octane
         lowCpCoeffs     ( 12.5245 -0.0101019 0.000221993 -2.84864e-07 1.1241e-10 -29843.4 -19.711 );
     }
 }
-C12H6CL4O2
+C12H6Cl4O2
 {
     specie
     {
@@ -24408,7 +24408,7 @@ C12H10_biphenyl
         lowCpCoeffs     ( 0.1946 0.053526 8.55001e-05 -1.63904e-07 7.29976e-11 19002.1 27.2149 );
     }
 }
-NH4CL(III)
+NH4Cl(III)
 {
     specie
     {
@@ -24424,7 +24424,7 @@ NH4CL(III)
         lowCpCoeffs     ( 1.70591 0.0307824 -4.40956e-05 4.81013e-08 -1.91059e-11 -38502.2 -3.73732 );
     }
 }
-SO2FCL
+SO2FCl
 {
     specie
     {
@@ -24632,7 +24632,7 @@ C7H5(NO2)3_(TNT)
         lowCpCoeffs     ( 3.19573 0.086222 -2.31687e-05 -4.31208e-08 2.63453e-11 -1609.11 15.4068 );
     }
 }
-C2H5CL
+C2H5Cl
 {
     specie
     {
@@ -24696,7 +24696,7 @@ CH3C
         lowCpCoeffs     ( 3.59147 -6.65568e-05 2.69433e-05 -3.438e-08 1.35235e-11 59929.5 5.96528 );
     }
 }
-CH2CL
+CH2Cl
 {
     specie
     {
@@ -24856,7 +24856,7 @@ NCN
         lowCpCoeffs     ( 2.79808 0.0100009 -9.59242e-06 4.75566e-09 -1.04349e-12 53857.5 8.6213 );
     }
 }
-CHBR2
+CHBr2
 {
     specie
     {
@@ -24904,7 +24904,7 @@ CH3-_anion
         lowCpCoeffs     ( 4.35455 -0.00541267 2.17109e-05 -1.94567e-08 5.95104e-12 15405.2 -0.727196 );
     }
 }
-MgAL2O4(L)
+MgAl2O4(L)
 {
     specie
     {
@@ -25096,7 +25096,7 @@ C12H9,o-bipheny
         lowCpCoeffs     ( 0.407668 0.0542795 7.12516e-05 -1.44404e-07 6.48498e-11 48535.2 28.1981 );
     }
 }
-CLF
+ClF
 {
     specie
     {
@@ -25160,7 +25160,7 @@ N2O+
         lowCpCoeffs     ( 3.28691 0.00740222 -4.86664e-06 7.32928e-10 2.98234e-13 159103 7.40137 );
     }
 }
-CLCN
+ClCN
 {
     specie
     {
@@ -25688,7 +25688,7 @@ C3H3Cl_Chloro-Al
         lowCpCoeffs     ( 2.17406 0.0233296 -8.27347e-06 -8.72361e-09 6.26711e-12 19487 15.7635 );
     }
 }
-BFCL
+BFCl
 {
     specie
     {
@@ -25960,7 +25960,7 @@ C2H4F_beta-Fluor
         lowCpCoeffs     ( 4.38589 0.00444185 2.81593e-05 -3.89282e-08 1.56056e-11 -9031.77 6.2837 );
     }
 }
-AL(OH)3
+Al(OH)3
 {
     specie
     {
@@ -26024,7 +26024,7 @@ H6F6
         lowCpCoeffs     ( 4.76645 0.0786031 -0.000121157 9.36149e-08 -2.78945e-11 -221172 12.5468 );
     }
 }
-GeCL2____singlet
+GeCl2____singlet
 {
     specie
     {
@@ -26056,7 +26056,7 @@ C3H6_cyclo-
         lowCpCoeffs     ( 2.83279 -0.00521029 9.29583e-05 -1.22753e-07 4.99191e-11 5195.2 10.8306 );
     }
 }
-ALO+
+AlO+
 {
     specie
     {
@@ -26264,7 +26264,7 @@ H2O(L)
         lowCpCoeffs     ( 72.5575 -0.662445 0.00256199 -4.36592e-06 2.78179e-09 -41886.5 -288.28 );
     }
 }
-CBr2CLF___11B3
+CBr2ClF___11B3
 {
     specie
     {
@@ -26520,7 +26520,7 @@ N2O3
         lowCpCoeffs     ( 5.81084 0.0143331 -1.96209e-05 1.73061e-08 -6.46554e-12 8191.84 1.20461 );
     }
 }
-CL
+Cl
 {
     specie
     {
@@ -26536,7 +26536,7 @@ CL
         lowCpCoeffs     ( 2.26062 0.00154154 -6.80284e-07 -1.59973e-09 1.15417e-12 13855.3 6.57021 );
     }
 }
-Cl2C=C=CCL(O*)
+Cl2C=C=CCl(O*)
 {
     specie
     {
@@ -26584,7 +26584,7 @@ CrO
         lowCpCoeffs     ( 3.18819 0.00146295 3.31396e-06 -6.66294e-09 3.11838e-12 21611.6 10.0817 );
     }
 }
-ALCL3
+AlCl3
 {
     specie
     {
@@ -26616,7 +26616,7 @@ C4H3_E-1yl_Radical
         lowCpCoeffs     ( 0.554264 0.0386185 -4.70818e-05 3.0624e-08 -7.90588e-12 63797.5 21.0542 );
     }
 }
-COCL2
+COCl2
 {
     specie
     {
@@ -27272,7 +27272,7 @@ C4H5__1,3-Butadi
         lowCpCoeffs     ( 2.00881 0.0250341 4.4793e-06 -2.6399e-08 1.34433e-11 36207 15.9914 );
     }
 }
-MgCL2(L)
+MgCl2(L)
 {
     specie
     {
@@ -27320,7 +27320,7 @@ CH3+
         lowCpCoeffs     ( 4.73044 -0.0086626 3.12269e-05 -3.13569e-08 1.09957e-11 131270 -3.03198 );
     }
 }
-ALBr3
+AlBr3
 {
     specie
     {
@@ -27448,7 +27448,7 @@ HPO
         lowCpCoeffs     ( 4.13953 -0.00375644 2.10092e-05 -2.45888e-08 9.33164e-12 -12480.7 5.14556 );
     }
 }
-FeOCL(cr)
+FeOCl(cr)
 {
     specie
     {
@@ -27784,7 +27784,7 @@ CrO3
         lowCpCoeffs     ( 2.2336 0.0241281 -3.23842e-05 2.06088e-08 -5.05776e-12 -40222.5 13.7496 );
     }
 }
-BOCL2
+BOCl2
 {
     specie
     {
@@ -27800,7 +27800,7 @@ BOCL2
         lowCpCoeffs     ( 2.39602 0.0242258 -3.58262e-05 2.65234e-08 -7.85785e-12 -45009.4 15.654 );
     }
 }
-Fe2CL4
+Fe2Cl4
 {
     specie
     {
@@ -28344,7 +28344,7 @@ CD2_Deutherometh
         lowCpCoeffs     ( 3.55503 0.00336947 -3.5028e-06 4.99693e-09 -2.45123e-12 44827.3 3.42741 );
     }
 }
-C2H2CL2_1,1-
+C2H2Cl2_1,1-
 {
     specie
     {
@@ -28360,7 +28360,7 @@ C2H2CL2_1,1-
         lowCpCoeffs     ( 1.09096 0.0338226 -4.14124e-05 2.66328e-08 -6.88458e-12 -1247.49 19.9996 );
     }
 }
-BFCL2
+BFCl2
 {
     specie
     {
@@ -28504,7 +28504,7 @@ C3H2(1)_HCC-CH**
         lowCpCoeffs     ( 2.87527 0.0199236 -2.41971e-05 1.66378e-08 -4.69231e-12 96819.2 8.88674 );
     }
 }
-HALO
+HAlO
 {
     specie
     {
@@ -28776,7 +28776,7 @@ C6H7_1,3,5_Linear
         lowCpCoeffs     ( 2.82605 0.0348405 1.31407e-05 -4.6882e-08 2.29961e-11 49458.2 17.0295 );
     }
 }
-HCLO4
+HClO4
 {
     specie
     {
@@ -28872,7 +28872,7 @@ N2-
         lowCpCoeffs     ( 3.87906 -0.00316855 8.46825e-06 -7.28826e-09 2.18785e-12 21755.2 3.12725 );
     }
 }
-BCL2+
+BCl2+
 {
     specie
     {
@@ -29016,7 +29016,7 @@ NH4NO3_gas
         lowCpCoeffs     ( 4.14853 0.0269825 -9.75933e-06 -6.09907e-09 4.33965e-12 -30074.6 8.49838 );
     }
 }
-CL+
+Cl+
 {
     specie
     {
@@ -29128,7 +29128,7 @@ F2O+__FOF+
         lowCpCoeffs     ( 2.46499 0.0109177 -1.05316e-05 4.05496e-09 -3.04762e-13 154795 13.2086 );
     }
 }
-ALF2-
+AlF2-
 {
     specie
     {
@@ -29320,7 +29320,7 @@ C10H8O__Naphtol
         lowCpCoeffs     ( -2.08768 0.07681 -1.53593e-05 -4.04658e-08 2.3376e-11 -6290.56 34.3331 );
     }
 }
-ALH3
+AlH3
 {
     specie
     {
@@ -29384,7 +29384,7 @@ s-1,2,3,5-C6H2Cl4
         lowCpCoeffs     ( 2.48196 0.0655633 -5.95894e-05 2.22036e-08 -1.43435e-12 -5391.51 16.9276 );
     }
 }
-CCL2F2_FREON-12
+CCl2F2_FREON-12
 {
     specie
     {
@@ -29704,7 +29704,7 @@ CH3S_Radical
         lowCpCoeffs     ( 2.56437 0.0115796 -4.5012e-06 -5.02342e-10 6.95253e-13 13370.6 11.2505 );
     }
 }
-CHFCL2___FC-21
+CHFCl2___FC-21
 {
     specie
     {
@@ -30200,7 +30200,7 @@ C2H2Br2_trans
         lowCpCoeffs     ( 3.8637 0.016965 -3.41692e-06 -1.08161e-08 6.58651e-12 10083.8 10.913 );
     }
 }
-SiCL2
+SiCl2
 {
     specie
     {
@@ -30440,7 +30440,7 @@ C4F8_CY
         lowCpCoeffs     ( -6.40876 0.117788 -0.000157354 1.1578e-07 -3.71123e-11 -184189 56.1863 );
     }
 }
-CHCL3_Chloroform
+CHCl3_Chloroform
 {
     specie
     {
@@ -30584,7 +30584,7 @@ CH3-NH-NH2
         lowCpCoeffs     ( 3.36546 0.00916487 4.07415e-05 -6.18271e-08 2.62064e-11 11498.2 9.75315 );
     }
 }
-SCL
+SCl
 {
     specie
     {
@@ -31224,7 +31224,7 @@ C24H17
         lowCpCoeffs     ( -16.409 0.226724 -0.000140015 -2.78751e-09 2.47131e-11 70999.3 110.51 );
     }
 }
-BCL2
+BCl2
 {
     specie
     {
@@ -31464,7 +31464,7 @@ CI
         lowCpCoeffs     ( 1.89139 0.0167386 -3.68508e-05 3.50616e-08 -1.22019e-11 67533.2 14.609 );
     }
 }
-C12H6CL2O2
+C12H6Cl2O2
 {
     specie
     {
@@ -31512,7 +31512,7 @@ C13H10O__Benzoph
         lowCpCoeffs     ( 2.03306 0.0530785 0.000104699 -1.89967e-07 8.33778e-11 4094.98 22.7448 );
     }
 }
-C2H2CL2_Equilibriu
+C2H2Cl2_Equilibriu
 {
     specie
     {
@@ -31544,7 +31544,7 @@ HNO2+_cis____HF2
         lowCpCoeffs     ( 2.63706 0.0102578 -5.14296e-06 -5.04116e-10 9.47515e-13 120845 12.4287 );
     }
 }
-CBR
+CBr
 {
     specie
     {
@@ -31624,7 +31624,7 @@ H2Sn(C2H5)2
         lowCpCoeffs     ( 5.22643 0.0383917 2.00663e-05 -5.18249e-08 2.32704e-11 3442.92 7.61235 );
     }
 }
-AL2O3(b)
+Al2O3(b)
 {
     specie
     {
@@ -31672,7 +31672,7 @@ MgSiO3(III)
         lowCpCoeffs     7 { 0 };
     }
 }
-C5H7CL2
+C5H7Cl2
 {
     specie
     {
@@ -31736,7 +31736,7 @@ HCCNO2
         lowCpCoeffs     ( 1.34403 0.0333183 -3.93939e-05 2.41125e-08 -5.90505e-12 31935.8 18.7891 );
     }
 }
-S2CL2
+S2Cl2
 {
     specie
     {
@@ -31944,7 +31944,7 @@ C4H9O_DiEthyl_Et
         lowCpCoeffs     ( 7.25386 -0.000750391 0.000104998 -1.35171e-07 5.26869e-11 -8118.19 -0.573033 );
     }
 }
-C2BR6
+C2Br6
 {
     specie
     {
@@ -32248,7 +32248,7 @@ C4H8O2_DIOXANE
         lowCpCoeffs     ( 4.81265 -0.00385996 0.000125372 -1.60862e-07 6.33257e-11 -37571.3 6.04153 );
     }
 }
-ALO
+AlO
 {
     specie
     {
@@ -32392,7 +32392,7 @@ NO2-
         lowCpCoeffs     ( 3.09784 0.00370486 5.92941e-06 -1.09497e-08 4.62722e-12 -24155.4 9.48237 );
     }
 }
-C2HBR4_1,1,2,2
+C2HBr4_1,1,2,2
 {
     specie
     {
@@ -32424,7 +32424,7 @@ F2+
         lowCpCoeffs     ( 3.96417 -0.000599836 4.03663e-06 -4.74261e-09 1.76772e-12 181724 2.80862 );
     }
 }
-CF2CL-CHCLF_123a
+CF2Cl-CHClF_123a
 {
     specie
     {
@@ -32456,7 +32456,7 @@ COOH
         lowCpCoeffs     ( 2.92208 0.00762454 3.29884e-06 -1.07135e-08 5.11587e-12 -23028.2 11.2926 );
     }
 }
-CH3COCL_Acetyl-CL
+CH3COCl_Acetyl-Cl
 {
     specie
     {
@@ -32472,7 +32472,7 @@ CH3COCL_Acetyl-CL
         lowCpCoeffs     ( 3.9884 0.0126777 7.80939e-06 -1.82292e-08 7.97984e-12 -30830 8.16676 );
     }
 }
-NE
+Ne
 {
     specie
     {
@@ -33048,7 +33048,7 @@ C2H5O-__CH3C*HOH-
         lowCpCoeffs     ( 2.73686 0.0206277 -7.16876e-06 -3.02068e-09 2.28832e-12 -6393.69 12.5982 );
     }
 }
-C12H4CL6O2__tric
+C12H4Cl6O2__tric
 {
     specie
     {
@@ -33064,7 +33064,7 @@ C12H4CL6O2__tric
         lowCpCoeffs     ( 3.28452 0.141319 -0.000138658 5.99059e-08 -7.31751e-12 -30439.2 19.9985 );
     }
 }
-COCL
+COCl
 {
     specie
     {
@@ -33400,7 +33400,7 @@ C4H10_isobutane
         lowCpCoeffs     ( 4.45479 0.00826059 8.29886e-05 -1.14648e-07 4.6457e-11 -18459.4 4.92741 );
     }
 }
-C12H5CL5O2_PD
+C12H5Cl5O2_PD
 {
     specie
     {
@@ -33592,7 +33592,7 @@ MgSO4(I)
         lowCpCoeffs     7 { 0 };
     }
 }
-C2HFCL2_equilibr
+C2HFCl2_equilibr
 {
     specie
     {
@@ -33800,7 +33800,7 @@ C18H36O2_etPalmita
         lowCpCoeffs     ( 0.607765 0.187616 -4.8932e-05 -5.75354e-08 3.32268e-11 -96555.9 43.5519 );
     }
 }
-COFCL
+COFCl
 {
     specie
     {
@@ -33896,7 +33896,7 @@ C6H6+_Benzene_ion
         lowCpCoeffs     ( -2.36188 0.050756 -2.00023e-05 -1.27434e-08 9.63134e-12 116788 33.7617 );
     }
 }
-BRCN
+BrCN
 {
     specie
     {
@@ -33976,7 +33976,7 @@ C8H7___i-styryl
         lowCpCoeffs     ( 0.595576 0.0431716 3.39695e-05 -8.55153e-08 4.02635e-11 41975.6 25.7012 );
     }
 }
-GeCL
+GeCl
 {
     specie
     {
@@ -33992,7 +33992,7 @@ GeCL
         lowCpCoeffs     ( 2.72445 0.00895175 -1.25463e-05 6.75349e-09 -1.04008e-12 7190.16 11.8835 );
     }
 }
-CHCLF2__HCFC-22
+CHClF2__HCFC-22
 {
     specie
     {
@@ -34632,7 +34632,7 @@ C19H36O2_meOleic
         lowCpCoeffs     ( 1.03901 0.189498 -4.90209e-05 -6.24649e-08 3.76956e-11 -82267.1 52.4855 );
     }
 }
-MgCL2
+MgCl2
 {
     specie
     {
@@ -34696,7 +34696,7 @@ C6H6_1,3-Butadie
         lowCpCoeffs     ( 0.744284 0.0472659 -2.19464e-05 -9.84219e-09 9.27386e-12 39556.6 21.8138 );
     }
 }
-MgCL2(cr)
+MgCl2(cr)
 {
     specie
     {
@@ -34744,7 +34744,7 @@ GeS2(II)(s)
         lowCpCoeffs     ( 5.26457 0.0158411 -3.14864e-05 3.00355e-08 -1.04866e-11 -17420.7 -22.3062 );
     }
 }
-AL2O
+Al2O
 {
     specie
     {
@@ -34792,7 +34792,7 @@ Mg2SiO4(L)
         lowCpCoeffs     7 { 0 };
     }
 }
-SCL2+
+SCl2+
 {
     specie
     {
@@ -34888,7 +34888,7 @@ C2Cl5___Pentachl
         lowCpCoeffs     ( 3.91975 0.0549683 -9.27441e-05 7.45661e-08 -2.32158e-11 -284.949 13.3912 );
     }
 }
-C2BR3
+C2Br3
 {
     specie
     {
@@ -35048,7 +35048,7 @@ C8H7___1,3,5,7_Cy
         lowCpCoeffs     ( 0.221489 0.0439671 3.08077e-05 -8.02318e-08 3.77773e-11 58455.7 25.8576 );
     }
 }
-PBS(cr)__GALENA
+PbS(cr)__GALENA
 {
     specie
     {
@@ -35208,7 +35208,7 @@ C4H6Cl2_1,4-DiCl
         lowCpCoeffs     ( 4.62931 0.0213074 4.38339e-05 -8.04356e-08 3.58875e-11 -8812.42 12.3975 );
     }
 }
-CHBr2CL
+CHBr2Cl
 {
     specie
     {
@@ -35272,7 +35272,7 @@ ClC2H4OH__ATcT_C
         lowCpCoeffs     ( 3.29693 0.0155882 2.61101e-05 -4.87089e-08 2.16773e-11 -33904.2 13.6163 );
     }
 }
-ALBr
+AlBr
 {
     specie
     {
@@ -35336,7 +35336,7 @@ Na2O
         lowCpCoeffs     ( 4.47778 0.0141517 -2.77158e-05 2.4968e-08 -8.46423e-12 -3756.21 3.92862 );
     }
 }
-CHCL
+CHCl
 {
     specie
     {
@@ -35416,7 +35416,7 @@ C4F6_CycloButene
         lowCpCoeffs     ( 4.2381 0.0498 -4.01139e-05 9.85389e-09 1.49299e-12 -148774 8.3064 );
     }
 }
-C24CL12_Coronene
+C24Cl12_Coronene
 {
     specie
     {
@@ -35672,7 +35672,7 @@ C7H8__1,6-diyne
         lowCpCoeffs     ( 2.65094 0.0475342 -6.58275e-06 -2.70985e-08 1.531e-11 44797.6 14.6492 );
     }
 }
-CHCL2
+CHCl2
 {
     specie
     {
@@ -35784,7 +35784,7 @@ B3O3F3
         lowCpCoeffs     ( 2.25601 0.046567 -3.26831e-05 1.27816e-09 5.045e-12 -289030 16.0606 );
     }
 }
-PbCL
+PbCl
 {
     specie
     {
@@ -35832,7 +35832,7 @@ C10_linear_triple
         lowCpCoeffs     ( 3.4855 0.0640662 -9.35342e-05 7.56085e-08 -2.48799e-11 206209 10.6203 );
     }
 }
-C2CL2F4__FC-114
+C2Cl2F4__FC-114
 {
     specie
     {
@@ -35928,7 +35928,7 @@ C7H5NS_Benzothiaz
         lowCpCoeffs     ( -0.923877 0.0491355 1.97405e-05 -7.21022e-08 3.54777e-11 22598.7 30.7415 );
     }
 }
-ALCL2
+AlCl2
 {
     specie
     {
@@ -36200,7 +36200,7 @@ HNO3+
         lowCpCoeffs     ( 0.696075 0.0308976 -4.05429e-05 2.68505e-08 -7.08467e-12 122156 22.6095 );
     }
 }
-CCLF
+CClF
 {
     specie
     {
@@ -36408,12 +36408,12 @@ C3H7NO3_NPN
         lowCpCoeffs     ( 4.69954 0.0174527 6.53066e-05 -9.90515e-08 4.08918e-11 -24608.3 11.0308 );
     }
 }
-AIR
+air
 {
     specie
     {
         nMoles          1;
-        molWeight       0;
+        molWeight       28.9644;
     }
     thermodynamics
     {
@@ -36808,7 +36808,7 @@ CH2O+_Fornald_cati
         lowCpCoeffs     ( 2.99008 0.00405957 7.18536e-06 -1.01674e-08 3.74118e-12 112947 8.64302 );
     }
 }
-C12H6CL2O
+C12H6Cl2O
 {
     specie
     {
@@ -36952,7 +36952,7 @@ Na2O(L)
         lowCpCoeffs     7 { 0 };
     }
 }
-CH2BRCOOH
+CH2BrCOOH
 {
     specie
     {

From 72e03b1799b1bab01cc75bddd37fd8da2de76f8d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 10 Aug 2015 10:01:36 +0100
Subject: [PATCH 04/70] face: Add handling for duplicate vertices in
 sameVertices Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1821

---
 src/OpenFOAM/meshes/meshShapes/face/face.C    | 22 +++++++++++--------
 src/mesh/blockMesh/blockMesh/blockMeshCheck.C |  3 +--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index e7b8c5e3e9..30847ce3ca 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -427,18 +427,22 @@ bool Foam::face::sameVertices(const face& a, const face& b)
 
     forAll(a, i)
     {
-        bool found = false;
-
-        forAll(b, j)
+        // Count occurrences of a[i] in a
+        label aOcc = 0;
+        forAll(a, j)
         {
-            if (a[i] == b[j])
-            {
-                found = true;
-                break;
-            }
+            if (a[i] == a[j]) aOcc++;
         }
 
-        if (!found) return false;
+        // Count occurrences of a[i] in b
+        label bOcc = 0;
+        forAll(b, j)
+        {
+            if (a[i] == b[j]) bOcc++;
+        }
+
+        // Check if occurrences of a[i] in a and b are the same
+        if (aOcc != bOcc) return false;
     }
 
     return true;
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshCheck.C b/src/mesh/blockMesh/blockMesh/blockMeshCheck.C
index b44f7259b8..39c7ed6c10 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshCheck.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshCheck.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Check the blockMesh topology
 void Foam::blockMesh::checkBlockMesh(const polyMesh& bm) const
 {
     if (verboseOutput)

From fbb330414b96643b21a581dc9a2caee54a5fafa4 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 10 Aug 2015 12:06:13 +0100
Subject: [PATCH 05/70] transformFvPatchField: Specialize valueInternalCoeffs
 for scalar Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1820

---
 .../basic/transform/transformFvPatchField.C   | 35 ++++++++-----------
 .../basic/transform/transformFvPatchField.H   | 10 ++++--
 .../transform/transformFvPatchScalarField.C   | 24 +++++++------
 3 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
index 2af9131b02..901c81e9cc 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,15 +27,10 @@ License
 #include "IOstreams.H"
 #include "transformField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-transformFvPatchField<Type>::transformFvPatchField
+Foam::transformFvPatchField<Type>::transformFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -46,7 +41,7 @@ transformFvPatchField<Type>::transformFvPatchField
 
 
 template<class Type>
-transformFvPatchField<Type>::transformFvPatchField
+Foam::transformFvPatchField<Type>::transformFvPatchField
 (
     const transformFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -59,7 +54,7 @@ transformFvPatchField<Type>::transformFvPatchField
 
 
 template<class Type>
-transformFvPatchField<Type>::transformFvPatchField
+Foam::transformFvPatchField<Type>::transformFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
@@ -71,7 +66,7 @@ transformFvPatchField<Type>::transformFvPatchField
 
 
 template<class Type>
-transformFvPatchField<Type>::transformFvPatchField
+Foam::transformFvPatchField<Type>::transformFvPatchField
 (
     const transformFvPatchField<Type>& ptf
 )
@@ -81,7 +76,7 @@ transformFvPatchField<Type>::transformFvPatchField
 
 
 template<class Type>
-transformFvPatchField<Type>::transformFvPatchField
+Foam::transformFvPatchField<Type>::transformFvPatchField
 (
     const transformFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -94,7 +89,8 @@ transformFvPatchField<Type>::transformFvPatchField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<Field<Type> > transformFvPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::transformFvPatchField<Type>::valueInternalCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -104,7 +100,8 @@ tmp<Field<Type> > transformFvPatchField<Type>::valueInternalCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > transformFvPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::transformFvPatchField<Type>::valueBoundaryCoeffs
 (
     const tmp<scalarField>&
 ) const
@@ -120,14 +117,16 @@ tmp<Field<Type> > transformFvPatchField<Type>::valueBoundaryCoeffs
 
 
 template<class Type>
-tmp<Field<Type> > transformFvPatchField<Type>::gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::transformFvPatchField<Type>::gradientInternalCoeffs() const
 {
     return -this->patch().deltaCoeffs()*snGradTransformDiag();
 }
 
 
 template<class Type>
-tmp<Field<Type> > transformFvPatchField<Type>::gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::transformFvPatchField<Type>::gradientBoundaryCoeffs() const
 {
     return
         snGrad()
@@ -138,7 +137,7 @@ tmp<Field<Type> > transformFvPatchField<Type>::gradientBoundaryCoeffs() const
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Type>
-void transformFvPatchField<Type>::operator=
+void Foam::transformFvPatchField<Type>::operator=
 (
     const fvPatchField<Type>& ptf
 )
@@ -147,8 +146,4 @@ void transformFvPatchField<Type>::operator=
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
index 0eab206104..76174f2627 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -153,7 +153,13 @@ public:
 // * * * * * * * * * * * Template Specialisations  * * * * * * * * * * * * * //
 
 template<>
-tmp<scalarField > transformFvPatchField<scalar>::gradientInternalCoeffs() const;
+tmp<scalarField> transformFvPatchField<scalar>::valueInternalCoeffs
+(
+    const tmp<scalarField>&
+) const;
+
+template<>
+tmp<scalarField> transformFvPatchField<scalar>::gradientInternalCoeffs() const;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
index 506374c742..81947be896 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,21 +25,25 @@ License
 
 #include "transformFvPatchField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<>
-tmp<scalarField > transformFvPatchField<scalar>::gradientInternalCoeffs() const
+Foam::tmp<Foam::scalarField>
+Foam::transformFvPatchField<Foam::scalar>::valueInternalCoeffs
+(
+    const tmp<scalarField>&
+) const
 {
-    return tmp<scalarField >(new scalarField(size(), 0.0));
+     return tmp<scalarField>(new scalarField(size(), 1.0));
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+template<>
+Foam::tmp<Foam::scalarField>
+Foam::transformFvPatchField<Foam::scalar>::gradientInternalCoeffs() const
+{
+    return tmp<scalarField>(new scalarField(size(), 0.0));
+}
+
 
 // ************************************************************************* //

From 3449f4a503d87439c2a5711ed3b5c2cf29b7cf75 Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Tue, 11 Aug 2015 14:48:58 +0100
Subject: [PATCH 06/70] Template explicitPorositySource fvOption with a set of
 template coordinate systems for the porous media

---
 .../general/coordinateSystem/cartesianXY      | 26 ++++++++
 .../general/coordinateSystem/cartesianXZ      | 26 ++++++++
 .../general/coordinateSystem/cartesianYZ      | 26 ++++++++
 .../general/coordinateSystem/cylindrical      | 24 ++++++++
 .../general/fvOptions/porosity/porousZone     | 60 +++++++++++++++++++
 5 files changed, 162 insertions(+)
 create mode 100644 etc/caseDicts/general/coordinateSystem/cartesianXY
 create mode 100644 etc/caseDicts/general/coordinateSystem/cartesianXZ
 create mode 100644 etc/caseDicts/general/coordinateSystem/cartesianYZ
 create mode 100644 etc/caseDicts/general/coordinateSystem/cylindrical
 create mode 100644 etc/caseDicts/general/fvOptions/porosity/porousZone

diff --git a/etc/caseDicts/general/coordinateSystem/cartesianXY b/etc/caseDicts/general/coordinateSystem/cartesianXY
new file mode 100644
index 0000000000..020366c10f
--- /dev/null
+++ b/etc/caseDicts/general/coordinateSystem/cartesianXY
@@ -0,0 +1,26 @@
+/*--------------------------------*- 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      cartesianXY;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type      cartesian;
+origin    (0 0 0);
+coordinateRotation
+{
+    type  axesRotation;
+    e1    $x;
+    e2    $y;
+}
+
+//************************************************************************* //
diff --git a/etc/caseDicts/general/coordinateSystem/cartesianXZ b/etc/caseDicts/general/coordinateSystem/cartesianXZ
new file mode 100644
index 0000000000..e1be4c9dd4
--- /dev/null
+++ b/etc/caseDicts/general/coordinateSystem/cartesianXZ
@@ -0,0 +1,26 @@
+/*--------------------------------*- 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      cartesianXZ;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type      cartesian;
+origin    (0 0 0);
+coordinateRotation
+{
+    type  axesRotation;
+    e1    $x;
+    e3    $z;
+}
+
+//************************************************************************* //
diff --git a/etc/caseDicts/general/coordinateSystem/cartesianYZ b/etc/caseDicts/general/coordinateSystem/cartesianYZ
new file mode 100644
index 0000000000..e2def70c32
--- /dev/null
+++ b/etc/caseDicts/general/coordinateSystem/cartesianYZ
@@ -0,0 +1,26 @@
+/*--------------------------------*- 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      cartesianYZ;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type      cartesian;
+origin    (0 0 0);
+coordinateRotation
+{
+    type  axesRotation;
+    e2    $y;
+    e3    $z
+}
+
+//************************************************************************* //
diff --git a/etc/caseDicts/general/coordinateSystem/cylindrical b/etc/caseDicts/general/coordinateSystem/cylindrical
new file mode 100644
index 0000000000..ff5b3559d3
--- /dev/null
+++ b/etc/caseDicts/general/coordinateSystem/cylindrical
@@ -0,0 +1,24 @@
+/*--------------------------------*- 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      cylindrical;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type      cartesian;
+coordinateRotation
+{
+    type  localAxesRotation;
+    e3    $axis;
+}
+
+//************************************************************************* //
diff --git a/etc/caseDicts/general/fvOptions/porosity/porousZone b/etc/caseDicts/general/fvOptions/porosity/porousZone
new file mode 100644
index 0000000000..393edc6346
--- /dev/null
+++ b/etc/caseDicts/general/fvOptions/porosity/porousZone
@@ -0,0 +1,60 @@
+/*--------------------------------*- 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      porousZone;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+porousZone // Change to something more descriptive
+{
+    type           explicitPorositySource;
+    active         true;
+    selectionMode  cellZone;
+    cellZone       <cellZoneName>; // Specify the name of the cellZone
+
+    explicitPorositySourceCoeffs
+    {
+        type           DarcyForchheimer;
+
+        DarcyForchheimerCoeffs
+        {
+            // Negative coeffs are multiplied by largest positive coeff,
+            // taking the magnitude, e.g. for -1000, coeff = |1e7*-1000| = 1e10
+
+            d          d [0 -2 0 0 0 0 0] (1e7 -1000 -1000);
+            f          f [0 -1 0 0 0 0 0] (0 0 0);
+
+            coordinateSystem // Cartesian coordinates for the cellZone
+            {
+                x          (1 0 0);
+                y          (0 1 0);
+                #includeEtc "caseDicts/general/coordinateSystem/cartesianXY"
+            }
+        }
+
+        fixedCoeffCoeffs
+        {
+            alpha      alpha [0 0 -1 0 0 0 0] (100 -1000 -1000);
+            beta       beta  [0 -1 0 0 0 0 0] (0 0 0);
+            rhoRef     1.205;
+
+            coordinateSystem // Cylindrical coordinates for the cellZone
+            {
+                origin     (0 0 0);
+                axis       (0 0 1);
+                #includeEtc "caseDicts/general/coordinateSystem/cylindrical"
+            }
+        }
+    }
+}
+
+//************************************************************************** //

From a275e9d7f2d30f53bd46fe45343ef5843746776c Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Tue, 11 Aug 2015 14:54:48 +0100
Subject: [PATCH 07/70] porousZone template: removed duplicate name in
 dimensionedScalars

---
 etc/caseDicts/general/fvOptions/porosity/porousZone | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/caseDicts/general/fvOptions/porosity/porousZone b/etc/caseDicts/general/fvOptions/porosity/porousZone
index 393edc6346..f7ab42ffed 100644
--- a/etc/caseDicts/general/fvOptions/porosity/porousZone
+++ b/etc/caseDicts/general/fvOptions/porosity/porousZone
@@ -30,8 +30,8 @@ porousZone // Change to something more descriptive
             // Negative coeffs are multiplied by largest positive coeff,
             // taking the magnitude, e.g. for -1000, coeff = |1e7*-1000| = 1e10
 
-            d          d [0 -2 0 0 0 0 0] (1e7 -1000 -1000);
-            f          f [0 -1 0 0 0 0 0] (0 0 0);
+            d          [0 -2 0 0 0 0 0] (1e7 -1000 -1000);
+            f          [0 -1 0 0 0 0 0] (0 0 0);
 
             coordinateSystem // Cartesian coordinates for the cellZone
             {
@@ -43,8 +43,8 @@ porousZone // Change to something more descriptive
 
         fixedCoeffCoeffs
         {
-            alpha      alpha [0 0 -1 0 0 0 0] (100 -1000 -1000);
-            beta       beta  [0 -1 0 0 0 0 0] (0 0 0);
+            alpha      [0 0 -1 0 0 0 0] (100 -1000 -1000);
+            beta       [0 -1 0 0 0 0 0] (0 0 0);
             rhoRef     1.205;
 
             coordinateSystem // Cylindrical coordinates for the cellZone

From 573e8a891faef15545eefa9acaf92c35689124e3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 13 Aug 2015 09:25:28 +0100
Subject: [PATCH 08/70] Rename localAxesRotation -> cylindrical

This class does not simply rotate the coordinate system is also changes
it from Cartesian to cylindrical which is not clear from the original name.

We plan to rewrite the coordinateRotation classes to be
coordinateTransformation classes and massively simplify the interface
from the currently unintelligible mess.
---
 .../derived/rotorDiskSource/rotorDiskSource.C | 10 +--
 .../derived/rotorDiskSource/rotorDiskSource.H |  4 +-
 .../rotorDiskSourceTemplates.C                |  4 +-
 src/meshTools/Make/files                      |  2 +-
 .../coordinateRotation/coordinateRotation.H   |  4 +-
 .../{localAxesRotation.C => cylindrical.C}    | 70 +++++++++----------
 .../{localAxesRotation.H => cylindrical.H}    | 40 +++++------
 .../coordinateSystems/coordinateSystem.H      |  6 +-
 8 files changed, 70 insertions(+), 70 deletions(-)
 rename src/meshTools/coordinateSystems/coordinateRotation/{localAxesRotation.C => cylindrical.C} (75%)
 rename src/meshTools/coordinateSystems/coordinateRotation/{localAxesRotation.H => cylindrical.H} (86%)

diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index c638d06ad4..73e11394e7 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -334,9 +334,9 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
 
             coeffs_.lookup("refDirection") >> refDir;
 
-            localAxesRotation_.reset
+            cylindrical_.reset
             (
-                new localAxesRotation
+                new cylindrical
                 (
                     mesh_,
                     axis,
@@ -357,9 +357,9 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
             coeffs_.lookup("axis") >> axis;
             coeffs_.lookup("refDirection") >> refDir;
 
-            localAxesRotation_.reset
+            cylindrical_.reset
             (
-                new localAxesRotation
+                new cylindrical
                 (
                     mesh_,
                     axis,
@@ -491,7 +491,7 @@ Foam::fv::rotorDiskSource::rotorDiskSource
     invR_(cells_.size(), I),
     area_(cells_.size(), 0.0),
     coordSys_(false),
-    localAxesRotation_(),
+    cylindrical_(),
     rMax_(0.0),
     trim_(trimModel::New(*this, coeffs_)),
     blade_(coeffs_.subDict("blade")),
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
index ddd4c6cae9..f94a463eb7 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -103,7 +103,7 @@ SourceFiles
 
 #include "cellSetOption.H"
 #include "cylindricalCS.H"
-#include "localAxesRotation.H"
+#include "cylindrical.H"
 #include "NamedEnum.H"
 #include "bladeModel.H"
 #include "profileModelList.H"
@@ -201,7 +201,7 @@ protected:
         cylindricalCS coordSys_;
 
          //- Rotor transformation co-ordinate system
-        autoPtr<localAxesRotation> localAxesRotation_;
+        autoPtr<cylindrical> cylindrical_;
 
         //- Maximum radius
         scalar rMax_;
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
index 83a29e2248..a0664e696d 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
@@ -59,7 +59,7 @@ void Foam::fv::rotorDiskSource::calculate
             const scalar radius = x_[i].x();
 
             // Transform velocity into local cylindrical reference frame
-            vector Uc = localAxesRotation_->invTransform(U[cellI], i);
+            vector Uc = cylindrical_->invTransform(U[cellI], i);
 
             // Transform velocity into local coning system
             Uc = R_[i] & Uc;
@@ -132,7 +132,7 @@ void Foam::fv::rotorDiskSource::calculate
             localForce = invR_[i] & localForce;
 
             // Transform force into global Cartesian co-ordinate system
-            force[cellI] = localAxesRotation_->transform(localForce, i);
+            force[cellI] = cylindrical_->transform(localForce, i);
 
             if (divideVolume)
             {
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index d704929503..0c1b794f7c 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -20,7 +20,7 @@ $(csys)/coordinateRotation/coordinateRotation.C
 $(csys)/coordinateRotation/coordinateRotationNew.C
 $(csys)/coordinateRotation/EulerCoordinateRotation.C
 $(csys)/coordinateRotation/STARCDCoordinateRotation.C
-$(csys)/coordinateRotation/localAxesRotation.C
+$(csys)/coordinateRotation/cylindrical.C
 
 edgeFaceCirculator/edgeFaceCirculator.C
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
index 0e90d7aa8f..ae37a3764f 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ Description
     Types of coordinateRotation:
     1) axesRotation
     2) STARCDRotation
-    3) localAxesRotation
+    3) cylindrical
     4) EulerCoordinateRotation
 
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/localAxesRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
similarity index 75%
rename from src/meshTools/coordinateSystems/coordinateRotation/localAxesRotation.C
rename to src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
index 53c18f9fb9..8d0c85568c 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/localAxesRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "localAxesRotation.H"
+#include "cylindrical.H"
 #include "axesRotation.H"
 #include "addToRunTimeSelectionTable.H"
 #include "polyMesh.H"
@@ -33,17 +33,17 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(localAxesRotation, 0);
+    defineTypeNameAndDebug(cylindrical, 0);
     addToRunTimeSelectionTable
     (
         coordinateRotation,
-        localAxesRotation,
+        cylindrical,
         dictionary
     );
     addToRunTimeSelectionTable
     (
         coordinateRotation,
-        localAxesRotation,
+        cylindrical,
         objectRegistry
     );
 }
@@ -51,7 +51,7 @@ namespace Foam
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
-void Foam::localAxesRotation::init
+void Foam::cylindrical::init
 (
     const objectRegistry& obr,
     const List<label>& cells
@@ -92,7 +92,7 @@ void Foam::localAxesRotation::init
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::localAxesRotation::localAxesRotation
+Foam::cylindrical::cylindrical
 (
     const dictionary& dict,
     const objectRegistry& obr
@@ -115,7 +115,7 @@ Foam::localAxesRotation::localAxesRotation
 }
 
 
-Foam::localAxesRotation::localAxesRotation
+Foam::cylindrical::cylindrical
 (
     const objectRegistry& obr,
     const vector& axis,
@@ -130,7 +130,7 @@ Foam::localAxesRotation::localAxesRotation
 }
 
 
-Foam::localAxesRotation::localAxesRotation
+Foam::cylindrical::cylindrical
 (
     const objectRegistry& obr,
     const vector& axis,
@@ -146,14 +146,14 @@ Foam::localAxesRotation::localAxesRotation
 }
 
 
-Foam::localAxesRotation::localAxesRotation(const dictionary& dict)
+Foam::cylindrical::cylindrical(const dictionary& dict)
 :
     Rptr_(),
     origin_(),
     e3_()
 {
-    FatalErrorIn("localAxesRotation(const dictionary&)")
-        << " localAxesRotation can not be constructed from dictionary "
+    FatalErrorIn("cylindrical(const dictionary&)")
+        << " cylindrical can not be constructed from dictionary "
         << " use the construtctor : "
            "("
            "    const dictionary&, const objectRegistry&"
@@ -162,7 +162,7 @@ Foam::localAxesRotation::localAxesRotation(const dictionary& dict)
 }
 
 
-Foam::localAxesRotation::localAxesRotation(const tensorField& R)
+Foam::cylindrical::cylindrical(const tensorField& R)
 :
     Rptr_(),
     origin_(vector::zero),
@@ -174,7 +174,7 @@ Foam::localAxesRotation::localAxesRotation(const tensorField& R)
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-void Foam::localAxesRotation::clear()
+void Foam::cylindrical::clear()
 {
     if (!Rptr_.empty())
     {
@@ -183,7 +183,7 @@ void Foam::localAxesRotation::clear()
 }
 
 
-void Foam::localAxesRotation::updateCells
+void Foam::cylindrical::updateCells
 (
     const polyMesh& mesh,
     const labelList& cells
@@ -203,7 +203,7 @@ void Foam::localAxesRotation::updateCells
 }
 
 
-Foam::tmp<Foam::vectorField> Foam::localAxesRotation::transform
+Foam::tmp<Foam::vectorField> Foam::cylindrical::transform
 (
     const vectorField& vf
 ) const
@@ -212,7 +212,7 @@ Foam::tmp<Foam::vectorField> Foam::localAxesRotation::transform
     {
         FatalErrorIn
         (
-            "tmp<vectorField> localAxesRotation::transform(const vectorField&)"
+            "tmp<vectorField> cylindrical::transform(const vectorField&)"
         )
             << "vectorField st has different size to tensorField "
             << abort(FatalError);
@@ -222,17 +222,17 @@ Foam::tmp<Foam::vectorField> Foam::localAxesRotation::transform
 }
 
 
-Foam::vector Foam::localAxesRotation::transform(const vector& v) const
+Foam::vector Foam::cylindrical::transform(const vector& v) const
 {
     notImplemented
     (
-        "vector localAxesRotation::transform(const vector&) const"
+        "vector cylindrical::transform(const vector&) const"
     );
     return vector::zero;
 }
 
 
-Foam::vector Foam::localAxesRotation::transform
+Foam::vector Foam::cylindrical::transform
 (
     const vector& v,
     const label cmptI
@@ -242,7 +242,7 @@ Foam::vector Foam::localAxesRotation::transform
 }
 
 
-Foam::tmp<Foam::vectorField> Foam::localAxesRotation::invTransform
+Foam::tmp<Foam::vectorField> Foam::cylindrical::invTransform
 (
     const vectorField& vf
 ) const
@@ -251,17 +251,17 @@ Foam::tmp<Foam::vectorField> Foam::localAxesRotation::invTransform
 }
 
 
-Foam::vector Foam::localAxesRotation::invTransform(const vector& v) const
+Foam::vector Foam::cylindrical::invTransform(const vector& v) const
 {
     notImplemented
     (
-        "vector localAxesRotation::invTransform(const vector&) const"
+        "vector cylindrical::invTransform(const vector&) const"
     );
     return vector::zero;
 }
 
 
-Foam::vector Foam::localAxesRotation::invTransform
+Foam::vector Foam::cylindrical::invTransform
 (
     const vector& v,
     const label cmptI
@@ -271,7 +271,7 @@ Foam::vector Foam::localAxesRotation::invTransform
 }
 
 
-Foam::tmp<Foam::tensorField> Foam::localAxesRotation::transformTensor
+Foam::tmp<Foam::tensorField> Foam::cylindrical::transformTensor
 (
     const tensorField& tf
 ) const
@@ -280,7 +280,7 @@ Foam::tmp<Foam::tensorField> Foam::localAxesRotation::transformTensor
     {
         FatalErrorIn
         (
-            "tmp<tensorField> localAxesRotation::transformTensor"
+            "tmp<tensorField> cylindrical::transformTensor"
             "("
                 "const tensorField&"
             ")"
@@ -292,21 +292,21 @@ Foam::tmp<Foam::tensorField> Foam::localAxesRotation::transformTensor
 }
 
 
-Foam::tensor Foam::localAxesRotation::transformTensor
+Foam::tensor Foam::cylindrical::transformTensor
 (
     const tensor& t
 ) const
 {
     notImplemented
     (
-        "tensor localAxesRotation::transformTensor(const tensor&) const"
+        "tensor cylindrical::transformTensor(const tensor&) const"
     );
 
     return tensor::zero;
 }
 
 
-Foam::tmp<Foam::tensorField> Foam::localAxesRotation::transformTensor
+Foam::tmp<Foam::tensorField> Foam::cylindrical::transformTensor
 (
     const tensorField& tf,
     const labelList& cellMap
@@ -316,7 +316,7 @@ Foam::tmp<Foam::tensorField> Foam::localAxesRotation::transformTensor
     {
         FatalErrorIn
         (
-            "tmp<tensorField> localAxesRotation::transformTensor"
+            "tmp<tensorField> cylindrical::transformTensor"
             "("
                 "const tensorField&, "
                 "const labelList&"
@@ -340,14 +340,14 @@ Foam::tmp<Foam::tensorField> Foam::localAxesRotation::transformTensor
 }
 
 
-Foam::tmp<Foam::symmTensorField> Foam::localAxesRotation::transformVector
+Foam::tmp<Foam::symmTensorField> Foam::cylindrical::transformVector
 (
     const vectorField& vf
 ) const
 {
     if (Rptr_->size() != vf.size())
     {
-        FatalErrorIn("localAxesRotation::transformVector(const vectorField&)")
+        FatalErrorIn("cylindrical::transformVector(const vectorField&)")
             << "tensorField vf has different size to tensorField Tr"
             << abort(FatalError);
     }
@@ -364,20 +364,20 @@ Foam::tmp<Foam::symmTensorField> Foam::localAxesRotation::transformVector
 }
 
 
-Foam::symmTensor Foam::localAxesRotation::transformVector
+Foam::symmTensor Foam::cylindrical::transformVector
 (
     const vector& v
 ) const
 {
     notImplemented
     (
-        "tensor localAxesRotation::transformVector(const vector&) const"
+        "tensor cylindrical::transformVector(const vector&) const"
     );
     return symmTensor::zero;
 }
 
 
-void Foam::localAxesRotation::write(Ostream& os) const
+void Foam::cylindrical::write(Ostream& os) const
 {
      os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl;
 }
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/localAxesRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
similarity index 86%
rename from src/meshTools/coordinateSystems/coordinateRotation/localAxesRotation.H
rename to src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
index 41a12f459b..f166f95e71 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/localAxesRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::localAxesRotation
+    Foam::cylindrical
 
 Description
     A local coordinate rotation.
@@ -34,7 +34,7 @@ Description
         (cylindrical coordinates)
 
         \verbatim
-            localAxesRotation
+            cylindrical
             {
                 type        localAxes;
                 e3          (0 0 1);
@@ -45,8 +45,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef localAxesRotation_H
-#define localAxesRotation_H
+#ifndef cylindrical_H
+#define cylindrical_H
 
 #include "point.H"
 #include "vector.H"
@@ -58,10 +58,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class localAxesRotation Declaration
+                    Class cylindrical Declaration
 \*---------------------------------------------------------------------------*/
 
-class localAxesRotation
+class cylindrical
 :
     public coordinateRotation
 {
@@ -90,15 +90,15 @@ class localAxesRotation
 public:
 
     //- Runtime type information
-    TypeName("localAxesRotation");
+    TypeName("cylindrical");
 
     // Constructors
 
         //- Construct from dictionary and objectRegistry
-        localAxesRotation(const dictionary&, const objectRegistry&);
+        cylindrical(const dictionary&, const objectRegistry&);
 
         //- Construct from components for all cells
-        localAxesRotation
+        cylindrical
         (
             const objectRegistry&,
             const vector& axis,
@@ -106,7 +106,7 @@ public:
         );
 
         //- Construct from components for list of cells
-        localAxesRotation
+        cylindrical
         (
             const objectRegistry&,
             const vector& axis,
@@ -115,20 +115,20 @@ public:
         );
 
         //- Construct from dictionary
-        localAxesRotation(const dictionary&);
+        cylindrical(const dictionary&);
 
         //- Construct from tensor Field
-        localAxesRotation(const tensorField&);
+        cylindrical(const tensorField&);
 
         //- Return clone
-        autoPtr<localAxesRotation> clone() const
+        autoPtr<cylindrical> clone() const
         {
-            return autoPtr<localAxesRotation>(new localAxesRotation(*this));
+            return autoPtr<cylindrical>(new cylindrical(*this));
         }
 
 
     //- Destructor
-    virtual ~localAxesRotation()
+    virtual ~cylindrical()
     {}
 
 
@@ -143,28 +143,28 @@ public:
         //- Return local-to-global transformation tensor
         virtual const tensor& R() const
         {
-            notImplemented("const tensor& localAxesRotation::R() const");
+            notImplemented("const tensor& cylindrical::R() const");
             return tensor::zero;
         }
 
         //- Return global-to-local transformation tensor
         virtual const tensor& Rtr() const
         {
-             notImplemented("const tensor& localAxesRotation::Rtr() const");
+             notImplemented("const tensor& cylindrical::Rtr() const");
              return tensor::zero;
         }
 
         //- Return local Cartesian x-axis
         virtual const vector e1() const
         {
-            notImplemented("const tensor& localAxesRotation::e1() const");
+            notImplemented("const tensor& cylindrical::e1() const");
             return vector::zero;
         }
 
         //- Return local Cartesian y-axis
         virtual const vector e2() const
         {
-            notImplemented("const tensor& localAxesRotation::e2() const");
+            notImplemented("const tensor& cylindrical::e2() const");
             return vector::zero;
         }
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.H b/src/meshTools/coordinateSystems/coordinateSystem.H
index 7e8b81c0e5..34579acf27 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.H
+++ b/src/meshTools/coordinateSystems/coordinateSystem.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Description
             origin  (0 0 0);
             coordinateRotation
             {
-                type        localAxesRotation;
+                type        cylindrical;
                 e3          (0 0 1);
             }
         }
@@ -45,7 +45,7 @@ Description
     Types of coordinateRotation:
     1) axesRotation
     2) STARCDRotation
-    3) localAxesRotation
+    3) cylindrical
     4) EulerCoordinateRotation
 
     Type of co-ordinates:

From 3ce1bdb63dfc15762fb18138b9a50e06f4dd013c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 13 Aug 2015 19:08:52 +0100
Subject: [PATCH 09/70] uniformFixedGradientFvPatchField: Corrected constructor
 Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1827

---
 .../uniformFixedGradient/uniformFixedGradientFvPatchField.C   | 2 ++
 .../uniformFixedGradientFvPatchFieldsFwd.H                    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
index 566093591a..0a5a113d90 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C
@@ -90,6 +90,8 @@ Foam::uniformFixedGradientFvPatchField<Type>::uniformFixedGradientFvPatchField
         const scalar t = this->db().time().timeOutputValue();
         this->gradient() = uniformGradient_->value(t);
     }
+
+    fixedGradientFvPatchField<Type>::evaluate();
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFieldsFwd.H
index 9eaa07e2a6..d76a6080e2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFieldsFwd.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchFieldsFwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ namespace Foam
 
 template<class Type> class uniformFixedGradientFvPatchField;
 
-makePatchTypeFieldTypedefs(uniform);
+makePatchTypeFieldTypedefs(uniformFixedGradient);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From 47185ee83095d1b05fe8e5c3a605a5ac2f5d40a6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 18 Aug 2015 12:13:09 +0100
Subject: [PATCH 10/70] functionObjects/fvTools/calcFvcGrad: Avoid clash with
 cached gradient field Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1828

---
 .../fvTools/calcFvcGrad/calcFvcGradTemplates.C     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C
index c028628e37..89589a0c45 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,6 +26,8 @@ License
 #include "fvMesh.H"
 #include "fvcGrad.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
 template<class Type>
 Foam::GeometricField
 <
@@ -35,6 +37,8 @@ Foam::GeometricField
 >&
 Foam::calcFvcGrad::gradField(const word& gradName, const dimensionSet& dims)
 {
+    Info<< "gradField" << endl;
+
     typedef typename outerProduct<vector, Type>::type gradType;
     typedef GeometricField<gradType, fvPatchField, volMesh> vfGradType;
 
@@ -73,8 +77,6 @@ Foam::calcFvcGrad::gradField(const word& gradName, const dimensionSet& dims)
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
 template<class Type>
 void Foam::calcFvcGrad::calcGrad
 (
@@ -98,7 +100,8 @@ void Foam::calcFvcGrad::calcGrad
 
         vfGradType& field = gradField<Type>(resultName, vf.dimensions());
 
-        field = fvc::grad(vf);
+        // De-reference the tmp to avoid a clash with the cached grad field
+        field = fvc::grad(vf)();
 
         processed = true;
     }
@@ -108,7 +111,8 @@ void Foam::calcFvcGrad::calcGrad
 
         vfGradType& field = gradField<Type>(resultName, sf.dimensions());
 
-        field = fvc::grad(sf);
+        // De-reference the tmp to avoid a clash with the cached grad field
+        field = fvc::grad(sf)();
 
         processed = true;
     }

From 9f697a5b6528070f59063049809a029a3626d927 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 19 Aug 2015 11:37:27 +0100
Subject: [PATCH 11/70] utilities/postProcessing/noise: Corrected documentation
 Patches provided by Bruno Santos Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1832

---
 .../utilities/postProcessing/noise/noise.C        | 15 +++++++++------
 .../primitives/functions/DataEntry/CSV/CSV.H      |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/applications/utilities/postProcessing/noise/noise.C b/applications/utilities/postProcessing/noise/noise.C
index 79a5521510..6b6628f080 100644
--- a/applications/utilities/postProcessing/noise/noise.C
+++ b/applications/utilities/postProcessing/noise/noise.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,13 +42,16 @@ Description
     fU          10000;
     graphFormat raw;
 
-    csvFileData
+    pressureData
     {
         fileName        "pressureData"
-        nHeaderLine     1;
-        refColumn       0;
-        componentColumns (1);
-        separator       " ";
+        nHeaderLine         1;          // number of header lines
+        refColumn           0;          // reference column index
+        componentColumns    (1);        // component column indices
+        separator           " ";        // optional (defaults to ",")
+        mergeSeparators     no;         // merge multiple separators
+        outOfBounds         clamp;      // optional out-of-bounds handling
+        interpolationScheme linear;     // optional interpolation scheme
     }
     \endverbatim
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
index 5969339d67..1d0b0620e9 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
@@ -32,7 +32,7 @@ Description
         <entryName> csvFile;
         <entryName>Coeffs
         {
-            nHeaderLine         4;
+            nHeaderLine         4;          // number of header lines
             refColumn           0;          // reference column index
             componentColumns    (1 2 3);    // component column indices
             separator           ",";        // optional (defaults to ",")

From 61b6cde56488eaf6971a654f79980f69ff084c95 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 19 Aug 2015 13:42:46 +0100
Subject: [PATCH 12/70] hRefConstThermo: New constant coefficient
 thermodynamics model for phase-change Provided by Juho Peltola

---
 .../specie/thermo/hRefConst/hRefConstThermo.C |  97 ++++++
 .../specie/thermo/hRefConst/hRefConstThermo.H | 233 +++++++++++++++
 .../thermo/hRefConst/hRefConstThermoI.H       | 277 ++++++++++++++++++
 3 files changed, 607 insertions(+)
 create mode 100644 src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
 create mode 100644 src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
 create mode 100644 src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H

diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
new file mode 100644
index 0000000000..fe83f1794b
--- /dev/null
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "hRefConstThermo.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class EquationOfState>
+Foam::hRefConstThermo<EquationOfState>::hRefConstThermo(Istream& is)
+:
+    EquationOfState(is),
+    Cp_(readScalar(is)),
+    Hf_(readScalar(is)),
+    Tref_(readScalar(is)),
+    Href_(readScalar(is))
+{
+    is.check("hRefConstThermo::hRefConstThermo(Istream& is)");
+
+    Cp_ *= this->W();
+    Hf_ *= this->W();
+    Href_ *= this->W();
+}
+
+
+template<class EquationOfState>
+Foam::hRefConstThermo<EquationOfState>::hRefConstThermo(const dictionary& dict)
+:
+    EquationOfState(dict),
+    Cp_(readScalar(dict.subDict("thermodynamics").lookup("Cp"))),
+    Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf"))),
+    Tref_(readScalar(dict.subDict("thermodynamics").lookup("Tref"))),
+    Href_(readScalar(dict.subDict("thermodynamics").lookup("Href")))
+{
+    Cp_ *= this->W();
+    Hf_ *= this->W();
+    Href_ *= this->W();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class EquationOfState>
+void Foam::hRefConstThermo<EquationOfState>::write(Ostream& os) const
+{
+    EquationOfState::write(os);
+
+    dictionary dict("thermodynamics");
+    dict.add("Cp", Cp_/this->W());
+    dict.add("Hf", Hf_/this->W());
+    dict.add("Tref", Tref_);
+    dict.add("Href", Href_/this->W());
+    os  << indent << dict.dictName() << dict;
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
+
+template<class EquationOfState>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const hRefConstThermo<EquationOfState>& ct
+)
+{
+    os  << static_cast<const EquationOfState&>(ct) << tab
+        << ct.Cp_/ct.W() << tab << ct.Hf_/ct.W() << tab
+        << ct.Tref_ << tab << ct.Href_/ct.W();
+
+    os.check("Ostream& operator<<(Ostream& os, const hRefConstThermo& ct)");
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
new file mode 100644
index 0000000000..9a62231d9c
--- /dev/null
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.H
@@ -0,0 +1,233 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::hRefConstThermo
+
+Description
+    Constant properties thermodynamics package
+    templated into the EquationOfState.
+
+SourceFiles
+    hRefConstThermoI.H
+    hRefConstThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef hRefConstThermo_H
+#define hRefConstThermo_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+template<class EquationOfState> class hRefConstThermo;
+
+template<class EquationOfState>
+inline hRefConstThermo<EquationOfState> operator+
+(
+    const hRefConstThermo<EquationOfState>&,
+    const hRefConstThermo<EquationOfState>&
+);
+
+template<class EquationOfState>
+inline hRefConstThermo<EquationOfState> operator-
+(
+    const hRefConstThermo<EquationOfState>&,
+    const hRefConstThermo<EquationOfState>&
+);
+
+template<class EquationOfState>
+inline hRefConstThermo<EquationOfState> operator*
+(
+    const scalar,
+    const hRefConstThermo<EquationOfState>&
+);
+
+template<class EquationOfState>
+inline hRefConstThermo<EquationOfState> operator==
+(
+    const hRefConstThermo<EquationOfState>&,
+    const hRefConstThermo<EquationOfState>&
+);
+
+template<class EquationOfState>
+Ostream& operator<<
+(
+    Ostream&,
+    const hRefConstThermo<EquationOfState>&
+);
+
+
+/*---------------------------------------------------------------------------*\
+                           Class hRefConstThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class EquationOfState>
+class hRefConstThermo
+:
+    public EquationOfState
+{
+    // Private data
+
+        scalar Cp_;
+        scalar Hf_;
+        scalar Tref_;
+        scalar Href_;
+
+
+    // Private Member Functions
+
+        //- Construct from components
+        inline hRefConstThermo
+        (
+            const EquationOfState& st,
+            const scalar cp,
+            const scalar hf,
+            const scalar tref,
+            const scalar href
+        );
+
+
+public:
+
+    // Constructors
+
+        //- Construct from Istream
+        hRefConstThermo(Istream&);
+
+        //- Construct from dictionary
+        hRefConstThermo(const dictionary& dict);
+
+        //- Construct as named copy
+        inline hRefConstThermo(const word&, const hRefConstThermo&);
+
+        //- Construct and return a clone
+        inline autoPtr<hRefConstThermo> clone() const;
+
+        //- Selector from Istream
+        inline static autoPtr<hRefConstThermo> New(Istream& is);
+
+        //- Selector from dictionary
+        inline static autoPtr<hRefConstThermo> New(const dictionary& dict);
+
+
+    // Member Functions
+
+        //- Return the instantiated type name
+        static word typeName()
+        {
+            return "hRefConst<" + EquationOfState::typeName() + '>';
+        }
+
+        //- Limit the temperature to be in the range Tlow_ to Thigh_
+        inline scalar limit(const scalar T) const;
+
+
+        // Fundamental properties
+
+            //- Heat capacity at constant pressure [J/(kmol K)]
+            inline scalar cp(const scalar p, const scalar T) const;
+
+            //- Absolute Enthalpy [J/kmol]
+            inline scalar ha(const scalar p, const scalar T) const;
+
+            //- Sensible enthalpy [J/kmol]
+            inline scalar hs(const scalar p, const scalar T) const;
+
+            //- Chemical enthalpy [J/kmol]
+            inline scalar hc() const;
+
+            //- Entropy [J/(kmol K)]
+            inline scalar s(const scalar p, const scalar T) const;
+
+
+        // I-O
+
+            //- Write to Ostream
+            void write(Ostream& os) const;
+
+
+    // Member operators
+
+        inline void operator+=(const hRefConstThermo&);
+        inline void operator-=(const hRefConstThermo&);
+
+
+    // Friend operators
+
+        friend hRefConstThermo operator+ <EquationOfState>
+        (
+            const hRefConstThermo&,
+            const hRefConstThermo&
+        );
+
+        friend hRefConstThermo operator- <EquationOfState>
+        (
+            const hRefConstThermo&,
+            const hRefConstThermo&
+        );
+
+        friend hRefConstThermo operator* <EquationOfState>
+        (
+            const scalar,
+            const hRefConstThermo&
+        );
+
+        friend hRefConstThermo operator== <EquationOfState>
+        (
+            const hRefConstThermo&,
+            const hRefConstThermo&
+        );
+
+
+    // IOstream Operators
+
+        friend Ostream& operator<< <EquationOfState>
+        (
+            Ostream&,
+            const hRefConstThermo&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "hRefConstThermoI.H"
+
+#ifdef NoRepository
+#   include "hRefConstThermo.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
new file mode 100644
index 0000000000..c6a699540e
--- /dev/null
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H
@@ -0,0 +1,277 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class EquationOfState>
+inline Foam::hRefConstThermo<EquationOfState>::hRefConstThermo
+(
+    const EquationOfState& st,
+    const scalar cp,
+    const scalar hf,
+    const scalar tref,
+    const scalar href
+)
+:
+    EquationOfState(st),
+    Cp_(cp),
+    Hf_(hf),
+    Tref_(tref),
+    Href_(href)
+{}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class EquationOfState>
+inline Foam::hRefConstThermo<EquationOfState>::hRefConstThermo
+(
+    const word& name,
+    const hRefConstThermo& ct
+)
+:
+    EquationOfState(name, ct),
+    Cp_(ct.Cp_),
+    Hf_(ct.Hf_),
+    Tref_(ct.Tref_),
+    Href_(ct.Href_)
+{}
+
+
+template<class EquationOfState>
+inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState> >
+Foam::hRefConstThermo<EquationOfState>::clone() const
+{
+    return autoPtr<hRefConstThermo<EquationOfState> >
+    (
+        new hRefConstThermo<EquationOfState>(*this)
+    );
+}
+
+
+template<class EquationOfState>
+inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState> >
+Foam::hRefConstThermo<EquationOfState>::New(Istream& is)
+{
+    return autoPtr<hRefConstThermo<EquationOfState> >
+    (
+        new hRefConstThermo<EquationOfState>(is)
+    );
+}
+
+
+template<class EquationOfState>
+inline Foam::autoPtr<Foam::hRefConstThermo<EquationOfState> >
+Foam::hRefConstThermo<EquationOfState>::New(const dictionary& dict)
+{
+    return autoPtr<hRefConstThermo<EquationOfState> >
+    (
+        new hRefConstThermo<EquationOfState>(dict)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class EquationOfState>
+inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::limit
+(
+    const scalar T
+) const
+{
+    return T;
+}
+
+
+template<class EquationOfState>
+inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::cp
+(
+    const scalar p,
+    const scalar T
+) const
+{
+    return Cp_;
+}
+
+
+template<class EquationOfState>
+inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::ha
+(
+    const scalar p, const scalar T
+) const
+{
+    return Cp_*(T-Tref_) + Href_ + Hf_;
+}
+
+
+template<class EquationOfState>
+inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::hs
+(
+    const scalar p, const scalar T
+) const
+{
+    return Cp_*(T-Tref_) + Href_ ;
+}
+
+
+template<class EquationOfState>
+inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::hc() const
+{
+    return Hf_;
+}
+
+
+template<class EquationOfState>
+inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::s
+(
+    const scalar p, const scalar T
+) const
+{
+    return Cp_*log(T/Tstd) + EquationOfState::s(p, T);
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class EquationOfState>
+inline void Foam::hRefConstThermo<EquationOfState>::operator+=
+(
+    const hRefConstThermo<EquationOfState>& ct
+)
+{
+    scalar molr1 = this->nMoles();
+
+    EquationOfState::operator+=(ct);
+
+    molr1 /= this->nMoles();
+    scalar molr2 = ct.nMoles()/this->nMoles();
+
+    Cp_ = molr1*Cp_ + molr2*ct.Cp_;
+    Hf_ = molr1*Hf_ + molr2*ct.Hf_;
+}
+
+
+template<class EquationOfState>
+inline void Foam::hRefConstThermo<EquationOfState>::operator-=
+(
+    const hRefConstThermo<EquationOfState>& ct
+)
+{
+    scalar molr1 = this->nMoles();
+
+    EquationOfState::operator-=(ct);
+
+    molr1 /= this->nMoles();
+    scalar molr2 = ct.nMoles()/this->nMoles();
+
+    Cp_ = molr1*Cp_ - molr2*ct.Cp_;
+    Hf_ = molr1*Hf_ - molr2*ct.Hf_;
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+template<class EquationOfState>
+inline Foam::hRefConstThermo<EquationOfState> Foam::operator+
+(
+    const hRefConstThermo<EquationOfState>& ct1,
+    const hRefConstThermo<EquationOfState>& ct2
+)
+{
+    EquationOfState eofs
+    (
+        static_cast<const EquationOfState&>(ct1)
+      + static_cast<const EquationOfState&>(ct2)
+    );
+
+    return hRefConstThermo<EquationOfState>
+    (
+        eofs,
+        ct1.nMoles()/eofs.nMoles()*ct1.Cp_
+      + ct2.nMoles()/eofs.nMoles()*ct2.Cp_,
+        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
+      + ct2.nMoles()/eofs.nMoles()*ct2.Hf_,
+        ct1.nMoles()/eofs.nMoles()*ct1.Tref_
+      + ct2.nMoles()/eofs.nMoles()*ct2.Tref_,
+        ct1.nMoles()/eofs.nMoles()*ct1.Href_
+      + ct2.nMoles()/eofs.nMoles()*ct2.Href_
+    );
+}
+
+
+template<class EquationOfState>
+inline Foam::hRefConstThermo<EquationOfState> Foam::operator-
+(
+    const hRefConstThermo<EquationOfState>& ct1,
+    const hRefConstThermo<EquationOfState>& ct2
+)
+{
+    EquationOfState eofs
+    (
+        static_cast<const EquationOfState&>(ct1)
+      - static_cast<const EquationOfState&>(ct2)
+    );
+
+    return hRefConstThermo<EquationOfState>
+    (
+        eofs,
+        ct1.nMoles()/eofs.nMoles()*ct1.Cp_
+      - ct2.nMoles()/eofs.nMoles()*ct2.Cp_,
+        ct1.nMoles()/eofs.nMoles()*ct1.Hf_
+      - ct2.nMoles()/eofs.nMoles()*ct2.Hf_
+    );
+}
+
+
+template<class EquationOfState>
+inline Foam::hRefConstThermo<EquationOfState> Foam::operator*
+(
+    const scalar s,
+    const hRefConstThermo<EquationOfState>& ct
+)
+{
+    return hRefConstThermo<EquationOfState>
+    (
+        s*static_cast<const EquationOfState&>(ct),
+        ct.Cp_,
+        ct.Hf_,
+        ct.Tref_,
+        ct.Href_
+    );
+}
+
+
+template<class EquationOfState>
+inline Foam::hRefConstThermo<EquationOfState> Foam::operator==
+(
+    const hRefConstThermo<EquationOfState>& ct1,
+    const hRefConstThermo<EquationOfState>& ct2
+)
+{
+    return ct2 - ct1;
+}
+
+
+// ************************************************************************* //

From c9c4e47ac5f53f4b886c54d8568689f953573015 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 19 Aug 2015 13:43:59 +0100
Subject: [PATCH 13/70] perfectFluidI.H: Corrected return type Patch provided
 by Juho Peltola

---
 .../specie/equationOfState/perfectFluid/perfectFluidI.H       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
index 338807ad02..d30416c014 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H
@@ -186,7 +186,7 @@ inline Foam::perfectFluid<Specie> Foam::operator+
     scalar molr1 = pf1.nMoles()/nMoles;
     scalar molr2 = pf2.nMoles()/nMoles;
 
-    return rhoConst<Specie>
+    return perfectFluid<Specie>
     (
         static_cast<const Specie&>(pf1)
       + static_cast<const Specie&>(pf2),
@@ -207,7 +207,7 @@ inline Foam::perfectFluid<Specie> Foam::operator-
     scalar molr1 = pf1.nMoles()/nMoles;
     scalar molr2 = pf2.nMoles()/nMoles;
 
-    return rhoConst<Specie>
+    return perfectFluid<Specie>
     (
         static_cast<const Specie&>(pf1)
       - static_cast<const Specie&>(pf2),

From 24c7a739fffad2c36b1ae996f889456f19962d5b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 19 Aug 2015 13:45:49 +0100
Subject: [PATCH 14/70] reactingTwoPhaseEulerFoam: Improved support for
 boiling/condensation Includes many contributions from Juho Peltola

---
 .../reactingTwoPhaseEulerFoam/EEqns.H         |   6 +
 .../RanzMarshall/RanzMarshall.C               |   4 +-
 .../RanzMarshall/RanzMarshall.H               |   2 +-
 .../heatTransferModel/heatTransferModel.C     |   9 +
 .../heatTransferModel/heatTransferModel.H     |   8 +-
 .../sphericalHeatTransfer.C                   |   7 +-
 .../sphericalHeatTransfer.H                   |   2 +-
 .../BlendedInterfacialModel.C                 |  60 +++++
 .../BlendedInterfacialModel.H                 |   3 +
 .../phaseSystems/Make/files                   |   2 +
 .../HeatAndMassTransferPhaseSystem.C          |  26 +-
 .../ThermalPhaseChangePhaseSystem.C           |  90 +++++--
 .../ThermalPhaseChangePhaseSystem.H           |   4 +
 .../reactionThermo/hRefConstThermos.C         | 226 ++++++++++++++++++
 14 files changed, 407 insertions(+), 42 deletions(-)
 create mode 100644 applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C

diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/EEqns.H
index 588bd7ddf4..ff72d8d94e 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/EEqns.H
@@ -47,3 +47,9 @@
 }
 
 fluid.correctThermo();
+
+Info<< "  phase1.thermo().T(): " << min(phase1.thermo().T()).value()
+    << " - " << max(phase1.thermo().T()).value() << endl;
+
+Info<< "  phase2.thermo().T(): " << min(phase2.thermo().T()).value()
+    << " - " << max(phase2.thermo().T()).value() << endl;
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
index 7e1693dfed..9b65bb82f7 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
@@ -60,13 +60,13 @@ Foam::heatTransferModels::RanzMarshall::~RanzMarshall()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::heatTransferModels::RanzMarshall::K() const
+Foam::heatTransferModels::RanzMarshall::K(const scalar residualAlpha) const
 {
     volScalarField Nu(scalar(2) + 0.6*sqrt(pair_.Re())*cbrt(pair_.Pr()));
 
     return
         6.0
-       *max(pair_.dispersed(), residualAlpha_)
+       *max(pair_.dispersed(), residualAlpha)
        *pair_.continuous().kappa()
        *Nu
        /sqr(pair_.dispersed().d());
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
index c02126528a..a4987ab0af 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
@@ -79,7 +79,7 @@ public:
     // Member Functions
 
         //- The heat transfer function K used in the enthalpy equation
-        tmp<volScalarField> K() const;
+        tmp<volScalarField> K(const scalar residualAlpha) const;
 };
 
 
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
index 1621b6be19..3a75fbf3d1 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
@@ -65,4 +65,13 @@ Foam::heatTransferModel::~heatTransferModel()
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField>
+Foam::heatTransferModel::K() const
+{
+    return K(residualAlpha_.value());
+}
+
+
 // ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
index 6276e8aee1..130b82198b 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
@@ -117,7 +117,13 @@ public:
         //- The heat transfer function K used in the enthalpy equation
         //    ddt(alpha1*rho1*ha) + ... = ... K*(Ta - Tb)
         //    ddt(alpha2*rho2*hb) + ... = ... K*(Tb - Ta)
-        virtual tmp<volScalarField> K() const = 0;
+        tmp<volScalarField> K() const;
+
+        //- The heat transfer function K used in the enthalpy equation
+        //    ddt(alpha1*rho1*ha) + ... = ... K*(Ta - Tb)
+        //    ddt(alpha2*rho2*hb) + ... = ... K*(Tb - Ta)
+        //  with a specified residual volume fraction
+        virtual tmp<volScalarField> K(const scalar residualAlpha) const = 0;
 };
 
 
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
index 4eec6de028..0672f16ef8 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
@@ -65,11 +65,14 @@ Foam::heatTransferModels::sphericalHeatTransfer::~sphericalHeatTransfer()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::heatTransferModels::sphericalHeatTransfer::K() const
+Foam::heatTransferModels::sphericalHeatTransfer::K
+(
+    const scalar residualAlpha
+) const
 {
     return
         60.0
-       *max(pair_.dispersed(), residualAlpha_)
+       *max(pair_.dispersed(), residualAlpha)
        *pair_.continuous().kappa()
        /sqr(pair_.dispersed().d());
 }
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H
index 88d098668f..f3164df9bd 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H
@@ -79,7 +79,7 @@ public:
     // Member Functions
 
         //- The heat transfer function K used in the enthalpy equation
-        tmp<volScalarField> K() const;
+        tmp<volScalarField> K(const scalar residualAlpha) const;
 };
 
 
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
index da6c62ade5..36e31630a4 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
@@ -223,6 +223,66 @@ Foam::BlendedInterfacialModel<ModelType>::K() const
 }
 
 
+template<class ModelType>
+Foam::tmp<Foam::volScalarField>
+Foam::BlendedInterfacialModel<ModelType>::K(const scalar residualAlpha) const
+{
+    tmp<volScalarField> f1, f2;
+
+    if (model_.valid() || model1In2_.valid())
+    {
+        f1 = blending_.f1(phase1_, phase2_);
+    }
+
+    if (model_.valid() || model2In1_.valid())
+    {
+        f2 = blending_.f2(phase1_, phase2_);
+    }
+
+    tmp<volScalarField> x
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                ModelType::typeName + ":K",
+                phase1_.mesh().time().timeName(),
+                phase1_.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            phase1_.mesh(),
+            dimensionedScalar("zero", ModelType::dimK, 0)
+        )
+    );
+
+    if (model_.valid())
+    {
+        x() += model_->K(residualAlpha)*(scalar(1) - f1() - f2());
+    }
+    if (model1In2_.valid())
+    {
+        x() += model1In2_->K(residualAlpha)*f1;
+    }
+    if (model2In1_.valid())
+    {
+        x() += model2In1_->K(residualAlpha)*f2;
+    }
+
+    if
+    (
+        correctFixedFluxBCs_
+     && (model_.valid() || model1In2_.valid() || model2In1_.valid())
+    )
+    {
+        correctFixedFluxBCs(x());
+    }
+
+    return x;
+}
+
+
 template<class ModelType>
 Foam::tmp<Foam::surfaceScalarField>
 Foam::BlendedInterfacialModel<ModelType>::Kf() const
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
index bd2ec60235..4be8f0b347 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
@@ -136,6 +136,9 @@ public:
         //- Return the blended force coefficient
         tmp<volScalarField> K() const;
 
+        //- Return the blended force coefficient with a specified residual alpha
+        tmp<volScalarField> K(const scalar residualAlpha) const;
+
         //- Return the face blended force coefficient
         tmp<surfaceScalarField> Kf() const;
 
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/Make/files b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/Make/files
index 538bd7d637..9f8f4f1fdb 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/Make/files
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/Make/files
@@ -29,4 +29,6 @@ twoPhaseSystem/twoPhaseSystem.C
 twoPhaseSystem/newTwoPhaseSystem.C
 twoPhaseSystem/twoPhaseSystems.C
 
+reactionThermo/hRefConstThermos.C
+
 LIB = $(FOAM_LIBBIN)/libreactingTwoPhaseSystem
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
index ff4fb10e9d..8b2bbdb99e 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
@@ -192,11 +192,11 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
         const volVectorField& U2(pair.phase2().U());
 
         const volScalarField dmdt(this->dmdt(pair));
-        const volScalarField dmdt12(posPart(dmdt));
-        const volScalarField dmdt21(negPart(dmdt));
+        const volScalarField dmdt21(posPart(dmdt));
+        const volScalarField dmdt12(negPart(dmdt));
 
-        *eqns[pair.phase1().name()] += fvm::Sp(dmdt21, U1) - dmdt21*U2;
-        *eqns[pair.phase2().name()] += dmdt12*U1 - fvm::Sp(dmdt12, U2);
+        *eqns[pair.phase1().name()] += dmdt21*U2 - fvm::Sp(dmdt21, U1);
+        *eqns[pair.phase2().name()] -= dmdt12*U1 - fvm::Sp(dmdt12, U2);
     }
 
     return eqnsPtr;
@@ -283,7 +283,7 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
         }
     }
 
-    // Source term due to mass trasfer
+    // Source term due to mass transfer
     forAllConstIter
     (
         phaseSystem::phasePairTable,
@@ -308,17 +308,19 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
         const volScalarField& K2(phase2.K());
 
         const volScalarField dmdt(this->dmdt(pair));
-        const volScalarField dmdt12(posPart(dmdt));
-        const volScalarField dmdt21(negPart(dmdt));
+        const volScalarField dmdt21(posPart(dmdt));
+        const volScalarField dmdt12(negPart(dmdt));
         const volScalarField& Tf(*Tf_[pair]);
 
         *eqns[phase1.name()] +=
-            fvm::Sp(dmdt21, he1) + dmdt21*K1
-          - dmdt21*(phase2.thermo().he(phase2.thermo().p(), Tf) + K2);
+            dmdt21*(phase1.thermo().he(phase1.thermo().p(), Tf))
+          - fvm::Sp(dmdt21, he1)
+          + dmdt21*(K2 - K1);
 
-        *eqns[phase2.name()] +=
-            dmdt12*(phase1.thermo().he(phase1.thermo().p(), Tf) + K1)
-          - fvm::Sp(dmdt12, he2) - dmdt12*K2;
+        *eqns[phase2.name()] -=
+            dmdt12*(phase2.thermo().he(phase2.thermo().p(), Tf))
+          - fvm::Sp(dmdt12, he2)
+          + dmdt12*(K1 - K2);
     }
 
     return eqnsPtr;
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index bbce1962a1..ffdb41326e 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ThermalPhaseChangePhaseSystem.H"
+#include "fvCFD.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -36,7 +37,8 @@ ThermalPhaseChangePhaseSystem
 :
     HeatAndMassTransferPhaseSystem<BasePhaseSystem>(mesh),
     volatile_(this->lookup("volatile")),
-    saturationModel_(saturationModel::New(this->subDict("saturationModel")))
+    saturationModel_(saturationModel::New(this->subDict("saturationModel"))),
+    massTransfer_(this->lookup("massTransfer"))
 {}
 
 
@@ -143,37 +145,79 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
         const phaseModel& phase1 = pair.phase1();
         const phaseModel& phase2 = pair.phase2();
 
-        volScalarField& Tf = *this->Tf_[pair];
-        Tf = saturationModel_->Tsat(phase1.thermo().p());
-
-        Info<< "Tf." << pair.name()
-            << ": min = " << min(Tf.internalField())
-            << ", mean = " << average(Tf.internalField())
-            << ", max = " << max(Tf.internalField())
-            << endl;
-
-        volScalarField& dmdt(*this->dmdt_[pair]);
-
-        volScalarField H1(this->heatTransferModels_[pair][pair.first()]->K());
-        volScalarField H2(this->heatTransferModels_[pair][pair.second()]->K());
-
         const volScalarField& T1(phase1.thermo().T());
         const volScalarField& T2(phase2.thermo().T());
 
         const volScalarField& he1(phase1.thermo().he());
         const volScalarField& he2(phase2.thermo().he());
 
-        volScalarField hef2(phase2.thermo().he(phase2.thermo().p(), Tf));
-        volScalarField hef1(phase1.thermo().he(phase1.thermo().p(), Tf));
+        volScalarField& dmdt(*this->dmdt_[pair]);
 
-        dmdt =
-            (H2*(Tf - T1) + H1*(Tf - T2))
-           /min
+        volScalarField& Tf = *this->Tf_[pair];
+
+        volScalarField hef1(phase1.thermo().he(phase1.thermo().p(), Tf));
+        volScalarField hef2(phase2.thermo().he(phase2.thermo().p(), Tf));
+
+        if (massTransfer_ )
+        {
+            volScalarField H1
+            (
+                this->heatTransferModels_[pair][pair.first()]->K(0)
+            );
+
+            volScalarField H2
+            (
+                this->heatTransferModels_[pair][pair.second()]->K(0)
+            );
+
+            Tf = saturationModel_->Tsat(phase1.thermo().p());
+
+            dmdt =
+                (H1*(Tf - T1) + H2*(Tf - T2))
+               /min
+                (
+                    (pos(dmdt)*he2 + neg(dmdt)*hef2)
+                  - (neg(dmdt)*he1 + pos(dmdt)*hef1),
+                    0.3*mag(hef2 - hef1)
+                );
+
+            Info<< "dmdt." << pair.name()
+                << ": min = " << min(dmdt.internalField())
+                << ", mean = " << average(dmdt.internalField())
+                << ", max = " << max(dmdt.internalField())
+                << ", integral = " << fvc::domainIntegrate(dmdt).value()
+                << endl;
+        }
+        else
+        {
+            dmdt == dimensionedScalar("0", dmdt.dimensions(), 0);
+        }
+
+        volScalarField H1(this->heatTransferModels_[pair][pair.first()]->K());
+        volScalarField H2(this->heatTransferModels_[pair][pair.second()]->K());
+
+        // Limit the H[12] boundary field to avoid /0
+        const scalar HLimit = 1e-4;
+        H1.boundaryField() =
+            max(H1.boundaryField(), phase1.boundaryField()*HLimit);
+        H2.boundaryField() =
+            max(H2.boundaryField(), phase2.boundaryField()*HLimit);
+
+        volScalarField mDotL
+        (
+            dmdt*
             (
                 (pos(dmdt)*he2 + neg(dmdt)*hef2)
-              - (neg(dmdt)*he1 + pos(dmdt)*hef1),
-                0.3*(hef1 - hef2)
-            );
+              - (neg(dmdt)*he1 + pos(dmdt)*hef1)
+            )
+        );
+        Tf = (H1*T1 + H2*T2 + mDotL)/(H1 + H2);
+
+        Info<< "Tf." << pair.name()
+            << ": min = " << min(Tf.internalField())
+            << ", mean = " << average(Tf.internalField())
+            << ", max = " << max(Tf.internalField())
+            << endl;
     }
 }
 
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
index 9a0a0d109a..edae5a6ff6 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
@@ -43,6 +43,7 @@ SourceFiles
 
 #include "HeatAndMassTransferPhaseSystem.H"
 #include "saturationModel.H"
+#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,6 +70,9 @@ protected:
         //- The saturation model used to evaluate Tsat = Tf
         autoPtr<saturationModel> saturationModel_;
 
+        // Mass transfer enabled
+        Switch massTransfer_;
+
 
 public:
 
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
new file mode 100644
index 0000000000..25bc49fd48
--- /dev/null
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
@@ -0,0 +1,226 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "makeReactionThermo.H"
+#include "makeThermo.H"
+
+#include "rhoReactionThermo.H"
+#include "heRhoThermo.H"
+
+#include "specie.H"
+#include "perfectGas.H"
+#include "perfectFluid.H"
+#include "rhoConst.H"
+#include "incompressiblePerfectGas.H"
+#include "hConstThermo.H"
+#include "janafThermo.H"
+#include "sensibleEnthalpy.H"
+#include "absoluteEnthalpy.H"
+#include "absoluteInternalEnergy.H"
+#include "thermo.H"
+
+#include "constTransport.H"
+#include "sutherlandTransport.H"
+
+#include "pureMixture.H"
+#include "homogeneousMixture.H"
+#include "inhomogeneousMixture.H"
+#include "veryInhomogeneousMixture.H"
+#include "multiComponentMixture.H"
+#include "reactingMixture.H"
+#include "singleStepReactingMixture.H"
+
+#include "thermoPhysicsTypes.H"
+
+#include "hRefConstThermo.H"
+
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Thermo type typedefs:
+
+typedef
+constTransport
+<
+    species::thermo
+    <
+        hRefConstThermo
+        <
+            perfectGas<specie>
+        >,
+        sensibleEnthalpy
+    >
+> constRefGasHThermoPhysics;
+
+typedef
+constTransport
+<
+    species::thermo
+    <
+        hRefConstThermo
+        <
+            perfectFluid<specie>
+        >,
+        sensibleEnthalpy
+    >
+> constRefFluidHThermoPhysics;
+
+typedef
+constTransport
+<
+    species::thermo
+    <
+        hRefConstThermo
+        <
+            perfectGas<specie>
+        >,
+        sensibleInternalEnergy
+    >
+> constRefGasEThermoPhysics;
+
+typedef
+constTransport
+<
+    species::thermo
+    <
+        hRefConstThermo
+        <
+            perfectFluid<specie>
+        >,
+        sensibleInternalEnergy
+    >
+> constRefFluidEThermoPhysics;
+
+
+// pureMixture, sensibleEnthalpy:
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleEnthalpy,
+    hRefConstThermo,
+    perfectGas,
+    specie
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleEnthalpy,
+    hRefConstThermo,
+    perfectFluid,
+    specie
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleEnthalpy,
+    hRefConstThermo,
+    rhoConst,
+    specie
+);
+
+
+// pureMixture, sensibleInternalEnergy:
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hRefConstThermo,
+    perfectGas,
+    specie
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hRefConstThermo,
+    perfectFluid,
+    specie
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hRefConstThermo,
+    rhoConst,
+    specie
+);
+
+
+// multiComponentMixture, sensibleInternalEnergy:
+
+makeReactionMixtureThermo
+(
+    rhoThermo,
+    rhoReactionThermo,
+    heRhoThermo,
+    multiComponentMixture,
+    constRefGasEThermoPhysics
+);
+
+makeReactionMixtureThermo
+(
+    rhoThermo,
+    rhoReactionThermo,
+    heRhoThermo,
+    multiComponentMixture,
+    constRefFluidEThermoPhysics
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //

From dbfb7cf250a364ed0972ee525c0521074fca370c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 19 Aug 2015 16:30:51 +0100
Subject: [PATCH 15/70] SchaefferFrictionalStress: Updated with
 alphaMinFriction Resolved bug-report
 http://openfoam.org/mantisbt/view.php?id=1831

---
 .../JohnsonJackson/JohnsonJacksonFrictionalStress.C          | 1 +
 .../JohnsonJackson/JohnsonJacksonFrictionalStress.H          | 1 +
 .../Schaeffer/SchaefferFrictionalStress.C                    | 5 +++--
 .../Schaeffer/SchaefferFrictionalStress.H                    | 1 +
 .../frictionalStressModel/frictionalStressModel.H            | 1 +
 .../kineticTheoryModel/kineticTheoryModel.C                  | 1 +
 .../JohnsonJackson/JohnsonJacksonFrictionalStress.C          | 1 +
 .../JohnsonJackson/JohnsonJacksonFrictionalStress.H          | 1 +
 .../Schaeffer/SchaefferFrictionalStress.C                    | 5 +++--
 .../Schaeffer/SchaefferFrictionalStress.H                    | 3 ++-
 .../frictionalStressModel/frictionalStressModel.H            | 3 ++-
 .../kineticTheoryModel/kineticTheoryModel.C                  | 1 +
 12 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index 2180c0bd2e..ab5fb531ea 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -115,6 +115,7 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::nu
 (
     const volScalarField& alpha1,
+    const dimensionedScalar& alphaMinFriction,
     const dimensionedScalar& alphaMax,
     const volScalarField& pf,
     const volSymmTensorField& D
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
index cc5a9dc5ea..1fe92e7d0e 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
@@ -108,6 +108,7 @@ public:
         virtual tmp<volScalarField> nu
         (
             const volScalarField& alpha1,
+            const dimensionedScalar& alphaMinFriction,
             const dimensionedScalar& alphaMax,
             const volScalarField& pf,
             const volSymmTensorField& D
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index 55e7b9f2cd..4a0d2290d1 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -104,6 +104,7 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
 (
     const volScalarField& alpha1,
+    const dimensionedScalar& alphaMinFriction,
     const dimensionedScalar& alphaMax,
     const volScalarField& pf,
     const volSymmTensorField& D
@@ -133,9 +134,9 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
 
     volScalarField& nuf = tnu();
 
-    forAll (D, celli)
+    forAll(D, celli)
     {
-        if (alpha1[celli] > alphaMax.value() - 5e-2)
+        if (alpha1[celli] > alphaMinFriction.value())
         {
             nuf[celli] =
                 0.5*pf[celli]*sin(phi_.value())
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
index 7ff4862348..d4a304eb40 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
@@ -96,6 +96,7 @@ public:
         virtual tmp<volScalarField> nu
         (
             const volScalarField& alpha1,
+            const dimensionedScalar& alphaMinFriction,
             const dimensionedScalar& alphaMax,
             const volScalarField& pf,
             const volSymmTensorField& D
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index 0e08f7ec8c..923a1fce3f 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -122,6 +122,7 @@ public:
         virtual tmp<volScalarField> nu
         (
             const volScalarField& alpha1,
+            const dimensionedScalar& alphaMinFriction,
             const dimensionedScalar& alphaMax,
             const volScalarField& pf,
             const volSymmTensorField& D
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 11d09d1118..9d502f7dd4 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -519,6 +519,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
         nut_ += frictionalStressModel_->nu
         (
             alpha,
+            alphaMinFriction_,
             alphaMax_,
             pf/rho,
             D
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index 2180c0bd2e..ab5fb531ea 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -115,6 +115,7 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::nu
 (
     const volScalarField& alpha1,
+    const dimensionedScalar& alphaMinFriction,
     const dimensionedScalar& alphaMax,
     const volScalarField& pf,
     const volSymmTensorField& D
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
index cc5a9dc5ea..1fe92e7d0e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
@@ -108,6 +108,7 @@ public:
         virtual tmp<volScalarField> nu
         (
             const volScalarField& alpha1,
+            const dimensionedScalar& alphaMinFriction,
             const dimensionedScalar& alphaMax,
             const volScalarField& pf,
             const volSymmTensorField& D
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index 55e7b9f2cd..4a0d2290d1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -104,6 +104,7 @@ Foam::tmp<Foam::volScalarField>
 Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
 (
     const volScalarField& alpha1,
+    const dimensionedScalar& alphaMinFriction,
     const dimensionedScalar& alphaMax,
     const volScalarField& pf,
     const volSymmTensorField& D
@@ -133,9 +134,9 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
 
     volScalarField& nuf = tnu();
 
-    forAll (D, celli)
+    forAll(D, celli)
     {
-        if (alpha1[celli] > alphaMax.value() - 5e-2)
+        if (alpha1[celli] > alphaMinFriction.value())
         {
             nuf[celli] =
                 0.5*pf[celli]*sin(phi_.value())
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
index 3f56759e2a..d4a304eb40 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,6 +96,7 @@ public:
         virtual tmp<volScalarField> nu
         (
             const volScalarField& alpha1,
+            const dimensionedScalar& alphaMinFriction,
             const dimensionedScalar& alphaMax,
             const volScalarField& pf,
             const volSymmTensorField& D
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index 28dc1ab1f0..923a1fce3f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,6 +122,7 @@ public:
         virtual tmp<volScalarField> nu
         (
             const volScalarField& alpha1,
+            const dimensionedScalar& alphaMinFriction,
             const dimensionedScalar& alphaMax,
             const volScalarField& pf,
             const volSymmTensorField& D
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 30254f3891..31a58c7abd 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -515,6 +515,7 @@ void Foam::RASModels::kineticTheoryModel::correct()
         nut_ += frictionalStressModel_->nu
         (
             alpha,
+            alphaMinFriction_,
             alphaMax_,
             pf/rho,
             D

From da2e7bdbbde4902c1c3e394bf065238ade3801f8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 20 Aug 2015 15:29:44 +0100
Subject: [PATCH 16/70] 
 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection: New
 tutorial to demonstrate steam condensation

---
 .../laminar/steamInjection/0/T.steam          |  42 ++++
 .../laminar/steamInjection/0/T.water          |  42 ++++
 .../laminar/steamInjection/0/U.steam          |  42 ++++
 .../laminar/steamInjection/0/U.water          |  42 ++++
 .../laminar/steamInjection/0/alpha.steam      |  47 ++++
 .../laminar/steamInjection/0/alpha.water      |  47 ++++
 .../laminar/steamInjection/0/nut.water        |  41 ++++
 .../laminar/steamInjection/0/p                |  40 ++++
 .../laminar/steamInjection/0/p_rgh            |  41 ++++
 .../laminar/steamInjection/0/water.steam      |  42 ++++
 .../laminar/steamInjection/0/water.water      |  42 ++++
 .../laminar/steamInjection/constant/fvOptions |  81 +++++++
 .../laminar/steamInjection/constant/g         |  22 ++
 .../steamInjection/constant/phaseProperties   | 222 ++++++++++++++++++
 .../constant/thermophysicalProperties.steam   |  60 +++++
 .../constant/thermophysicalProperties.water   |  66 ++++++
 .../constant/turbulenceProperties.steam       |  20 ++
 .../constant/turbulenceProperties.water       |  20 ++
 .../steamInjection/system/blockMeshDict       |  61 +++++
 .../laminar/steamInjection/system/controlDict |  55 +++++
 .../laminar/steamInjection/system/fvSchemes   |  75 ++++++
 .../laminar/steamInjection/system/fvSolution  |  97 ++++++++
 22 files changed, 1247 insertions(+)
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.steam
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.water
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.steam
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.water
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/nut.water
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p_rgh
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.water
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution

diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.steam
new file mode 100644
index 0000000000..c0cd064e49
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.steam
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      T.steam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions          [0 0 0 1 0 0 0];
+
+internalField       uniform 372.76;
+
+boundaryField
+{
+    walls
+    {
+        type            zeroGradient;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.steam;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.water
new file mode 100644
index 0000000000..16c68c31f2
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/T.water
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      T.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions          [0 0 0 1 0 0 0];
+
+internalField       uniform 360;
+
+boundaryField
+{
+    walls
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.water;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    inlet
+    {
+        type             zeroGradient;
+    }
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam
new file mode 100644
index 0000000000..15d945857a
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.steam
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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      binary;
+    class       volVectorField;
+    location    "0";
+    object      U.steam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0.1 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform (0 0.1 0);
+    }
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        phi             phi.steam;
+        value           $internalField;
+    }
+    walls
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water
new file mode 100644
index 0000000000..256fe1cb1a
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/U.water
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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      binary;
+    class       volVectorField;
+    location    "0";
+    object      U.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0.1 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform (0 0.1 0);
+    }
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        phi             phi.water;
+        value           $internalField;
+    }
+    walls
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.steam
new file mode 100644
index 0000000000..0b69e50eed
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.steam
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.steam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0.;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.steam;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.water
new file mode 100644
index 0000000000..f7aab53be2
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/alpha.water
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 1.;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.water;
+        inletValue      uniform 1.0;
+        value           uniform 1.0;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/nut.water
new file mode 100644
index 0000000000..634a29a38b
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/nut.water
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 1e-8;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+    walls
+    {
+        type            nutkWallFunction;
+        value           $internalField;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p
new file mode 100644
index 0000000000..799576be27
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p
@@ -0,0 +1,40 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions          [ 1 -1 -2 0 0 0 0 ];
+
+internalField       uniform 1e5;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+    walls
+    {
+        type            calculated;
+        value           $internalField;
+    }
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p_rgh
new file mode 100644
index 0000000000..071e58a395
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/p_rgh
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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 1e5;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedFluxPressure;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            prghPressure;
+        p               $internalField;
+        value           $internalField;
+    }
+    walls
+    {
+        type            fixedFluxPressure;
+        value           $internalField;
+    }
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam
new file mode 100644
index 0000000000..edd088bc17
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.steam
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      AIR.steam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 1;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.steam;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.water
new file mode 100644
index 0000000000..78063efe66
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0/water.water
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      AIR.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.water;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
new file mode 100644
index 0000000000..6a3a4da0be
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions
@@ -0,0 +1,81 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      fvOptions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+injector1
+{
+    timeStart       1;
+    duration        500;
+    selectionMode   points;
+    points
+    (
+        (0.075 0.2 0.05)
+    );
+}
+
+options
+{
+    massSource1
+    {
+        type            scalarSemiImplicitSource;
+
+        scalarSemiImplicitSourceCoeffs
+        {
+            $injector1;
+
+            volumeMode      absolute;
+            injectionRateSuSp
+            {
+                thermo:rho.steam     (1.0e-3 0); // kg/s
+            }
+        }
+    }
+
+    momentumSource1
+    {
+        type            vectorSemiImplicitSource;
+
+        vectorSemiImplicitSourceCoeffs
+        {
+            $injector1;
+
+            volumeMode      absolute;
+            injectionRateSuSp
+            {
+                U.steam           ((0 1e-1 0) 0); // kg*m/s^2
+            }
+        }
+    }
+
+    energySource1
+    {
+        type            scalarSemiImplicitSource;
+
+        scalarSemiImplicitSourceCoeffs
+        {
+            $injector1;
+
+            volumeMode      absolute;
+            injectionRateSuSp
+            {
+                e.steam      (3700 0); // kg*m^2/s^3
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
new file mode 100644
index 0000000000..0cc222ca34
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- 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       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
new file mode 100644
index 0000000000..fc976bc67c
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties
@@ -0,0 +1,222 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      phaseProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type    thermalPhaseChangeTwoPhaseSystem;
+
+phases (steam water);
+
+volatile    "water";
+
+massTransfer on;
+
+steam
+{
+    type            multiComponentPhaseModel;
+    diameterModel   isothermal;
+    isothermalCoeffs
+    {
+        d0              3e-3;
+        p0              1e5;
+    }
+    Sc              0.7;
+
+    residualAlpha   1e-6;
+}
+
+water
+{
+    type            multiComponentPhaseModel;
+    diameterModel   constant;
+    constantCoeffs
+    {
+        d               1e-4;
+    }
+    Sc              0.7;
+
+    residualAlpha   1e-6;
+}
+
+blending
+{
+    default
+    {
+        type            none;
+        continuousPhase water;
+        minFullyContinuousAlpha.steam 0.7;
+        minPartlyContinuousAlpha.steam 0.5;
+        minFullyContinuousAlpha.water 0.7;
+        minPartlyContinuousAlpha.water 0.5;
+    }
+
+    heatTransfer
+    {
+        type            none;
+        continuousPhase water;
+        minFullyContinuousAlpha.steam 1;
+        minPartlyContinuousAlpha.steam 0;
+        minFullyContinuousAlpha.water 1;
+        minPartlyContinuousAlpha.water 0;
+    }
+
+    massTransfer
+    {
+        type            none;
+        continuousPhase water;
+        minFullyContinuousAlpha.steam 1;
+        minPartlyContinuousAlpha.steam 0;
+        minFullyContinuousAlpha.water 1;
+        minPartlyContinuousAlpha.water 0;
+    }
+}
+
+surfaceTension
+(
+    (steam and water)
+    {
+        type            constant;
+        sigma           0.07;
+    }
+);
+
+saturationModel
+{
+    type constant;
+    pSat 1e5;
+    Tsat 372.76;
+};
+
+
+aspectRatio
+(
+    (steam in water)
+    {
+        type            constant;
+        E0              1.0;
+    }
+
+    (water in steam)
+    {
+        type            constant;
+        E0              1.0;
+    }
+);
+
+drag
+(
+    (steam in water)
+    {
+        type            SchillerNaumann;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (water in steam)
+    {
+        type            SchillerNaumann;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+);
+
+virtualMass
+(
+    (steam in water)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (water in steam)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+);
+
+interfaceComposition
+(
+    (steam in water)
+    {
+        type Saturated;
+        species ( H2O );
+        Le 1.0;
+        saturationPressure
+        {
+            type ArdenBuck;
+        }
+    }
+
+);
+
+heatTransfer.steam
+(
+    (steam in water)
+    {
+        type spherical;
+        residualAlpha 1e-4;
+    }
+);
+
+heatTransfer.water
+(
+    (steam in water)
+    {
+        type RanzMarshall;
+        residualAlpha 1e-4;
+    }
+);
+
+massTransfer.steam
+(
+
+);
+
+massTransfer.water
+(
+
+);
+
+lift
+(
+);
+
+wallLubrication
+(
+);
+
+turbulentDispersion
+(
+    (steam in water)
+    {
+        type                Burns;//
+        sigma               0.7;
+        Ctd                 1.0;
+        residualAlpha       1e-3;
+    }
+);
+
+// Minimum allowable pressure
+pMin            10000;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
new file mode 100644
index 0000000000..4053b173ee
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam
@@ -0,0 +1,60 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      thermophysicalProperties.steam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         multiComponentMixture;
+    transport       const;
+    thermo          hRefConst;
+    equationOfState perfectGas;
+    specie          specie;
+    energy          sensibleInternalEnergy;
+}
+
+species
+(
+    water
+);
+
+inertSpecie water;
+
+water
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+
+    thermodynamics
+    {
+        Hf          0;
+        Cp          2078.4;
+        Tref        372.76;
+        Href        2675500;
+    }
+
+    transport
+    {
+        mu          1.2256e-5;
+        Pr          2.289;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
new file mode 100644
index 0000000000..3e40c9dce6
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water
@@ -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       dictionary;
+    location    "constant";
+    object      thermophysicalProperties.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         multiComponentMixture;
+    transport       const;
+    thermo          hRefConst;
+    equationOfState perfectFluid;
+    specie          specie;
+    energy          sensibleInternalEnergy;
+}
+
+species
+(
+    water
+);
+
+inertSpecie water;
+
+water
+{
+    specie
+    {
+        nMoles          1;
+        molWeight       18.0153;
+    }
+
+    equationOfState
+    {
+        R           3000;
+        rho0        959;
+    }
+
+    thermodynamics
+    {
+        Hf          0;
+        Cp          4195;
+        Tref        372.76;
+        Href        417500;
+    }
+
+    transport
+    {
+        mu          2.8291e-4;
+        Pr          2.289;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
new file mode 100644
index 0000000000..bdcd006d4e
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties.steam;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
new file mode 100644
index 0000000000..2accd9147b
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
new file mode 100644
index 0000000000..d03967afdc
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict
@@ -0,0 +1,61 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (0 0 0)
+    (0.15 0 0)
+    (0.15 1 0)
+    (0 1 0)
+    (0 0 0.1)
+    (0.15 0 0.1)
+    (0.15 1 0.1)
+    (0 1 0.1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (25 75 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+patches
+(
+    patch inlet
+    (
+        (1 5 4 0)
+    )
+    patch outlet
+    (
+        (3 7 6 2)
+    )
+    wall walls
+    (
+        (0 4 7 3)
+        (2 6 5 1)
+    )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
new file mode 100644
index 0000000000..c39421ffae
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict
@@ -0,0 +1,55 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     reactingTwoPhaseEulerFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         10;
+
+deltaT          1e-6;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.5;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  10;
+
+writeCompression compressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.1;
+
+maxDeltaT       1e-2;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
new file mode 100644
index 0000000000..2eb1993dc7
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes
@@ -0,0 +1,75 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default                         none;
+
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
+    "div\(phir,alpha.*\)"           Gauss vanLeer;
+
+    "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
+    "div\(phi.*,U.*\)"              Gauss limitedLinearV 1;
+
+    "div\(alphaRhoPhi.*,Yi\)"       Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
+    "div\(alphaPhi.*,p\)"           Gauss limitedLinear 1;
+
+    "div\(alphaRhoPhi.*,(k|epsilon).*\)"  Gauss limitedLinear 1;
+    "div\(phim,(k|epsilon)m\)"      Gauss limitedLinear 1;
+
+    "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear uncorrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         uncorrected;
+}
+
+fluxRequired
+{
+    default         no;
+}
+
+wallDist
+{
+    method          meshWave;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
new file mode 100644
index 0000000000..6cf90aa61f
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution
@@ -0,0 +1,97 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.*"
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 3;
+    }
+
+    p_rgh
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-8;
+        relTol          0;
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        relTol          0;
+    }
+
+    "U.*"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-6;
+        relTol          0;
+        minIter         1;
+    }
+
+    "(e|h).*"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-6;
+        relTol          0;
+        minIter         1;
+        maxIter         20;
+    }
+
+    "(k|epsilon|Theta).*"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
+        minIter         1;
+    }
+
+    Yi
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-6;
+        relTol          0;
+        minIter         1;
+        residualAlpha   1e-8;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors 4;
+    nCorrectors      1;
+    nNonOrthogonalCorrectors 0;
+    nEnergyCorrectors 1;
+    faceMomentum    on;
+}
+
+relaxationFactors
+{
+    equations
+    {
+        ".*"            1;
+    }
+}
+
+
+// ************************************************************************* //

From f95661df22a798d299a16ae78546ff53ce2374b6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 20 Aug 2015 15:30:53 +0100
Subject: [PATCH 17/70] src/TurbulenceModels: Renamed template classes to start
 with capital letter

---
 .../EddyDiffusivity.C}                        | 16 +++++++--------
 .../EddyDiffusivity.H}                        | 20 +++++++++----------
 .../ThermalDiffusivity.C}                     | 16 +++++++--------
 .../ThermalDiffusivity.H}                     | 20 +++++++++----------
 ...RateAdvectiveDiffusiveFvPatchScalarField.C |  4 ++--
 .../makeTurbulenceModel.H                     |  8 ++++----
 .../turbulentFluidThermoModel.H               | 10 +++++-----
 .../turbulentFluidThermoModels.C              | 10 +++++-----
 8 files changed, 52 insertions(+), 52 deletions(-)
 rename src/TurbulenceModels/compressible/{eddyDiffusivity/eddyDiffusivity.C => EddyDiffusivity/EddyDiffusivity.C} (89%)
 rename src/TurbulenceModels/compressible/{eddyDiffusivity/eddyDiffusivity.H => EddyDiffusivity/EddyDiffusivity.H} (94%)
 rename src/TurbulenceModels/compressible/{thermalDiffusivity/thermalDiffusivity.C => ThermalDiffusivity/ThermalDiffusivity.C} (88%)
 rename src/TurbulenceModels/compressible/{thermalDiffusivity/thermalDiffusivity.H => ThermalDiffusivity/ThermalDiffusivity.H} (93%)

diff --git a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
similarity index 89%
rename from src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C
rename to src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
index fc73f457e8..8e66570e16 100644
--- a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.C
+++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "eddyDiffusivity.H"
+#include "EddyDiffusivity.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-void Foam::eddyDiffusivity<BasicTurbulenceModel>::correctNut()
+void Foam::EddyDiffusivity<BasicTurbulenceModel>::correctNut()
 {
     alphat_ = this->rho_*this->nut()/Prt_;
     alphat_.correctBoundaryConditions();
@@ -38,7 +38,7 @@ void Foam::eddyDiffusivity<BasicTurbulenceModel>::correctNut()
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-Foam::eddyDiffusivity<BasicTurbulenceModel>::eddyDiffusivity
+Foam::EddyDiffusivity<BasicTurbulenceModel>::EddyDiffusivity
 (
     const word& type,
     const geometricOneField& alpha,
@@ -92,8 +92,8 @@ Foam::eddyDiffusivity<BasicTurbulenceModel>::eddyDiffusivity
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-Foam::autoPtr<Foam::eddyDiffusivity<BasicTurbulenceModel> >
-Foam::eddyDiffusivity<BasicTurbulenceModel>::New
+Foam::autoPtr<Foam::EddyDiffusivity<BasicTurbulenceModel> >
+Foam::EddyDiffusivity<BasicTurbulenceModel>::New
 (
     const volScalarField& rho,
     const volVectorField& U,
@@ -102,9 +102,9 @@ Foam::eddyDiffusivity<BasicTurbulenceModel>::New
     const word& propertiesName
 )
 {
-    return autoPtr<eddyDiffusivity>
+    return autoPtr<EddyDiffusivity>
     (
-        static_cast<eddyDiffusivity*>(
+        static_cast<EddyDiffusivity*>(
         BasicTurbulenceModel::New
         (
             rho,
@@ -120,7 +120,7 @@ Foam::eddyDiffusivity<BasicTurbulenceModel>::New
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
-bool Foam::eddyDiffusivity<BasicTurbulenceModel>::read()
+bool Foam::EddyDiffusivity<BasicTurbulenceModel>::read()
 {
     if (BasicTurbulenceModel::read())
     {
diff --git a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
similarity index 94%
rename from src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H
rename to src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
index 0913da8464..4b04ca83d4 100644
--- a/src/TurbulenceModels/compressible/eddyDiffusivity/eddyDiffusivity.H
+++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::eddyDiffusivity
+    Foam::EddyDiffusivity
 
 Description
     Templated abstract base class for single-phase compressible
     turbulence models.
 
 SourceFiles
-    eddyDiffusivity.C
+    EddyDiffusivity.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef eddyDiffusivity_H
-#define eddyDiffusivity_H
+#ifndef EddyDiffusivity_H
+#define EddyDiffusivity_H
 
 #include "CompressibleTurbulenceModel.H"
 
@@ -44,11 +44,11 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-               Class eddyDiffusivity Declaration
+               Class EddyDiffusivity Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class BasicTurbulenceModel>
-class eddyDiffusivity
+class EddyDiffusivity
 :
     public BasicTurbulenceModel
 {
@@ -81,7 +81,7 @@ public:
     // Constructors
 
         //- Construct
-        eddyDiffusivity
+        EddyDiffusivity
         (
             const word& type,
             const geometricOneField& alpha,
@@ -97,7 +97,7 @@ public:
     // Selectors
 
         //- Return a reference to the selected turbulence model
-        static autoPtr<eddyDiffusivity> New
+        static autoPtr<EddyDiffusivity> New
         (
             const volScalarField& rho,
             const volVectorField& U,
@@ -108,7 +108,7 @@ public:
 
 
     //- Destructor
-    virtual ~eddyDiffusivity()
+    virtual ~EddyDiffusivity()
     {}
 
 
@@ -167,7 +167,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "eddyDiffusivity.C"
+#   include "EddyDiffusivity.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
similarity index 88%
rename from src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C
rename to src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
index 5b25fe8d8e..8c6ac11656 100644
--- a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.C
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "thermalDiffusivity.H"
+#include "ThermalDiffusivity.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class TransportModel>
-Foam::thermalDiffusivity<TransportModel>::thermalDiffusivity
+Foam::ThermalDiffusivity<TransportModel>::ThermalDiffusivity
 (
     const word& type,
     const geometricOneField& alpha,
@@ -57,8 +57,8 @@ Foam::thermalDiffusivity<TransportModel>::thermalDiffusivity
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class TransportModel>
-Foam::autoPtr<Foam::thermalDiffusivity<TransportModel> >
-Foam::thermalDiffusivity<TransportModel>::New
+Foam::autoPtr<Foam::ThermalDiffusivity<TransportModel> >
+Foam::ThermalDiffusivity<TransportModel>::New
 (
     const volScalarField& rho,
     const volVectorField& U,
@@ -67,9 +67,9 @@ Foam::thermalDiffusivity<TransportModel>::New
     const word& propertiesName
 )
 {
-    return autoPtr<thermalDiffusivity>
+    return autoPtr<ThermalDiffusivity>
     (
-        static_cast<thermalDiffusivity*>(
+        static_cast<ThermalDiffusivity*>(
         CompressibleTurbulenceModel<transportModel>::New
         (
             rho,
@@ -86,7 +86,7 @@ Foam::thermalDiffusivity<TransportModel>::New
 
 template<class BasicTurbulenceModel>
 Foam::tmp<Foam::volScalarField>
-Foam::thermalDiffusivity<BasicTurbulenceModel>::alphat() const
+Foam::ThermalDiffusivity<BasicTurbulenceModel>::alphat() const
 {
     return tmp<volScalarField>
     (
@@ -109,7 +109,7 @@ Foam::thermalDiffusivity<BasicTurbulenceModel>::alphat() const
 
 template<class BasicTurbulenceModel>
 Foam::tmp<Foam::scalarField>
-Foam::thermalDiffusivity<BasicTurbulenceModel>::alphat
+Foam::ThermalDiffusivity<BasicTurbulenceModel>::alphat
 (
     const label patchi
 ) const
diff --git a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
similarity index 93%
rename from src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H
rename to src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
index b62cfa2e95..4c6328be13 100644
--- a/src/TurbulenceModels/compressible/thermalDiffusivity/thermalDiffusivity.H
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::thermalDiffusivity
+    Foam::ThermalDiffusivity
 
 Description
     Templated abstract base class for single-phase compressible
     turbulence models.
 
 SourceFiles
-    thermalDiffusivity.C
+    ThermalDiffusivity.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef thermalDiffusivity_H
-#define thermalDiffusivity_H
+#ifndef ThermalDiffusivity_H
+#define ThermalDiffusivity_H
 
 #include "CompressibleTurbulenceModel.H"
 
@@ -44,11 +44,11 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-               Class thermalDiffusivity Declaration
+               Class ThermalDiffusivity Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class TransportModel>
-class thermalDiffusivity
+class ThermalDiffusivity
 :
     public CompressibleTurbulenceModel<TransportModel>
 {
@@ -63,7 +63,7 @@ public:
     // Constructors
 
         //- Construct
-        thermalDiffusivity
+        ThermalDiffusivity
         (
             const word& type,
             const geometricOneField& alpha,
@@ -79,7 +79,7 @@ public:
     // Selectors
 
         //- Return a reference to the selected turbulence model
-        static autoPtr<thermalDiffusivity> New
+        static autoPtr<ThermalDiffusivity> New
         (
             const volScalarField& rho,
             const volVectorField& U,
@@ -90,7 +90,7 @@ public:
 
 
     //- Destructor
-    virtual ~thermalDiffusivity()
+    virtual ~ThermalDiffusivity()
     {}
 
 
@@ -166,7 +166,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "thermalDiffusivity.C"
+#   include "ThermalDiffusivity.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index 646fbed662..63d700d3a2 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -153,10 +153,10 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs()
 
     const label patchI = patch().index();
 
-    const LESModel<eddyDiffusivity<compressible::turbulenceModel> >& turbModel =
+    const LESModel<EddyDiffusivity<compressible::turbulenceModel> >& turbModel =
     db().lookupObject
     <
-        LESModel<eddyDiffusivity<compressible::turbulenceModel> >
+        LESModel<EddyDiffusivity<compressible::turbulenceModel> >
     >   (
             IOobject::groupName
             (
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
index 12839d7c6b..a2720aa797 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
@@ -56,7 +56,7 @@ License
         );                                                                     \
                                                                                \
                                                                                \
-        typedef RASModel<eddyDiffusivity<Transport##BaseModel> >               \
+        typedef RASModel<EddyDiffusivity<Transport##BaseModel> >               \
             RAS##Transport##BaseModel;                                         \
                                                                                \
         defineNamedTemplateTypeNameAndDebug(RAS##Transport##BaseModel, 0);     \
@@ -72,7 +72,7 @@ License
         );                                                                     \
                                                                                \
                                                                                \
-        typedef LESModel<eddyDiffusivity<Transport##BaseModel> >               \
+        typedef LESModel<EddyDiffusivity<Transport##BaseModel> >               \
             LES##Transport##BaseModel;                                         \
                                                                                \
         defineNamedTemplateTypeNameAndDebug(LES##Transport##BaseModel, 0);     \
@@ -90,7 +90,7 @@ License
 
 
 #define makeTemplatedTurbulenceModel(BaseModel, SType, Type)                   \
-    typedef Foam::SType##Models::Type<Foam::eddyDiffusivity<Foam::BaseModel> > \
+    typedef Foam::SType##Models::Type<Foam::EddyDiffusivity<Foam::BaseModel> > \
         Type##SType##BaseModel;                                                \
     defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0);            \
                                                                                \
@@ -98,7 +98,7 @@ License
     {                                                                          \
         namespace SType##Models                                                \
         {                                                                      \
-            typedef Type<eddyDiffusivity<BaseModel> > Type##SType##BaseModel;  \
+            typedef Type<EddyDiffusivity<BaseModel> > Type##SType##BaseModel;  \
                                                                                \
             addToRunTimeSelectionTable                                         \
             (                                                                  \
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
index 7725dee971..b8e70ca47f 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
@@ -43,8 +43,8 @@ SourceFiles
 #define turbulentFluidThermoModel_H
 
 #include "SpecificCompressibleTurbulenceModel.H"
-#include "thermalDiffusivity.H"
-#include "eddyDiffusivity.H"
+#include "ThermalDiffusivity.H"
+#include "EddyDiffusivity.H"
 #include "RASModel.H"
 #include "LESModel.H"
 #include "fluidThermo.H"
@@ -55,16 +55,16 @@ namespace Foam
 {
     namespace compressible
     {
-        typedef thermalDiffusivity<fluidThermo> turbulenceModel;
+        typedef ThermalDiffusivity<fluidThermo> turbulenceModel;
 
         typedef SpecificCompressibleTurbulenceModel
         <
-            RASModel<eddyDiffusivity<turbulenceModel> >
+            RASModel<EddyDiffusivity<turbulenceModel> >
         > RASModel;
 
         typedef SpecificCompressibleTurbulenceModel
         <
-            LESModel<eddyDiffusivity<turbulenceModel> >
+            LESModel<EddyDiffusivity<turbulenceModel> >
         > LESModel;
     }
 }
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
index ec6a3eb4db..cfd29dba9a 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
@@ -28,8 +28,8 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
-#include "thermalDiffusivity.H"
-#include "eddyDiffusivity.H"
+#include "ThermalDiffusivity.H"
+#include "EddyDiffusivity.H"
 
 #include "laminar.H"
 #include "RASModel.H"
@@ -42,17 +42,17 @@ makeBaseTurbulenceModel
     geometricOneField,
     volScalarField,
     compressibleTurbulenceModel,
-    thermalDiffusivity,
+    ThermalDiffusivity,
     fluidThermo
 );
 
 #define makeRASModel(Type)                                                     \
     makeTemplatedTurbulenceModel                                               \
-    (fluidThermothermalDiffusivity, RAS, Type)
+    (fluidThermoThermalDiffusivity, RAS, Type)
 
 #define makeLESModel(Type)                                                     \
     makeTemplatedTurbulenceModel                                               \
-    (fluidThermothermalDiffusivity, LES, Type)
+    (fluidThermoThermalDiffusivity, LES, Type)
 
 
 // -------------------------------------------------------------------------- //

From 988b0fd3e1601be963de8c7a50841f393b254ff7 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 20 Aug 2015 17:54:51 +0100
Subject: [PATCH 18/70] ThermalDiffusivity: Refactored to support phase
 turbulence models

---
 .../PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C |  2 +-
 .../PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H |  2 +-
 .../compressible/EddyDiffusivity/EddyDiffusivity.H |  2 --
 .../ThermalDiffusivity/ThermalDiffusivity.C        | 14 +++++++-------
 .../ThermalDiffusivity/ThermalDiffusivity.H        | 12 +++++-------
 .../makeTurbulenceModel.H                          |  3 ++-
 .../turbulentFluidThermoModel.H                    |  3 ++-
 .../turbulentFluidThermoModels.C                   |  1 +
 8 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 73dbee5664..e09c1bbd14 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -55,7 +55,7 @@ PDRkEpsilon::PDRkEpsilon
     const word& modelName
 )
 :
-    Foam::RASModels::kEpsilon<eddyDiffusivity<compressible::turbulenceModel> >
+    Foam::RASModels::kEpsilon<EddyDiffusivity<compressible::turbulenceModel> >
     (
         geometricOneField(),
         rho,
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
index 689a47844a..1ee0719076 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
@@ -80,7 +80,7 @@ class PDRkEpsilon
 :
     public Foam::RASModels::kEpsilon
     <
-        eddyDiffusivity
+        EddyDiffusivity
         <
             compressible::turbulenceModel
         >
diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
index 4b04ca83d4..a01107f630 100644
--- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
+++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
@@ -36,8 +36,6 @@ SourceFiles
 #ifndef EddyDiffusivity_H
 #define EddyDiffusivity_H
 
-#include "CompressibleTurbulenceModel.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
index 8c6ac11656..ad6de84714 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
@@ -27,8 +27,8 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class TransportModel>
-Foam::ThermalDiffusivity<TransportModel>::ThermalDiffusivity
+template<class BasicTurbulenceModel>
+Foam::ThermalDiffusivity<BasicTurbulenceModel>::ThermalDiffusivity
 (
     const word& type,
     const geometricOneField& alpha,
@@ -40,7 +40,7 @@ Foam::ThermalDiffusivity<TransportModel>::ThermalDiffusivity
     const word& propertiesName
 )
 :
-    CompressibleTurbulenceModel<TransportModel>
+    BasicTurbulenceModel
     (
         type,
         alpha,
@@ -56,9 +56,9 @@ Foam::ThermalDiffusivity<TransportModel>::ThermalDiffusivity
 
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
-template<class TransportModel>
-Foam::autoPtr<Foam::ThermalDiffusivity<TransportModel> >
-Foam::ThermalDiffusivity<TransportModel>::New
+template<class BasicTurbulenceModel>
+Foam::autoPtr<Foam::ThermalDiffusivity<BasicTurbulenceModel> >
+Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
 (
     const volScalarField& rho,
     const volVectorField& U,
@@ -70,7 +70,7 @@ Foam::ThermalDiffusivity<TransportModel>::New
     return autoPtr<ThermalDiffusivity>
     (
         static_cast<ThermalDiffusivity*>(
-        CompressibleTurbulenceModel<transportModel>::New
+        BasicTurbulenceModel::New
         (
             rho,
             U,
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
index 4c6328be13..5996798d87 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
@@ -25,8 +25,8 @@ Class
     Foam::ThermalDiffusivity
 
 Description
-    Templated abstract base class for single-phase compressible
-    turbulence models.
+    Templated wrapper class to provide compressible turbulence models
+    thermal diffusivity based thermal transport.
 
 SourceFiles
     ThermalDiffusivity.C
@@ -36,8 +36,6 @@ SourceFiles
 #ifndef ThermalDiffusivity_H
 #define ThermalDiffusivity_H
 
-#include "CompressibleTurbulenceModel.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -47,17 +45,17 @@ namespace Foam
                Class ThermalDiffusivity Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class TransportModel>
+template<class BasicTurbulenceModel>
 class ThermalDiffusivity
 :
-    public CompressibleTurbulenceModel<TransportModel>
+    public BasicTurbulenceModel
 {
 
 public:
 
     typedef geometricOneField alphaField;
     typedef volScalarField rhoField;
-    typedef TransportModel transportModel;
+    typedef typename BasicTurbulenceModel::transportModel transportModel;
 
 
     // Constructors
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
index a2720aa797..91c3a2e71b 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
@@ -41,7 +41,8 @@ License
             dictionary                                                         \
         );                                                                     \
                                                                                \
-        typedef BaseModel<Transport> Transport##BaseModel;                     \
+        typedef BaseModel<CompressibleTurbulenceModel<Transport> >             \
+            Transport##BaseModel;                                              \
                                                                                \
                                                                                \
         typedef laminar<Transport##BaseModel> Laminar##Transport##BaseModel;   \
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
index b8e70ca47f..da111a9907 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
@@ -55,7 +55,8 @@ namespace Foam
 {
     namespace compressible
     {
-        typedef ThermalDiffusivity<fluidThermo> turbulenceModel;
+        typedef ThermalDiffusivity<CompressibleTurbulenceModel<fluidThermo> >
+            turbulenceModel;
 
         typedef SpecificCompressibleTurbulenceModel
         <
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
index cfd29dba9a..d5342a15d7 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
@@ -28,6 +28,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
+#include "CompressibleTurbulenceModel.H"
 #include "ThermalDiffusivity.H"
 #include "EddyDiffusivity.H"
 

From 86cc19bd8bf72779ec06b2c862f028cf063444bb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 22 Aug 2015 18:09:44 +0100
Subject: [PATCH 19/70] reactingTwoPhaseEulerFoam: Added support for thermal
 diffusivity and thermal wall-functions

---
 .../Make/options                              |  2 +-
 .../kineticTheoryModel/kineticTheoryModel.C   | 13 +++-
 .../kineticTheoryModel/kineticTheoryModel.H   |  7 +-
 .../phaseCompressibleTurbulenceModels.C       |  4 +
 .../phasePressureModel/phasePressureModel.C   | 13 +++-
 .../phasePressureModel/phasePressureModel.H   |  7 +-
 .../ThermoPhaseModel/ThermoPhaseModel.C       | 77 +++++++++++++++++--
 .../ThermoPhaseModel/ThermoPhaseModel.H       | 38 ++++++++-
 .../phaseModel/phaseModel/phaseModel.H        | 38 ++++++++-
 .../reactionThermo/hRefConstThermos.C         | 48 +++++++-----
 .../EddyDiffusivity/EddyDiffusivity.C         | 51 +++---------
 .../EddyDiffusivity/EddyDiffusivity.H         | 15 +---
 .../ThermalDiffusivity/ThermalDiffusivity.C   | 30 +++++++-
 .../ThermalDiffusivity/ThermalDiffusivity.H   | 16 +++-
 ...convectiveHeatTransferFvPatchScalarField.C | 15 ++--
 ...RateAdvectiveDiffusiveFvPatchScalarField.C | 10 ++-
 ...ayatillekeWallFunctionFvPatchScalarField.C | 16 ++--
 .../alphatWallFunctionFvPatchScalarField.C    | 33 ++++----
 .../alphatWallFunctionFvPatchScalarField.H    |  6 --
 .../makeTurbulenceModel.H                     |  5 +-
 .../turbulentFluidThermoModels.C              |  7 +-
 .../RAS/kOmegaSST/kOmegaSST.H                 |  2 -
 .../LES/bubbleColumn/0/alphat.air             | 48 ++++++++++++
 .../LES/bubbleColumn/0/alphat.water           | 48 ++++++++++++
 .../RAS/bubbleColumn/0/alphat.air             | 48 ++++++++++++
 .../RAS/bubbleColumn/0/alphat.water           | 48 ++++++++++++
 .../0/alphat.gas                              | 48 ++++++++++++
 .../RAS/fluidisedBed/0/alphat.air             | 48 ++++++++++++
 .../RAS/fluidisedBed/0/alphat.particles       | 47 +++++++++++
 .../laminar/fluidisedBed/0/alphat.particles   | 47 +++++++++++
 30 files changed, 691 insertions(+), 144 deletions(-)
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alphat.gas
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles
 create mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles

diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
index 832cefa73d..6a88d1d9ce 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
@@ -4,8 +4,8 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/transportModel \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 9d502f7dd4..bbf37904ca 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -41,7 +41,13 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
     const word& type
 )
 :
-    eddyViscosity<RASModel<PhaseCompressibleTurbulenceModel<phaseModel> > >
+    eddyViscosity
+    <
+        RASModel<EddyDiffusivity<ThermalDiffusivity
+        <
+            PhaseCompressibleTurbulenceModel<phaseModel>
+        > > >
+    >
     (
         type,
         alpha,
@@ -183,7 +189,10 @@ bool Foam::RASModels::kineticTheoryModel::read()
     (
         eddyViscosity
         <
-            RASModel<PhaseCompressibleTurbulenceModel<phaseModel> >
+            RASModel<EddyDiffusivity<ThermalDiffusivity
+            <
+                PhaseCompressibleTurbulenceModel<phaseModel>
+            > > >
         >::read()
     )
     {
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index bfa1f872cb..9aadb83d12 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -48,6 +48,8 @@ SourceFiles
 #include "RASModel.H"
 #include "eddyViscosity.H"
 #include "PhaseCompressibleTurbulenceModel.H"
+#include "ThermalDiffusivity.H"
+#include "EddyDiffusivity.H"
 #include "phaseModel.H"
 #include "dragModel.H"
 #include "viscosityModel.H"
@@ -72,7 +74,10 @@ class kineticTheoryModel
 :
     public eddyViscosity
     <
-        RASModel<PhaseCompressibleTurbulenceModel<phaseModel> >
+        RASModel<EddyDiffusivity<ThermalDiffusivity
+        <
+            PhaseCompressibleTurbulenceModel<phaseModel>
+        > > >
     >
 {
     // Private data
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
index 65d857d9c8..eb0a070044 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
@@ -29,6 +29,9 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
+#include "ThermalDiffusivity.H"
+#include "EddyDiffusivity.H"
+
 #include "laminar.H"
 #include "RASModel.H"
 #include "LESModel.H"
@@ -39,6 +42,7 @@ makeBaseTurbulenceModel
     volScalarField,
     compressibleTurbulenceModel,
     PhaseCompressibleTurbulenceModel,
+    ThermalDiffusivity,
     phaseModel
 );
 
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index 8cca6f493f..adb23d40d2 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -40,7 +40,13 @@ Foam::RASModels::phasePressureModel::phasePressureModel
     const word& type
 )
 :
-    eddyViscosity<RASModel<PhaseCompressibleTurbulenceModel<phaseModel> > >
+    eddyViscosity
+    <
+        RASModel<EddyDiffusivity<ThermalDiffusivity
+        <
+            PhaseCompressibleTurbulenceModel<phaseModel>
+        > > >
+    >
     (
         type,
         alpha,
@@ -87,7 +93,10 @@ bool Foam::RASModels::phasePressureModel::read()
     (
         eddyViscosity
         <
-            RASModel<PhaseCompressibleTurbulenceModel<phaseModel> >
+            RASModel<EddyDiffusivity<ThermalDiffusivity
+            <
+                PhaseCompressibleTurbulenceModel<phaseModel>
+            > > >
         >::read()
     )
     {
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
index a2b17dc1c7..68734e5b4f 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
@@ -54,6 +54,8 @@ SourceFiles
 #include "RASModel.H"
 #include "eddyViscosity.H"
 #include "PhaseCompressibleTurbulenceModel.H"
+#include "ThermalDiffusivity.H"
+#include "EddyDiffusivity.H"
 #include "phaseModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,7 +73,10 @@ class phasePressureModel
 :
     public eddyViscosity
     <
-        RASModel<PhaseCompressibleTurbulenceModel<phaseModel> >
+        RASModel<EddyDiffusivity<ThermalDiffusivity
+        <
+            PhaseCompressibleTurbulenceModel<phaseModel>
+        > > >
     >
 {
     // Private data
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
index 2befe1585a..e79a9469fd 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
@@ -110,10 +110,10 @@ template<class BasePhaseModel, class ThermoType>
 Foam::tmp<Foam::scalarField>
 Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::mu
 (
-    const label patchI
+    const label patchi
 ) const
 {
-    return thermo_->mu(patchI);
+    return thermo_->mu(patchi);
 }
 
 
@@ -129,10 +129,10 @@ template<class BasePhaseModel, class ThermoType>
 Foam::tmp<Foam::scalarField>
 Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::nu
 (
-    const label patchI
+    const label patchi
 ) const
 {
-    return thermo_->nu(patchI);
+    return thermo_->nu(patchi);
 }
 
 
@@ -148,10 +148,75 @@ template<class BasePhaseModel, class ThermoType>
 Foam::tmp<Foam::scalarField>
 Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::kappa
 (
-    const label patchI
+    const label patchi
 ) const
 {
-    return thermo_->kappa(patchI);
+    return thermo_->kappa(patchi);
+}
+
+
+template<class BasePhaseModel, class ThermoType>
+Foam::tmp<Foam::volScalarField>
+Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::kappaEff
+(
+    const volScalarField& alphat
+) const
+{
+    return thermo_->kappaEff(alphat);
+}
+
+
+template<class BasePhaseModel, class ThermoType>
+Foam::tmp<Foam::scalarField>
+Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::kappaEff
+(
+    const scalarField& alphat,
+    const label patchi
+) const
+{
+    return thermo_->kappaEff(alphat, patchi);
+}
+
+
+template<class BasePhaseModel, class ThermoType>
+Foam::tmp<Foam::volScalarField>
+Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::alpha() const
+{
+    return thermo_->alpha();
+}
+
+
+template<class BasePhaseModel, class ThermoType>
+Foam::tmp<Foam::scalarField>
+Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::alpha
+(
+    const label patchi
+) const
+{
+    return thermo_->alpha(patchi);
+}
+
+
+template<class BasePhaseModel, class ThermoType>
+Foam::tmp<Foam::volScalarField>
+Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::alphaEff
+(
+    const volScalarField& alphat
+) const
+{
+    return thermo_->alphaEff(alphat);
+}
+
+
+template<class BasePhaseModel, class ThermoType>
+Foam::tmp<Foam::scalarField>
+Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::alphaEff
+(
+    const scalarField& alphat,
+    const label patchi
+) const
+{
+    return thermo_->alphaEff(alphat, patchi);
 }
 
 
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
index 0c2b243a83..923187931e 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
@@ -105,19 +105,51 @@ public:
             virtual tmp<volScalarField> mu() const;
 
             //- Access the laminar dynamic viscosity
-            virtual tmp<scalarField> mu(const label patchI) const;
+            virtual tmp<scalarField> mu(const label patchi) const;
 
             //- Return the laminar kinematic viscosity
             virtual tmp<volScalarField> nu() const;
 
             //- Access the laminar kinematic viscosity
-            virtual tmp<scalarField> nu(const label patchI) const;
+            virtual tmp<scalarField> nu(const label patchi) const;
 
             //- Return the laminar thermal conductivity
             virtual tmp<volScalarField> kappa() const;
 
             //- Access the laminar thermal conductivity
-            virtual tmp<scalarField> kappa(const label patchI) const;
+            virtual tmp<scalarField> kappa(const label patchi) const;
+
+            //- Return the laminar thermal conductivity
+            virtual tmp<volScalarField> kappaEff
+            (
+                const volScalarField& alphat
+            ) const;
+
+            //- Access the laminar thermal conductivity
+            virtual tmp<scalarField> kappaEff
+            (
+                const scalarField& alphat,
+                const label patchi
+            ) const;
+
+            //- Return the thermal diffusivity for enthalpy
+            virtual tmp<volScalarField> alpha() const;
+
+            //- Return the thermal diffusivity for enthalpy on a patch
+            virtual tmp<scalarField> alpha(const label patchi) const;
+
+            //- Return the thermal diffusivity for enthalpy
+            virtual tmp<volScalarField> alphaEff
+            (
+                const volScalarField& alphat
+            ) const;
+
+            //- Return the thermal diffusivity for enthalpy on a patch
+            virtual tmp<scalarField> alphaEff
+            (
+                const scalarField& alphat,
+                const label patchi
+            ) const;
 };
 
 
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
index 082bb6c019..34e371a040 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
@@ -246,19 +246,51 @@ public:
             virtual tmp<volScalarField> mu() const = 0;
 
             //- Return the laminar dynamic viscosity on a patch
-            virtual tmp<scalarField> mu(const label patchI) const = 0;
+            virtual tmp<scalarField> mu(const label patchi) const = 0;
 
             //- Return the laminar kinematic viscosity
             virtual tmp<volScalarField> nu() const = 0;
 
             //- Return the laminar kinematic viscosity on a patch
-            virtual tmp<scalarField> nu(const label patchI) const = 0;
+            virtual tmp<scalarField> nu(const label patchi) const = 0;
 
             //- Return the laminar thermal conductivity
             virtual tmp<volScalarField> kappa() const = 0;
 
             //- Return the laminar thermal conductivity on a patch
-            virtual tmp<scalarField> kappa(const label patchI) const = 0;
+            virtual tmp<scalarField> kappa(const label patchi) const = 0;
+
+            //- Return the laminar thermal conductivity
+            virtual tmp<volScalarField> kappaEff
+            (
+                const volScalarField& alphat
+            ) const = 0;
+
+            //- Access the laminar thermal conductivity
+            virtual tmp<scalarField> kappaEff
+            (
+                const scalarField& alphat,
+                const label patchi
+            ) const = 0;
+
+            //- Return the thermal diffusivity for enthalpy
+            virtual tmp<volScalarField> alpha() const = 0;
+
+            //- Return the thermal diffusivity for enthalpy on a patch
+            virtual tmp<scalarField> alpha(const label patchi) const = 0;
+
+            //- Return the thermal diffusivity for enthalpy
+            virtual tmp<volScalarField> alphaEff
+            (
+                const volScalarField& alphat
+            ) const = 0;
+
+            //- Return the thermal diffusivity for enthalpy on a patch
+            virtual tmp<scalarField> alphaEff
+            (
+                const scalarField& alphat,
+                const label patchi
+            ) const = 0;
 
 
         // Turbulence
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
index 25bc49fd48..47ae733b14 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
@@ -33,29 +33,17 @@ License
 #include "perfectGas.H"
 #include "perfectFluid.H"
 #include "rhoConst.H"
-#include "incompressiblePerfectGas.H"
-#include "hConstThermo.H"
-#include "janafThermo.H"
+
 #include "sensibleEnthalpy.H"
-#include "absoluteEnthalpy.H"
-#include "absoluteInternalEnergy.H"
-#include "thermo.H"
-
-#include "constTransport.H"
-#include "sutherlandTransport.H"
-
-#include "pureMixture.H"
-#include "homogeneousMixture.H"
-#include "inhomogeneousMixture.H"
-#include "veryInhomogeneousMixture.H"
-#include "multiComponentMixture.H"
-#include "reactingMixture.H"
-#include "singleStepReactingMixture.H"
-
-#include "thermoPhysicsTypes.H"
 
 #include "hRefConstThermo.H"
 
+#include "constTransport.H"
+
+#include "pureMixture.H"
+#include "multiComponentMixture.H"
+
+#include "thermoPhysicsTypes.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -119,6 +107,19 @@ constTransport
     >
 > constRefFluidEThermoPhysics;
 
+typedef
+constTransport
+<
+    species::thermo
+    <
+        hRefConstThermo
+        <
+            rhoConst<specie>
+        >,
+        sensibleInternalEnergy
+    >
+> constRefRhoConstEThermoPhysics;
+
 
 // pureMixture, sensibleEnthalpy:
 
@@ -218,6 +219,15 @@ makeReactionMixtureThermo
     constRefFluidEThermoPhysics
 );
 
+makeReactionMixtureThermo
+(
+    rhoThermo,
+    rhoReactionThermo,
+    heRhoThermo,
+    multiComponentMixture,
+    constRefRhoConstEThermoPhysics
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
index 8e66570e16..eec1be8c8e 100644
--- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
+++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
@@ -30,6 +30,14 @@ License
 template<class BasicTurbulenceModel>
 void Foam::EddyDiffusivity<BasicTurbulenceModel>::correctNut()
 {
+    // Read Prt if provided
+    Prt_ = dimensioned<scalar>::lookupOrDefault
+    (
+        "Prt",
+        this->coeffDict(),
+        1.0
+    );
+
     alphat_ = this->rho_*this->nut()/Prt_;
     alphat_.correctBoundaryConditions();
 }
@@ -41,7 +49,7 @@ template<class BasicTurbulenceModel>
 Foam::EddyDiffusivity<BasicTurbulenceModel>::EddyDiffusivity
 (
     const word& type,
-    const geometricOneField& alpha,
+    const alphaField& alpha,
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& alphaRhoPhi,
@@ -62,23 +70,14 @@ Foam::EddyDiffusivity<BasicTurbulenceModel>::EddyDiffusivity
         propertiesName
     ),
 
-    // Prt_
-    // (
-    //     dimensioned<scalar>::lookupOrAddToDict
-    //     (
-    //         "Prt",
-    //         this->coeffDict_,
-    //         1.0
-    //     )
-    // ),
-
+    // Cannot read Prt yet
     Prt_("Prt", dimless, 1.0),
 
     alphat_
     (
         IOobject
         (
-            "alphat",
+            IOobject::groupName("alphat", U.group()),
             this->runTime_.timeName(),
             this->mesh_,
             IOobject::MUST_READ,
@@ -89,34 +88,6 @@ Foam::EddyDiffusivity<BasicTurbulenceModel>::EddyDiffusivity
 {}
 
 
-// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
-
-template<class BasicTurbulenceModel>
-Foam::autoPtr<Foam::EddyDiffusivity<BasicTurbulenceModel> >
-Foam::EddyDiffusivity<BasicTurbulenceModel>::New
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const transportModel& transport,
-    const word& propertiesName
-)
-{
-    return autoPtr<EddyDiffusivity>
-    (
-        static_cast<EddyDiffusivity*>(
-        BasicTurbulenceModel::New
-        (
-            rho,
-            U,
-            phi,
-            transport,
-            propertiesName
-        ).ptr())
-    );
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class BasicTurbulenceModel>
diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
index a01107f630..a6693fac10 100644
--- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
+++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
@@ -82,7 +82,7 @@ public:
         EddyDiffusivity
         (
             const word& type,
-            const geometricOneField& alpha,
+            const alphaField& alpha,
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& alphaRhoPhi,
@@ -92,19 +92,6 @@ public:
         );
 
 
-    // Selectors
-
-        //- Return a reference to the selected turbulence model
-        static autoPtr<EddyDiffusivity> New
-        (
-            const volScalarField& rho,
-            const volVectorField& U,
-            const surfaceScalarField& phi,
-            const transportModel& trasportModel,
-            const word& propertiesName = turbulenceModel::propertiesName
-        );
-
-
     //- Destructor
     virtual ~EddyDiffusivity()
     {}
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
index ad6de84714..4a85a59d07 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
@@ -31,7 +31,7 @@ template<class BasicTurbulenceModel>
 Foam::ThermalDiffusivity<BasicTurbulenceModel>::ThermalDiffusivity
 (
     const word& type,
-    const geometricOneField& alpha,
+    const alphaField& alpha,
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& alphaRhoPhi,
@@ -56,6 +56,34 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::ThermalDiffusivity
 
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
+template<class BasicTurbulenceModel>
+Foam::autoPtr<Foam::ThermalDiffusivity<BasicTurbulenceModel> >
+Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
+(
+    const alphaField& alpha,
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const transportModel& transport,
+    const word& propertiesName
+)
+{
+    return autoPtr<ThermalDiffusivity>
+    (
+        static_cast<ThermalDiffusivity*>(
+        BasicTurbulenceModel::New
+        (
+            alpha,
+            rho,
+            U,
+            phi,
+            transport,
+            propertiesName
+        ).ptr())
+    );
+}
+
+
 template<class BasicTurbulenceModel>
 Foam::autoPtr<Foam::ThermalDiffusivity<BasicTurbulenceModel> >
 Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
index 5996798d87..2066e44a1d 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
@@ -53,7 +53,7 @@ class ThermalDiffusivity
 
 public:
 
-    typedef geometricOneField alphaField;
+    typedef typename BasicTurbulenceModel::alphaField alphaField;
     typedef volScalarField rhoField;
     typedef typename BasicTurbulenceModel::transportModel transportModel;
 
@@ -64,7 +64,7 @@ public:
         ThermalDiffusivity
         (
             const word& type,
-            const geometricOneField& alpha,
+            const alphaField& alpha,
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& alphaRhoPhi,
@@ -76,6 +76,18 @@ public:
 
     // Selectors
 
+        //- Return a reference to the selected turbulence model
+        static autoPtr<ThermalDiffusivity> New
+        (
+            const alphaField& alpha,
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const transportModel& trasportModel,
+            const word& propertiesName = turbulenceModel::propertiesName
+        );
+
+
         //- Return a reference to the selected turbulence model
         static autoPtr<ThermalDiffusivity> New
         (
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
index 02e87c7a77..8ace068f48 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
@@ -110,14 +110,15 @@ void convectiveHeatTransferFvPatchScalarField::updateCoeffs()
 
     const label patchi = patch().index();
 
-    const turbulenceModel& turbModel = db().lookupObject<turbulenceModel>
-    (
-        IOobject::groupName
+    const compressible::turbulenceModel& turbModel =
+        db().lookupObject<compressible::turbulenceModel>
         (
-            turbulenceModel::propertiesName,
-            dimensionedInternalField().group()
-        )
-    );
+            IOobject::groupName
+            (
+                compressible::turbulenceModel::propertiesName,
+                dimensionedInternalField().group()
+            )
+        );
 
     const scalarField alphaEffw(turbModel.alphaEff(patchi));
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
index 63d700d3a2..d3d5116348 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
@@ -32,6 +32,7 @@ License
 #include "turbulentFluidThermoModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
 Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::
 totalFlowRateAdvectiveDiffusiveFvPatchScalarField
 (
@@ -154,10 +155,11 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs()
     const label patchI = patch().index();
 
     const LESModel<EddyDiffusivity<compressible::turbulenceModel> >& turbModel =
-    db().lookupObject
-    <
-        LESModel<EddyDiffusivity<compressible::turbulenceModel> >
-    >   (
+        db().lookupObject
+        <
+            LESModel<EddyDiffusivity<compressible::turbulenceModel> >
+        >
+        (
             IOobject::groupName
             (
                 turbulenceModel::propertiesName,
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index 98a5a05f5e..7a9983fc20 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -200,15 +200,15 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
     const label patchi = patch().index();
 
     // Retrieve turbulence properties from model
-
-    const turbulenceModel& turbModel = db().lookupObject<turbulenceModel>
-    (
-        IOobject::groupName
+    const compressible::turbulenceModel& turbModel =
+        db().lookupObject<compressible::turbulenceModel>
         (
-            turbulenceModel::propertiesName,
-            dimensionedInternalField().group()
-        )
-    );
+            IOobject::groupName
+            (
+                compressible::turbulenceModel::propertiesName,
+                dimensionedInternalField().group()
+            )
+        );
 
     const scalar Cmu25 = pow025(Cmu_);
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
index 90d2236005..ece3ac9e36 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "alphatWallFunctionFvPatchScalarField.H"
+#include "compressibleTurbulenceModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
@@ -44,8 +45,6 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    rhoName_("rho"),
-    nutName_("nut"),
     Prt_(0.85)
 {}
 
@@ -59,8 +58,6 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
-    rhoName_(ptf.rhoName_),
-    nutName_(ptf.nutName_),
     Prt_(ptf.Prt_)
 {}
 
@@ -73,8 +70,6 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    nutName_(dict.lookupOrDefault<word>("nut", "nut")),
     Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85))
 {}
 
@@ -85,8 +80,6 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(awfpsf),
-    rhoName_(awfpsf.rhoName_),
-    nutName_(awfpsf.nutName_),
     Prt_(awfpsf.Prt_)
 {}
 
@@ -98,8 +91,6 @@ alphatWallFunctionFvPatchScalarField::alphatWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(awfpsf, iF),
-    rhoName_(awfpsf.rhoName_),
-    nutName_(awfpsf.nutName_),
     Prt_(awfpsf.Prt_)
 {}
 
@@ -113,13 +104,23 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const scalarField& rhow =
-        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+    const label patchi = patch().index();
 
-    const scalarField& nutw =
-        patch().lookupPatchField<volScalarField, scalar>(nutName_);
+    // Retrieve turbulence properties from model
+    const compressibleTurbulenceModel& turbModel =
+        db().lookupObject<compressibleTurbulenceModel>
+        (
+            IOobject::groupName
+            (
+                compressibleTurbulenceModel::propertiesName,
+                dimensionedInternalField().group()
+            )
+        );
 
-    operator==(rhow*nutw/Prt_);
+    const scalarField& rhow = turbModel.rho().boundaryField()[patchi];
+    const tmp<scalarField> tnutw = turbModel.nut(patchi);
+
+    operator==(rhow*tnutw/Prt_);
 
     fixedValueFvPatchScalarField::updateCoeffs();
 }
@@ -128,8 +129,6 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs()
 void alphatWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
-    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
-    writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
     os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
index f44ee6b8cf..308128ecce 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
@@ -95,12 +95,6 @@ class alphatWallFunctionFvPatchScalarField
 {
     // Private data
 
-        //- Name of density field (default = rho)
-        word rhoName_;
-
-        //- Name of turbulent viscosity field (default = nut)
-        word nutName_;
-
         //- Turbulent Prandtl number (default = 0.85)
         scalar Prt_;
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
index 91c3a2e71b..2bf0664c16 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
@@ -23,7 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#define makeBaseTurbulenceModel(Alpha, Rho, baseModel, BaseModel, Transport)   \
+#define makeBaseTurbulenceModel(                                               \
+    Alpha, Rho, baseModel, BaseModel, TDModel, Transport)                      \
                                                                                \
     namespace Foam                                                             \
     {                                                                          \
@@ -41,7 +42,7 @@ License
             dictionary                                                         \
         );                                                                     \
                                                                                \
-        typedef BaseModel<CompressibleTurbulenceModel<Transport> >             \
+        typedef TDModel<BaseModel<Transport> >                                 \
             Transport##BaseModel;                                              \
                                                                                \
                                                                                \
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
index d5342a15d7..db2d414070 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "CompressibleTurbulenceModel.H"
 #include "compressibleTransportModel.H"
 #include "fluidThermo.H"
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
-#include "CompressibleTurbulenceModel.H"
 #include "ThermalDiffusivity.H"
 #include "EddyDiffusivity.H"
 
@@ -43,17 +43,18 @@ makeBaseTurbulenceModel
     geometricOneField,
     volScalarField,
     compressibleTurbulenceModel,
+    CompressibleTurbulenceModel,
     ThermalDiffusivity,
     fluidThermo
 );
 
 #define makeRASModel(Type)                                                     \
     makeTemplatedTurbulenceModel                                               \
-    (fluidThermoThermalDiffusivity, RAS, Type)
+    (fluidThermoCompressibleTurbulenceModel, RAS, Type)
 
 #define makeLESModel(Type)                                                     \
     makeTemplatedTurbulenceModel                                               \
-    (fluidThermoThermalDiffusivity, LES, Type)
+    (fluidThermoCompressibleTurbulenceModel, LES, Type)
 
 
 // -------------------------------------------------------------------------- //
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
index e3a3fcd332..1bbbedc91d 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
@@ -141,8 +141,6 @@ protected:
             dimensionedScalar alphaOmega1_;
             dimensionedScalar alphaOmega2_;
 
-            dimensionedScalar Prt_;
-
             dimensionedScalar gamma1_;
             dimensionedScalar gamma2_;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
new file mode 100644
index 0000000000..60979da94f
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      alphat.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
new file mode 100644
index 0000000000..3ae0a65592
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      alphat.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
new file mode 100644
index 0000000000..60979da94f
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      alphat.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
new file mode 100644
index 0000000000..3ae0a65592
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      alphat.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alphat.gas
new file mode 100644
index 0000000000..de0de30191
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/alphat.gas
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      alphat.gas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
new file mode 100644
index 0000000000..60979da94f
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      alphat.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles
new file mode 100644
index 0000000000..b047d8d119
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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      alphat.particles;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles
new file mode 100644
index 0000000000..b047d8d119
--- /dev/null
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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      alphat.particles;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //

From 047883da9862fb2aa81d4444f1a804a87efb302e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 24 Aug 2015 17:53:50 +0100
Subject: [PATCH 20/70] fluent3DMeshToFoam: Updated to handle ',' and '|'
 characters in headers Patch provided by Bruno Santos Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1826

---
 .../conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index bf1bee143f..830fecbb23 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -137,7 +137,6 @@ int yyFlexLexer::yywrap()
 one_space                  [ \t\f]
 space                      {one_space}*
 some_space                 {one_space}+
-cspace                     ","{space}
 
 alpha                      [_[:alpha:]]
 digit                      [[:digit:]]
@@ -150,6 +149,7 @@ rbrac                      ")"
 quote                      \"
 dash                       "-"
 dotColonDash               [.:-]
+commaPipe                  [,\|]
 
 schemeSpecialInitial       [!$%&*/\\:<=>?~_^#.@']
 schemeSpecialSubsequent    [.+-]
@@ -164,6 +164,7 @@ zeroLabel                  {digit}*
 signedInteger              [-+]?{integer}
 word                       ({alpha}|{digit}|{dotColonDash})*
 wordBraces                 ({word}|{lbrac}|{rbrac})*
+wordBracesExtras           ({word}|{lbrac}|{rbrac}|{commaPipe})*
 
 exponent_part              [eE][-+]?{digit}+
 fractional_constant        [-+]?(({digit}*"."{digit}+)|({digit}+".")|({digit}))
@@ -186,6 +187,8 @@ schemeSymbolList           ({schemeSymbolListElement}+{space})
 starStar                   ("**")
 text                       ({space}({word}*{space})*)
 textBraces                 ({space}({wordBraces}*{space})*)
+textExtras                 ({space}({word}*{commaPipe}{space})*)
+textBracesExtras           ({space}({wordBracesExtras}*{space})*)
 anythingInBlock            ([^)]*)
 
 dateDDMMYYYY               ({digit}{digit}"/"{digit}{digit}"/"{digit}{digit}{digit}{digit})
@@ -278,7 +281,7 @@ endOfSection               {space}")"{space}
         BEGIN(readHeader);
     }
 
-<readHeader>{quote}{textBraces}{quote} {
+<readHeader>{quote}{textBracesExtras}{quote} {
         Info<< "Reading header: " << YYText() << endl;
     }
 
@@ -727,6 +730,8 @@ endOfSection               {space}")"{space}
 <ignoreBlock,ignoreEmbeddedBlock>{space}{text} {
     }
 
+<ignoreBlock,ignoreEmbeddedBlock>{space}{textExtras} {
+    }
 
  /* ------              Count newlines.                              ------  */
 

From 0ece494f55dfa694472c74825f83f2a66688f76d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 24 Aug 2015 18:36:57 +0100
Subject: [PATCH 21/70] activePressureForceBaffleVelocityFvPatchVectorField:
 Corrected implementation and documentation Updated files provided by Bruno
 Santos Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1793

---
 ...ureForceBaffleVelocityFvPatchVectorField.C |  6 ++--
 ...ureForceBaffleVelocityFvPatchVectorField.H | 34 +++++++++++--------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index 18321c9013..02a63dd00d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -296,13 +296,13 @@ void Foam::activePressureForceBaffleVelocityFvPatchVectorField::updateCoeffs()
             Info<< "Pressure difference = " << valueDiff << endl;
         }
 
-        if ((mag(valueDiff) > mag(minThresholdValue_) || baffleActivated_))
+        if ((mag(valueDiff) > mag(minThresholdValue_)) || baffleActivated_)
         {
             openFraction_ =
                 max(
                     min(
                         openFraction_
-                      + max
+                      + min
                         (
                           this->db().time().deltaT().value()/openingTime_,
                           maxOpenFractionDelta_
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.H
index c313f296fe..289e735586 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,17 +29,20 @@ Group
 
 Description
     This boundary condition is applied to the flow velocity, to simulate the
-    opening of a baffle due to local flow conditions, by merging the behaviours
-    of wall and cyclic conditions.
+    opening or closure of a baffle due to local pressure or force changes,
+    by merging the behaviours of wall and cyclic conditions.
 
     The baffle joins two mesh regions, where the open fraction determines
     the interpolation weights applied to each cyclic- and neighbour-patch
-    contribution.
+    contribution. This means that this is boundary condition is meant to be
+    used in an extra wall beyond an existing cyclic patch pair. See PDRMesh
+    for more details.
 
-    Once opened the baffle continues to open at a fixed rate using
+    Once the threshold is crossed, this condition activated and continues to
+    open or close at a fixed rate using
 
         \f[
-            x = x_{old} + \frac{dt}{DT}
+            x = x_{old} + s \times \frac{dt}{DT}
         \f]
 
     where
@@ -47,6 +50,7 @@ Description
     \vartable
         x       | baffle open fraction [0-1]
         x_{old} | baffle open fraction on previous evaluation
+        s       | sign for orientation: 1 to open or -1 to close
         dt      | simulation time step
         DT      | time taken to open the baffle
     \endvartable
@@ -58,12 +62,13 @@ Description
     \table
         Property     | Description             | Required    | Default value
         p            | pressure field name     | no          | p
-        cyclicPatch  | cylclic patch name      | yes         |
-        orientation  | 1 or -1 used to switch flow direction | yes|
-        openFraction | current opatch open fraction [0-1]| yes |
-        openingTime  | time taken to open the baffle | yes |
-        maxOpenFractionDelta | max open fraction change per timestep | yes |
-        minThresholdValue | minimum open fraction for activation | yes |
+        cyclicPatch  | cyclic patch name       | yes         |
+        orientation  | 1 to open or -1 to close | yes|
+        openFraction | current open fraction [0-1] | yes |
+        openingTime  | time taken to open or close the baffle | yes |
+        maxOpenFractionDelta | max fraction change per timestep | yes |
+        minThresholdValue | minimum absolute pressure or
+                            force difference for activation | yes |
         forceBased   | force (true) or pressure-based (false) activation | yes |
     \endtable
 
@@ -119,9 +124,8 @@ class activePressureForceBaffleVelocityFvPatchVectorField
         //- Index of the cyclic patch used when the active baffle is open
         label cyclicPatchLabel_;
 
-        //- Orientation (1 or -1) of the active baffle patch.
-        //  Used to change the direction of opening without the need for
-        //  reordering the patch faces
+        //- Orientation (1 or -1) of the active baffle mode
+        //  Used to change the direction of opening or closing the baffle
         label orientation_;
 
         //- Initial wall patch areas

From f5dc3eb8a7210c08104046b345d07f7160cd83bf Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 26 Aug 2015 12:49:26 +0100
Subject: [PATCH 22/70] reactingTwoPhaseEulerFoam: Moved into reactingEulerFoam
 and two-phase functionality separated from multiphase functionality

---
 .../Allwclean                                 |  3 +--
 .../Allwmake                                  |  3 +--
 .../interfacialCompositionModels/Make/files   |  0
 .../interfacialCompositionModels/Make/options |  0
 .../interfaceCompositionModels/Henry/Henry.C  |  0
 .../interfaceCompositionModels/Henry/Henry.H  |  0
 .../InterfaceCompositionModel.C               |  0
 .../InterfaceCompositionModel.H               |  0
 .../InterfaceCompositionModels.C              |  0
 .../NonRandomTwoLiquid/NonRandomTwoLiquid.C   |  0
 .../NonRandomTwoLiquid/NonRandomTwoLiquid.H   |  0
 .../Raoult/Raoult.C                           |  0
 .../Raoult/Raoult.H                           |  0
 .../Saturated/Saturated.C                     |  0
 .../Saturated/Saturated.H                     |  0
 .../interfaceCompositionModel.C               |  0
 .../interfaceCompositionModel.H               |  0
 .../newInterfaceCompositionModel.C            |  0
 .../massTransferModels/Frossling/Frossling.C  |  0
 .../massTransferModels/Frossling/Frossling.H  |  0
 .../massTransferModel/massTransferModel.C     |  0
 .../massTransferModel/massTransferModel.H     |  0
 .../massTransferModel/newMassTransferModel.C  |  0
 .../sphericalMassTransfer.C                   |  0
 .../sphericalMassTransfer.H                   |  0
 .../saturationModels/Antoine/Antoine.C        |  0
 .../saturationModels/Antoine/Antoine.H        |  0
 .../AntoineExtended/AntoineExtended.C         |  0
 .../AntoineExtended/AntoineExtended.H         |  0
 .../saturationModels/ArdenBuck/ArdenBuck.C    |  0
 .../saturationModels/ArdenBuck/ArdenBuck.H    |  0
 .../constantSaturationConditions.C            |  0
 .../constantSaturationConditions.H            |  0
 .../saturationModel/newSaturationModel.C      |  0
 .../saturationModel/saturationModel.C         |  0
 .../saturationModel/saturationModel.H         |  0
 .../constantSurfaceTensionCoefficient.C       |  0
 .../constantSurfaceTensionCoefficient.H       |  0
 .../newSurfaceTensionModel.C                  |  0
 .../surfaceTensionModel/surfaceTensionModel.C |  0
 .../surfaceTensionModel/surfaceTensionModel.H |  0
 .../interfacialModels/Make/files              |  0
 .../interfacialModels/Make/options            |  0
 .../TomiyamaAspectRatio/TomiyamaAspectRatio.C |  0
 .../TomiyamaAspectRatio/TomiyamaAspectRatio.H |  0
 .../VakhrushevEfremov/VakhrushevEfremov.C     |  0
 .../VakhrushevEfremov/VakhrushevEfremov.H     |  0
 .../aspectRatioModels/Wellek/Wellek.C         |  0
 .../aspectRatioModels/Wellek/Wellek.H         |  0
 .../aspectRatioModel/aspectRatioModel.C       |  0
 .../aspectRatioModel/aspectRatioModel.H       |  0
 .../aspectRatioModel/newAspectRatioModel.C    |  0
 .../constantAspectRatio/constantAspectRatio.C |  0
 .../constantAspectRatio/constantAspectRatio.H |  0
 .../dragModels/Ergun/Ergun.C                  |  0
 .../dragModels/Ergun/Ergun.H                  |  0
 .../dragModels/Gibilaro/Gibilaro.C            |  0
 .../dragModels/Gibilaro/Gibilaro.H            |  0
 .../GidaspowErgunWenYu/GidaspowErgunWenYu.C   |  0
 .../GidaspowErgunWenYu/GidaspowErgunWenYu.H   |  0
 .../GidaspowSchillerNaumann.C                 |  0
 .../GidaspowSchillerNaumann.H                 |  0
 .../dragModels/IshiiZuber/IshiiZuber.C        |  0
 .../dragModels/IshiiZuber/IshiiZuber.H        |  0
 .../interfacialModels/dragModels/Lain/Lain.C  |  0
 .../interfacialModels/dragModels/Lain/Lain.H  |  0
 .../SchillerNaumann/SchillerNaumann.C         |  0
 .../SchillerNaumann/SchillerNaumann.H         |  0
 .../dragModels/SyamlalOBrien/SyamlalOBrien.C  |  0
 .../dragModels/SyamlalOBrien/SyamlalOBrien.H  |  0
 .../TomiyamaAnalytic/TomiyamaAnalytic.C       |  0
 .../TomiyamaAnalytic/TomiyamaAnalytic.H       |  0
 .../TomiyamaCorrelated/TomiyamaCorrelated.C   |  0
 .../TomiyamaCorrelated/TomiyamaCorrelated.H   |  0
 .../dragModels/WenYu/WenYu.C                  |  0
 .../dragModels/WenYu/WenYu.H                  |  0
 .../dragModels/dragModel/dragModel.C          |  0
 .../dragModels/dragModel/dragModel.H          |  0
 .../dragModels/dragModel/newDragModel.C       |  0
 .../dragModels/segregated/segregated.C        |  0
 .../dragModels/segregated/segregated.H        |  0
 .../RanzMarshall/RanzMarshall.C               |  0
 .../RanzMarshall/RanzMarshall.H               |  0
 .../heatTransferModel/heatTransferModel.C     |  0
 .../heatTransferModel/heatTransferModel.H     |  0
 .../heatTransferModel/newHeatTransferModel.C  |  0
 .../sphericalHeatTransfer.C                   |  0
 .../sphericalHeatTransfer.H                   |  0
 .../LegendreMagnaudet/LegendreMagnaudet.C     |  0
 .../LegendreMagnaudet/LegendreMagnaudet.H     |  0
 .../liftModels/Moraga/Moraga.C                |  0
 .../liftModels/Moraga/Moraga.H                |  0
 .../liftModels/TomiyamaLift/TomiyamaLift.C    |  0
 .../liftModels/TomiyamaLift/TomiyamaLift.H    |  0
 .../constantLiftCoefficient.C                 |  0
 .../constantLiftCoefficient.H                 |  0
 .../liftModels/liftModel/liftModel.C          |  0
 .../liftModels/liftModel/liftModel.H          |  0
 .../liftModels/liftModel/newLiftModel.C       |  0
 .../liftModels/noLift/noLift.C                |  0
 .../liftModels/noLift/noLift.H                |  0
 .../TomiyamaSwarm/TomiyamaSwarm.C             |  0
 .../TomiyamaSwarm/TomiyamaSwarm.H             |  0
 .../swarmCorrections/noSwarm/noSwarm.C        |  0
 .../swarmCorrections/noSwarm/noSwarm.H        |  0
 .../swarmCorrection/newSwarmCorrection.C      |  0
 .../swarmCorrection/swarmCorrection.C         |  0
 .../swarmCorrection/swarmCorrection.H         |  0
 .../turbulentDispersionModels/Burns/Burns.C   |  0
 .../turbulentDispersionModels/Burns/Burns.H   |  0
 .../turbulentDispersionModels/Gosman/Gosman.C |  0
 .../turbulentDispersionModels/Gosman/Gosman.H |  0
 .../LopezDeBertodano/LopezDeBertodano.C       |  0
 .../LopezDeBertodano/LopezDeBertodano.H       |  0
 .../constantTurbulentDispersionCoefficient.C  |  0
 .../constantTurbulentDispersionCoefficient.H  |  0
 .../noTurbulentDispersion.C                   |  0
 .../noTurbulentDispersion.H                   |  0
 .../newTurbulentDispersionModel.C             |  0
 .../turbulentDispersionModel.C                |  0
 .../turbulentDispersionModel.H                |  0
 .../virtualMassModels/Lamb/Lamb.C             |  0
 .../virtualMassModels/Lamb/Lamb.H             |  0
 .../constantVirtualMassCoefficient.C          |  0
 .../constantVirtualMassCoefficient.H          |  0
 .../noVirtualMass/noVirtualMass.C             |  0
 .../noVirtualMass/noVirtualMass.H             |  0
 .../virtualMassModel/newVirtualMassModel.C    |  0
 .../virtualMassModel/virtualMassModel.C       |  0
 .../virtualMassModel/virtualMassModel.H       |  0
 .../wallDependentModel/wallDependentModel.C   |  0
 .../wallDependentModel/wallDependentModel.H   |  0
 .../wallLubricationModels/Antal/Antal.C       |  0
 .../wallLubricationModels/Antal/Antal.H       |  0
 .../wallLubricationModels/Frank/Frank.C       |  0
 .../wallLubricationModels/Frank/Frank.H       |  0
 .../TomiyamaWallLubrication.C                 |  0
 .../TomiyamaWallLubrication.H                 |  0
 .../noWallLubrication/noWallLubrication.C     |  0
 .../noWallLubrication/noWallLubrication.H     |  0
 .../newWallLubricationModel.C                 |  0
 .../wallLubricationModel.C                    |  0
 .../wallLubricationModel.H                    |  0
 .../BlendedInterfacialModel.C                 |  0
 .../BlendedInterfacialModel.H                 |  0
 .../blendingMethod/blendingMethod.C           |  0
 .../blendingMethod/blendingMethod.H           |  0
 .../blendingMethod/newBlendingMethod.C        |  0
 .../blendingMethods/hyperbolic/hyperbolic.C   |  0
 .../blendingMethods/hyperbolic/hyperbolic.H   |  0
 .../blendingMethods/linear/linear.C           |  0
 .../blendingMethods/linear/linear.H           |  0
 .../blendingMethods/noBlending/noBlending.C   |  0
 .../blendingMethods/noBlending/noBlending.H   |  0
 .../phaseSystems/Make/files                   | 12 +----------
 .../phaseSystems/Make/options                 |  0
 .../HeatAndMassTransferPhaseSystem.C          |  0
 .../HeatAndMassTransferPhaseSystem.H          |  0
 .../HeatTransferPhaseSystem.C                 |  0
 .../HeatTransferPhaseSystem.H                 |  0
 ...terfaceCompositionPhaseChangePhaseSystem.C |  0
 ...terfaceCompositionPhaseChangePhaseSystem.H |  0
 .../MomentumTransferPhaseSystem.C             |  0
 .../MomentumTransferPhaseSystem.H             |  0
 .../ThermalPhaseChangePhaseSystem.C           |  0
 .../ThermalPhaseChangePhaseSystem.H           |  0
 .../constantDiameter/constantDiameter.C       |  0
 .../constantDiameter/constantDiameter.H       |  0
 .../diameterModel/diameterModel.C             |  0
 .../diameterModel/diameterModel.H             |  0
 .../diameterModel/newDiameterModel.C          |  0
 .../isothermalDiameter/isothermalDiameter.C   |  0
 .../isothermalDiameter/isothermalDiameter.H   |  0
 .../AnisothermalPhaseModel.C                  |  0
 .../AnisothermalPhaseModel.H                  |  0
 .../InertPhaseModel/InertPhaseModel.C         |  0
 .../InertPhaseModel/InertPhaseModel.H         |  0
 .../IsothermalPhaseModel.C                    |  0
 .../IsothermalPhaseModel.H                    |  0
 .../MovingPhaseModel/MovingPhaseModel.C       |  0
 .../MovingPhaseModel/MovingPhaseModel.H       |  0
 .../MultiComponentPhaseModel.C                |  0
 .../MultiComponentPhaseModel.H                |  0
 .../PurePhaseModel/PurePhaseModel.C           |  0
 .../PurePhaseModel/PurePhaseModel.H           |  0
 .../ReactingPhaseModel/ReactingPhaseModel.C   |  0
 .../ReactingPhaseModel/ReactingPhaseModel.H   |  0
 .../ThermoPhaseModel/ThermoPhaseModel.C       |  0
 .../ThermoPhaseModel/ThermoPhaseModel.H       |  0
 .../phaseModel/phaseModel/newPhaseModel.C     |  0
 .../phaseModel/phaseModel/phaseModel.C        |  0
 .../phaseModel/phaseModel/phaseModel.H        |  0
 .../phaseModel/phaseModel/phaseModels.C       |  0
 .../orderedPhasePair/orderedPhasePair.C       |  0
 .../orderedPhasePair/orderedPhasePair.H       |  0
 .../phasePair/phasePair/phasePair.C           |  0
 .../phasePair/phasePair/phasePair.H           |  0
 .../phasePair/phasePair/phasePairI.H          |  0
 .../phasePair/phasePairKey/phasePairKey.C     |  0
 .../phasePair/phasePairKey/phasePairKey.H     |  0
 .../phaseSystems/phaseSystem/phaseSystem.C    |  0
 .../phaseSystems/phaseSystem/phaseSystem.H    |  0
 .../phaseSystems/phaseSystem/phaseSystemI.H   |  0
 .../phaseSystem/phaseSystemTemplates.H        |  0
 .../reactionThermo/hRefConstThermos.C         |  0
 .../reactingTwoPhaseEulerFoam/Allwclean       |  9 +++++++++
 .../reactingTwoPhaseEulerFoam/Allwmake        |  9 +++++++++
 .../reactingTwoPhaseEulerFoam/CourantNos.H    |  0
 .../reactingTwoPhaseEulerFoam/EEqns.H         |  0
 .../reactingTwoPhaseEulerFoam/Make/files      |  0
 .../reactingTwoPhaseEulerFoam/Make/options    | 12 ++++++-----
 .../reactingTwoPhaseEulerFoam/YEqns.H         |  0
 .../reactingTwoPhaseEulerFoam/createFields.H  |  0
 .../reactingTwoPhaseEulerFoam/pU/UEqns.H      |  0
 .../reactingTwoPhaseEulerFoam/pU/pEqn.H       |  0
 .../reactingTwoPhaseEulerFoam/pUf/DDtU.H      |  0
 .../reactingTwoPhaseEulerFoam/pUf/UEqns.H     |  0
 .../pUf/createDDtU.H                          |  0
 .../reactingTwoPhaseEulerFoam/pUf/pEqn.H      |  0
 .../reactingTwoPhaseEulerFoam.C               |  0
 .../reactingTwoPhaseEulerFoam/setRDeltaT.H    |  0
 .../Make/files                                |  2 +-
 .../Make/options                              |  5 +++--
 .../Gidaspow/GidaspowConductivity.C           |  0
 .../Gidaspow/GidaspowConductivity.H           |  0
 .../HrenyaSinclairConductivity.C              |  0
 .../HrenyaSinclairConductivity.H              |  0
 .../Syamlal/SyamlalConductivity.C             |  0
 .../Syamlal/SyamlalConductivity.H             |  0
 .../conductivityModel/conductivityModel.C     |  0
 .../conductivityModel/conductivityModel.H     |  0
 .../conductivityModel/newConductivityModel.C  |  0
 ...sonJacksonParticleSlipFvPatchVectorField.C |  0
 ...sonJacksonParticleSlipFvPatchVectorField.H |  0
 ...onJacksonParticleThetaFvPatchScalarField.C |  0
 ...onJacksonParticleThetaFvPatchScalarField.H |  0
 .../JohnsonJacksonFrictionalStress.C          |  0
 .../JohnsonJacksonFrictionalStress.H          |  0
 .../Schaeffer/SchaefferFrictionalStress.C     |  0
 .../Schaeffer/SchaefferFrictionalStress.H     |  0
 .../frictionalStressModel.C                   |  0
 .../frictionalStressModel.H                   |  0
 .../newFrictionalStressModel.C                |  0
 .../granularPressureModel/Lun/LunPressure.C   |  0
 .../granularPressureModel/Lun/LunPressure.H   |  0
 .../SyamlalRogersOBrienPressure.C             |  0
 .../SyamlalRogersOBrienPressure.H             |  0
 .../granularPressureModel.C                   |  0
 .../granularPressureModel.H                   |  0
 .../newGranularPressureModel.C                |  0
 .../kineticTheoryModel/kineticTheoryModel.C   |  0
 .../kineticTheoryModel/kineticTheoryModel.H   |  0
 .../CarnahanStarling/CarnahanStarlingRadial.C |  0
 .../CarnahanStarling/CarnahanStarlingRadial.H |  0
 .../radialModel/LunSavage/LunSavageRadial.C   |  0
 .../radialModel/LunSavage/LunSavageRadial.H   |  0
 .../SinclairJackson/SinclairJacksonRadial.C   |  0
 .../SinclairJackson/SinclairJacksonRadial.H   |  0
 .../radialModel/radialModel/newRadialModel.C  |  0
 .../radialModel/radialModel/radialModel.C     |  0
 .../radialModel/radialModel/radialModel.H     |  0
 .../Gidaspow/GidaspowViscosity.C              |  0
 .../Gidaspow/GidaspowViscosity.H              |  0
 .../HrenyaSinclair/HrenyaSinclairViscosity.C  |  0
 .../HrenyaSinclair/HrenyaSinclairViscosity.H  |  0
 .../viscosityModel/Syamlal/SyamlalViscosity.C |  0
 .../viscosityModel/Syamlal/SyamlalViscosity.H |  0
 .../viscosityModel/none/noneViscosity.C       |  0
 .../viscosityModel/none/noneViscosity.H       |  0
 .../viscosityModel/newViscosityModel.C        |  0
 .../viscosityModel/viscosityModel.C           |  0
 .../viscosityModel/viscosityModel.H           |  0
 .../phaseCompressibleTurbulenceModels.C       |  0
 .../phasePressureModel/phasePressureModel.C   |  0
 .../phasePressureModel/phasePressureModel.H   |  0
 .../twoPhaseSystem/Make/files                 | 11 ++++++++++
 .../twoPhaseSystem/Make/options               | 20 +++++++++++++++++++
 .../diameterModels/IATE/IATE.C                |  0
 .../diameterModels/IATE/IATE.H                |  0
 .../IATE/IATEsources/IATEsource/IATEsource.C  |  1 -
 .../IATE/IATEsources/IATEsource/IATEsource.H  |  0
 .../IATE/IATEsources/dummy/dummy.C            |  0
 .../IATE/IATEsources/dummy/dummy.H            |  0
 .../randomCoalescence/randomCoalescence.C     |  0
 .../randomCoalescence/randomCoalescence.H     |  0
 .../turbulentBreakUp/turbulentBreakUp.C       |  0
 .../turbulentBreakUp/turbulentBreakUp.H       |  0
 .../wakeEntrainmentCoalescence.C              |  0
 .../wakeEntrainmentCoalescence.H              |  0
 .../twoPhaseSystem/newTwoPhaseSystem.C        |  0
 .../twoPhaseSystem/twoPhaseSystem.C           |  0
 .../twoPhaseSystem/twoPhaseSystem.H           |  0
 .../twoPhaseSystem/twoPhaseSystemI.H          |  0
 .../twoPhaseSystem/twoPhaseSystems.C          |  0
 .../reactingTwoPhaseEulerFoam/write.H         |  0
 295 files changed, 63 insertions(+), 24 deletions(-)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/Allwclean (82%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/Allwmake (86%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/Make/files (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/Make/options (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/saturationModels/Antoine/Antoine.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/saturationModels/Antoine/Antoine.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/Make/files (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/Make/options (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/aspectRatioModels/Wellek/Wellek.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/aspectRatioModels/Wellek/Wellek.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/Ergun/Ergun.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/Ergun/Ergun.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/Gibilaro/Gibilaro.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/Gibilaro/Gibilaro.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/Lain/Lain.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/Lain/Lain.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/WenYu/WenYu.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/WenYu/WenYu.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/dragModel/dragModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/dragModel/dragModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/dragModel/newDragModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/segregated/segregated.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/dragModels/segregated/segregated.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/Moraga/Moraga.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/Moraga/Moraga.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/liftModel/liftModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/liftModel/liftModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/liftModel/newLiftModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/noLift/noLift.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/liftModels/noLift/noLift.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/swarmCorrections/noSwarm/noSwarm.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/swarmCorrections/noSwarm/noSwarm.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/Burns/Burns.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/Burns/Burns.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/virtualMassModels/Lamb/Lamb.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/virtualMassModels/Lamb/Lamb.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallDependentModel/wallDependentModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallDependentModel/wallDependentModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallLubricationModels/Antal/Antal.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallLubricationModels/Antal/Antal.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallLubricationModels/Frank/Frank.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallLubricationModels/Frank/Frank.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/Make/files (64%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/Make/options (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/diameterModels/constantDiameter/constantDiameter.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/diameterModels/constantDiameter/constantDiameter.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/diameterModels/diameterModel/diameterModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/diameterModels/diameterModel/diameterModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/diameterModels/diameterModel/newDiameterModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/phaseModel/newPhaseModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/phaseModel/phaseModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/phaseModel/phaseModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseModel/phaseModel/phaseModels.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phasePair/phasePair/phasePair.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phasePair/phasePair/phasePair.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phasePair/phasePair/phasePairI.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phasePair/phasePairKey/phasePairKey.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phasePair/phasePairKey/phasePairKey.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseSystem/phaseSystem.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseSystem/phaseSystem.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseSystem/phaseSystemI.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/phaseSystem/phaseSystemTemplates.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam => reactingEulerFoam}/phaseSystems/reactionThermo/hRefConstThermos.C (100%)
 create mode 100755 applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean
 create mode 100755 applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/CourantNos.H (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/EEqns.H (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/Make/files (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/Make/options (70%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/YEqns.H (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/createFields.H (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/pU/UEqns.H (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/pU/pEqn.H (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/pUf/DDtU.H (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/pUf/UEqns.H (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/pUf/createDDtU.H (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/pUf/pEqn.H (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/setRDeltaT.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/Make/files (97%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/Make/options (81%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/radialModel/radialModel/newRadialModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/radialModel/radialModel/radialModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/radialModel/radialModel/radialModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/viscosityModel/none/noneViscosity.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/viscosityModel/none/noneViscosity.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/phaseCompressibleTurbulenceModels.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/phasePressureModel/phasePressureModel.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels}/phasePressureModel/phasePressureModel.H (100%)
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/files
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATE.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATE.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C (99%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATEsources/dummy/dummy.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATEsources/dummy/dummy.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem}/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam}/twoPhaseSystem/newTwoPhaseSystem.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam}/twoPhaseSystem/twoPhaseSystem.C (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam}/twoPhaseSystem/twoPhaseSystem.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam}/twoPhaseSystem/twoPhaseSystemI.H (100%)
 rename applications/solvers/multiphase/{reactingTwoPhaseEulerFoam/phaseSystems => reactingEulerFoam/reactingTwoPhaseEulerFoam}/twoPhaseSystem/twoPhaseSystems.C (100%)
 rename applications/solvers/multiphase/{ => reactingEulerFoam}/reactingTwoPhaseEulerFoam/write.H (100%)

diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/Allwclean
similarity index 82%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Allwclean
rename to applications/solvers/multiphase/reactingEulerFoam/Allwclean
index ac1a48d1a8..e9a7070211 100755
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/reactingEulerFoam/Allwclean
@@ -5,7 +5,6 @@ set -x
 wclean libso phaseSystems
 wclean libso interfacialModels
 wclean libso interfacialCompositionModels
-wclean libso phaseCompressibleTurbulenceModels
-wclean
+reactingTwoPhaseEulerFoam/Allwclean
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
similarity index 86%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Allwmake
rename to applications/solvers/multiphase/reactingEulerFoam/Allwmake
index 2566b5a1eb..4682cf568d 100755
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
@@ -7,7 +7,6 @@ wmakeLnInclude interfacialCompositionModels
 wmake libso phaseSystems
 wmake libso interfacialModels
 wmake libso interfacialCompositionModels
-wmake libso phaseCompressibleTurbulenceModels
-wmake
+reactingTwoPhaseEulerFoam/Allwmake
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/files
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/Make/files
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/files
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/Make/options
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/files
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/Make/files
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/files
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/Make/options
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Lain/Lain.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Lain/Lain.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Lain/Lain.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Lain/Lain.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Lain/Lain.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Lain/Lain.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/Lain/Lain.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Lain/Lain.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/Make/files b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/files
similarity index 64%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/Make/files
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/files
index 9f8f4f1fdb..1f516dc243 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/Make/files
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/files
@@ -13,22 +13,12 @@ diameterModels/diameterModel/newDiameterModel.C
 diameterModels/constantDiameter/constantDiameter.C
 diameterModels/isothermalDiameter/isothermalDiameter.C
 
-diameterModels/IATE/IATE.C
-diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
-diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
-diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
-diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
-
 BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
 BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
 BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
 BlendedInterfacialModel/blendingMethods/linear/linear.C
 BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
 
-twoPhaseSystem/twoPhaseSystem.C
-twoPhaseSystem/newTwoPhaseSystem.C
-twoPhaseSystem/twoPhaseSystems.C
-
 reactionThermo/hRefConstThermos.C
 
-LIB = $(FOAM_LIBBIN)/libreactingTwoPhaseSystem
+LIB = $(FOAM_LIBBIN)/libreactingPhaseSystem
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/Make/options b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/Make/options
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/phasePair/phasePairI.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePairI.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/phasePair/phasePairI.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePairI.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean
new file mode 100755
index 0000000000..87e030a14a
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+set -x
+
+wclean libso twoPhaseSystem
+wclean libso twoPhaseCompressibleTurbulenceModels
+wclean
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
new file mode 100755
index 0000000000..d0e2fc63c7
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+set -x
+
+wmake libso twoPhaseSystem
+wmake libso twoPhaseCompressibleTurbulenceModels
+wmake
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/CourantNos.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/CourantNos.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/CourantNos.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/CourantNos.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/EEqns.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/files b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/files
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/files
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/files
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
similarity index 70%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
index f1f3b8dc8e..6d3bc54b85 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options
@@ -1,8 +1,9 @@
 EXE_INC = \
-    -IphaseSystems/lnInclude \
-    -IinterfacialModels/lnInclude \
-    -IinterfacialCompositionModels/lnInclude \
-    -IphaseCompressibleTurbulenceModels/lnInclude \
+    -ItwoPhaseSystem/lnInclude \
+    -I../phaseSystems/lnInclude \
+    -I../interfacialModels/lnInclude \
+    -I../interfacialCompositionModels/lnInclude \
+    -ItwoPhaseCompressibleTurbulenceModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
@@ -14,10 +15,11 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
+    -lreactingPhaseSystem \
     -lreactingTwoPhaseSystem \
     -lreactingEulerianInterfacialModels \
     -lreactingEulerianInterfacialCompositionModels \
-    -lphaseReactingTurbulenceModels \
+    -ltwoPhaseReactingTurbulenceModels \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/YEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/YEqns.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/YEqns.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/YEqns.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pU/UEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pU/UEqns.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pU/pEqn.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/DDtU.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/DDtU.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/DDtU.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/DDtU.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/UEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/UEqns.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/createDDtU.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/createDDtU.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/createDDtU.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/createDDtU.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/pEqn.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/setRDeltaT.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files
similarity index 97%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/files
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files
index eccde529bd..d1cbb6eaeb 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/files
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files
@@ -35,4 +35,4 @@ kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
 kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
 kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
 
-LIB = $(FOAM_LIBBIN)/libphaseReactingTurbulenceModels
+LIB = $(FOAM_LIBBIN)/libtwoPhaseReactingTurbulenceModels
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
similarity index 81%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
index 6a88d1d9ce..cd3f851fc8 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
@@ -1,6 +1,7 @@
 EXE_INC = \
-    -I../phaseSystems/lnInclude \
-    -I../interfacialModels/lnInclude\
+    -I../twoPhaseSystem/lnInclude \
+    -I../../phaseSystems/lnInclude \
+    -I../../interfacialModels/lnInclude\
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/transportModel \
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/files b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/files
new file mode 100644
index 0000000000..ce89d9907b
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/files
@@ -0,0 +1,11 @@
+diameterModels/IATE/IATE.C
+diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
+diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
+diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
+
+twoPhaseSystem.C
+newTwoPhaseSystem.C
+twoPhaseSystems.C
+
+LIB = $(FOAM_LIBBIN)/libreactingTwoPhaseSystem
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options
new file mode 100644
index 0000000000..7321f6ef68
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options
@@ -0,0 +1,20 @@
+EXE_INC = \
+    -I../../interfacialModels/lnInclude \
+    -I../../interfacialCompositionModels/lnInclude \
+    -I../../phaseSystems/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
+    -I$(LIB_SRC)/combustionModels/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
+
+LIB_LIBS = \
+    -lcombustionModels \
+    -lreactingPhaseSystem
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
similarity index 99%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
index 59bf824f56..9c62dfc819 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
@@ -24,7 +24,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "IATEsource.H"
-#include "twoPhaseSystem.H"
 #include "fvMatrix.H"
 #include "PhaseCompressibleTurbulenceModel.H"
 #include "uniformDimensionedFields.H"
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/twoPhaseSystem/newTwoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/twoPhaseSystem/newTwoPhaseSystem.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/twoPhaseSystem/twoPhaseSystem.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/twoPhaseSystem/twoPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/twoPhaseSystem/twoPhaseSystem.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/twoPhaseSystem/twoPhaseSystemI.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystemI.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/twoPhaseSystem/twoPhaseSystemI.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystemI.H
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/twoPhaseSystem/twoPhaseSystems.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystems.C
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/twoPhaseSystem/twoPhaseSystems.C
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystems.C
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/write.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/write.H
similarity index 100%
rename from applications/solvers/multiphase/reactingTwoPhaseEulerFoam/write.H
rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/write.H

From fb11bcc8749f8df610b1b8588735bd43bfe16e8a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 26 Aug 2015 15:37:52 +0100
Subject: [PATCH 23/70] TurbulenceModels/compressible: Added
 correctEnergyTransport() function to allow the turbulent energy transport
 properties to be updated for every energy solution if required.

Added correctEnergyTransport() call to reactingTwoPhaseEulerFoam
---
 .../MovingPhaseModel/MovingPhaseModel.C       |   8 +
 .../MovingPhaseModel/MovingPhaseModel.H       |   3 +
 .../phaseModel/phaseModel/phaseModel.C        |   4 +
 .../phaseModel/phaseModel/phaseModel.H        |   3 +
 .../phaseSystems/phaseSystem/phaseSystem.C    |   9 ++
 .../phaseSystems/phaseSystem/phaseSystem.H    |   3 +
 .../reactingTwoPhaseEulerFoam/EEqns.H         |   2 +
 .../EddyDiffusivity/EddyDiffusivity.C         |   7 +
 .../EddyDiffusivity/EddyDiffusivity.H         |   3 +
 src/TurbulenceModels/compressible/Make/files  |   2 +
 .../ThermalDiffusivity/ThermalDiffusivity.C   |   5 +
 .../ThermalDiffusivity/ThermalDiffusivity.H   |   3 +
 .../compressibleTurbulenceModel.H             |   3 +
 ...haseChangeWallFunctionFvPatchScalarField.C | 122 +++++++++++++++
 ...haseChangeWallFunctionFvPatchScalarField.H | 147 ++++++++++++++++++
 15 files changed, 324 insertions(+)
 create mode 100644 src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
 create mode 100644 src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index b1869b9fbf..d64a5c862e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -243,6 +243,14 @@ void Foam::MovingPhaseModel<BasePhaseModel>::correctTurbulence()
 }
 
 
+template<class BasePhaseModel>
+void Foam::MovingPhaseModel<BasePhaseModel>::correctEnergyTransport()
+{
+    BasePhaseModel::correctEnergyTransport();
+    turbulence_->correctEnergyTransport();
+}
+
+
 template<class BasePhaseModel>
 Foam::tmp<Foam::fvVectorMatrix>
 Foam::MovingPhaseModel<BasePhaseModel>::UEqn()
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
index 14e9c057b7..fc719c18ca 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
@@ -125,6 +125,9 @@ public:
         //- Correct the turbulence
         virtual void correctTurbulence();
 
+        //- Correct the energy transport e.g. alphat
+        virtual void correctEnergyTransport();
+
         //- Return the momentum equation
         virtual tmp<fvVectorMatrix> UEqn();
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
index 61ea75e586..2fbd56db2f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
@@ -128,6 +128,10 @@ void Foam::phaseModel::correctTurbulence()
 {}
 
 
+void Foam::phaseModel::correctEnergyTransport()
+{}
+
+
 bool Foam::phaseModel::read()
 {
     return diameterModel_->read(fluid_.subDict(name_));
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
index 34e371a040..191cc35700 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
@@ -151,6 +151,9 @@ public:
         //- Correct the turbulence
         virtual void correctTurbulence();
 
+        //- Correct the energy transport e.g. alphat
+        virtual void correctEnergyTransport();
+
         //- Return the momentum equation
         virtual tmp<fvVectorMatrix> UEqn() = 0;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
index 3bbb6e82de..97f139c57c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
@@ -334,6 +334,15 @@ void Foam::phaseSystem::correctTurbulence()
 }
 
 
+void Foam::phaseSystem::correctEnergyTransport()
+{
+    forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
+    {
+        phaseModelIter()->correctEnergyTransport();
+    }
+}
+
+
 bool Foam::phaseSystem::read()
 {
     if (regIOobject::read())
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index 81bfd708f8..8f50c5c17a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
@@ -348,6 +348,9 @@ public:
         //- Correct the turbulence
         virtual void correctTurbulence();
 
+        //- Correct the energy transport e.g. alphat
+        virtual void correctEnergyTransport();
+
         //- Read base phaseProperties dictionary
         virtual bool read();
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
index ff72d8d94e..27db7d1a36 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
@@ -1,4 +1,6 @@
 {
+    fluid.correctEnergyTransport();
+
     autoPtr<phaseSystem::heatTransferTable>
         heatTransferPtr(fluid.heatTransfer());
 
diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
index eec1be8c8e..1647c88ca8 100644
--- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
+++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
@@ -106,4 +106,11 @@ bool Foam::EddyDiffusivity<BasicTurbulenceModel>::read()
 }
 
 
+template<class BasicTurbulenceModel>
+void Foam::EddyDiffusivity<BasicTurbulenceModel>::correctEnergyTransport()
+{
+    EddyDiffusivity<BasicTurbulenceModel>::correctNut();
+}
+
+
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
index a6693fac10..82ba1221d9 100644
--- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
+++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
@@ -142,6 +142,9 @@ public:
         {
             return this->transport_.alphaEff(alphat(patchi), patchi);
         }
+
+        //- Correct the turbulence thermal diffusivity for energy transport
+        virtual void correctEnergyTransport();
 };
 
 
diff --git a/src/TurbulenceModels/compressible/Make/files b/src/TurbulenceModels/compressible/Make/files
index 2f6e9f1dd3..1f7f2fa12d 100644
--- a/src/TurbulenceModels/compressible/Make/files
+++ b/src/TurbulenceModels/compressible/Make/files
@@ -16,4 +16,6 @@ $(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
 turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
 turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
 
+/*turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C*/
+
 LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
index 4a85a59d07..6f678ce21a 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
@@ -149,4 +149,9 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::alphat
 }
 
 
+template<class BasicTurbulenceModel>
+void Foam::ThermalDiffusivity<BasicTurbulenceModel>::correctEnergyTransport()
+{}
+
+
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
index 2066e44a1d..8d00e9f08b 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
@@ -166,6 +166,9 @@ public:
         {
             return alpha(patchi);
         }
+
+        //- Correct the turbulence thermal diffusivity for energy transport
+        virtual void correctEnergyTransport();
 };
 
 
diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
index 8ecf2f51ff..5d0c95b5cc 100644
--- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
@@ -120,6 +120,9 @@ public:
 
         //- Return the source term for the momentum equation
         virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const = 0;
+
+        //- Correct the turbulence thermal diffusivity for energy transport
+        virtual void correctEnergyTransport() = 0;
 };
 
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
new file mode 100644
index 0000000000..1df17993a7
--- /dev/null
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "alphatPhaseChangeWallFunctionFvPatchScalarField.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+alphatPhaseChangeWallFunctionFvPatchScalarField::
+alphatPhaseChangeWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    dmdt_(p.size(), 0.0)
+{}
+
+
+alphatPhaseChangeWallFunctionFvPatchScalarField::
+alphatPhaseChangeWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict),
+    dmdt_(p.size(), 0.0)
+{
+    if (dict.found("dmdt"))
+    {
+        dmdt_ = scalarField("dmdt", dict, p.size());
+    }
+}
+
+
+alphatPhaseChangeWallFunctionFvPatchScalarField::
+alphatPhaseChangeWallFunctionFvPatchScalarField
+(
+    const alphatPhaseChangeWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    dmdt_(ptf.dmdt_, mapper)
+{}
+
+
+alphatPhaseChangeWallFunctionFvPatchScalarField::
+alphatPhaseChangeWallFunctionFvPatchScalarField
+(
+    const alphatPhaseChangeWallFunctionFvPatchScalarField& awfpsf
+)
+:
+    fixedValueFvPatchScalarField(awfpsf),
+    dmdt_(awfpsf.dmdt_)
+{}
+
+
+alphatPhaseChangeWallFunctionFvPatchScalarField::
+alphatPhaseChangeWallFunctionFvPatchScalarField
+(
+    const alphatPhaseChangeWallFunctionFvPatchScalarField& awfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(awfpsf, iF),
+    dmdt_(awfpsf.dmdt_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void alphatPhaseChangeWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    dmdt_.writeEntry("dmdt", os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H
new file mode 100644
index 0000000000..fb424995a8
--- /dev/null
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::compressible::alphatPhaseChangeWallFunctionFvPatchScalarField
+
+Group
+    grpCmpWallFunctions
+
+Description
+    Abstract base-class for all alphatWallFunctions supporting phase-change.
+
+SeeAlso
+    Foam::alphatWallFunction
+
+SourceFiles
+    alphatPhaseChangeWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleAlphatWallFunctionPhaseChangeFvPatchScalarField_H
+#define compressibleAlphatWallFunctionPhaseChangeFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+/*---------------------------------------------------------------------------*\
+            Class alphatPhaseChangeWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class alphatPhaseChangeWallFunctionFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+protected:
+
+    // Protected data
+
+        //- Rate of phase-change
+        scalarField dmdt_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("compressible::alphatPhaseChangeWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        alphatPhaseChangeWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        alphatPhaseChangeWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  alphatPhaseChangeWallFunctionFvPatchScalarField
+        //  onto a new patch
+        alphatPhaseChangeWallFunctionFvPatchScalarField
+        (
+            const alphatPhaseChangeWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        alphatPhaseChangeWallFunctionFvPatchScalarField
+        (
+            const alphatPhaseChangeWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct as copy setting internal field reference
+        alphatPhaseChangeWallFunctionFvPatchScalarField
+        (
+            const alphatPhaseChangeWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+
+    // Member functions
+
+        //- Return the rate of phase-change
+        const scalarField& dmdt() const
+        {
+            return dmdt_;
+        }
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs() = 0;
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 6f6c2ab0240b8182413880eace160ea24098e302 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 26 Aug 2015 18:06:43 +0100
Subject: [PATCH 24/70] twoPhaseEulerFoam: Added support for alphat and thermal
 wall-functions

---
 .../phaseModel/phaseModel/phaseModel.H        | 12 ++--
 .../Make/options                              |  3 +-
 .../Gidaspow/GidaspowConductivity.C           |  2 +-
 .../Gidaspow/GidaspowConductivity.H           |  2 +-
 .../Syamlal/SyamlalConductivity.C             |  2 +-
 .../Syamlal/SyamlalConductivity.H             |  2 +-
 .../conductivityModel/conductivityModel.C     |  2 +-
 .../conductivityModel/conductivityModel.H     |  2 +-
 .../conductivityModel/newConductivityModel.C  |  2 +-
 ...sonJacksonParticleSlipFvPatchVectorField.C |  2 +-
 ...sonJacksonParticleSlipFvPatchVectorField.H |  2 +-
 ...onJacksonParticleThetaFvPatchScalarField.C |  2 +-
 ...onJacksonParticleThetaFvPatchScalarField.H |  2 +-
 .../frictionalStressModel.C                   |  2 +-
 .../newFrictionalStressModel.C                |  2 +-
 .../granularPressureModel/Lun/LunPressure.C   |  2 +-
 .../granularPressureModel/Lun/LunPressure.H   |  2 +-
 .../SyamlalRogersOBrienPressure.C             |  2 +-
 .../SyamlalRogersOBrienPressure.H             |  2 +-
 .../granularPressureModel.C                   |  2 +-
 .../granularPressureModel.H                   |  2 +-
 .../newGranularPressureModel.C                |  2 +-
 .../kineticTheoryModel/kineticTheoryModel.C   | 21 +++++--
 .../kineticTheoryModel/kineticTheoryModel.H   |  9 ++-
 .../CarnahanStarling/CarnahanStarlingRadial.C |  2 +-
 .../CarnahanStarling/CarnahanStarlingRadial.H |  2 +-
 .../radialModel/LunSavage/LunSavageRadial.C   |  2 +-
 .../radialModel/LunSavage/LunSavageRadial.H   |  2 +-
 .../SinclairJackson/SinclairJacksonRadial.C   |  2 +-
 .../SinclairJackson/SinclairJacksonRadial.H   |  2 +-
 .../radialModel/radialModel/newRadialModel.C  |  2 +-
 .../radialModel/radialModel/radialModel.C     |  2 +-
 .../radialModel/radialModel/radialModel.H     |  2 +-
 .../Gidaspow/GidaspowViscosity.C              |  2 +-
 .../Gidaspow/GidaspowViscosity.H              |  2 +-
 .../HrenyaSinclair/HrenyaSinclairViscosity.H  |  2 +-
 .../viscosityModel/Syamlal/SyamlalViscosity.C |  2 +-
 .../viscosityModel/Syamlal/SyamlalViscosity.H |  2 +-
 .../viscosityModel/none/noneViscosity.C       |  2 +-
 .../viscosityModel/none/noneViscosity.H       |  2 +-
 .../viscosityModel/newViscosityModel.C        |  2 +-
 .../viscosityModel/viscosityModel.C           |  2 +-
 .../viscosityModel/viscosityModel.H           |  2 +-
 .../phaseCompressibleTurbulenceModels.C       |  6 +-
 .../phasePressureModel/phasePressureModel.C   | 13 ++++-
 .../phasePressureModel/phasePressureModel.H   |  9 ++-
 .../twoPhaseSystem/phaseModel/phaseModel.H    | 56 +++++++++++++++++++
 .../ThermalDiffusivity/ThermalDiffusivity.C   |  5 --
 .../ThermalDiffusivity/ThermalDiffusivity.H   |  3 -
 .../compressibleTurbulenceModel.C             |  4 ++
 .../compressibleTurbulenceModel.H             |  2 +-
 .../LES/bubbleColumn/0/alphat.air             | 48 ++++++++++++++++
 .../LES/bubbleColumn/0/alphat.water           | 48 ++++++++++++++++
 .../RAS/bubbleColumn/0/alphat.air             | 48 ++++++++++++++++
 .../RAS/bubbleColumn/0/alphat.water           | 48 ++++++++++++++++
 .../RAS/fluidisedBed/0/alphat.air             | 48 ++++++++++++++++
 .../RAS/fluidisedBed/0/alphat.particles       | 47 ++++++++++++++++
 57 files changed, 442 insertions(+), 66 deletions(-)
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
index 191cc35700..dc1de338f8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
@@ -263,32 +263,32 @@ public:
             //- Return the laminar thermal conductivity on a patch
             virtual tmp<scalarField> kappa(const label patchi) const = 0;
 
-            //- Return the laminar thermal conductivity
+            //- Return the effective thermal conductivity
             virtual tmp<volScalarField> kappaEff
             (
                 const volScalarField& alphat
             ) const = 0;
 
-            //- Access the laminar thermal conductivity
+            //- Access the effective thermal conductivity
             virtual tmp<scalarField> kappaEff
             (
                 const scalarField& alphat,
                 const label patchi
             ) const = 0;
 
-            //- Return the thermal diffusivity for enthalpy
+            //- Return the laminar thermal diffusivity for enthalpy
             virtual tmp<volScalarField> alpha() const = 0;
 
-            //- Return the thermal diffusivity for enthalpy on a patch
+            //- Return the laminar thermal diffusivity for enthalpy on a patch
             virtual tmp<scalarField> alpha(const label patchi) const = 0;
 
-            //- Return the thermal diffusivity for enthalpy
+            //- Return the effective thermal diffusivity for enthalpy
             virtual tmp<volScalarField> alphaEff
             (
                 const volScalarField& alphat
             ) const = 0;
 
-            //- Return the thermal diffusivity for enthalpy on a patch
+            //- Return the effective thermal diffusivity for enthalpy on a patch
             virtual tmp<scalarField> alphaEff
             (
                 const scalarField& alphat,
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
index efb6d206ea..1035e5526e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options
@@ -4,8 +4,9 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/transportModel \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
index 63e84966bb..6ef7f1ec83 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
index 714282dbb8..f8987ce13d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
index 3732c57ecd..2bd6c25f79 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
index bb47cf6694..dbc6b8f60a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
index 3db83f67b6..4cd6368943 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
index 19f13ca9a6..6e44f6457a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
index 4f86a8d206..a878a09773 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
index 78b6ab7e70..ea28dd01b5 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H
index b125ba0211..1aaa801f0f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
index 1bea519982..93d97c650c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H
index 586a3b4e51..5391e8c27d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
index f1e899e854..3a764313a7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
index 96e15ed4a6..db6102174a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
index 248d8b1fec..3a94ea5734 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
index 8585d00174..d82ba47d5b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
index 892a690a6a..8e45c45e21 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
index 8b4223f1ce..3f420538f1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
index 6f3c915fb4..3a2214e9e6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
index b22ae26771..06160f6c0a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
index deaf6fc676..36b2c2b175 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 31a58c7abd..bbf37904ca 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -41,7 +41,13 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
     const word& type
 )
 :
-    eddyViscosity<RASModel<PhaseCompressibleTurbulenceModel<phaseModel> > >
+    eddyViscosity
+    <
+        RASModel<EddyDiffusivity<ThermalDiffusivity
+        <
+            PhaseCompressibleTurbulenceModel<phaseModel>
+        > > >
+    >
     (
         type,
         alpha,
@@ -183,7 +189,10 @@ bool Foam::RASModels::kineticTheoryModel::read()
     (
         eddyViscosity
         <
-            RASModel<PhaseCompressibleTurbulenceModel<phaseModel> >
+            RASModel<EddyDiffusivity<ThermalDiffusivity
+            <
+                PhaseCompressibleTurbulenceModel<phaseModel>
+            > > >
         >::read()
     )
     {
@@ -339,7 +348,8 @@ void Foam::RASModels::kineticTheoryModel::correct()
     const volScalarField& rho = phase_.rho();
     const surfaceScalarField& alphaRhoPhi = alphaRhoPhi_;
     const volVectorField& U = U_;
-    const volVectorField& Uc_ = phase_.fluid().otherPhase(phase_).U();
+    const volVectorField& Uc_ =
+        refCast<const twoPhaseSystem>(phase_.fluid()).otherPhase(phase_).U();
 
     const scalar sqrtPi = sqrt(constant::mathematical::pi);
     dimensionedScalar ThetaSmall("ThetaSmall", Theta_.dimensions(), 1.0e-6);
@@ -381,7 +391,10 @@ void Foam::RASModels::kineticTheoryModel::correct()
         );
 
         // Drag
-        volScalarField beta(phase_.fluid().drag(phase_).K());
+        volScalarField beta
+        (
+            refCast<const twoPhaseSystem>(phase_.fluid()).drag(phase_).K()
+        );
 
         // Eq. 3.25, p. 50 Js = J1 - J2
         volScalarField J1("J1", 3.0*beta);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
index b631143d40..9aadb83d12 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,6 +48,8 @@ SourceFiles
 #include "RASModel.H"
 #include "eddyViscosity.H"
 #include "PhaseCompressibleTurbulenceModel.H"
+#include "ThermalDiffusivity.H"
+#include "EddyDiffusivity.H"
 #include "phaseModel.H"
 #include "dragModel.H"
 #include "viscosityModel.H"
@@ -72,7 +74,10 @@ class kineticTheoryModel
 :
     public eddyViscosity
     <
-        RASModel<PhaseCompressibleTurbulenceModel<phaseModel> >
+        RASModel<EddyDiffusivity<ThermalDiffusivity
+        <
+            PhaseCompressibleTurbulenceModel<phaseModel>
+        > > >
     >
 {
     // Private data
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
index 8ea724a20b..abc364979c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
index 528a3b366e..a4082d5326 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
index a362a48841..df931c8752 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
index a20682422c..17cd8e5907 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
index 3697107917..bc74ce177a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
index 9e5abcbb8f..37545343a9 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
index 18b8eed813..65f6c9ebb8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
index e8763a01b1..821e9e6ec7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
index 1d225e3bb7..de73a22747 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
index ebe4e6ddd8..98cf0c90ef 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
index 96a65bb799..e309ed988a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
index a47163e063..0a280ba369 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
index 1eab21fc10..215d360816 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
index 979e039149..844bf21b0d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
index 843386cac7..4b3c97d69a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H
index 565dd45fc8..f5d74f0e96 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
index c0222ff4df..e79cbde0c1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
index d7aa5efb91..dae23e2b31 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
index 045c7f4986..e0bc93cc79 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
index d7e35e96cb..eb0a070044 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,9 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "makeTurbulenceModel.H"
 
+#include "ThermalDiffusivity.H"
+#include "EddyDiffusivity.H"
+
 #include "laminar.H"
 #include "RASModel.H"
 #include "LESModel.H"
@@ -39,6 +42,7 @@ makeBaseTurbulenceModel
     volScalarField,
     compressibleTurbulenceModel,
     PhaseCompressibleTurbulenceModel,
+    ThermalDiffusivity,
     phaseModel
 );
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index 8cca6f493f..adb23d40d2 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -40,7 +40,13 @@ Foam::RASModels::phasePressureModel::phasePressureModel
     const word& type
 )
 :
-    eddyViscosity<RASModel<PhaseCompressibleTurbulenceModel<phaseModel> > >
+    eddyViscosity
+    <
+        RASModel<EddyDiffusivity<ThermalDiffusivity
+        <
+            PhaseCompressibleTurbulenceModel<phaseModel>
+        > > >
+    >
     (
         type,
         alpha,
@@ -87,7 +93,10 @@ bool Foam::RASModels::phasePressureModel::read()
     (
         eddyViscosity
         <
-            RASModel<PhaseCompressibleTurbulenceModel<phaseModel> >
+            RASModel<EddyDiffusivity<ThermalDiffusivity
+            <
+                PhaseCompressibleTurbulenceModel<phaseModel>
+            > > >
         >::read()
     )
     {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
index f44f77a460..68734e5b4f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,6 +54,8 @@ SourceFiles
 #include "RASModel.H"
 #include "eddyViscosity.H"
 #include "PhaseCompressibleTurbulenceModel.H"
+#include "ThermalDiffusivity.H"
+#include "EddyDiffusivity.H"
 #include "phaseModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,7 +73,10 @@ class phasePressureModel
 :
     public eddyViscosity
     <
-        RASModel<PhaseCompressibleTurbulenceModel<phaseModel> >
+        RASModel<EddyDiffusivity<ThermalDiffusivity
+        <
+            PhaseCompressibleTurbulenceModel<phaseModel>
+        > > >
     >
 {
     // Private data
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H
index 3550c3da98..3f91a8bd25 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H
@@ -196,12 +196,68 @@ public:
             return thermo_->mu(patchi);
         }
 
+        //- Return the thermal conductivity on a patch
+        tmp<scalarField> kappa(const label patchi) const
+        {
+            return thermo_->kappa(patchi);
+        }
+
         //- Return the thermal conductivity
         tmp<volScalarField> kappa() const
         {
             return thermo_->kappa();
         }
 
+        //- Return the laminar thermal conductivity
+        tmp<volScalarField> kappaEff
+        (
+            const volScalarField& alphat
+        ) const
+        {
+            return thermo_->kappaEff(alphat);
+        }
+
+        //- Return the laminar thermal conductivity on a patch
+        tmp<scalarField> kappaEff
+        (
+            const scalarField& alphat,
+            const label patchi
+        ) const
+        {
+            return thermo_->kappaEff(alphat, patchi);
+        }
+
+        //- Return the laminar thermal diffusivity for enthalpy
+        tmp<volScalarField> alpha() const
+        {
+            return thermo_->alpha();
+        }
+
+        //- Return the laminar thermal diffusivity for enthalpy on a patch
+        tmp<scalarField> alpha(const label patchi) const
+        {
+            return thermo_->alpha(patchi);
+        }
+
+        //- Return the effective thermal diffusivity for enthalpy
+        tmp<volScalarField> alphaEff
+        (
+            const volScalarField& alphat
+        ) const
+        {
+            return thermo_->alphaEff(alphat);
+        }
+
+        //- Return the effective thermal diffusivity for enthalpy on a patch
+        tmp<scalarField> alphaEff
+        (
+            const scalarField& alphat,
+            const label patchi
+        ) const
+        {
+            return thermo_->alphaEff(alphat, patchi);
+        }
+
         //- Return the specific heat capacity
         tmp<volScalarField> Cp() const
         {
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
index 6f678ce21a..4a85a59d07 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
@@ -149,9 +149,4 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::alphat
 }
 
 
-template<class BasicTurbulenceModel>
-void Foam::ThermalDiffusivity<BasicTurbulenceModel>::correctEnergyTransport()
-{}
-
-
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
index 8d00e9f08b..2066e44a1d 100644
--- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
+++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
@@ -166,9 +166,6 @@ public:
         {
             return alpha(patchi);
         }
-
-        //- Correct the turbulence thermal diffusivity for energy transport
-        virtual void correctEnergyTransport();
 };
 
 
diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C
index 1fbebad3ee..6b021975ac 100644
--- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C
@@ -73,4 +73,8 @@ Foam::compressibleTurbulenceModel::phi() const
 }
 
 
+void Foam::compressibleTurbulenceModel::correctEnergyTransport()
+{}
+
+
 // ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
index 5d0c95b5cc..a952fbeadc 100644
--- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
@@ -122,7 +122,7 @@ public:
         virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const = 0;
 
         //- Correct the turbulence thermal diffusivity for energy transport
-        virtual void correctEnergyTransport() = 0;
+        virtual void correctEnergyTransport();
 };
 
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
new file mode 100644
index 0000000000..60979da94f
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.air
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      alphat.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
new file mode 100644
index 0000000000..3ae0a65592
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/alphat.water
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      alphat.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
new file mode 100644
index 0000000000..60979da94f
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.air
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      alphat.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
new file mode 100644
index 0000000000..3ae0a65592
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/alphat.water
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      alphat.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
new file mode 100644
index 0000000000..60979da94f
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.air
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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      alphat.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            compressible::alphatWallFunction;
+        Prt             0.85;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles
new file mode 100644
index 0000000000..b047d8d119
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/alphat.particles
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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      alphat.particles;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //

From edd570e3185cfb7b811e0c731cf1ec4880484d9b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 26 Aug 2015 18:07:16 +0100
Subject: [PATCH 25/70] Updated header

---
 src/TurbulenceModels/compressible/compressibleTurbulenceModel.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C
index 6b021975ac..ae0462081a 100644
--- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C
+++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 363cd93d59da56a41c700b2a2aacbfffdc4d964f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 28 Aug 2015 18:39:50 +0100
Subject: [PATCH 26/70] blockMeshMergeFast: Added more diagnostics

---
 src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C b/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C
index d6d2a2d5f4..077db0b8fd 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshMergeFast.C
@@ -455,6 +455,9 @@ void Foam::blockMesh::calcMergeInfoFast()
                         << " and face "
                         << blockNfacei << " of block " << blockNi
                         << endl
+                        << "    Points: " << blockPpoints[blockPpointi]
+                        << " " << blockNpoints[blockNpointi]
+                        << endl
                         << "    This may be due to inconsistent grading."
                         << exit(FatalError);
                 }

From ffedbafee1a7a8e44d5d8590f2c7233c586302a3 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 28 Aug 2015 18:40:22 +0100
Subject: [PATCH 27/70] reactingEulerFoam/phaseSystem: Create an ordered
 container for phaseModels The previous method using a HashTable required a
 separate ordered list of names which is hard to work with and maintain.

---
 .../multiphaseMixtureThermo.H                 |  4 +-
 .../ThermoPhaseModel/ThermoPhaseModel.C       |  2 +-
 .../phaseModel/phaseModel/phaseModel.C        | 13 ++++
 .../phaseModel/phaseModel/phaseModel.H        | 36 +++++++++-
 .../phaseSystems/phaseSystem/phaseSystem.C    | 66 ++++++-------------
 .../phaseSystems/phaseSystem/phaseSystem.H    | 32 ++++-----
 .../phaseSystems/phaseSystem/phaseSystemI.H   | 14 ++++
 .../phaseSystem/phaseSystemTemplates.H        |  6 +-
 .../reactingTwoPhaseEulerFoam/createFields.H  |  1 -
 .../twoPhaseSystem/twoPhaseSystem.C           |  7 +-
 .../DictionaryBase/DictionaryBase.H           |  3 +-
 .../PtrDictionary/PtrDictionary.H             | 17 ++++-
 .../LinkedLists/accessTypes/LList/LList.H     | 33 +++++++++-
 .../LinkedLists/accessTypes/UILList/UILList.H | 53 +++++++++++++++
 .../linkTypes/DLListBase/DLListBase.H         |  3 +-
 .../containers/LinkedLists/user/DLPtrList.H   |  8 +--
 16 files changed, 214 insertions(+), 84 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
index 6d797d16c5..a769a45914 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H
@@ -254,14 +254,14 @@ public:
             virtual volScalarField& he()
             {
                 notImplemented("multiphaseMixtureThermo::he()");
-                return phases_[0]->thermo().he();
+                return phases_[0].thermo().he();
             }
 
             //- Enthalpy/Internal energy [J/kg]
             virtual const volScalarField& he() const
             {
                 notImplemented("multiphaseMixtureThermo::he() const");
-                return phases_[0]->thermo().he();
+                return phases_[0].thermo().he();
             }
 
             //- Enthalpy/Internal energy
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
index e79a9469fd..72aef43d2a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
@@ -50,7 +50,7 @@ Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::ThermoPhaseModel
     {
         thermoPtr_.set
         (
-            ThermoType::New(fluid.mesh(), phaseName).ptr()
+            ThermoType::New(fluid.mesh(), this->name()).ptr()
         );
 
         thermo_ = thermoPtr_.ptr();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
index 2fbd56db2f..b0a54fa582 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
@@ -72,6 +72,13 @@ Foam::phaseModel::phaseModel
 }
 
 
+Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::clone() const
+{
+    notImplemented("phaseModel::clone() const");
+    return autoPtr<phaseModel>(NULL);
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::phaseModel::~phaseModel()
@@ -86,6 +93,12 @@ const Foam::word& Foam::phaseModel::name() const
 }
 
 
+const Foam::word& Foam::phaseModel::keyword() const
+{
+    return name_;
+}
+
+
 const Foam::phaseSystem& Foam::phaseModel::fluid() const
 {
     return fluid_;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
index dc1de338f8..d5e50410c5 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
@@ -107,9 +107,8 @@ public:
             const word& phaseName
         );
 
-
-    //- Destructor
-    virtual ~phaseModel();
+        //- Return clone
+        autoPtr<phaseModel> clone() const;
 
 
     // Selectors
@@ -120,12 +119,43 @@ public:
             const word& phaseName
         );
 
+        //- Return a pointer to a new phase created on freestore
+        //  from Istream
+        class iNew
+        {
+            const phaseSystem& fluid_;
+
+        public:
+
+            iNew
+            (
+                const phaseSystem& fluid
+            )
+            :
+                fluid_(fluid)
+            {}
+
+            autoPtr<phaseModel> operator()(Istream& is) const
+            {
+                return autoPtr<phaseModel>
+                (
+                    phaseModel::New(fluid_, word(is))
+                );
+            }
+        };
+
+
+    //- Destructor
+    virtual ~phaseModel();
+
 
     // Member Functions
 
         //- Return the name of this phase
         const word& name() const;
 
+        const word& keyword() const;
+
         //- Return the system to which this phase belongs
         const phaseSystem& fluid() const;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
index 97f139c57c..3c5dafdfa6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
@@ -41,31 +41,7 @@ const Foam::word Foam::phaseSystem::propertiesName("phaseProperties");
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-Foam::phaseSystem::phaseModelTable
-Foam::phaseSystem::generatePhaseModels(const wordList& phaseNames) const
-{
-    phaseModelTable phaseModels;
-
-    forAllConstIter(wordList, phaseNames, phaseNameIter)
-    {
-        phaseModels.insert
-        (
-            *phaseNameIter,
-            phaseModel::New
-            (
-                *this,
-                *phaseNameIter
-            )
-        );
-    }
-
-    // normalise ?
-
-    return phaseModels;
-}
-
-
-Foam::tmp<Foam::surfaceScalarField> Foam::phaseSystem::generatePhi
+Foam::tmp<Foam::surfaceScalarField> Foam::phaseSystem::calcPhi
 (
     const phaseModelTable& phaseModels
 ) const
@@ -77,7 +53,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::phaseSystem::generatePhi
         new surfaceScalarField
         (
             "phi",
-            fvc::interpolate(phaseModelIter()())*phaseModelIter()->phi()
+            fvc::interpolate(phaseModelIter())*phaseModelIter().phi()
         )
     );
 
@@ -86,8 +62,8 @@ Foam::tmp<Foam::surfaceScalarField> Foam::phaseSystem::generatePhi
     for (; phaseModelIter != phaseModels.end(); ++ phaseModelIter)
     {
         tmpPhi() +=
-            fvc::interpolate(phaseModelIter()())
-           *phaseModelIter()->phi();
+            fvc::interpolate(phaseModelIter())
+           *phaseModelIter().phi();
     }
 
     return tmpPhi;
@@ -167,11 +143,9 @@ Foam::phaseSystem::phaseSystem
 
     mesh_(mesh),
 
-    phaseNames_(lookup("phases")),
+    phaseModels_(lookup("phases"), phaseModel::iNew(*this)),
 
-    phaseModels_(generatePhaseModels(phaseNames_)),
-
-    phi_(generatePhi(phaseModels_)),
+    phi_(calcPhi(phaseModels_)),
 
     dpdt_
     (
@@ -197,7 +171,7 @@ Foam::phaseSystem::phaseSystem
             blendingMethod::New
             (
                 iter().dict(),
-                wordList(lookup("phases"))
+                phaseModels_.toc()
             )
         );
     }
@@ -224,12 +198,12 @@ Foam::tmp<Foam::volScalarField> Foam::phaseSystem::rho() const
 
     tmp<volScalarField> tmpRho
     (
-        phaseModelIter()()*phaseModelIter()->rho()
+        phaseModelIter()*phaseModelIter().rho()
     );
 
     for (; phaseModelIter != phaseModels_.end(); ++ phaseModelIter)
     {
-        tmpRho() += phaseModelIter()()*phaseModelIter()->rho();
+        tmpRho() += phaseModelIter()*phaseModelIter().rho();
     }
 
     return tmpRho;
@@ -242,12 +216,12 @@ Foam::tmp<Foam::volVectorField> Foam::phaseSystem::U() const
 
     tmp<volVectorField> tmpU
     (
-        phaseModelIter()()*phaseModelIter()->U()
+        phaseModelIter()*phaseModelIter().U()
     );
 
     for (; phaseModelIter != phaseModels_.end(); ++ phaseModelIter)
     {
-        tmpU() += phaseModelIter()()*phaseModelIter()->U();
+        tmpU() += phaseModelIter()*phaseModelIter().U();
     }
 
     return tmpU;
@@ -292,7 +266,7 @@ void Foam::phaseSystem::correct()
 {
     forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
     {
-        phaseModelIter()->correct();
+        phaseModelIter().correct();
     }
 }
 
@@ -303,15 +277,17 @@ void Foam::phaseSystem::correctKinematics()
 
     forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
     {
-        phaseModelIter()->correctKinematics();
+        phaseModelIter().correctKinematics();
 
-        updateDpdt = updateDpdt || phaseModelIter()->thermo().dpdt();
+        updateDpdt = updateDpdt || phaseModelIter().thermo().dpdt();
     }
 
+    //phaseModelTable::iterator iter = phaseModels_.begin();
+
     // Update the pressure time-derivative if required
     if (updateDpdt)
     {
-        dpdt_ = fvc::ddt(phaseModels_.begin()()().thermo().p());
+        dpdt_ = fvc::ddt(phaseModels_.begin()()->thermo().p());
     }
 }
 
@@ -320,7 +296,7 @@ void Foam::phaseSystem::correctThermo()
 {
     forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
     {
-        phaseModelIter()->correctThermo();
+        phaseModelIter().correctThermo();
     }
 }
 
@@ -329,7 +305,7 @@ void Foam::phaseSystem::correctTurbulence()
 {
     forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
     {
-        phaseModelIter()->correctTurbulence();
+        phaseModelIter().correctTurbulence();
     }
 }
 
@@ -338,7 +314,7 @@ void Foam::phaseSystem::correctEnergyTransport()
 {
     forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
     {
-        phaseModelIter()->correctEnergyTransport();
+        phaseModelIter().correctEnergyTransport();
     }
 }
 
@@ -351,7 +327,7 @@ bool Foam::phaseSystem::read()
 
         forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
         {
-            readOK &= phaseModelIter()->read();
+            readOK &= phaseModelIter().read();
         }
 
         // models ...
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index 8f50c5c17a..84c69aa655 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
@@ -42,6 +42,7 @@ SourceFiles
 #include "phasePair.H"
 #include "orderedPhasePair.H"
 #include "HashPtrTable.H"
+#include "PtrDictionary.H"
 
 #include "IOMRFZoneList.H"
 #include "fvIOoptionList.H"
@@ -117,15 +118,17 @@ public:
             >
             massTransferTable;
 
+        // typedef
+        //     HashTable<autoPtr<phaseModel>, word, word::hash>
+        //     phaseModelTable;
+
+        typedef PtrDictionary<phaseModel> phaseModelTable;
+
 
 protected:
 
     // Protected typedefs
 
-        typedef
-            HashTable<autoPtr<phaseModel>, word, word::hash>
-            phaseModelTable;
-
         typedef
             HashTable<dictionary, phasePairKey, phasePairKey::hash>
             dictTable;
@@ -162,9 +165,6 @@ protected:
         //- Reference to the mesh
         const fvMesh& mesh_;
 
-        //- Phase names
-        wordList phaseNames_;
-
         //- Phase models
         phaseModelTable phaseModels_;
 
@@ -198,16 +198,10 @@ protected:
 
     // Protected member functions
 
-        //- Generate the phases
-        HashTable<autoPtr<phaseModel> > generatePhaseModels
+        //- Calculate and return the mixture flux
+        tmp<surfaceScalarField> calcPhi
         (
-            const wordList& names
-        ) const;
-
-        //- Generate the mixture flux
-        tmp<surfaceScalarField> generatePhi
-        (
-            const HashTable<autoPtr<phaseModel> >& phaseModels
+            const phaseModelTable& phaseModels
         ) const;
 
         //- Generate pairs
@@ -360,6 +354,12 @@ public:
             //- Constant access the mesh
             inline const fvMesh& mesh() const;
 
+            //- Constant access the phase models
+            inline const phaseModelTable& phases() const;
+
+            //- Access the phase models
+            inline phaseModelTable& phases();
+
             //- Constant access the mixture flux
             inline const surfaceScalarField& phi() const;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
index 3d7e837533..35b61ab451 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
@@ -31,6 +31,20 @@ inline const Foam::fvMesh& Foam::phaseSystem::mesh() const
 }
 
 
+inline const Foam::phaseSystem::phaseModelTable&
+Foam::phaseSystem::phases() const
+{
+    return phaseModels_;
+}
+
+
+inline Foam::phaseSystem::phaseModelTable&
+Foam::phaseSystem::phases()
+{
+    return phaseModels_;
+}
+
+
 inline const Foam::surfaceScalarField& Foam::phaseSystem::phi() const
 {
     return phi_;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
index 48d1716612..40d96f9df7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
@@ -151,12 +151,12 @@ void Foam::phaseSystem::generatePairsAndSubModels
         HashTable<autoPtr<modelType>, phasePairKey, phasePairKey::hash>
         modelTypeTable;
 
-    forAllConstIter(wordList, phaseNames_, phaseNameIter)
+    forAllConstIter(phaseModelTable, phaseModels_, phaseModelIter)
     {
         modelTypeTable tempModels;
         generatePairsAndSubModels
         (
-            IOobject::groupName(modelName, *phaseNameIter),
+            IOobject::groupName(modelName, phaseModelIter().name()),
             tempModels
         );
 
@@ -175,7 +175,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
 
             models[tempModelIter.key()].insert
             (
-                *phaseNameIter,
+                phaseModelIter().name(),
                 *tempModelIter
             );
         }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
index 30b3b0e715..60d17c251f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
@@ -72,7 +72,6 @@ setRefCell
     pRefValue
 );
 mesh.setFluxRequired(p_rgh.name());
-mesh.setFluxRequired(alpha1.name());
 
 const IOMRFZoneList& MRF = fluid.MRF();
 fv::IOoptionList& fvOptions = fluid.fvOptions();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index caee01b251..50b79b5672 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -57,10 +57,13 @@ Foam::twoPhaseSystem::twoPhaseSystem
 )
 :
     phaseSystem(mesh),
-    phase1_(phaseModels_[phaseNames_[0]]()),
-    phase2_(phaseModels_[phaseNames_[1]]())
+    phase1_(phaseModels_.first()),
+    phase2_(phaseModels_.last())
 {
     phase2_.volScalarField::operator=(scalar(1) - phase1_);
+
+    volScalarField& alpha1 = phase1_;
+    mesh.setFluxRequired(alpha1.name());
 }
 
 
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
index 7d788fe4df..43634bc93a 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -146,6 +146,7 @@ public:
             //  and annul the argument.
             void transfer(DictionaryBase<IDLListType, T>&);
 
+
     // Member operators
 
         void operator=(const DictionaryBase&);
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
index efa739d26a..e6d1a5f999 100644
--- a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,6 +73,21 @@ public:
 
         //- Construct from Istream
         PtrDictionary(Istream&);
+
+
+    // Member operators
+
+        //- Find and return entry
+        const T& operator[](const word& key) const
+        {
+            return *DictionaryBase<DLPtrList<T>, T>::operator[](key);
+        }
+
+        //- Find and return entry
+        T& operator[](const word& key)
+        {
+            return *DictionaryBase<DLPtrList<T>, T>::operator[](key);
+        }
 };
 
 
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
index 3e4ed069c9..e8a9ff22d4 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -203,6 +203,7 @@ public:
             //  and annul the argument list.
             void transfer(LList<LListBase, T>&);
 
+
     // Member operators
 
         void operator=(const LList<LListBase, T>&);
@@ -265,6 +266,16 @@ public:
                 }
         };
 
+        inline iterator begin()
+        {
+            return LListBase::begin();
+        }
+
+        inline const iterator& end()
+        {
+            return static_cast<const iterator&>(LListBase::end());
+        }
+
 
     // STL const_iterator
 
@@ -313,6 +324,26 @@ public:
                 }
         };
 
+        inline const_iterator cbegin() const
+        {
+            return LListBase::cbegin();
+        }
+
+        inline const const_iterator& cend() const
+        {
+            return static_cast<const const_iterator&>(LListBase::cend());
+        }
+
+        inline const_iterator begin() const
+        {
+            return LListBase::begin();
+        }
+
+        inline const const_iterator& end() const
+        {
+            return static_cast<const const_iterator&>(LListBase::end());
+        }
+
 
     // IOstream operators
 
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
index 893af00422..b2ec4c8fca 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
@@ -209,6 +209,16 @@ public:
                 }
         };
 
+        inline iterator begin()
+        {
+            return LListBase::begin();
+        }
+
+        inline const iterator& end()
+        {
+            return static_cast<const iterator&>(LListBase::end());
+        }
+
 
     // STL const_iterator
 
@@ -256,6 +266,26 @@ public:
                 }
         };
 
+        inline const_iterator cbegin() const
+        {
+            return LListBase::cbegin();
+        }
+
+        inline const const_iterator& cend() const
+        {
+            return static_cast<const const_iterator&>(LListBase::cend());
+        }
+
+        inline const_iterator begin() const
+        {
+            return LListBase::begin();
+        }
+
+        inline const const_iterator& end() const
+        {
+            return static_cast<const const_iterator&>(LListBase::end());
+        }
+
 
     // STL const_reverse_iterator
 
@@ -298,6 +328,29 @@ public:
                 }
         };
 
+        inline const_reverse_iterator crbegin() const
+        {
+            return LListBase::crbegin();
+        }
+
+        inline const const_reverse_iterator& crend() const
+        {
+            return
+                static_cast<const const_reverse_iterator&>(LListBase::crend());
+        }
+
+
+        inline const_reverse_iterator rbegin() const
+        {
+            return LListBase::rbegin();
+        }
+
+        inline const const_reverse_iterator& rend() const
+        {
+            return
+                static_cast<const const_reverse_iterator&>(LListBase::rend());
+        }
+
 
     // STL member operators
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
index 095e51fe1f..0e7fc75aa8 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
@@ -263,6 +263,7 @@ public:
         inline const_iterator begin() const;
         inline const const_iterator& end() const;
 
+
     // STL const_reverse_iterator
 
         //- An STL-conforming const_reverse_iterator
@@ -300,6 +301,7 @@ public:
         inline const_reverse_iterator rbegin() const;
         inline const const_reverse_iterator& rend() const;
 
+
 private:
 
         //- Iterator returned by end()
@@ -310,7 +312,6 @@ private:
 
         //- const_reverse_iterator returned by end()
         static const_reverse_iterator endConstRevIter_;
-
 };
 
 
diff --git a/src/OpenFOAM/containers/LinkedLists/user/DLPtrList.H b/src/OpenFOAM/containers/LinkedLists/user/DLPtrList.H
index 6e83434125..9793d8be9f 100644
--- a/src/OpenFOAM/containers/LinkedLists/user/DLPtrList.H
+++ b/src/OpenFOAM/containers/LinkedLists/user/DLPtrList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,12 +58,6 @@ public:
         DLPtrList()
         {}
 
-        //- Construct given initial T
-        DLPtrList(T a)
-        :
-            LPtrList<DLListBase, T>(a)
-        {}
-
         //- Construct from Istream using given Istream constructor class
         template<class INew>
         DLPtrList(Istream& is, const INew& inewt)

From 87532b27b069f73a6d7ba228938e93e506d50ab0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 28 Aug 2015 20:26:23 +0100
Subject: [PATCH 28/70] blockMesh: Avoid test failure for lambda == 1

---
 src/mesh/blockMesh/curvedEdges/arcEdge.C  | 4 ++--
 src/mesh/blockMesh/curvedEdges/lineEdge.C | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mesh/blockMesh/curvedEdges/arcEdge.C b/src/mesh/blockMesh/curvedEdges/arcEdge.C
index 1f42125f98..512eab4a20 100644
--- a/src/mesh/blockMesh/curvedEdges/arcEdge.C
+++ b/src/mesh/blockMesh/curvedEdges/arcEdge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -133,7 +133,7 @@ Foam::arcEdge::arcEdge(const pointField& points, Istream& is)
 
 Foam::point Foam::arcEdge::position(const scalar lambda) const
 {
-    if (lambda < 0 || lambda > 1)
+    if (lambda < -SMALL || lambda > 1 + SMALL)
     {
         FatalErrorIn("arcEdge::position(const scalar lambda) const")
             << "Parameter out of range, lambda = " << lambda
diff --git a/src/mesh/blockMesh/curvedEdges/lineEdge.C b/src/mesh/blockMesh/curvedEdges/lineEdge.C
index f5bd3348ea..a00243e584 100644
--- a/src/mesh/blockMesh/curvedEdges/lineEdge.C
+++ b/src/mesh/blockMesh/curvedEdges/lineEdge.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,16 +54,18 @@ Foam::lineEdge::lineEdge(const pointField& points, Istream& is)
     curvedEdge(points, is)
 {}
 
+
 // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * //
 
 Foam::lineEdge::~lineEdge()
 {}
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::point Foam::lineEdge::position(const scalar lambda) const
 {
-    if (lambda < 0 || lambda > 1)
+    if (lambda < -SMALL || lambda > 1+SMALL)
     {
         FatalErrorIn("lineEdge::position(const scalar)")
             << "Parameter out of range, lambda = " << lambda

From 0c926959b4e65e7adbb6850c3347c23677b9324e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 29 Aug 2015 00:02:15 +0100
Subject: [PATCH 29/70] reactingEulerFoam: Correct handling of phaseName in
 ReactingPhaseModel

---
 .../phaseModel/ReactingPhaseModel/ReactingPhaseModel.C          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C
index a6ab32d2fc..0bd35ee16f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C
@@ -39,7 +39,7 @@ Foam::ReactingPhaseModel<BasePhaseModel, ReactionType>::ReactingPhaseModel
     BasePhaseModel(fluid, phaseName, false),
     reaction_
     (
-        ReactionType::New(fluid.mesh(), phaseName)
+        ReactionType::New(fluid.mesh(), this->name())
     )
 {
     this->thermo_ = &reaction_->thermo();

From a159722136369bd40210b461d348be01878f4b19 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 29 Aug 2015 00:02:44 +0100
Subject: [PATCH 30/70] 
 tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed: Add missing file

---
 .../laminar/fluidisedBed/0/alphat.particles   | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles

diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles
new file mode 100644
index 0000000000..b047d8d119
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/alphat.particles
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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      alphat.particles;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //

From 430d894e376d46f1a26c071e1e8bfe095303e9fd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 2 Sep 2015 15:29:54 +0100
Subject: [PATCH 31/70] Added ROOTSMALL

---
 .../utilities/mesh/manipulation/checkMesh/checkGeometry.C   | 2 +-
 src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H  | 1 +
 src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H    | 1 +
 src/OpenFOAM/primitives/Scalar/scalar/scalar.H              | 2 ++
 .../autoMesh/autoHexMesh/meshRefinement/meshRefinement.C    | 6 +++---
 .../autoHexMesh/meshRefinement/meshRefinementBaffles.C      | 6 +++---
 .../autoHexMesh/meshRefinement/meshRefinementRefine.C       | 6 +++---
 src/meshTools/searchableSurface/searchableBox.C             | 2 +-
 .../distributedTriSurfaceMesh/distributedTriSurfaceMesh.C   | 2 +-
 9 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index 8677f08c65..987e26d2e3 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -136,7 +136,7 @@ bool Foam::checkWedges
                 const point& pt = p[pp.meshPoints()[i]];
                 scalar d = mag((pt - p0) & pp.n());
 
-                if (d > sqrt(SMALL))
+                if (d > ROOTSMALL)
                 {
                     if (report)
                     {
diff --git a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
index 2498f5f9cc..3089947853 100644
--- a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
+++ b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
@@ -55,6 +55,7 @@ static const doubleScalar doubleScalarGREAT = 1.0e+15;
 static const doubleScalar doubleScalarVGREAT = 1.0e+300;
 static const doubleScalar doubleScalarROOTVGREAT = 1.0e+150;
 static const doubleScalar doubleScalarSMALL = 1.0e-15;
+static const doubleScalar doubleScalarROOTSMALL = 3.0e-8;
 static const doubleScalar doubleScalarVSMALL = 1.0e-300;
 static const doubleScalar doubleScalarROOTVSMALL = 1.0e-150;
 
diff --git a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
index 31ae9891dd..1cfb728a23 100644
--- a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
+++ b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
@@ -55,6 +55,7 @@ static const floatScalar floatScalarGREAT = 1.0e+6;
 static const floatScalar floatScalarVGREAT = 1.0e+37;
 static const floatScalar floatScalarROOTVGREAT = 1.0e+18;
 static const floatScalar floatScalarSMALL = 1.0e-6;
+static const floatScalar floatScalarROOTSMALL = 1.0e-3;
 static const floatScalar floatScalarVSMALL = 1.0e-37;
 static const floatScalar floatScalarROOTVSMALL = 1.0e-18;
 
diff --git a/src/OpenFOAM/primitives/Scalar/scalar/scalar.H b/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
index cb5496a65e..8f9c1c5616 100644
--- a/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
@@ -53,6 +53,7 @@ namespace Foam
     static const scalar VGREAT = floatScalarVGREAT;
     static const scalar ROOTVGREAT = floatScalarROOTVGREAT;
     static const scalar SMALL = floatScalarSMALL;
+    static const scalar ROOTSMALL = floatScalarROOTSMALL;
     static const scalar VSMALL = floatScalarVSMALL;
     static const scalar ROOTVSMALL = floatScalarROOTVSMALL;
 
@@ -71,6 +72,7 @@ namespace Foam
     static const scalar VGREAT = doubleScalarVGREAT;
     static const scalar ROOTVGREAT = doubleScalarROOTVGREAT;
     static const scalar SMALL = doubleScalarSMALL;
+    static const scalar ROOTSMALL = doubleScalarROOTSMALL;
     static const scalar VSMALL = doubleScalarVSMALL;
     static const scalar ROOTVSMALL = doubleScalarROOTVSMALL;
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 5d96aafca9..12e94465f0 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -272,7 +272,7 @@ void Foam::meshRefinement::updateIntersections(const labelList& changedFaces)
 
     // Extend segments a bit
     {
-        const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+        const vectorField smallVec(ROOTSMALL*(end-start));
         start -= smallVec;
         end += smallVec;
     }
@@ -483,7 +483,7 @@ void Foam::meshRefinement::checkData()
 
         // Extend segments a bit
         {
-            const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+            const vectorField smallVec(ROOTSMALL*(end-start));
             start -= smallVec;
             end += smallVec;
         }
@@ -2897,7 +2897,7 @@ void Foam::meshRefinement::dumpIntersections(const fileName& prefix) const
 
         // Extend segments a bit
         {
-            const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+            const vectorField smallVec(ROOTSMALL*(end-start));
             start -= smallVec;
             end += smallVec;
         }
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index 8cf215729d..bbbe08c353 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -243,7 +243,7 @@ void Foam::meshRefinement::getBafflePatches
 
     // Extend segments a bit
     {
-        const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+        const vectorField smallVec(ROOTSMALL*(end-start));
         start -= smallVec;
         end += smallVec;
     }
@@ -830,7 +830,7 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::freeStandingBaffles
 
         // Extend segments a bit
         {
-            const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+            const vectorField smallVec(ROOTSMALL*(end-start));
             start -= smallVec;
             end += smallVec;
         }
@@ -2967,7 +2967,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
 
         // Extend segments a bit
         {
-            const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+            const vectorField smallVec(ROOTSMALL*(end-start));
             start -= smallVec;
             end += smallVec;
         }
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
index 3ccaa72835..e2224f7cd4 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@@ -967,7 +967,7 @@ Foam::label Foam::meshRefinement::markSurfaceRefinement
 
     // Extend segments a bit
     {
-        const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+        const vectorField smallVec(ROOTSMALL*(end-start));
         start -= smallVec;
         end += smallVec;
     }
@@ -1161,7 +1161,7 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
 
     // Extend segments a bit
     {
-        const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+        const vectorField smallVec(ROOTSMALL*(end-start));
         start -= smallVec;
         end += smallVec;
     }
@@ -1764,7 +1764,7 @@ Foam::label Foam::meshRefinement::markProximityRefinement
 
     // Extend segments a bit
     {
-        const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+        const vectorField smallVec(ROOTSMALL*(end-start));
         start -= smallVec;
         end += smallVec;
     }
diff --git a/src/meshTools/searchableSurface/searchableBox.C b/src/meshTools/searchableSurface/searchableBox.C
index 5970e82575..f20b808e86 100644
--- a/src/meshTools/searchableSurface/searchableBox.C
+++ b/src/meshTools/searchableSurface/searchableBox.C
@@ -531,7 +531,7 @@ void Foam::searchableBox::findLineAll
     const scalarField magSqrDirVec(magSqr(dirVec));
     const vectorField smallVec
     (
-        Foam::sqrt(SMALL)*dirVec
+        ROOTSMALL*dirVec
       + vector(ROOTVSMALL,ROOTVSMALL,ROOTVSMALL)
     );
 
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 1a636b1cad..80e3943cd1 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -1752,7 +1752,7 @@ void Foam::distributedTriSurfaceMesh::findLineAll
     const scalarField magSqrDirVec(magSqr(dirVec));
     const vectorField smallVec
     (
-        Foam::sqrt(SMALL)*dirVec
+        ROOTSMALL*dirVec
       + vector(ROOTVSMALL,ROOTVSMALL,ROOTVSMALL)
     );
 

From a96d82f79b9893a46333062e925f9a8f936c2afb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 2 Sep 2015 15:30:10 +0100
Subject: [PATCH 32/70] Updated headers

---
 src/OpenFOAM/primitives/Scalar/scalar/scalar.H                  | 2 +-
 src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C   | 2 +-
 .../autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C | 2 +-
 src/meshTools/searchableSurface/searchableBox.C                 | 2 +-
 .../distributedTriSurfaceMesh/distributedTriSurfaceMesh.C       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/OpenFOAM/primitives/Scalar/scalar/scalar.H b/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
index 8f9c1c5616..f4a4a0f63b 100644
--- a/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 12e94465f0..2fc70109dd 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index bbbe08c353..d9ec65959c 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/searchableSurface/searchableBox.C b/src/meshTools/searchableSurface/searchableBox.C
index f20b808e86..535b7e2871 100644
--- a/src/meshTools/searchableSurface/searchableBox.C
+++ b/src/meshTools/searchableSurface/searchableBox.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 80e3943cd1..f17d26277e 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 7405f7552ed8852dc6bfcd99182f222579190273 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 2 Sep 2015 15:30:20 +0100
Subject: [PATCH 33/70] chtMultiRegionFoam: Updated temperature diagnostics
 Patch provided by Daniel Jasinski Resolved bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1843

---
 .../chtMultiRegionSimpleFoam/solid/solveSolid.H                | 3 ++-
 .../solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H

diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
index 49a945989d..0600a1c650 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
@@ -24,4 +24,5 @@
 
 thermo.correct();
 
-Info<< "Min/max T:" << min(thermo.T()) << ' ' << max(thermo.T()) << endl;
+Info<< "Min/max T:" << min(thermo.T()).value() << ' '
+    << max(thermo.T()).value() << endl;
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
old mode 100644
new mode 100755
index 27f1737e52..49fd39e45b
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
@@ -30,7 +30,8 @@ if (finalIter)
 
 thermo.correct();
 
-Info<< "Min/max T:" << min(thermo.T()) << ' ' << max(thermo.T()) << endl;
+Info<< "Min/max T:" << min(thermo.T()).value() << ' '
+    << max(thermo.T()).value() << endl;
 
 if (finalIter)
 {

From 8733ce815eca3985ad9fb606f9b14f3fd95278cd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 2 Sep 2015 15:32:16 +0100
Subject: [PATCH 34/70] chemkinReader: Add tolerance to element balance check
 Patch provided by Daniel Jasinski Resolved bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1843

---
 .../chemistryReaders/chemkinReader/chemkinReader.C    | 11 +++++++----
 .../chemistryReaders/chemkinReader/chemkinReader.H    |  7 +++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
index 701ce73c8d..10d1b60a4d 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
@@ -753,10 +753,11 @@ void Foam::chemkinReader::addReaction
 
     forAll(nAtoms, i)
     {
-        if (mag(nAtoms[i]) > SMALL)
+        if (mag(nAtoms[i]) > imbalanceTol_)
         {
             FatalErrorIn("chemkinReader::addReaction")
-                << "Elemental imbalance in " << elementNames_[i]
+                << "Elemental imbalance of " << mag(nAtoms[i])
+                << " in " << elementNames_[i]
                 << " in reaction" << nl
                 << reactions_.last() << nl
                 << " on line " << lineNo_-1
@@ -839,7 +840,8 @@ Foam::chemkinReader::chemkinReader
     specieNames_(10),
     speciesTable_(species),
     reactions_(speciesTable_, speciesThermo_),
-    newFormat_(newFormat)
+    newFormat_(newFormat),
+    imbalanceTol_(ROOTSMALL)
 {
     read(CHEMKINFileName, thermoFileName);
 }
@@ -855,7 +857,8 @@ Foam::chemkinReader::chemkinReader
     specieNames_(10),
     speciesTable_(species),
     reactions_(speciesTable_, speciesThermo_),
-    newFormat_(thermoDict.lookupOrDefault("newFormat", false))
+    newFormat_(thermoDict.lookupOrDefault("newFormat", false)),
+    imbalanceTol_(thermoDict.lookupOrDefault("imbalanceTolerance", ROOTSMALL))
 {
     if (newFormat_)
     {
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
index 1f5aa7acc8..f08daec9f9 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
             gas
         };
 
-        //- Species element
+        //- species element
         struct specieElement
         {
             word elementName;
@@ -211,6 +211,9 @@ private:
         //- Flag to indicate that file is in new format
         Switch newFormat_;
 
+        //- Tolerance for element imbalance in a reaction
+        scalar imbalanceTol_;
+
 
     // Private Member Functions
 

From f9870ed9d0cd9ae2bc42a3c2ef63ce87d44032ae Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 2 Sep 2015 15:33:16 +0100
Subject: [PATCH 35/70] Updated headers

---
 .../chemistryReaders/chemkinReader/chemkinReader.C              | 2 +-
 .../chemistryReaders/chemkinReader/chemkinReader.H              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
index 10d1b60a4d..2334241940 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
index f08daec9f9..ee1986f60b 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From dd3f68b1fac19093d64ae9f7beb8508493fd9188 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 4 Sep 2015 17:01:31 +0100
Subject: [PATCH 36/70] reactingEulerFoam: Rationalize the phaseSystem
 base-class

---
 .../MomentumTransferPhaseSystem.C             |  65 +++++++++-
 .../MomentumTransferPhaseSystem.H             |   9 ++
 .../MovingPhaseModel/MovingPhaseModel.C       |   1 +
 .../phaseSystems/phaseSystem/phaseSystem.C    |   2 -
 .../phaseSystems/phaseSystem/phaseSystem.H    | 114 ++++++------------
 .../phaseSystems/phaseSystem/phaseSystemI.H   |   7 ++
 .../reactingTwoPhaseEulerFoam/pU/UEqns.H      |   3 -
 .../reactingTwoPhaseEulerFoam/pUf/UEqns.H     |   3 -
 .../twoPhaseSystem/twoPhaseSystem.C           |  26 ++--
 .../twoPhaseSystem/twoPhaseSystem.H           |  99 +++++++++------
 10 files changed, 193 insertions(+), 136 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index 9646a6a80c..a209933b09 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -155,6 +155,63 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Kdf
 }
 
 
+template<class BasePhaseSystem>
+Foam::tmp<Foam::volScalarField>
+Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Kd
+(
+    const Foam::phaseModel& phase
+) const
+{
+    tmp<volScalarField> tKd
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                IOobject::groupName("Kd", phase.name()),
+                this->mesh_.time().timeName(),
+                this->mesh_
+            ),
+            this->mesh_,
+            dimensionedScalar
+            (
+                IOobject::groupName("Kd", phase.name()),
+                dimensionSet(1, -3, -1, 0, 0),
+                0
+            )
+        )
+    );
+
+    // Add the implicit part of the drag force
+    forAllConstIter
+    (
+        phaseSystem::KdTable,
+        Kds_,
+        KdIter
+    )
+    {
+        const volScalarField& K(*KdIter());
+
+        const phasePair& pair(this->phasePairs_[KdIter.key()]);
+
+        const phaseModel* phase1 = &pair.phase1();
+        const phaseModel* phase2 = &pair.phase2();
+
+        forAllConstIter(phasePair, pair, iter)
+        {
+            if (phase1 == &phase)
+            {
+                tKd() += K;
+            }
+
+            Swap(phase1, phase2);
+        }
+    }
+
+    return tKd;
+}
+
+
 template<class BasePhaseSystem>
 Foam::tmp<Foam::volScalarField>
 Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Vm
@@ -385,6 +442,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
     }
 
     // Add the implicit part of the drag force
+    /* ***HGW Currently this is handled in the pEqn
     forAllConstIter
     (
         phaseSystem::KdTable,
@@ -401,13 +459,14 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
 
         forAllConstIter(phasePair, pair, iter)
         {
-            const volVectorField& U(phase->U());
+            const volVectorField& U = phase->U();
 
             *eqns[phase->name()] -= fvm::Sp(K, U);
 
             Swap(phase, otherPhase);
         }
     }
+    */
 
     // Update the virtual mass coefficients
     forAllConstIter
@@ -437,8 +496,8 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
 
         forAllConstIter(phasePair, pair, iter)
         {
-            const volVectorField& U(phase->U());
-            const surfaceScalarField& phi(phase->phi());
+            const volVectorField& U = phase->U();
+            const surfaceScalarField& phi = phase->phi();
 
             *eqns[phase->name()] +=
               - Vm
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
index 5c9f057bed..b6aeadd34c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
@@ -148,12 +148,21 @@ public:
 
     // Member Functions
 
+        //- Constant access to drag coefficients
+        virtual const phaseSystem::KdTable& Kds() const
+        {
+            return Kds_;
+        }
+
         //- Return the drag coefficient
         virtual tmp<volScalarField> Kd(const phasePairKey& key) const;
 
         //- Return the face drag coefficient
         virtual tmp<surfaceScalarField> Kdf(const phasePairKey& key) const;
 
+        //- Return the drag coefficient for phase
+        virtual tmp<volScalarField> Kd(const phaseModel& phase) const;
+
         //- Return the virtual mass coefficient
         virtual tmp<volScalarField> Vm(const phasePairKey& key) const;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index d64a5c862e..090d29fafe 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -260,6 +260,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::UEqn()
         fvm::ddt(*this, this->thermo().rho(), U_)
       + fvm::div(alphaRhoPhi_, U_)
       - fvm::Sp(continuityError_, U_)
+      + this->fluid().MRF().DDt(*this*this->thermo().rho(), U_)
       + turbulence_->divDevRhoReff(U_)
     );
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
index 3c5dafdfa6..dee40846b6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
@@ -282,8 +282,6 @@ void Foam::phaseSystem::correctKinematics()
         updateDpdt = updateDpdt || phaseModelIter().thermo().dpdt();
     }
 
-    //phaseModelTable::iterator iter = phaseModels_.begin();
-
     // Update the pressure time-derivative if required
     if (updateDpdt)
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index 84c69aa655..bcb268bdc5 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
@@ -118,10 +118,6 @@ public:
             >
             massTransferTable;
 
-        // typedef
-        //     HashTable<autoPtr<phaseModel>, word, word::hash>
-        //     phaseModelTable;
-
         typedef PtrDictionary<phaseModel> phaseModelTable;
 
 
@@ -284,48 +280,56 @@ public:
 
     // Member Functions
 
+        //- Constant access the mesh
+        inline const fvMesh& mesh() const;
+
+        //- Constant access the phase models
+        inline const phaseModelTable& phases() const;
+
+        //- Access the phase models
+        inline phaseModelTable& phases();
+
+        //- Constant access the phase pairs
+        inline const phasePairTable& phasePairs() const;
+
         //- Return the mixture density
         tmp<volScalarField> rho() const;
 
         //- Return the mixture velocity
         tmp<volVectorField> U() const;
 
+        //- Constant access the mixture flux
+        inline const surfaceScalarField& phi() const;
+
+        //- Access the mixture flux
+        inline surfaceScalarField& phi();
+
+        //- Constant access the rate of change of the pressure
+        inline const volScalarField& dpdt() const;
+
+        //- Access the rate of change of the pressure
+        inline volScalarField& dpdt();
+
         //- Return the surface tension coefficient
         tmp<volScalarField> sigma(const phasePairKey& key) const;
 
-        //- Return the drag coefficient
-        virtual tmp<volScalarField> Kd(const phasePairKey& key) const = 0;
+        //- Return MRF zones
+        inline const IOMRFZoneList& MRF() const;
 
-        //- Return the face drag coefficient
-        virtual tmp<surfaceScalarField> Kdf(const phasePairKey& key) const = 0;
+        //- Optional FV-options
+        inline fv::IOoptionList& fvOptions() const;
 
-        //- Return the virtual mass coefficient
-        virtual tmp<volScalarField> Vm(const phasePairKey& key) const = 0;
+        //- Access a sub model between a phase pair
+        template <class modelType>
+        const modelType& lookupSubModel(const phasePair& key) const;
 
-        //- Return the face virtual mass coefficient
-        virtual tmp<surfaceScalarField> Vmf(const phasePairKey& key) const = 0;
-
-        //- Return the combined force (lift + wall-lubrication)
-        virtual tmp<volVectorField> F(const phasePairKey& key) const = 0;
-
-        //- Return the combined face-force (lift + wall-lubrication)
-        virtual tmp<surfaceScalarField> Ff(const phasePairKey& key) const = 0;
-
-        //- Return the turbulent diffusivity
-        //  Multiplies the phase-fraction gradient
-        virtual tmp<volScalarField> D(const phasePairKey& key) const = 0;
-
-        //- Return the interfacial mass flow rate
-        virtual tmp<volScalarField> dmdt(const phasePairKey& key) const = 0;
-
-        //- Return the momentum transfer matrices
-        virtual autoPtr<momentumTransferTable> momentumTransfer() const = 0;
-
-        //- Return the heat transfer matrices
-        virtual autoPtr<heatTransferTable> heatTransfer() const = 0;
-
-        //- Return the mass transfer matrices
-        virtual autoPtr<massTransferTable> massTransfer() const = 0;
+        //- Access a sub model between two phases
+        template <class modelType>
+        const modelType& lookupSubModel
+        (
+            const phaseModel& dispersed,
+            const phaseModel& continuous
+        ) const;
 
         //- Solve for the phase fractions
         virtual void solve();
@@ -347,48 +351,6 @@ public:
 
         //- Read base phaseProperties dictionary
         virtual bool read();
-
-
-        // Access
-
-            //- Constant access the mesh
-            inline const fvMesh& mesh() const;
-
-            //- Constant access the phase models
-            inline const phaseModelTable& phases() const;
-
-            //- Access the phase models
-            inline phaseModelTable& phases();
-
-            //- Constant access the mixture flux
-            inline const surfaceScalarField& phi() const;
-
-            //- Access the mixture flux
-            inline surfaceScalarField& phi();
-
-            //- Constant access the rate of change of the pressure
-            inline const volScalarField& dpdt() const;
-
-            //- Access the rate of change of the pressure
-            inline volScalarField& dpdt();
-
-            //- Return MRF zones
-            inline const IOMRFZoneList& MRF() const;
-
-            //- Optional FV-options
-            inline fv::IOoptionList& fvOptions() const;
-
-            //- Access a sub model between a phase pair
-            template <class modelType>
-            const modelType& lookupSubModel(const phasePair& key) const;
-
-            //- Access a sub model between two phases
-            template <class modelType>
-            const modelType& lookupSubModel
-            (
-                const phaseModel& dispersed,
-                const phaseModel& continuous
-            ) const;
 };
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
index 35b61ab451..343d31f49b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
@@ -45,6 +45,13 @@ Foam::phaseSystem::phases()
 }
 
 
+inline const Foam::phaseSystem::phasePairTable&
+Foam::phaseSystem::phasePairs() const
+{
+    return phasePairs_;
+}
+
+
 inline const Foam::surfaceScalarField& Foam::phaseSystem::phi() const
 {
     return phi_;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H
index 31bd20ff7a..9252630429 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H
@@ -1,8 +1,5 @@
 Info<< "Constructing momentum equations" << endl;
 
-MRF.correctBoundaryVelocity(U1);
-MRF.correctBoundaryVelocity(U2);
-
 fvVectorMatrix U1Eqn(U1, rho1.dimensions()*U1.dimensions()*dimVol/dimTime);
 fvVectorMatrix U2Eqn(U2, rho2.dimensions()*U2.dimensions()*dimVol/dimTime);
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H
index eb1456bc15..83c3a9ce7f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H
@@ -1,8 +1,5 @@
 Info<< "Constructing face momentum equations" << endl;
 
-MRF.correctBoundaryVelocity(U1);
-MRF.correctBoundaryVelocity(U2);
-
 fvVectorMatrix U1Eqn(U1, rho1.dimensions()*U1.dimensions()*dimVol/dimTime);
 fvVectorMatrix U2Eqn(U2, rho2.dimensions()*U2.dimensions()*dimVol/dimTime);
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index 50b79b5672..13a98b885f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -85,6 +85,12 @@ Foam::twoPhaseSystem::sigma() const
 }
 
 
+const Foam::dragModel& Foam::twoPhaseSystem::drag(const phaseModel& phase) const
+{
+    return lookupSubModel<dragModel>(phase, otherPhase(phase));
+}
+
+
 Foam::tmp<Foam::volScalarField>
 Foam::twoPhaseSystem::Kd() const
 {
@@ -105,6 +111,13 @@ Foam::twoPhaseSystem::Kdf() const
 }
 
 
+const Foam::virtualMassModel&
+Foam::twoPhaseSystem::virtualMass(const phaseModel& phase) const
+{
+    return lookupSubModel<virtualMassModel>(phase, otherPhase(phase));
+}
+
+
 Foam::tmp<Foam::volScalarField>
 Foam::twoPhaseSystem::Vm() const
 {
@@ -409,17 +422,4 @@ void Foam::twoPhaseSystem::solve()
 }
 
 
-const Foam::dragModel& Foam::twoPhaseSystem::drag(const phaseModel& phase) const
-{
-    return lookupSubModel<dragModel>(phase, otherPhase(phase));
-}
-
-
-const Foam::virtualMassModel&
-Foam::twoPhaseSystem::virtualMass(const phaseModel& phase) const
-{
-    return lookupSubModel<virtualMassModel>(phase, otherPhase(phase));
-}
-
-
 // ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
index 0ac971b790..deca55fa6e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
@@ -53,6 +53,35 @@ class twoPhaseSystem
 :
     public phaseSystem
 {
+    // Private member functions
+
+        //- Return the drag coefficient for phase pair
+        virtual tmp<volScalarField> Kd(const phasePairKey& key) const = 0;
+
+        //- Return the face drag coefficient for phase pair
+        virtual tmp<surfaceScalarField> Kdf(const phasePairKey& key) const = 0;
+
+        //- Return the virtual mass coefficient for phase pair
+        virtual tmp<volScalarField> Vm(const phasePairKey& key) const = 0;
+
+        //- Return the face virtual mass coefficient for phase pair
+        virtual tmp<surfaceScalarField> Vmf(const phasePairKey& key) const = 0;
+
+        //- Return the combined force (lift + wall-lubrication) for phase pair
+        virtual tmp<volVectorField> F(const phasePairKey& key) const = 0;
+
+        //- Return the combined face-force (lift + wall-lubrication)
+        //  for phase pair
+        virtual tmp<surfaceScalarField> Ff(const phasePairKey& key) const = 0;
+
+        //- Return the turbulent diffusivity for phase pair
+        //  Multiplies the phase-fraction gradient
+        virtual tmp<volScalarField> D(const phasePairKey& key) const = 0;
+
+        //- Return the interfacial mass flow rate for phase pair
+        virtual tmp<volScalarField> dmdt(const phasePairKey& key) const = 0;
+
+
 protected:
 
     // Protected data
@@ -103,28 +132,50 @@ public:
 
     // Member Functions
 
-        //- Solve for the phase fractions
-        virtual void solve();
+        //- Constant access phase model 1
+        const phaseModel& phase1() const;
+
+        //- Access phase model 1
+        phaseModel& phase1();
+
+        //- Constant access phase model 2
+        const phaseModel& phase2() const;
+
+        //- Access phase model 2
+        phaseModel& phase2();
+
+        //- Constant access the phase not given as an argument
+        const phaseModel& otherPhase
+        (
+            const phaseModel& phase
+        ) const;
+
+        //- Return the momentum transfer matrices
+        virtual autoPtr<momentumTransferTable> momentumTransfer() const = 0;
+
+        //- Return the heat transfer matrices
+        virtual autoPtr<heatTransferTable> heatTransfer() const = 0;
+
+        //- Return the mass transfer matrices
+        virtual autoPtr<massTransferTable> massTransfer() const = 0;
 
         using phaseSystem::sigma;
-        using phaseSystem::Kd;
-        using phaseSystem::Kdf;
-        using phaseSystem::Vm;
-        using phaseSystem::Vmf;
-        using phaseSystem::F;
-        using phaseSystem::Ff;
-        using phaseSystem::D;
-        using phaseSystem::dmdt;
 
         //- Return the surface tension coefficient
         tmp<volScalarField> sigma() const;
 
+        //- Return the drag model for the given phase
+        const dragModel& drag(const phaseModel& phase) const;
+
         //- Return the drag coefficient
         tmp<volScalarField> Kd() const;
 
         //- Return the face drag coefficient
         tmp<surfaceScalarField> Kdf() const;
 
+        //- Return the virtual mass model for the given phase
+        const virtualMassModel& virtualMass(const phaseModel& phase) const;
+
         //- Return the virtual mass coefficient
         tmp<volScalarField> Vm() const;
 
@@ -144,32 +195,8 @@ public:
         //- Return the interfacial mass flow rate
         tmp<volScalarField> dmdt() const;
 
-
-        // Access
-
-            //- Constant access phase model 1
-            const phaseModel& phase1() const;
-
-            //- Access phase model 1
-            phaseModel& phase1();
-
-            //- Constant access phase model 2
-            const phaseModel& phase2() const;
-
-            //- Access phase model 2
-            phaseModel& phase2();
-
-            //- Constant access the phase not given as an argument
-            const phaseModel& otherPhase
-            (
-                const phaseModel& phase
-            ) const;
-
-            //- Return the drag model for the given phase
-            const dragModel& drag(const phaseModel& phase) const;
-
-            //- Return the virtual mass model for the given phase
-            const virtualMassModel& virtualMass(const phaseModel& phase) const;
+        //- Solve for the phase fractions
+        virtual void solve();
 };
 
 

From 5e4bf8c9f9dd8a983d57ffce15c6ebd0c2f79c65 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Sep 2015 19:53:10 +0100
Subject: [PATCH 37/70] Added
 applications/utilities/mesh/manipulation/stitchMesh/toleranceDict Provided by
 Bruno Santos Resolves report
 http://www.openfoam.org/mantisbt/view.php?id=1848

---
 .../manipulation/stitchMesh/toleranceDict     | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 applications/utilities/mesh/manipulation/stitchMesh/toleranceDict

diff --git a/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict b/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict
new file mode 100644
index 0000000000..a5e7a3297f
--- /dev/null
+++ b/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict
@@ -0,0 +1,45 @@
+/*--------------------------------*- 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      toleranceDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// For complete details on what this dictionary file should provide, see
+//   $FOAM_SRC/src/dynamicMesh/slidingInterface/slidingInterface.C
+//   method: Foam::slidingInterface::setTolerances
+
+//- Point merge tolerance
+pointMergeTol            0.05;
+
+//- Edge merge tolerance
+edgeMergeTol             0.01;
+
+//- Estimated number of faces an edge goes through
+nFacesPerSlaveEdge       5;
+
+//- Edge-face interaction escape limit
+edgeFaceEscapeLimit      10;
+
+//- Integral match point adjustment tolerance
+integralAdjTol           0.05;
+
+//- Edge intersection master catch fraction
+edgeMasterCatchFraction  0.4;
+
+//- Edge intersection co-planar tolerance
+edgeCoPlanarTol          0.8;
+
+//- Edge end cut-off tolerance
+edgeEndCutoffTol         0.0001;
+
+// ************************************************************************* //

From 34f060cfbb2266b28e9d1c868aaab01178a0f771 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 9 Sep 2015 19:56:07 +0100
Subject: [PATCH 38/70] stitchMesh: Improved docs Provided by Bruno Santos
 Resolves report http://www.openfoam.org/mantisbt/view.php?id=1767

---
 .../mesh/manipulation/stitchMesh/stitchMesh.C          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index c8cba9f2b2..8e64c28a38 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -198,8 +198,10 @@ int main(int argc, char *argv[])
 {
     argList::addNote
     (
-        "merge the faces on the specified patches (if geometrically possible)\n"
-        "so the faces become internal"
+        "Merge the faces on the specified patches (if geometrically possible)\n"
+        "so the faces become internal.\n"
+        "Integral matching is used when the options -partial and -perfect are "
+        "omitted.\n"
     );
 
     argList::noParallel();
@@ -212,12 +214,12 @@ int main(int argc, char *argv[])
     argList::addBoolOption
     (
         "partial",
-        "couple partially overlapping patches"
+        "couple partially overlapping patches (optional)"
     );
     argList::addBoolOption
     (
         "perfect",
-        "couple perfectly aligned patches"
+        "couple perfectly aligned patches (optional)"
     );
     argList::addOption
     (

From 85b27f674fdaaec45b6a6be8d334725dae83ea09 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 11 Sep 2015 15:33:12 +0100
Subject: [PATCH 39/70] reactingMultiphaseEulerFoam: New Euler-Euler multiphase
 solver Supporting any number of phases with heat and mass transfer,
 phase-change and reactions

---
 .../multiphase/multiphaseEulerFoam/UEqns.H    |    2 +-
 .../multiphaseSystem/multiphaseSystem.C       |   34 +-
 .../multiphaseSystem/phaseModel/phaseModel.C  |    4 +-
 .../multiphaseSystem/phaseModel/phaseModel.H  |   10 +-
 .../multiphase/reactingEulerFoam/Allwclean    |    1 +
 .../multiphase/reactingEulerFoam/Allwmake     |    1 +
 .../interfacialCompositionModels/Make/options |    1 -
 .../interfacialModels/Make/options            |    1 -
 .../dragModels/segregated/segregated.C        |    5 +-
 .../HeatAndMassTransferPhaseSystem.C          |   54 +
 .../HeatAndMassTransferPhaseSystem.H          |    8 +-
 .../HeatTransferPhaseSystem.C                 |   24 +
 .../HeatTransferPhaseSystem.H                 |    3 +
 .../MomentumTransferPhaseSystem.C             |   82 +-
 .../MomentumTransferPhaseSystem.H             |    3 +
 .../AnisothermalPhaseModel.C                  |    7 +-
 .../AnisothermalPhaseModel.H                  |    7 +-
 .../InertPhaseModel/InertPhaseModel.C         |    5 +-
 .../InertPhaseModel/InertPhaseModel.H         |    7 +-
 .../IsothermalPhaseModel.C                    |    5 +-
 .../IsothermalPhaseModel.H                    |    7 +-
 .../MovingPhaseModel/MovingPhaseModel.C       |    6 +-
 .../MovingPhaseModel/MovingPhaseModel.H       |    3 +-
 .../MultiComponentPhaseModel.C                |    5 +-
 .../MultiComponentPhaseModel.H                |    3 +-
 .../PurePhaseModel/PurePhaseModel.C           |    5 +-
 .../PurePhaseModel/PurePhaseModel.H           |    7 +-
 .../ReactingPhaseModel/ReactingPhaseModel.C   |    5 +-
 .../ReactingPhaseModel/ReactingPhaseModel.H   |    3 +-
 .../ThermoPhaseModel/ThermoPhaseModel.C       |    3 +-
 .../ThermoPhaseModel/ThermoPhaseModel.H       |    1 +
 .../phaseModel/phaseModel/newPhaseModel.C     |    5 +-
 .../phaseModel/phaseModel/phaseModel.C        |   10 +-
 .../phaseModel/phaseModel/phaseModel.H        |   25 +-
 .../phaseSystems/phaseSystem/phaseSystem.C    |    2 +
 .../reactingMultiphaseEulerFoam/Allwclean     |    9 +
 .../reactingMultiphaseEulerFoam/Allwmake      |    9 +
 .../reactingMultiphaseEulerFoam/CourantNo.H   |   60 +
 .../reactingMultiphaseEulerFoam/EEqns.H       |   47 +
 .../reactingMultiphaseEulerFoam/Make/files    |    3 +
 .../reactingMultiphaseEulerFoam/Make/options  |   25 +
 .../reactingMultiphaseEulerFoam/YEqns.H       |   36 +
 .../createFields.H                            |   52 +
 .../reactingMultiphaseEulerFoam/log           |    6 +
 .../Make/files                                |    3 +
 .../Make/options                              |   13 +
 .../multiphaseCompressibleTurbulenceModels.C  |   70 +
 .../multiphaseSystem/Make/files               |    6 +
 .../multiphaseSystem/Make/options             |   21 +
 .../alphaContactAngleFvPatchScalarField.C     |  146 ++
 .../alphaContactAngleFvPatchScalarField.H     |  215 ++
 .../multiphaseSystem/multiphaseSystem.C       |  713 ++++++
 .../multiphaseSystem/multiphaseSystem.H       |  207 ++
 .../multiphaseSystem/multiphaseSystemI.H      |   28 +
 .../multiphaseSystem/multiphaseSystems.C      |   86 +
 .../multiphaseSystem/newMultiphaseSystem.C    |   70 +
 .../reactingMultiphaseEulerFoam/pU/UEqns.H    |   37 +
 .../reactingMultiphaseEulerFoam/pU/pEqn.H     |  447 ++++
 .../reactingMultiphaseEulerFoam/pU/pEqnSave.H |  285 +++
 .../reactingMultiphaseEulerFoam.C             |  143 ++
 .../reactingMultiphaseEulerFoam/setRDeltaT.H  |   36 +
 .../reactingTwoPhaseEulerFoam/EEqns.H         |   14 +-
 .../reactingTwoPhaseEulerFoam/pU/pEqn.H       |  124 +-
 .../bubbleColumn/system/fvSchemes             |    2 +-
 .../damBreak4phase/system/fvSchemes           |    2 +-
 .../damBreak4phaseFine/system/fvSchemes       |    2 +-
 .../mixerVessel2D/system/fvSchemes            |    2 +-
 .../laminar/bubbleColumn/0/T.air              |   45 +
 .../laminar/bubbleColumn/0/T.water            |   45 +
 .../laminar/bubbleColumn/0/Theta              |   47 +
 .../laminar/bubbleColumn/0/U.air              |   41 +
 .../laminar/bubbleColumn/0/U.water            |   41 +
 .../laminar/bubbleColumn/0/alpha.air          | 1926 +++++++++++++++++
 .../laminar/bubbleColumn/0/alpha.air.org      |   42 +
 .../laminar/bubbleColumn/0/alpha.water        | 1926 +++++++++++++++++
 .../laminar/bubbleColumn/0/alpha.water.org    |   41 +
 .../laminar/bubbleColumn/0/p                  |   40 +
 .../laminar/bubbleColumn/0/p_rgh              |   41 +
 .../laminar/bubbleColumn/constant/g           |   22 +
 .../bubbleColumn/constant/phaseProperties     |  169 ++
 .../bubbleColumn/constant/polyMesh/boundary   |   48 +
 .../constant/thermophysicalProperties.air     |   49 +
 .../constant/thermophysicalProperties.water   |   54 +
 .../constant/turbulenceProperties.air         |   20 +
 .../constant/turbulenceProperties.water       |   20 +
 .../laminar/bubbleColumn/system/blockMeshDict |   61 +
 .../laminar/bubbleColumn/system/controlDict   |   95 +
 .../laminar/bubbleColumn/system/fvSchemes     |   63 +
 .../laminar/bubbleColumn/system/fvSolution    |   82 +
 .../laminar/bubbleColumn/system/setFieldsDict |   36 +
 .../laminar/damBreak4phase/0.org/U            |   51 +
 .../laminar/damBreak4phase/0.org/U.air        |   51 +
 .../laminar/damBreak4phase/0.org/U.mercury    |   51 +
 .../laminar/damBreak4phase/0.org/U.oil        |   51 +
 .../laminar/damBreak4phase/0.org/U.water      |   51 +
 .../laminar/damBreak4phase/0.org/alpha.air    |   79 +
 .../damBreak4phase/0.org/alpha.mercury        |   49 +
 .../laminar/damBreak4phase/0.org/alpha.oil    |   49 +
 .../laminar/damBreak4phase/0.org/alpha.water  |   49 +
 .../laminar/damBreak4phase/0.org/alphas       |   47 +
 .../laminar/damBreak4phase/0.org/p_rgh        |   59 +
 .../laminar/damBreak4phase/Allclean           |   11 +
 .../laminar/damBreak4phase/Allrun             |   17 +
 .../laminar/damBreak4phase/constant/g         |   22 +
 .../damBreak4phase/constant/motionProperties  |   21 +
 .../damBreak4phase/constant/polyMesh/boundary |   56 +
 .../constant/transportProperties              |  236 ++
 .../constant/turbulenceProperties             |   21 +
 .../damBreak4phase/system/blockMeshDict       |  108 +
 .../laminar/damBreak4phase/system/controlDict |   56 +
 .../damBreak4phase/system/decomposeParDict    |   45 +
 .../laminar/damBreak4phase/system/fvSchemes   |   53 +
 .../laminar/damBreak4phase/system/fvSolution  |   98 +
 .../damBreak4phase/system/setFieldsDict       |   65 +
 .../laminar/damBreak4phaseFine/0.org/U        |   51 +
 .../laminar/damBreak4phaseFine/0.org/U.air    |   51 +
 .../damBreak4phaseFine/0.org/U.mercury        |   51 +
 .../laminar/damBreak4phaseFine/0.org/U.oil    |   51 +
 .../laminar/damBreak4phaseFine/0.org/U.water  |   51 +
 .../damBreak4phaseFine/0.org/alpha.air        |   79 +
 .../damBreak4phaseFine/0.org/alpha.mercury    |   49 +
 .../damBreak4phaseFine/0.org/alpha.oil        |   49 +
 .../damBreak4phaseFine/0.org/alpha.water      |   49 +
 .../laminar/damBreak4phaseFine/0.org/alphas   |   47 +
 .../laminar/damBreak4phaseFine/0.org/p_rgh    |   59 +
 .../laminar/damBreak4phaseFine/Allclean       |   11 +
 .../laminar/damBreak4phaseFine/Allrun         |   19 +
 .../laminar/damBreak4phaseFine/constant/g     |   22 +
 .../constant/motionProperties                 |   21 +
 .../constant/polyMesh/boundary                |   56 +
 .../constant/transportProperties              |  236 ++
 .../constant/turbulenceProperties             |   21 +
 .../damBreak4phaseFine/system/blockMeshDict   |  108 +
 .../damBreak4phaseFine/system/controlDict     |   56 +
 .../system/decomposeParDict                   |   45 +
 .../damBreak4phaseFine/system/fvSchemes       |   53 +
 .../damBreak4phaseFine/system/fvSolution      |   98 +
 .../damBreak4phaseFine/system/setFieldsDict   |   65 +
 .../laminar/mixerVessel2D/0/T.air             |   48 +
 .../laminar/mixerVessel2D/0/T.mercury         |   48 +
 .../laminar/mixerVessel2D/0/T.oil             |   48 +
 .../laminar/mixerVessel2D/0/T.water           |   48 +
 .../laminar/mixerVessel2D/0/Theta             |   44 +
 .../laminar/mixerVessel2D/0/U.air             |   46 +
 .../laminar/mixerVessel2D/0/U.mercury         |   46 +
 .../laminar/mixerVessel2D/0/U.oil             |   46 +
 .../laminar/mixerVessel2D/0/U.water           |   46 +
 .../laminar/mixerVessel2D/0/alpha.air         |   44 +
 .../laminar/mixerVessel2D/0/alpha.mercury     |   44 +
 .../laminar/mixerVessel2D/0/alpha.oil         |   44 +
 .../laminar/mixerVessel2D/0/alpha.water       |   44 +
 .../laminar/mixerVessel2D/0/p                 |   46 +
 .../laminar/mixerVessel2D/0/p_rgh             |   46 +
 .../laminar/mixerVessel2D/Allrun              |   12 +
 .../mixerVessel2D/constant/MRFProperties      |   31 +
 .../laminar/mixerVessel2D/constant/g          |   22 +
 .../mixerVessel2D/constant/phaseProperties    |  456 ++++
 .../mixerVessel2D/constant/polyMesh/boundary  |   50 +
 .../constant/thermophysicalProperties.air     |   49 +
 .../constant/thermophysicalProperties.mercury |   53 +
 .../constant/thermophysicalProperties.oil     |   53 +
 .../constant/thermophysicalProperties.water   |   54 +
 .../constant/turbulenceProperties.air         |   20 +
 .../constant/turbulenceProperties.mercury     |   20 +
 .../constant/turbulenceProperties.oil         |   20 +
 .../constant/turbulenceProperties.water       |   20 +
 .../laminar/mixerVessel2D/makeMesh            |    6 +
 .../mixerVessel2D/system/blockMeshDict.m4     |  818 +++++++
 .../laminar/mixerVessel2D/system/controlDict  |   55 +
 .../laminar/mixerVessel2D/system/fvSchemes    |   58 +
 .../laminar/mixerVessel2D/system/fvSolution   |  109 +
 .../laminar/mixerVessel2D/system/topoSetDict  |   32 +
 172 files changed, 13503 insertions(+), 144 deletions(-)
 create mode 100755 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean
 create mode 100755 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/files
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/log
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/files
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/files
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystemI.H
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystems.C
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqnSave.H
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/Theta
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water.org
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.mercury
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.oil
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.mercury
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.oil
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alphas
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/p_rgh
 create mode 100755 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allclean
 create mode 100755 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allrun
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/g
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/motionProperties
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/polyMesh/boundary
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/transportProperties
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/blockMeshDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/controlDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/decomposeParDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSolution
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/setFieldsDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.mercury
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.oil
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.oil
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alphas
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/p_rgh
 create mode 100755 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allclean
 create mode 100755 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allrun
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/g
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/motionProperties
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/transportProperties
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/blockMeshDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/controlDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/decomposeParDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSchemes
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSolution
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/setFieldsDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.mercury
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.oil
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/Theta
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.mercury
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.oil
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
 create mode 100755 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
 create mode 100755 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/makeMesh
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
index 6b9174def7..abad0dfaf0 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
@@ -18,7 +18,7 @@ forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
         new fvVectorMatrix
         (
             fvm::ddt(alpha, U)
-          + fvm::div(phase.phiAlpha(), U)
+          + fvm::div(phase.alphaPhi(), U)
 
           + (alpha/phase.rho())*fluid.Cvm(phase)*
             (
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 01637a6cc1..2203d6e144 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -61,7 +61,7 @@ void Foam::multiphaseSystem::calcAlphas()
 
 void Foam::multiphaseSystem::solveAlphas()
 {
-    PtrList<surfaceScalarField> phiAlphaCorrs(phases_.size());
+    PtrList<surfaceScalarField> alphaPhiCorrs(phases_.size());
     int phasei = 0;
 
     forAllIter(PtrDictionary<phaseModel>, phases_, iter)
@@ -69,10 +69,10 @@ void Foam::multiphaseSystem::solveAlphas()
         phaseModel& phase1 = iter();
         volScalarField& alpha1 = phase1;
 
-        phase1.phiAlpha() =
+        phase1.alphaPhi() =
             dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0);
 
-        phiAlphaCorrs.set
+        alphaPhiCorrs.set
         (
             phasei,
             new surfaceScalarField
@@ -87,7 +87,7 @@ void Foam::multiphaseSystem::solveAlphas()
             )
         );
 
-        surfaceScalarField& phiAlphaCorr = phiAlphaCorrs[phasei];
+        surfaceScalarField& alphaPhiCorr = alphaPhiCorrs[phasei];
 
         forAllIter(PtrDictionary<phaseModel>, phases_, iter2)
         {
@@ -118,7 +118,7 @@ void Foam::multiphaseSystem::solveAlphas()
                 "div(phir," + alpha2.name() + ',' + alpha1.name() + ')'
             );
 
-            phiAlphaCorr += fvc::flux
+            alphaPhiCorr += fvc::flux
             (
                 -fvc::flux(-phir, phase2, phirScheme),
                 phase1,
@@ -127,21 +127,21 @@ void Foam::multiphaseSystem::solveAlphas()
         }
 
         // Ensure that the flux at inflow BCs is preserved
-        forAll(phiAlphaCorr.boundaryField(), patchi)
+        forAll(alphaPhiCorr.boundaryField(), patchi)
         {
-            fvsPatchScalarField& phiAlphaCorrp =
-                phiAlphaCorr.boundaryField()[patchi];
+            fvsPatchScalarField& alphaPhiCorrp =
+                alphaPhiCorr.boundaryField()[patchi];
 
-            if (!phiAlphaCorrp.coupled())
+            if (!alphaPhiCorrp.coupled())
             {
                 const scalarField& phi1p = phase1.phi().boundaryField()[patchi];
                 const scalarField& alpha1p = alpha1.boundaryField()[patchi];
 
-                forAll(phiAlphaCorrp, facei)
+                forAll(alphaPhiCorrp, facei)
                 {
                     if (phi1p[facei] < 0)
                     {
-                        phiAlphaCorrp[facei] = alpha1p[facei]*phi1p[facei];
+                        alphaPhiCorrp[facei] = alpha1p[facei]*phi1p[facei];
                     }
                 }
             }
@@ -153,7 +153,7 @@ void Foam::multiphaseSystem::solveAlphas()
             geometricOneField(),
             phase1,
             phi_,
-            phiAlphaCorr,
+            alphaPhiCorr,
             zeroField(),
             zeroField(),
             1,
@@ -164,7 +164,7 @@ void Foam::multiphaseSystem::solveAlphas()
         phasei++;
     }
 
-    MULES::limitSum(phiAlphaCorrs);
+    MULES::limitSum(alphaPhiCorrs);
 
     volScalarField sumAlpha
     (
@@ -184,19 +184,19 @@ void Foam::multiphaseSystem::solveAlphas()
     {
         phaseModel& phase1 = iter();
 
-        surfaceScalarField& phiAlpha = phiAlphaCorrs[phasei];
-        phiAlpha += upwind<scalar>(mesh_, phi_).flux(phase1);
+        surfaceScalarField& alphaPhi = alphaPhiCorrs[phasei];
+        alphaPhi += upwind<scalar>(mesh_, phi_).flux(phase1);
 
         MULES::explicitSolve
         (
             geometricOneField(),
             phase1,
-            phiAlpha,
+            alphaPhi,
             zeroField(),
             zeroField()
         );
 
-        phase1.phiAlpha() += phiAlpha;
+        phase1.alphaPhi() += alphaPhi;
 
         Info<< phase1.name() << " volume fraction, min, max = "
             << phase1.weightedAverage(mesh_.V()).value()
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
index 9f6ed4ac73..f107cfb440 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
@@ -100,11 +100,11 @@ Foam::phaseModel::phaseModel
         mesh,
         dimensionedVector("0", dimVelocity/dimTime, vector::zero)
     ),
-    phiAlpha_
+    alphaPhi_
     (
         IOobject
         (
-            IOobject::groupName("phiAlpha", phaseName),
+            IOobject::groupName("alphaPhi", phaseName),
             mesh.time().timeName(),
             mesh
         ),
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H
index 54d6119e49..d1f1157b9a 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H
@@ -80,7 +80,7 @@ class phaseModel
         volVectorField DDtU_;
 
         //- Volumetric flux of the phase
-        surfaceScalarField phiAlpha_;
+        surfaceScalarField alphaPhi_;
 
         //- Volumetric flux for the phase
         autoPtr<surfaceScalarField> phiPtr_;
@@ -198,14 +198,14 @@ public:
             return phiPtr_();
         }
 
-        const surfaceScalarField& phiAlpha() const
+        const surfaceScalarField& alphaPhi() const
         {
-            return phiAlpha_;
+            return alphaPhi_;
         }
 
-        surfaceScalarField& phiAlpha()
+        surfaceScalarField& alphaPhi()
         {
-            return phiAlpha_;
+            return alphaPhi_;
         }
 
         //- Correct the phase properties
diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/Allwclean
index e9a7070211..618570ccbb 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/Allwclean
+++ b/applications/solvers/multiphase/reactingEulerFoam/Allwclean
@@ -6,5 +6,6 @@ wclean libso phaseSystems
 wclean libso interfacialModels
 wclean libso interfacialCompositionModels
 reactingTwoPhaseEulerFoam/Allwclean
+reactingMultiphaseEulerFoam/Allwclean
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
index 4682cf568d..91c6cd9491 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
@@ -8,5 +8,6 @@ wmake libso phaseSystems
 wmake libso interfacialModels
 wmake libso interfacialCompositionModels
 reactingTwoPhaseEulerFoam/Allwmake
+reactingMultiphaseEulerFoam/Allwmake
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
index 088d504706..b25751cd2d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
@@ -21,7 +21,6 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
-    -lreactingTwoPhaseSystem \
     -lfluidThermophysicalModels \
     -lreactionThermophysicalModels \
     -lspecie
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options
index ba5bb85f99..1e5f8f0aea 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options
@@ -10,7 +10,6 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
-    -lreactingTwoPhaseSystem \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
index 4b1fc88ddc..2f3e0db699 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
@@ -132,7 +132,10 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::K() const
     volScalarField muAlphaI
     (
         alpha1*rho1*nu1*alpha2*rho2*nu2
-       /(alpha1*rho1*nu1 + alpha2*rho2*nu2)
+       /(
+           max(alpha1, pair_.phase1().residualAlpha())*rho1*nu1
+         + max(alpha2, pair_.phase2().residualAlpha())*rho2*nu2
+        )
     );
 
     volScalarField ReI
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
index 8b2bbdb99e..66d119fd94 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
@@ -164,6 +164,60 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::dmdt
 }
 
 
+template<class BasePhaseSystem>
+Foam::tmp<Foam::volScalarField>
+Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::dmdt
+(
+    const Foam::phaseModel& phase
+) const
+{
+    tmp<volScalarField> tdmdt
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                IOobject::groupName("dmdt", phase.name()),
+                this->mesh_.time().timeName(),
+                this->mesh_
+            ),
+            this->mesh_,
+            dimensionedScalar("zero", dimDensity/dimTime, 0)
+        )
+    );
+
+    forAllConstIter
+    (
+        phaseSystem::phasePairTable,
+        this->phasePairs_,
+        phasePairIter
+    )
+    {
+        const phasePair& pair(phasePairIter());
+
+        if (pair.ordered())
+        {
+            continue;
+        }
+
+        const phaseModel* phase1 = &pair.phase1();
+        const phaseModel* phase2 = &pair.phase2();
+
+        forAllConstIter(phasePair, pair, iter)
+        {
+            if (phase1 == &phase)
+            {
+                tdmdt() += this->dmdt(pair);
+            }
+
+            Swap(phase1, phase2);
+        }
+    }
+
+    return tdmdt;
+}
+
+
 template<class BasePhaseSystem>
 Foam::autoPtr<Foam::phaseSystem::momentumTransferTable>
 Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
index 3f20c575f8..d8aa29676a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
@@ -121,10 +121,10 @@ public:
     // Member Functions
 
         //- Return the interfacial mass flow rate
-        virtual tmp<volScalarField> dmdt
-        (
-            const phasePairKey& key
-        ) const;
+        virtual tmp<volScalarField> dmdt(const phasePairKey& key) const;
+
+        //- Return the total interfacial mass transfer rate for phase
+        virtual tmp<volScalarField> dmdt(const phaseModel& phase) const;
 
         //- Return the momentum transfer matrices
         virtual autoPtr<phaseSystem::momentumTransferTable>
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
index 0a5d8a7060..67a3918a32 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
@@ -85,6 +85,30 @@ Foam::HeatTransferPhaseSystem<BasePhaseSystem>::dmdt
 }
 
 
+template<class BasePhaseSystem>
+Foam::tmp<Foam::volScalarField>
+Foam::HeatTransferPhaseSystem<BasePhaseSystem>::dmdt
+(
+    const Foam::phaseModel& phase
+) const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                IOobject::groupName("dmdt", phase.name()),
+                this->mesh().time().timeName(),
+                this->mesh().time()
+            ),
+            this->mesh(),
+            dimensionedScalar("zero", dimDensity/dimTime, 0)
+        )
+    );
+}
+
+
 template<class BasePhaseSystem>
 Foam::autoPtr<Foam::phaseSystem::heatTransferTable>
 Foam::HeatTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
index 6bb96c90ba..cef3b696bd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
@@ -95,6 +95,9 @@ public:
             const phasePairKey& key
         ) const;
 
+        //- Return the total interfacial mass transfer rate for phase
+        virtual tmp<volScalarField> dmdt(const phaseModel& phase) const;
+
         //- Return the heat transfer matrices
         virtual autoPtr<phaseSystem::heatTransferTable>
             heatTransfer() const;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index a209933b09..cf7fae6f40 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -182,7 +182,6 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Kd
         )
     );
 
-    // Add the implicit part of the drag force
     forAllConstIter
     (
         phaseSystem::KdTable,
@@ -442,7 +441,6 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
     }
 
     // Add the implicit part of the drag force
-    /* ***HGW Currently this is handled in the pEqn
     forAllConstIter
     (
         phaseSystem::KdTable,
@@ -466,7 +464,6 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
             Swap(phase, otherPhase);
         }
     }
-    */
 
     // Update the virtual mass coefficients
     forAllConstIter
@@ -499,20 +496,57 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
             const volVectorField& U = phase->U();
             const surfaceScalarField& phi = phase->phi();
 
-            *eqns[phase->name()] +=
-              - Vm
+            *eqns[phase->name()] -=
+                Vm
                *(
                     fvm::ddt(U)
                   + fvm::div(phi, U)
                   - fvm::Sp(fvc::div(phi), U)
                   - otherPhase->DUDt()
                 )
-              - this->MRF_.DDt(Vm, U - otherPhase->U());
+              + this->MRF_.DDt(Vm, U - otherPhase->U());
 
             Swap(phase, otherPhase);
         }
     }
 
+    return eqnsPtr;
+}
+
+
+template<class BasePhaseSystem>
+Foam::autoPtr<Foam::PtrList<Foam::volVectorField> >
+Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
+{
+    autoPtr<PtrList<volVectorField> > tFs
+    (
+        new PtrList<volVectorField>(this->phases().size())
+    );
+
+    PtrList<volVectorField>& Fs = tFs();
+
+    forAll(Fs, phasei)
+    {
+        Fs.set
+        (
+            phasei,
+            new volVectorField
+            (
+                IOobject
+                (
+                    liftModel::typeName + ":F",
+                    this->mesh_.time().timeName(),
+                    this->mesh_,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                this->mesh_,
+                dimensionedVector("zero", liftModel::dimF, vector::zero)
+            )
+        );
+    }
+
     // Add the lift force
     forAllConstIter
     (
@@ -525,8 +559,8 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
 
         const phasePair& pair(this->phasePairs_[liftModelIter.key()]);
 
-        *eqns[pair.phase1().name()] += F;
-        *eqns[pair.phase2().name()] -= F;
+        Fs[pair.phase1().index()] += F;
+        Fs[pair.phase2().index()] -= F;
     }
 
     // Add the wall lubrication force
@@ -542,28 +576,28 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
         const phasePair&
             pair(this->phasePairs_[wallLubricationModelIter.key()]);
 
-        *eqns[pair.phase1().name()] += F;
-        *eqns[pair.phase2().name()] -= F;
+        Fs[pair.phase1().index()] += F;
+        Fs[pair.phase2().index()] -= F;
     }
 
     // Add the turbulent dispersion force
-    forAllConstIter
-    (
-        turbulentDispersionModelTable,
-        turbulentDispersionModels_,
-        turbulentDispersionModelIter
-    )
-    {
-        const volVectorField F(turbulentDispersionModelIter()->F<vector>());
+    // forAllConstIter
+    // (
+    //     turbulentDispersionModelTable,
+    //     turbulentDispersionModels_,
+    //     turbulentDispersionModelIter
+    // )
+    // {
+    //     const volVectorField F(turbulentDispersionModelIter()->F<vector>());
 
-        const phasePair&
-            pair(this->phasePairs_[turbulentDispersionModelIter.key()]);
+    //     const phasePair&
+    //         pair(this->phasePairs_[turbulentDispersionModelIter.key()]);
 
-        *eqns[pair.phase1().name()] += F;
-        *eqns[pair.phase2().name()] -= F;
-    }
+    //     *eqns[pair.phase1().name()] += F;
+    //     *eqns[pair.phase2().name()] -= F;
+    // }
 
-    return eqnsPtr;
+    return tFs;
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
index b6aeadd34c..194602dfc9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
@@ -172,6 +172,9 @@ public:
         //- Return the combined force (lift + wall-lubrication)
         virtual tmp<volVectorField> F(const phasePairKey& key) const;
 
+        //- Return the combined force (lift + wall-lubrication)
+        virtual autoPtr<PtrList<volVectorField> > Fs() const;
+
         //- Return the combined face-force (lift + wall-lubrication)
         virtual tmp<surfaceScalarField> Ff(const phasePairKey& key) const;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
index 3a2786d75c..78e015ff3a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
@@ -32,10 +32,11 @@ template<class BasePhaseModel>
 Foam::AnisothermalPhaseModel<BasePhaseModel>::AnisothermalPhaseModel
 (
     const phaseSystem& fluid,
-    const word& phaseName
+    const word& phaseName,
+    const label index
 )
 :
-    BasePhaseModel(fluid, phaseName),
+    BasePhaseModel(fluid, phaseName, index),
     divU_
     (
         IOobject
@@ -134,7 +135,7 @@ Foam::AnisothermalPhaseModel<BasePhaseModel>::heEqn()
 template<class BasePhaseModel>
 bool Foam::AnisothermalPhaseModel<BasePhaseModel>::compressible() const
 {
-    return true;
+    return !this->thermo().incompressible();
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
index e7a76bf496..9d7a92b499 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
@@ -65,7 +65,12 @@ public:
 
     // Constructors
 
-        AnisothermalPhaseModel(const phaseSystem& fluid, const word& phaseName);
+        AnisothermalPhaseModel
+        (
+            const phaseSystem& fluid,
+            const word& phaseName,
+            const label index
+        );
 
 
     //- Destructor
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C
index 909a5418b9..ba5e90459b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C
@@ -32,10 +32,11 @@ template<class BasePhaseModel>
 Foam::InertPhaseModel<BasePhaseModel>::InertPhaseModel
 (
     const phaseSystem& fluid,
-    const word& phaseName
+    const word& phaseName,
+    const label index
 )
 :
-    BasePhaseModel(fluid, phaseName)
+    BasePhaseModel(fluid, phaseName, index)
 {}
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H
index c74088eaa5..77823d4491 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H
@@ -56,7 +56,12 @@ public:
 
     // Constructors
 
-        InertPhaseModel(const phaseSystem& fluid, const word& phaseName);
+        InertPhaseModel
+        (
+            const phaseSystem& fluid,
+            const word& phaseName,
+            const label index
+        );
 
 
     //- Destructor
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C
index 07f99c5a5d..19b7b73ebe 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C
@@ -32,10 +32,11 @@ template<class BasePhaseModel>
 Foam::IsothermalPhaseModel<BasePhaseModel>::IsothermalPhaseModel
 (
     const phaseSystem& fluid,
-    const word& phaseName
+    const word& phaseName,
+    const label index
 )
 :
-    BasePhaseModel(fluid, phaseName)
+    BasePhaseModel(fluid, phaseName, index)
 {}
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H
index d43a1a6119..bdf1a14aed 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H
@@ -57,7 +57,12 @@ public:
 
     // Constructors
 
-        IsothermalPhaseModel(const phaseSystem& fluid, const word& phaseName);
+        IsothermalPhaseModel
+        (
+            const phaseSystem& fluid,
+            const word& phaseName,
+            const label index
+        );
 
 
     //- Destructor
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
index 090d29fafe..d06c61987a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@@ -123,10 +123,11 @@ template<class BasePhaseModel>
 Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
 (
     const phaseSystem& fluid,
-    const word& phaseName
+    const word& phaseName,
+    const label index
 )
 :
-    BasePhaseModel(fluid, phaseName),
+    BasePhaseModel(fluid, phaseName, index),
     U_
     (
         IOobject
@@ -197,6 +198,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
         dimensionedScalar("0", dimDensity/dimTime, 0)
     )
 {
+    phi_.writeOpt() = IOobject::AUTO_WRITE;
     correctKinematics();
 }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
index fc719c18ca..b78762fd53 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H
@@ -106,7 +106,8 @@ public:
         MovingPhaseModel
         (
             const phaseSystem& fluid,
-            const word& phaseName
+            const word& phaseName,
+            const label index
         );
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
index d6e05a5139..efa486a0e4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
@@ -41,10 +41,11 @@ template<class BasePhaseModel>
 Foam::MultiComponentPhaseModel<BasePhaseModel>::MultiComponentPhaseModel
 (
     const phaseSystem& fluid,
-    const word& phaseName
+    const word& phaseName,
+    const label index
 )
 :
-    BasePhaseModel(fluid, phaseName),
+    BasePhaseModel(fluid, phaseName, index),
     Sc_
     (
         "Sc",
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H
index 272e520eeb..94ca80582c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H
@@ -73,7 +73,8 @@ public:
         MultiComponentPhaseModel
         (
             const phaseSystem& fluid,
-            const word& phaseName
+            const word& phaseName,
+            const label index
         );
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C
index c3e1831158..be28005744 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C
@@ -32,10 +32,11 @@ template<class BasePhaseModel>
 Foam::PurePhaseModel<BasePhaseModel>::PurePhaseModel
 (
     const phaseSystem& fluid,
-    const word& phaseName
+    const word& phaseName,
+    const label index
 )
 :
-    BasePhaseModel(fluid, phaseName)
+    BasePhaseModel(fluid, phaseName, index)
 {}
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H
index f17c60cb6f..2aa8034ede 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H
@@ -64,7 +64,12 @@ public:
 
     // Constructors
 
-        PurePhaseModel(const phaseSystem& fluid, const word& phaseName);
+        PurePhaseModel
+        (
+            const phaseSystem& fluid,
+            const word& phaseName,
+            const label index
+        );
 
 
     //- Destructor
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C
index 0bd35ee16f..96a76de169 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C
@@ -33,10 +33,11 @@ template<class BasePhaseModel, class ReactionType>
 Foam::ReactingPhaseModel<BasePhaseModel, ReactionType>::ReactingPhaseModel
 (
     const phaseSystem& fluid,
-    const word& phaseName
+    const word& phaseName,
+    const label index
 )
 :
-    BasePhaseModel(fluid, phaseName, false),
+    BasePhaseModel(fluid, phaseName, index, false),
     reaction_
     (
         ReactionType::New(fluid.mesh(), this->name())
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H
index 988674d55c..305b62590a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H
@@ -67,7 +67,8 @@ public:
         ReactingPhaseModel
         (
             const phaseSystem& fluid,
-            const word& phaseName
+            const word& phaseName,
+            const label index
         );
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
index 72aef43d2a..2367cda414 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C
@@ -41,10 +41,11 @@ Foam::ThermoPhaseModel<BasePhaseModel, ThermoType>::ThermoPhaseModel
 (
     const phaseSystem& fluid,
     const word& phaseName,
+    const label index,
     const bool createThermo
 )
 :
-    BasePhaseModel(fluid, phaseName)
+    BasePhaseModel(fluid, phaseName, index)
 {
     if (createThermo)
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
index 923187931e..960d2c1ba6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H
@@ -76,6 +76,7 @@ public:
         (
             const phaseSystem& fluid,
             const word& phaseName,
+            const label index,
             const bool createThermo = true
         );
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
index f2686cedb5..0a577313b2 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C
@@ -31,7 +31,8 @@ License
 Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::New
 (
     const phaseSystem& fluid,
-    const word& phaseName
+    const word& phaseName,
+    const label index
 )
 {
     word phaseModelType(fluid.subDict(phaseName).lookup("type"));
@@ -52,7 +53,7 @@ Foam::autoPtr<Foam::phaseModel> Foam::phaseModel::New
             << exit(FatalError);
     }
 
-    return cstrIter()(fluid, phaseName);
+    return cstrIter()(fluid, phaseName, index);
 }
 
 // ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
index b0a54fa582..0849867944 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
@@ -41,7 +41,8 @@ namespace Foam
 Foam::phaseModel::phaseModel
 (
     const phaseSystem& fluid,
-    const word& phaseName
+    const word& phaseName,
+    const label index
 )
 :
     volScalarField
@@ -60,6 +61,7 @@ Foam::phaseModel::phaseModel
 
     fluid_(fluid),
     name_(phaseName),
+    index_(index),
     residualAlpha_
     (
         "residualAlpha",
@@ -99,6 +101,12 @@ const Foam::word& Foam::phaseModel::keyword() const
 }
 
 
+Foam::label Foam::phaseModel::index() const
+{
+    return index_;
+}
+
+
 const Foam::phaseSystem& Foam::phaseModel::fluid() const
 {
     return fluid_;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
index d5e50410c5..ae94353aeb 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
@@ -67,6 +67,9 @@ class phaseModel
         //- Name of phase
         word name_;
 
+        //- Index of phase
+        label index_;
+
         //- Return the residual phase-fraction for given phase
         //  Used to stabilize the phase momentum as the phase-fraction -> 0
         dimensionedScalar residualAlpha_;
@@ -93,9 +96,10 @@ public:
             phaseSystem,
             (
                 const phaseSystem& fluid,
-                const word& phaseName
+                const word& phaseName,
+                const label index
             ),
-            (fluid, phaseName)
+            (fluid, phaseName, index)
         );
 
 
@@ -104,7 +108,8 @@ public:
         phaseModel
         (
             const phaseSystem& fluid,
-            const word& phaseName
+            const word& phaseName,
+            const label index
         );
 
         //- Return clone
@@ -116,7 +121,8 @@ public:
         static autoPtr<phaseModel> New
         (
             const phaseSystem& fluid,
-            const word& phaseName
+            const word& phaseName,
+            const label index
         );
 
         //- Return a pointer to a new phase created on freestore
@@ -124,6 +130,7 @@ public:
         class iNew
         {
             const phaseSystem& fluid_;
+            mutable label indexCounter_;
 
         public:
 
@@ -132,14 +139,16 @@ public:
                 const phaseSystem& fluid
             )
             :
-                fluid_(fluid)
+                fluid_(fluid),
+                indexCounter_(-1)
             {}
 
             autoPtr<phaseModel> operator()(Istream& is) const
             {
+                indexCounter_++;
                 return autoPtr<phaseModel>
                 (
-                    phaseModel::New(fluid_, word(is))
+                    phaseModel::New(fluid_, word(is), indexCounter_)
                 );
             }
         };
@@ -154,8 +163,12 @@ public:
         //- Return the name of this phase
         const word& name() const;
 
+        //- Return the name of the phase for use as the keyword in PtrDictionary
         const word& keyword() const;
 
+        //- Return the index of the phase
+        label index() const;
+
         //- Return the system to which this phase belongs
         const phaseSystem& fluid() const;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
index dee40846b6..31dc2375db 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
@@ -162,6 +162,8 @@ Foam::phaseSystem::phaseSystem
     MRF_(mesh_),
     fvOptions_(mesh_)
 {
+    phi_.writeOpt() = IOobject::AUTO_WRITE;
+
     // Blending methods
     forAllConstIter(dictionary, subDict("blending"), iter)
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean
new file mode 100755
index 0000000000..93ee94face
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+set -x
+
+wclean libso multiphaseSystem
+wclean libso multiphaseCompressibleTurbulenceModels
+wclean
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
new file mode 100755
index 0000000000..c60b665df4
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+set -x
+
+wmake libso multiphaseSystem
+wmake libso multiphaseCompressibleTurbulenceModels
+wmake
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H
new file mode 100644
index 0000000000..df28acb69f
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Global
+    CourantNo
+
+Description
+    Calculates and outputs the mean and maximum Courant Numbers.
+
+\*---------------------------------------------------------------------------*/
+
+scalar CoNum = 0.0;
+scalar meanCoNum = 0.0;
+
+if (mesh.nInternalFaces())
+{
+    scalarField sumPhi
+    (
+        fvc::surfaceSum(mag(phi))().internalField()
+    );
+
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        sumPhi = max
+        (
+            sumPhi,
+            fvc::surfaceSum(mag(iter().phi()))().internalField()
+        );
+    }
+
+    CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue();
+
+    meanCoNum =
+        0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue();
+}
+
+Info<< "Courant Number mean: " << meanCoNum
+    << " max: " << CoNum << endl;
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
new file mode 100644
index 0000000000..86150a045d
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
@@ -0,0 +1,47 @@
+{
+    fluid.correctEnergyTransport();
+
+    autoPtr<phaseSystem::heatTransferTable>
+        heatTransferPtr(fluid.heatTransfer());
+
+    phaseSystem::heatTransferTable& heatTransfer = heatTransferPtr();
+
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+        const volScalarField& alpha = phase;
+        const volScalarField& rho = phase.rho();
+        const volVectorField& U = phase.U();
+
+        tmp<fvScalarMatrix> EEqn(phase.heEqn());
+
+        if (EEqn.valid())
+        {
+            EEqn =
+            (
+                EEqn
+             ==
+               *heatTransfer[phase.name()]
+              + alpha*rho*(U&g)
+              + fvOptions(alpha, rho, phase.thermo().he())
+            );
+
+            EEqn->relax();
+            fvOptions.constrain(EEqn());
+            EEqn->solve();
+        }
+    }
+}
+
+fluid.correctThermo();
+
+forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+{
+    phaseModel& phase = iter();
+
+    Info<< phase.name() << " min/max T "
+        << min(phase.thermo().T()).value()
+        << " - "
+        << max(phase.thermo().T()).value()
+        << endl;
+}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/files b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/files
new file mode 100644
index 0000000000..0f1d5ae271
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/files
@@ -0,0 +1,3 @@
+reactingMultiphaseEulerFoam.C
+
+EXE = $(FOAM_APPBIN)/reactingMultiphaseEulerFoam
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
new file mode 100644
index 0000000000..27e4869309
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
@@ -0,0 +1,25 @@
+EXE_INC = -ggdb3 \
+    -ImultiphaseSystem/lnInclude \
+    -I../phaseSystems/lnInclude \
+    -I../interfacialModels/lnInclude \
+    -I../interfacialCompositionModels/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
+
+EXE_LIBS = \
+    -lreactingPhaseSystem \
+    -lreactingMultiphaseSystem \
+    -lreactingEulerianInterfacialModels \
+    -lreactingEulerianInterfacialCompositionModels \
+    -lmultiphaseReactingTurbulenceModels \
+    -lfiniteVolume \
+    -lfvOptions \
+    -lmeshTools \
+    -lsampling
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H
new file mode 100644
index 0000000000..7c4345913d
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H
@@ -0,0 +1,36 @@
+{
+    autoPtr<phaseSystem::massTransferTable>
+        massTransferPtr(fluid.massTransfer());
+
+    phaseSystem::massTransferTable&
+        massTransfer(massTransferPtr());
+
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+        PtrList<volScalarField>& Y = phase.Y();
+        const volScalarField& alpha = phase;
+        const volScalarField& rho = phase.rho();
+
+        forAll(Y, i)
+        {
+            tmp<fvScalarMatrix> YiEqn(phase.YiEqn(Y[i]));
+
+            if (YiEqn.valid())
+            {
+                YiEqn =
+                (
+                    YiEqn
+                  ==
+                    *massTransfer[Y[i].name()]
+                   + fvOptions(alpha, rho, Y[i])
+                );
+
+                YiEqn->relax();
+                YiEqn->solve(mesh.solver("Yi"));
+            }
+        }
+    }
+
+    fluid.massTransfer(); // updates interfacial mass flow rates
+}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
new file mode 100644
index 0000000000..7f89ea5f45
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
@@ -0,0 +1,52 @@
+#include "readGravitationalAcceleration.H"
+#include "readhRef.H"
+
+Info<< "Creating phaseSystem\n" << endl;
+
+autoPtr<multiphaseSystem> fluidPtr
+(
+    multiphaseSystem::New(mesh)
+);
+multiphaseSystem& fluid = fluidPtr();
+
+surfaceScalarField& phi = fluid.phi();
+
+dimensionedScalar pMin
+(
+    "pMin",
+    dimPressure,
+    fluid
+);
+
+#include "gh.H"
+
+volScalarField& p = fluid.phases().first().thermo().p();
+
+Info<< "Reading field p_rgh\n" << endl;
+volScalarField p_rgh
+(
+    IOobject
+    (
+        "p_rgh",
+        runTime.timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::AUTO_WRITE
+    ),
+    mesh
+);
+
+label pRefCell = 0;
+scalar pRefValue = 0.0;
+setRefCell
+(
+    p,
+    p_rgh,
+    pimple.dict(),
+    pRefCell,
+    pRefValue
+);
+mesh.setFluxRequired(p_rgh.name());
+
+const IOMRFZoneList& MRF = fluid.MRF();
+fv::IOoptionList& fvOptions = fluid.fvOptions();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/log b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/log
new file mode 100644
index 0000000000..6a64f4e14f
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/log
@@ -0,0 +1,6 @@
+/home/dm2/henry/OpenFOAM/OpenFOAM-dev/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam
+Making dependency list for source file reactingMultiphaseEulerFoam.C
+clang++ -m64 -Dlinux64 -DWM_ARCH_OPTION=64 -DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions -O3  -DNoRepository -ftemplate-depth-100 -ImultiphaseSystem/lnInclude -I../phaseSystems/lnInclude -I../interfacialModels/lnInclude -I../interfacialCompositionModels/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/thermophysicalModels/basic/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/transportModels/compressible/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/TurbulenceModels/turbulenceModels/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/TurbulenceModels/compressible/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/TurbulenceModels/phaseCompressible/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/finiteVolume/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/fvOptions/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/meshTools/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/sampling/lnInclude -IlnInclude -I. -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/OpenFOAM/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/OSspecific/POSIX/lnInclude   -fPIC -c reactingMultiphaseEulerFoam.C -o /home/dm2/henry/OpenFOAM/OpenFOAM-dev/platforms/linux64ClangDPInt32Opt/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.o
+clang++ -m64 -Dlinux64 -DWM_ARCH_OPTION=64 -DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions -O3  -DNoRepository -ftemplate-depth-100 -ImultiphaseSystem/lnInclude -I../phaseSystems/lnInclude -I../interfacialModels/lnInclude -I../interfacialCompositionModels/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/thermophysicalModels/basic/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/transportModels/compressible/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/TurbulenceModels/turbulenceModels/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/TurbulenceModels/compressible/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/TurbulenceModels/phaseCompressible/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/finiteVolume/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/fvOptions/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/meshTools/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/sampling/lnInclude -IlnInclude -I. -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/OpenFOAM/lnInclude -I/home/dm2/henry/OpenFOAM/OpenFOAM-dev/src/OSspecific/POSIX/lnInclude   -fPIC -Xlinker --add-needed /home/dm2/henry/OpenFOAM/OpenFOAM-dev/platforms/linux64ClangDPInt32Opt/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.o -L/home/dm2/henry/OpenFOAM/OpenFOAM-dev/platforms/linux64ClangDPInt32Opt/lib \
+    -lreactingPhaseSystem -lreactingMultiphaseSystem -lreactingEulerianInterfacialModels -lreactingEulerianInterfacialCompositionModels -lmultiphaseReactingTurbulenceModels -lfiniteVolume -lfvOptions -lmeshTools -lsampling -lOpenFOAM -ldl  \
+     -lm -o /home/dm2/henry/OpenFOAM/OpenFOAM-dev/platforms/linux64ClangDPInt32Opt/bin/reactingMultiphaseEulerFoam
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/files
new file mode 100644
index 0000000000..dd421b52a3
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/files
@@ -0,0 +1,3 @@
+multiphaseCompressibleTurbulenceModels.C
+
+LIB = $(FOAM_LIBBIN)/libmultiphaseReactingTurbulenceModels
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
new file mode 100644
index 0000000000..553f60638c
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
@@ -0,0 +1,13 @@
+EXE_INC = \
+    -I../multiphaseSystem/lnInclude \
+    -I../../phaseSystems/lnInclude \
+    -I../../interfacialModels/lnInclude\
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/transportModels/incompressible/transportModel \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
new file mode 100644
index 0000000000..de792b433a
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "PhaseCompressibleTurbulenceModel.H"
+#include "phaseModel.H"
+#include "multiphaseSystem.H"
+#include "addToRunTimeSelectionTable.H"
+#include "makeTurbulenceModel.H"
+
+#include "ThermalDiffusivity.H"
+#include "EddyDiffusivity.H"
+
+#include "laminar.H"
+#include "RASModel.H"
+#include "LESModel.H"
+
+makeBaseTurbulenceModel
+(
+    volScalarField,
+    volScalarField,
+    compressibleTurbulenceModel,
+    PhaseCompressibleTurbulenceModel,
+    ThermalDiffusivity,
+    phaseModel
+);
+
+#define makeRASModel(Type)                                                     \
+    makeTemplatedTurbulenceModel                                               \
+    (phaseModelPhaseCompressibleTurbulenceModel, RAS, Type)
+
+#define makeLESModel(Type)                                                     \
+    makeTemplatedTurbulenceModel                                               \
+    (phaseModelPhaseCompressibleTurbulenceModel, LES, Type)
+
+#include "kEpsilon.H"
+makeRASModel(kEpsilon);
+
+#include "kOmegaSST.H"
+makeRASModel(kOmegaSST);
+
+#include "Smagorinsky.H"
+makeLESModel(Smagorinsky);
+
+#include "kEqn.H"
+makeLESModel(kEqn);
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/files b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/files
new file mode 100644
index 0000000000..f1728bb33d
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/files
@@ -0,0 +1,6 @@
+alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+multiphaseSystem.C
+newMultiphaseSystem.C
+multiphaseSystems.C
+
+LIB = $(FOAM_LIBBIN)/libreactingMultiphaseSystem
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
new file mode 100644
index 0000000000..f4de6a6d84
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
@@ -0,0 +1,21 @@
+EXE_INC = -ggdb3 \
+    -I../../interfacialModels/lnInclude \
+    -I../../interfacialCompositionModels/lnInclude \
+    -I../../phaseSystems/lnInclude \
+    -IalphaContactAngle \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
+    -I$(LIB_SRC)/combustionModels/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fvOptions/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
+
+LIB_LIBS = \
+    -lcombustionModels \
+    -lreactingPhaseSystem
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
new file mode 100644
index 0000000000..b26ec2faa0
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "alphaContactAngleFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps
+(
+    Istream& is
+)
+:
+    theta0_(readScalar(is)),
+    uTheta_(readScalar(is)),
+    thetaA_(readScalar(is)),
+    thetaR_(readScalar(is))
+{}
+
+
+Istream& operator>>
+(
+    Istream& is,
+    alphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
+)
+{
+    is >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_;
+    return is;
+}
+
+
+Ostream& operator<<
+(
+    Ostream& os,
+    const alphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
+)
+{
+    os  << tp.theta0_ << token::SPACE
+        << tp.uTheta_ << token::SPACE
+        << tp.thetaA_ << token::SPACE
+        << tp.thetaR_;
+
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    zeroGradientFvPatchScalarField(p, iF)
+{}
+
+
+alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
+(
+    const alphaContactAngleFvPatchScalarField& gcpsf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    zeroGradientFvPatchScalarField(gcpsf, p, iF, mapper),
+    thetaProps_(gcpsf.thetaProps_)
+{}
+
+
+alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    zeroGradientFvPatchScalarField(p, iF),
+    thetaProps_(dict.lookup("thetaProperties"))
+{
+    evaluate();
+}
+
+
+alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
+(
+    const alphaContactAngleFvPatchScalarField& gcpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    zeroGradientFvPatchScalarField(gcpsf, iF),
+    thetaProps_(gcpsf.thetaProps_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchScalarField::write(os);
+    os.writeKeyword("thetaProperties")
+        << thetaProps_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    alphaContactAngleFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
new file mode 100644
index 0000000000..17fced8dfa
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
@@ -0,0 +1,215 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::alphaContactAngleFvPatchScalarField
+
+Description
+    Contact-angle boundary condition for multi-phase interface-capturing
+    simulations.  Used in conjuction with multiphaseSystem.
+
+SourceFiles
+    alphaContactAngleFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef alphaContactAngleFvPatchScalarField_H
+#define alphaContactAngleFvPatchScalarField_H
+
+#include "zeroGradientFvPatchFields.H"
+#include "multiphaseSystem.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class alphaContactAngleFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class alphaContactAngleFvPatchScalarField
+:
+    public zeroGradientFvPatchScalarField
+{
+public:
+
+    class interfaceThetaProps
+    {
+        //- Equilibrium contact angle
+        scalar theta0_;
+
+        //- Dynamic contact angle velocity scale
+        scalar uTheta_;
+
+        //- Limiting advancing contact angle
+        scalar thetaA_;
+
+        //- Limiting receeding contact angle
+        scalar thetaR_;
+
+
+    public:
+
+        // Constructors
+            interfaceThetaProps()
+            {}
+
+            interfaceThetaProps(Istream&);
+
+
+        // Member functions
+
+            //- Return the equilibrium contact angle theta0
+            scalar theta0(bool matched=true) const
+            {
+                if (matched) return theta0_;
+                else return 180.0 - theta0_;
+            }
+
+            //- Return the dynamic contact angle velocity scale
+            scalar uTheta() const
+            {
+                return uTheta_;
+            }
+
+            //- Return the limiting advancing contact angle
+            scalar thetaA(bool matched=true) const
+            {
+                if (matched) return thetaA_;
+                else return 180.0 - thetaA_;
+            }
+
+            //- Return the limiting receeding contact angle
+            scalar thetaR(bool matched=true) const
+            {
+                if (matched) return thetaR_;
+                else return 180.0 - thetaR_;
+            }
+
+
+        // IO functions
+
+            friend Istream& operator>>(Istream&, interfaceThetaProps&);
+            friend Ostream& operator<<(Ostream&, const interfaceThetaProps&);
+    };
+
+    typedef HashTable
+    <
+        interfaceThetaProps,
+        phasePairKey,
+        phasePairKey::hash
+    > thetaPropsTable;
+
+
+private:
+
+    // Private data
+
+        thetaPropsTable thetaProps_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("alphaContactAngle");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        alphaContactAngleFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        alphaContactAngleFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given alphaContactAngleFvPatchScalarField
+        //  onto a new patch
+        alphaContactAngleFvPatchScalarField
+        (
+            const alphaContactAngleFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphaContactAngleFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        alphaContactAngleFvPatchScalarField
+        (
+            const alphaContactAngleFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphaContactAngleFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        //- Return the contact angle properties
+        const thetaPropsTable& thetaProps() const
+        {
+            return thetaProps_;
+        }
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
new file mode 100644
index 0000000000..276dd4e026
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -0,0 +1,713 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "multiphaseSystem.H"
+#include "alphaContactAngleFvPatchScalarField.H"
+
+#include "MULES.H"
+#include "subCycle.H"
+
+#include "fvcDdt.H"
+#include "fvcDiv.H"
+#include "fvcSnGrad.H"
+#include "fvcFlux.H"
+#include "fvcMeshPhi.H"
+#include "fvcSup.H"
+
+#include "fvmDdt.H"
+#include "fvmLaplacian.H"
+#include "fvmSup.H"
+
+// * * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(multiphaseSystem, 0);
+    defineRunTimeSelectionTable(multiphaseSystem, dictionary);
+}
+
+const Foam::scalar Foam::multiphaseSystem::convertToRad =
+    Foam::constant::mathematical::pi/180.0;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::multiphaseSystem::calcAlphas()
+{
+    scalar level = 0.0;
+    alphas_ == 0.0;
+
+    forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+    {
+        alphas_ += level*iter();
+        level += 1.0;
+    }
+
+    alphas_.correctBoundaryConditions();
+}
+
+
+void Foam::multiphaseSystem::solveAlphas()
+{
+    PtrList<surfaceScalarField> alphaPhiCorrs(phases().size());
+    int phasei = 0;
+
+    forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+    {
+        phaseModel& phase = iter();
+        volScalarField& alpha1 = phase;
+
+        phase.alphaPhi() =
+            dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0);
+
+        alphaPhiCorrs.set
+        (
+            phasei,
+            new surfaceScalarField
+            (
+                "phi" + alpha1.name() + "Corr",
+                fvc::flux
+                (
+                    phi_,
+                    phase,
+                    "div(phi," + alpha1.name() + ')'
+                )
+            )
+        );
+
+        surfaceScalarField& alphaPhiCorr = alphaPhiCorrs[phasei];
+
+        forAllIter(PtrDictionary<phaseModel>, phases(), iter2)
+        {
+            phaseModel& phase2 = iter2();
+            volScalarField& alpha2 = phase2;
+
+            if (&phase2 == &phase) continue;
+
+            surfaceScalarField phir(phase.phi() - phase2.phi());
+
+            cAlphaTable::const_iterator cAlpha
+            (
+                cAlphas_.find(phasePairKey(phase.name(), phase2.name()))
+            );
+
+            if (cAlpha != cAlphas_.end())
+            {
+                surfaceScalarField phic
+                (
+                    (mag(phi_) + mag(phir))/mesh_.magSf()
+                );
+
+                phir += min(cAlpha()*phic, max(phic))*nHatf(phase, phase2);
+            }
+
+            word phirScheme
+            (
+                "div(phir," + alpha2.name() + ',' + alpha1.name() + ')'
+            );
+
+            alphaPhiCorr += fvc::flux
+            (
+                -fvc::flux(-phir, phase2, phirScheme),
+                phase,
+                phirScheme
+            );
+        }
+
+        // Ensure that the flux at inflow BCs is preserved
+        forAll(alphaPhiCorr.boundaryField(), patchi)
+        {
+            fvsPatchScalarField& alphaPhiCorrp =
+                alphaPhiCorr.boundaryField()[patchi];
+
+            if (!alphaPhiCorrp.coupled())
+            {
+                const scalarField& phi1p = phase.phi().boundaryField()[patchi];
+                const scalarField& alpha1p = alpha1.boundaryField()[patchi];
+
+                forAll(alphaPhiCorrp, facei)
+                {
+                    if (phi1p[facei] < 0)
+                    {
+                        alphaPhiCorrp[facei] = alpha1p[facei]*phi1p[facei];
+                    }
+                }
+            }
+        }
+
+        MULES::limit
+        (
+            1.0/mesh_.time().deltaT().value(),
+            geometricOneField(),
+            phase,
+            phi_,
+            alphaPhiCorr,
+            zeroField(),
+            zeroField(),
+            phase.alphaMax(),
+            0,
+            true
+        );
+
+        phasei++;
+    }
+
+    MULES::limitSum(alphaPhiCorrs);
+
+    volScalarField sumAlpha
+    (
+        IOobject
+        (
+            "sumAlpha",
+            mesh_.time().timeName(),
+            mesh_
+        ),
+        mesh_,
+        dimensionedScalar("sumAlpha", dimless, 0)
+    );
+
+
+    volScalarField divU(fvc::div(fvc::absolute(phi_, phases().first().U())));
+
+    phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+    {
+        phaseModel& phase = iter();
+        volScalarField& alpha = phase;
+
+        surfaceScalarField& alphaPhic = alphaPhiCorrs[phasei];
+        alphaPhic += upwind<scalar>(mesh_, phi_).flux(phase);
+
+        volScalarField::DimensionedInternalField Sp
+        (
+            IOobject
+            (
+                "Sp",
+                mesh_.time().timeName(),
+                mesh_
+            ),
+            mesh_,
+            dimensionedScalar("Sp", phase.divU().dimensions(), 0.0)
+        );
+
+        volScalarField::DimensionedInternalField Su
+        (
+            IOobject
+            (
+                "Su",
+                mesh_.time().timeName(),
+                mesh_
+            ),
+            // Divergence term is handled explicitly to be
+            // consistent with the explicit transport solution
+            divU*min(alpha, scalar(1))
+        );
+
+        if (phase.compressible())
+        {
+            const scalarField& dgdt = phase.divU();
+
+            forAll(dgdt, celli)
+            {
+                if (dgdt[celli] > 0.0)
+                {
+                    Sp[celli] -= dgdt[celli];
+                    Su[celli] += dgdt[celli];
+                }
+                else if (dgdt[celli] < 0.0)
+                {
+                    Sp[celli] +=
+                        dgdt[celli]
+                       *(1.0 - alpha[celli])/max(alpha[celli], 1e-4);
+                }
+            }
+        }
+
+        forAllConstIter(PtrDictionary<phaseModel>, phases(), iter2)
+        {
+            const phaseModel& phase2 = iter2();
+            const volScalarField& alpha2 = phase2;
+
+            if (&phase2 == &phase) continue;
+
+            if (phase2.compressible())
+            {
+                const scalarField& dgdt2 = phase2.divU();
+
+                forAll(dgdt2, celli)
+                {
+                    if (dgdt2[celli] < 0.0)
+                    {
+                        Sp[celli] +=
+                            dgdt2[celli]
+                           *(1.0 - alpha2[celli])/max(alpha2[celli], 1e-4);
+
+                        Su[celli] -=
+                            dgdt2[celli]
+                           *alpha[celli]/max(alpha2[celli], 1e-4);
+                    }
+                    else if (dgdt2[celli] > 0.0)
+                    {
+                        Sp[celli] -= dgdt2[celli];
+                    }
+                }
+            }
+        }
+
+        MULES::explicitSolve
+        (
+            geometricOneField(),
+            alpha,
+            alphaPhic,
+            Sp,
+            Su
+        );
+
+        phase.alphaPhi() += alphaPhic;
+
+        Info<< phase.name() << " volume fraction, min, max = "
+            << phase.weightedAverage(mesh_.V()).value()
+            << ' ' << min(phase).value()
+            << ' ' << max(phase).value()
+            << endl;
+
+        sumAlpha += phase;
+
+        phasei++;
+    }
+
+    Info<< "Phase-sum volume fraction, min, max = "
+        << sumAlpha.weightedAverage(mesh_.V()).value()
+        << ' ' << min(sumAlpha).value()
+        << ' ' << max(sumAlpha).value()
+        << endl;
+}
+
+
+Foam::tmp<Foam::surfaceVectorField> Foam::multiphaseSystem::nHatfv
+(
+    const volScalarField& alpha1,
+    const volScalarField& alpha2
+) const
+{
+    /*
+    // Cell gradient of alpha
+    volVectorField gradAlpha =
+        alpha2*fvc::grad(alpha1) - alpha1*fvc::grad(alpha2);
+
+    // Interpolated face-gradient of alpha
+    surfaceVectorField gradAlphaf = fvc::interpolate(gradAlpha);
+    */
+
+    surfaceVectorField gradAlphaf
+    (
+        fvc::interpolate(alpha2)*fvc::interpolate(fvc::grad(alpha1))
+      - fvc::interpolate(alpha1)*fvc::interpolate(fvc::grad(alpha2))
+    );
+
+    // Face unit interface normal
+    return gradAlphaf/(mag(gradAlphaf) + deltaN_);
+}
+
+
+Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::nHatf
+(
+    const volScalarField& alpha1,
+    const volScalarField& alpha2
+) const
+{
+    // Face unit interface normal flux
+    return nHatfv(alpha1, alpha2) & mesh_.Sf();
+}
+
+
+// Correction for the boundary condition on the unit normal nHat on
+// walls to produce the correct contact angle.
+
+// The dynamic contact angle is calculated from the component of the
+// velocity on the direction of the interface, parallel to the wall.
+
+void Foam::multiphaseSystem::correctContactAngle
+(
+    const phaseModel& phase1,
+    const phaseModel& phase2,
+    surfaceVectorField::GeometricBoundaryField& nHatb
+) const
+{
+    const volScalarField::GeometricBoundaryField& gbf
+        = phase1.boundaryField();
+
+    const fvBoundaryMesh& boundary = mesh_.boundary();
+
+    forAll(boundary, patchi)
+    {
+        if (isA<alphaContactAngleFvPatchScalarField>(gbf[patchi]))
+        {
+            const alphaContactAngleFvPatchScalarField& acap =
+                refCast<const alphaContactAngleFvPatchScalarField>(gbf[patchi]);
+
+            vectorField& nHatPatch = nHatb[patchi];
+
+            vectorField AfHatPatch
+            (
+                mesh_.Sf().boundaryField()[patchi]
+               /mesh_.magSf().boundaryField()[patchi]
+            );
+
+            alphaContactAngleFvPatchScalarField::thetaPropsTable::
+                const_iterator tp =
+                    acap.thetaProps()
+                   .find(phasePairKey(phase1.name(), phase2.name()));
+
+            if (tp == acap.thetaProps().end())
+            {
+                FatalErrorIn
+                (
+                    "multiphaseSystem::correctContactAngle"
+                    "(const phaseModel& phase1, const phaseModel& phase2, "
+                    "fvPatchVectorFieldField& nHatb) const"
+                )   << "Cannot find interface "
+                    << phasePairKey(phase1.name(), phase2.name())
+                    << "\n    in table of theta properties for patch "
+                    << acap.patch().name()
+                    << exit(FatalError);
+            }
+
+            bool matched = (tp.key().first() == phase1.name());
+
+            scalar theta0 = convertToRad*tp().theta0(matched);
+            scalarField theta(boundary[patchi].size(), theta0);
+
+            scalar uTheta = tp().uTheta();
+
+            // Calculate the dynamic contact angle if required
+            if (uTheta > SMALL)
+            {
+                scalar thetaA = convertToRad*tp().thetaA(matched);
+                scalar thetaR = convertToRad*tp().thetaR(matched);
+
+                // Calculated the component of the velocity parallel to the wall
+                vectorField Uwall
+                (
+                    phase1.U()().boundaryField()[patchi].patchInternalField()
+                  - phase1.U()().boundaryField()[patchi]
+                );
+                Uwall -= (AfHatPatch & Uwall)*AfHatPatch;
+
+                // Find the direction of the interface parallel to the wall
+                vectorField nWall
+                (
+                    nHatPatch - (AfHatPatch & nHatPatch)*AfHatPatch
+                );
+
+                // Normalise nWall
+                nWall /= (mag(nWall) + SMALL);
+
+                // Calculate Uwall resolved normal to the interface parallel to
+                // the interface
+                scalarField uwall(nWall & Uwall);
+
+                theta += (thetaA - thetaR)*tanh(uwall/uTheta);
+            }
+
+
+            // Reset nHatPatch to correspond to the contact angle
+
+            scalarField a12(nHatPatch & AfHatPatch);
+
+            scalarField b1(cos(theta));
+
+            scalarField b2(nHatPatch.size());
+
+            forAll(b2, facei)
+            {
+                b2[facei] = cos(acos(a12[facei]) - theta[facei]);
+            }
+
+            scalarField det(1.0 - a12*a12);
+
+            scalarField a((b1 - a12*b2)/det);
+            scalarField b((b2 - a12*b1)/det);
+
+            nHatPatch = a*AfHatPatch + b*nHatPatch;
+
+            nHatPatch /= (mag(nHatPatch) + deltaN_.value());
+        }
+    }
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::K
+(
+    const phaseModel& phase1,
+    const phaseModel& phase2
+) const
+{
+    tmp<surfaceVectorField> tnHatfv = nHatfv(phase1, phase2);
+
+    correctContactAngle(phase1, phase2, tnHatfv().boundaryField());
+
+    // Simple expression for curvature
+    return -fvc::div(tnHatfv & mesh_.Sf());
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::multiphaseSystem::multiphaseSystem
+(
+    const fvMesh& mesh
+)
+:
+    phaseSystem(mesh),
+
+    alphas_
+    (
+        IOobject
+        (
+            "alphas",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("alphas", dimless, 0.0),
+        zeroGradientFvPatchScalarField::typeName
+    ),
+
+    cAlphas_(lookup("interfaceCompression")),
+
+    deltaN_
+    (
+        "deltaN",
+        1e-8/pow(average(mesh.V()), 1.0/3.0)
+    )
+{
+    forAllIter(phaseSystem::phaseModelTable, phases(), iter)
+    {
+        volScalarField& alphai = iter();
+        mesh.setFluxRequired(alphai.name());
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::multiphaseSystem::~multiphaseSystem()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
+(
+    const phaseModel& phase1
+) const
+{
+    tmp<surfaceScalarField> tSurfaceTension
+    (
+        new surfaceScalarField
+        (
+            IOobject
+            (
+                "surfaceTension",
+                mesh_.time().timeName(),
+                mesh_
+            ),
+            mesh_,
+            dimensionedScalar
+            (
+                "surfaceTension",
+                dimensionSet(1, -2, -2, 0, 0),
+                0
+            )
+        )
+    );
+
+    forAllConstIter(PtrDictionary<phaseModel>, phases(), iter)
+    {
+        const phaseModel& phase2 = iter();
+
+        if (&phase2 != &phase1)
+        {
+            phasePairKey key12(phase1.name(), phase2.name());
+
+            cAlphaTable::const_iterator cAlpha(cAlphas_.find(key12));
+
+            if (cAlpha != cAlphas_.end())
+            {
+                tSurfaceTension() +=
+                    fvc::interpolate(sigma(key12)*K(phase1, phase2))
+                   *(
+                        fvc::interpolate(phase2)*fvc::snGrad(phase1)
+                      - fvc::interpolate(phase1)*fvc::snGrad(phase2)
+                    );
+            }
+        }
+    }
+
+    return tSurfaceTension;
+}
+
+
+Foam::tmp<Foam::volScalarField>
+Foam::multiphaseSystem::nearInterface() const
+{
+    tmp<volScalarField> tnearInt
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "nearInterface",
+                mesh_.time().timeName(),
+                mesh_
+            ),
+            mesh_,
+            dimensionedScalar("nearInterface", dimless, 0.0)
+        )
+    );
+
+    forAllConstIter(PtrDictionary<phaseModel>, phases(), iter)
+    {
+        tnearInt() = max(tnearInt(), pos(iter() - 0.01)*pos(0.99 - iter()));
+    }
+
+    return tnearInt;
+}
+
+
+void Foam::multiphaseSystem::solve()
+{
+    const fvMesh& mesh = this->mesh();
+    const Time& runTime = mesh.time();
+
+    const dictionary& alphaControls = mesh_.solverDict("alpha");
+    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+
+    bool LTS = fv::localEulerDdt::enabled(mesh);
+
+    if (nAlphaSubCycles > 1)
+    {
+        tmp<volScalarField> trSubDeltaT;
+
+        if (LTS)
+        {
+            trSubDeltaT =
+                fv::localEulerDdt::localRSubDeltaT(mesh, nAlphaSubCycles);
+        }
+
+        dimensionedScalar totalDeltaT = runTime.deltaT();
+
+        PtrList<volScalarField> alpha0s(phases().size());
+        PtrList<surfaceScalarField> phiSums(phases().size());
+
+        int phasei = 0;
+        forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+        {
+            phaseModel& phase = iter();
+            volScalarField& alpha = phase;
+
+            alpha0s.set
+            (
+                phasei,
+                new volScalarField(alpha.oldTime())
+            );
+
+            phiSums.set
+            (
+                phasei,
+                new surfaceScalarField
+                (
+                    IOobject
+                    (
+                        "phiSum" + alpha.name(),
+                        runTime.timeName(),
+                        mesh_
+                    ),
+                    mesh_,
+                    dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0)
+                )
+            );
+
+            phasei++;
+        }
+
+        for
+        (
+            subCycleTime alphaSubCycle
+            (
+                const_cast<Time&>(runTime),
+                nAlphaSubCycles
+            );
+            !(++alphaSubCycle).end();
+        )
+        {
+            solveAlphas();
+
+            int phasei = 0;
+            forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+            {
+                phiSums[phasei] += iter().phi();
+                phasei++;
+            }
+        }
+
+        phasei = 0;
+        forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+        {
+            phaseModel& phase = iter();
+            volScalarField& alpha = phase;
+
+            phase.phi() = phiSums[phasei]/nAlphaSubCycles;
+
+            // Correct the time index of the field
+            // to correspond to the global time
+            alpha.timeIndex() = runTime.timeIndex();
+
+            // Reset the old-time field value
+            alpha.oldTime() = alpha0s[phasei];
+            alpha.oldTime().timeIndex() = runTime.timeIndex();
+
+            phasei++;
+        }
+    }
+    else
+    {
+        solveAlphas();
+    }
+
+    forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+    {
+        phaseModel& phase = iter();
+        phase.alphaRhoPhi() = fvc::interpolate(phase.rho())*phase.alphaPhi();
+    }
+
+    calcAlphas();
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
new file mode 100644
index 0000000000..9b7e3da3c1
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::multiphaseSystem
+
+Description
+    Class which solves the volume fraction equations for two phases.
+
+SourceFiles
+    multiphaseSystem.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef multiphaseSystem_H
+#define multiphaseSystem_H
+
+#include "phaseSystem.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class dragModel;
+class virtualMassModel;
+
+/*---------------------------------------------------------------------------*\
+                         Class multiphaseSystem Declaration
+\*---------------------------------------------------------------------------*/
+
+class multiphaseSystem
+:
+    public phaseSystem
+{
+    // Private data
+
+        volScalarField alphas_;
+
+        typedef HashTable<scalar, phasePairKey, phasePairKey::hash>
+            cAlphaTable;
+
+        cAlphaTable cAlphas_;
+
+        //- Stabilisation for normalisation of the interface normal
+        const dimensionedScalar deltaN_;
+
+        //- Conversion factor for degrees into radians
+        static const scalar convertToRad;
+
+
+    // Private member functions
+
+        void calcAlphas();
+
+        void solveAlphas();
+
+        tmp<surfaceVectorField> nHatfv
+        (
+            const volScalarField& alpha1,
+            const volScalarField& alpha2
+        ) const;
+
+        tmp<surfaceScalarField> nHatf
+        (
+            const volScalarField& alpha1,
+            const volScalarField& alpha2
+        ) const;
+
+        void correctContactAngle
+        (
+            const phaseModel& alpha1,
+            const phaseModel& alpha2,
+            surfaceVectorField::GeometricBoundaryField& nHatb
+        ) const;
+
+        tmp<volScalarField> K
+        (
+            const phaseModel& alpha1,
+            const phaseModel& alpha2
+        ) const;
+
+
+        //- Return the drag coefficient for phase pair
+        virtual tmp<volScalarField> Kd(const phasePairKey& key) const = 0;
+
+        //- Return the face drag coefficient for phase pair
+        virtual tmp<surfaceScalarField> Kdf(const phasePairKey& key) const = 0;
+
+        //- Return the virtual mass coefficient for phase pair
+        virtual tmp<volScalarField> Vm(const phasePairKey& key) const = 0;
+
+        //- Return the face virtual mass coefficient for phase pair
+        virtual tmp<surfaceScalarField> Vmf(const phasePairKey& key) const = 0;
+
+        //- Return the turbulent diffusivity for phase pair
+        //  Multiplies the phase-fraction gradient
+        virtual tmp<volScalarField> D(const phasePairKey& key) const = 0;
+
+        //- Return the interfacial mass flow rate for phase pair
+        virtual tmp<volScalarField> dmdt(const phasePairKey& key) const = 0;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("multiphaseSystem");
+
+    // Declare runtime construction
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            multiphaseSystem,
+            dictionary,
+            (
+                const fvMesh& mesh
+            ),
+            (mesh)
+        );
+
+
+    // Constructors
+
+        //- Construct from fvMesh
+        multiphaseSystem(const fvMesh&);
+
+
+    //- Destructor
+    virtual ~multiphaseSystem();
+
+
+    // Selectors
+
+        static autoPtr<multiphaseSystem> New
+        (
+            const fvMesh& mesh
+        );
+
+
+    // Member Functions
+
+        //- Return the drag coefficient for all phase-pairs
+        virtual const phaseSystem::KdTable& Kds() const = 0;
+
+        //- Return the drag coefficient for phase
+        virtual tmp<volScalarField> Kd(const phaseModel& phase) const = 0;
+
+        //- Return the combined force (lift + wall-lubrication) for phase pair
+        virtual autoPtr<PtrList<Foam::volVectorField> > Fs() const = 0;
+
+        //- Return the total interfacial mass transfer rate for phase
+        virtual tmp<volScalarField> dmdt(const phaseModel& phase) const = 0;
+
+        //- Return the momentum transfer matrices
+        virtual autoPtr<momentumTransferTable> momentumTransfer() const = 0;
+
+        //- Return the heat transfer matrices
+        virtual autoPtr<heatTransferTable> heatTransfer() const = 0;
+
+        //- Return the mass transfer matrices
+        virtual autoPtr<massTransferTable> massTransfer() const = 0;
+
+        tmp<surfaceScalarField> surfaceTension(const phaseModel& phase) const;
+
+        //- Indicator of the proximity of the interface
+        //  Field values are 1 near and 0 away for the interface.
+        tmp<volScalarField> nearInterface() const;
+
+        //- Solve for the phase fractions
+        virtual void solve();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "multiphaseSystemI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystemI.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystemI.H
new file mode 100644
index 0000000000..b4ea367451
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystemI.H
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystems.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystems.C
new file mode 100644
index 0000000000..3e1a3eaf9f
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystems.C
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "addToRunTimeSelectionTable.H"
+
+#include "phaseSystem.H"
+#include "multiphaseSystem.H"
+#include "MomentumTransferPhaseSystem.H"
+#include "HeatTransferPhaseSystem.H"
+#include "InterfaceCompositionPhaseChangePhaseSystem.H"
+#include "ThermalPhaseChangePhaseSystem.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef
+        HeatTransferPhaseSystem
+        <
+            MomentumTransferPhaseSystem<multiphaseSystem>
+        >
+        heatAndMomentumTransferMultiphaseSystem;
+
+    addNamedToRunTimeSelectionTable
+    (
+        multiphaseSystem,
+        heatAndMomentumTransferMultiphaseSystem,
+        dictionary,
+        heatAndMomentumTransferMultiphaseSystem
+    );
+
+    typedef
+        InterfaceCompositionPhaseChangePhaseSystem
+        <
+            MomentumTransferPhaseSystem<multiphaseSystem>
+        >
+        interfaceCompositionPhaseChangeMultiphaseSystem;
+
+    addNamedToRunTimeSelectionTable
+    (
+        multiphaseSystem,
+        interfaceCompositionPhaseChangeMultiphaseSystem,
+        dictionary,
+        interfaceCompositionPhaseChangeMultiphaseSystem
+    );
+
+    typedef
+        ThermalPhaseChangePhaseSystem
+        <
+            MomentumTransferPhaseSystem<multiphaseSystem>
+        >
+        thermalPhaseChangeMultiphaseSystem;
+
+    addNamedToRunTimeSelectionTable
+    (
+        multiphaseSystem,
+        thermalPhaseChangeMultiphaseSystem,
+        dictionary,
+        thermalPhaseChangeMultiphaseSystem
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
new file mode 100644
index 0000000000..79e3546c49
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "multiphaseSystem.H"
+
+// * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::multiphaseSystem> Foam::multiphaseSystem::New
+(
+    const fvMesh& mesh
+)
+{
+    const word multiphaseSystemType
+    (
+        IOdictionary
+        (
+            IOobject
+            (
+                propertiesName,
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::NO_WRITE,
+                false
+            )
+        ).lookup("type")
+    );
+
+    Info<< "Selecting multiphaseSystem "
+        << multiphaseSystemType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(multiphaseSystemType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn("multiphaseSystem::New")
+            << "Unknown multiphaseSystemType type "
+            << multiphaseSystemType << endl << endl
+            << "Valid multiphaseSystem types are : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return cstrIter()(mesh);
+}
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
new file mode 100644
index 0000000000..07a5c88194
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
@@ -0,0 +1,37 @@
+Info<< "Constructing momentum equations" << endl;
+
+PtrList<fvVectorMatrix> UEqns(fluid.phases().size());
+
+{
+    autoPtr<phaseSystem::momentumTransferTable>
+        momentumTransferPtr(fluid.momentumTransfer());
+
+    phaseSystem::momentumTransferTable&
+        momentumTransfer(momentumTransferPtr());
+
+    int phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+        const volScalarField& alpha = phase;
+        const volScalarField& rho = phase.rho();
+        volVectorField& U = phase.U();
+
+        UEqns.set
+        (
+            phasei,
+            new fvVectorMatrix
+            (
+                phase.UEqn()
+             ==
+               *momentumTransfer[phase.name()]
+              + fvOptions(alpha, rho, U)
+            )
+        );
+
+        UEqns[phasei].relax();
+        fvOptions.constrain(UEqns[phasei]);
+
+        phasei++;
+    }
+}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
new file mode 100644
index 0000000000..442676d1b9
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -0,0 +1,447 @@
+PtrList<surfaceScalarField> alphafs(fluid.phases().size());
+PtrList<volScalarField> rAUs(fluid.phases().size());
+PtrList<surfaceScalarField> alpharAUfs(fluid.phases().size());
+
+int phasei = 0;
+forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+{
+    phaseModel& phase = iter();
+    const volScalarField& alpha = phase;
+
+    alphafs.set(phasei, fvc::interpolate(alpha).ptr());
+    alphafs[phasei].rename("pEqn" + alphafs[phasei].name());
+
+    rAUs.set
+    (
+        phasei,
+        new volScalarField
+        (
+            IOobject::groupName("rAU", phase.name()),
+            1.0
+           /(
+               UEqns[phasei].A()
+             + max(phase.residualAlpha() - alpha, scalar(0))
+              *phase.rho()/runTime.deltaT()
+            )
+        )
+    );
+
+    alpharAUfs.set
+    (
+        phasei,
+        (
+            fvc::interpolate(max(alpha, phase.residualAlpha())*rAUs[phasei])
+        ).ptr()
+    );
+
+    phasei++;
+}
+
+// Turbulent diffusion, particle-pressure, lift and wall-lubrication fluxes
+PtrList<surfaceScalarField> phiFs(fluid.phases().size());
+{
+    autoPtr<PtrList<volVectorField> > Fs = fluid.Fs();
+
+    phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+
+        phiFs.set
+        (
+            phasei,
+            new surfaceScalarField
+            (
+                IOobject::groupName("phiF", phase.name()),
+                (fvc::interpolate(rAUs[phasei]*Fs()[phasei]) & mesh.Sf())
+            )
+        );
+
+        phasei++;
+    }
+}
+
+// --- Pressure corrector loop
+while (pimple.correct())
+{
+    // Update continuity errors due to temperature changes
+    fluid.correct();
+
+    PtrList<volVectorField> HbyAs(fluid.phases().size());
+
+    phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+        const volScalarField& alpha = phase;
+
+        // Correct fixed-flux BCs to be consistent with the velocity BCs
+        MRF.correctBoundaryFlux(phase.U(), phase.phi());
+
+        HbyAs.set
+        (
+            phasei,
+            new volVectorField
+            (
+                IOobject::groupName("HbyA", phase.name()),
+                phase.U()
+            )
+        );
+
+        HbyAs[phasei] =
+            rAUs[phasei]
+           *(
+                UEqns[phasei].H()
+              + max(phase.residualAlpha() - alpha, scalar(0))
+               *phase.rho()*phase.U().oldTime()/runTime.deltaT()
+            );
+
+        phasei++;
+    }
+
+    // Mean density for buoyancy force and p_rgh -> p
+    volScalarField rho("rho", fluid.rho());
+
+    surfaceScalarField ghSnGradRho
+    (
+        "ghSnGradRho",
+        ghf*fvc::snGrad(rho)*mesh.magSf()
+    );
+
+    PtrList<surfaceScalarField> phigs(fluid.phases().size());
+    phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+
+        phigs.set
+        (
+            phasei,
+            (
+                alpharAUfs[phasei]
+               *(
+                   ghSnGradRho
+                 - (fvc::interpolate(phase.rho() - rho))*(g & mesh.Sf())
+                 - fluid.surfaceTension(phase)*mesh.magSf()
+                )
+            ).ptr()
+        );
+
+        phasei++;
+    }
+
+    PtrList<surfaceScalarField> phiHbyAs(fluid.phases().size());
+
+    surfaceScalarField phiHbyA
+    (
+        IOobject
+        (
+            "phiHbyA",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
+    );
+
+    phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+        const volScalarField& alpha = phase;
+
+        // ddtPhiCorr filter -- only apply in pure(ish) phases
+        surfaceScalarField alphafBar
+        (
+            fvc::interpolate(fvc::average(alphafs[phasei]))
+        );
+        surfaceScalarField phiCorrCoeff(pos(alphafBar - 0.99));
+
+        forAll(mesh.boundary(), patchi)
+        {
+            // Set ddtPhiCorr to 0 on non-coupled boundaries
+            if
+            (
+                !mesh.boundary()[patchi].coupled()
+             || isA<cyclicAMIFvPatch>(mesh.boundary()[patchi])
+            )
+            {
+                phiCorrCoeff.boundaryField()[patchi] = 0;
+            }
+        }
+
+        phiHbyAs.set
+        (
+            phasei,
+            new surfaceScalarField
+            (
+                IOobject::groupName("phiHbyA", phase.name()),
+                (fvc::interpolate(HbyAs[phasei]) & mesh.Sf())
+              + phiCorrCoeff
+               *fvc::interpolate
+                (
+                    alpha.oldTime()*phase.rho()().oldTime()*rAUs[phasei]
+                )
+               *(
+                   MRF.absolute(phase.phi().oldTime())
+                 - (fvc::interpolate(phase.U().oldTime()) & mesh.Sf())
+                )/runTime.deltaT()
+              - phiFs[phasei]
+              - phigs[phasei]
+            )
+        );
+
+        forAllConstIter
+        (
+            phaseSystem::KdTable,
+            fluid.Kds(),
+            KdIter
+        )
+        {
+            const volScalarField& K(*KdIter());
+
+            const phasePair& pair(fluid.phasePairs()[KdIter.key()]);
+
+            const phaseModel* phase1 = &pair.phase1();
+            const phaseModel* phase2 = &pair.phase2();
+
+            forAllConstIter(phasePair, pair, iter)
+            {
+                if (phase1 == &phase)
+                {
+                    phiHbyAs[phasei] +=
+                        fvc::interpolate(rAUs[phasei]*K)
+                       *MRF.absolute(phase2->phi());
+
+                    HbyAs[phasei] += rAUs[phasei]*K*phase2->U();
+                }
+
+                Swap(phase1, phase2);
+            }
+        }
+
+        phiHbyA += alphafs[phasei]*phiHbyAs[phasei];
+
+        phasei++;
+    }
+
+    MRF.makeRelative(phiHbyA);
+
+    // Construct pressure "diffusivity"
+    surfaceScalarField rAUf
+    (
+        IOobject
+        (
+            "rAUf",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("rAUf", dimensionSet(-1, 3, 1, 0, 0), 0)
+    );
+
+    phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        rAUf += alphafs[phasei]*alpharAUfs[phasei];
+        phasei++;
+    }
+    rAUf = mag(rAUf);
+
+
+    // Update the fixedFluxPressure BCs to ensure flux consistency
+    {
+        surfaceScalarField::GeometricBoundaryField phib(phi.boundaryField());
+        phib = 0;
+        phasei = 0;
+        forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+        {
+            phaseModel& phase = iter();
+            phib += alphafs[phasei].boundaryField()*phase.phi().boundaryField();
+            phasei++;
+        }
+
+        setSnGrad<fixedFluxPressureFvPatchScalarField>
+        (
+            p_rgh.boundaryField(),
+            (
+                phiHbyA.boundaryField() - phib
+            )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
+        );
+    }
+
+    PtrList<fvScalarMatrix> pEqnComps(fluid.phases().size());
+    phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+
+        if (phase.compressible())
+        {
+            const volScalarField& alpha = phase;
+            const volScalarField& rho = phase.rho();
+
+            if (pimple.transonic())
+            {
+                surfaceScalarField phid
+                (
+                    IOobject::groupName("phid", phase.name()),
+                    fvc::interpolate(phase.thermo().psi())*phase.phi()
+                );
+
+                pEqnComps.set
+                (
+                    phasei,
+                    (
+                        (
+                            phase.continuityError() - fluid.dmdt(phase)
+                          - fvc::Sp
+                            (
+                                fvc::ddt(alpha) + fvc::div(phase.alphaPhi()),
+                                rho
+                            )
+                        )/rho
+                      + (alpha/rho)*correction
+                        (
+                            phase.thermo().psi()*fvm::ddt(p_rgh)
+                          + fvm::div(phid, p_rgh)
+                          - fvm::Sp(fvc::div(phid), p_rgh)
+                        )
+                    ).ptr()
+                );
+
+                deleteDemandDrivenData
+                (
+                    pEqnComps[phasei].faceFluxCorrectionPtr()
+                );
+                pEqnComps[phasei].relax();
+            }
+            else
+            {
+                pEqnComps.set
+                (
+                    phasei,
+                    (
+                        (
+                            phase.continuityError() - fluid.dmdt(phase)
+                          - fvc::Sp
+                            (
+                                (fvc::ddt(alpha) + fvc::div(phase.alphaPhi())),
+                                rho
+                            )
+                        )/rho
+                      + (alpha*phase.thermo().psi()/rho)
+                       *correction(fvm::ddt(p_rgh))
+                    ).ptr()
+                );
+            }
+        }
+
+        phasei++;
+    }
+
+    // Cache p prior to solve for density update
+    volScalarField p_rgh_0(p_rgh);
+
+    // Iterate over the pressure equation to correct for non-orthogonality
+    while (pimple.correctNonOrthogonal())
+    {
+        // Construct the transport part of the pressure equation
+        fvScalarMatrix pEqnIncomp
+        (
+            fvc::div(phiHbyA)
+          - fvm::laplacian(rAUf, p_rgh)
+        );
+
+        {
+            fvScalarMatrix pEqn(pEqnIncomp);
+
+            phasei = 0;
+            forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+            {
+                phaseModel& phase = iter();
+
+                if (phase.compressible())
+                {
+                    pEqn += pEqnComps[phasei];
+                }
+
+                phasei++;
+            }
+
+            solve
+            (
+                pEqn,
+                mesh.solver(p_rgh.select(pimple.finalInnerIter()))
+            );
+        }
+
+        // Correct fluxes and velocities on last non-orthogonal iteration
+        if (pimple.finalNonOrthogonalIter())
+        {
+            phi = phiHbyA + pEqnIncomp.flux();
+
+            surfaceScalarField mSfGradp("mSfGradp", pEqnIncomp.flux()/rAUf);
+
+            phasei = 0;
+            forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+            {
+                phaseModel& phase = iter();
+
+                phase.phi() = phiHbyAs[phasei] + alpharAUfs[phasei]*mSfGradp;
+
+                // Set the phase dilatation rates
+                if (phase.compressible())
+                {
+                    phase.divU(-pEqnComps[phasei] & p_rgh);
+                }
+
+                phasei++;
+            }
+
+            // Optionally relax pressure for velocity correction
+            p_rgh.relax();
+
+            mSfGradp = pEqnIncomp.flux()/rAUf;
+
+            phasei = 0;
+            forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+            {
+                phaseModel& phase = iter();
+
+                phase.U() =
+                    HbyAs[phasei]
+                  + fvc::reconstruct
+                    (
+                        alpharAUfs[phasei]*mSfGradp
+                      - phiFs[phasei]
+                      - phigs[phasei]
+                    );
+                phase.U().correctBoundaryConditions();
+                fvOptions.correct(phase.U());
+
+                phasei++;
+            }
+        }
+    }
+
+    // Update and limit the static pressure
+    p = max(p_rgh + rho*gh, pMin);
+
+    // Limit p_rgh
+    p_rgh = p - rho*gh;
+
+    // Update densities from change in p_rgh
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+        phase.rho()() += phase.thermo().psi()*(p_rgh - p_rgh_0);
+    }
+
+    // Correct p_rgh for consistency with p and the updated densities
+    rho = fluid.rho();
+    p_rgh = p - rho*gh;
+    p_rgh.correctBoundaryConditions();
+}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqnSave.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqnSave.H
new file mode 100644
index 0000000000..e94f68d8f2
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqnSave.H
@@ -0,0 +1,285 @@
+// --- Pressure corrector loop
+while (pimple.correct())
+{
+    // rho1 = rho10 + psi1*p_rgh;
+    // rho2 = rho20 + psi2*p_rgh;
+
+    // tmp<fvScalarMatrix> pEqnComp1;
+    // tmp<fvScalarMatrix> pEqnComp2;
+
+    // //if (transonic)
+    // //{
+    // //}
+    // //else
+    // {
+    //     surfaceScalarField phid1("phid1", fvc::interpolate(psi1)*phi1);
+    //     surfaceScalarField phid2("phid2", fvc::interpolate(psi2)*phi2);
+
+    //     pEqnComp1 =
+    //         fvc::ddt(rho1) + psi1*correction(fvm::ddt(p_rgh))
+    //       + fvc::div(phid1, p_rgh)
+    //       - fvc::Sp(fvc::div(phid1), p_rgh);
+
+    //     pEqnComp2 =
+    //         fvc::ddt(rho2) + psi2*correction(fvm::ddt(p_rgh))
+    //       + fvc::div(phid2, p_rgh)
+    //       - fvc::Sp(fvc::div(phid2), p_rgh);
+    // }
+
+    PtrList<surfaceScalarField> alphafs(fluid.phases().size());
+    PtrList<volVectorField> HbyAs(fluid.phases().size());
+    PtrList<surfaceScalarField> phiHbyAs(fluid.phases().size());
+    PtrList<volScalarField> rAUs(fluid.phases().size());
+    PtrList<surfaceScalarField> rAlphaAUfs(fluid.phases().size());
+
+    int phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+
+        MRF.makeAbsolute(phase.phi().oldTime());
+        MRF.makeAbsolute(phase.phi());
+
+        HbyAs.set(phasei, new volVectorField(phase.U()));
+        phiHbyAs.set(phasei, new surfaceScalarField(1.0*phase.phi()));
+
+        phasei++;
+    }
+
+    surfaceScalarField phiHbyA
+    (
+        IOobject
+        (
+            "phiHbyA",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
+    );
+
+    volScalarField rho("rho", fluid.rho());
+    surfaceScalarField ghSnGradRho(ghf*fvc::snGrad(rho)*mesh.magSf());
+
+    phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+        const volScalarField& alpha = phase;
+
+        alphafs.set(phasei, fvc::interpolate(alpha).ptr());
+        alphafs[phasei].rename("hmm" + alpha.name());
+
+        volScalarField dragCoeffi
+        (
+            IOobject
+            (
+                "dragCoeffi",
+                runTime.timeName(),
+                mesh
+            ),
+            fluid.Kd(phase),
+            zeroGradientFvPatchScalarField::typeName
+        );
+        dragCoeffi.correctBoundaryConditions();
+
+        rAUs.set(phasei, (1.0/(UEqns[phasei].A() + dragCoeffi)).ptr());
+        rAlphaAUfs.set
+        (
+            phasei,
+            (
+                alphafs[phasei]*fvc::interpolate(phase.rho())
+               /fvc::interpolate(UEqns[phasei].A() + dragCoeffi)
+            ).ptr()
+        );
+
+        HbyAs[phasei] = rAUs[phasei]*UEqns[phasei].H();
+
+        phiHbyAs[phasei] =
+        (
+            (fvc::interpolate(HbyAs[phasei]) & mesh.Sf())
+          + rAlphaAUfs[phasei]*fvc::ddtCorr(phase.U(), phase.phi())
+        );
+        MRF.makeRelative(phiHbyAs[phasei]);
+        MRF.makeRelative(phase.phi().oldTime());
+        MRF.makeRelative(phase.phi());
+
+        phiHbyAs[phasei] +=
+            rAlphaAUfs[phasei]
+           *(
+               fluid.surfaceTension(phase)*mesh.magSf()
+             + (fvc::interpolate(phase.rho() - rho))*(g & mesh.Sf())
+             - ghSnGradRho
+            )/fvc::interpolate(phase.rho());
+
+        forAllConstIter
+        (
+            phaseSystem::KdTable,
+            fluid.Kds(),
+            KdIter
+        )
+        {
+            const volScalarField& K(*KdIter());
+
+            const phasePair& pair(fluid.phasePairs()[KdIter.key()]);
+
+            const phaseModel* phase1 = &pair.phase1();
+            const phaseModel* phase2 = &pair.phase2();
+
+            forAllConstIter(phasePair, pair, iter)
+            {
+                if (phase1 == &phase)
+                {
+                    phiHbyAs[phasei] +=
+                        fvc::interpolate(K)
+                       /fvc::interpolate(UEqns[phasei].A() + dragCoeffi)
+                       *phase2->phi();
+
+                    HbyAs[phasei] += rAUs[phasei]*K*phase2->U();
+                }
+
+                Swap(phase1, phase2);
+            }
+        }
+
+        phiHbyA += alphafs[phasei]*phiHbyAs[phasei];
+
+        phasei++;
+    }
+
+    surfaceScalarField rAUf
+    (
+        IOobject
+        (
+            "rAUf",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("rAUf", dimensionSet(-1, 3, 1, 0, 0), 0)
+    );
+
+    phasei = 0;
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        phaseModel& phase = iter();
+        rAUf += mag(alphafs[phasei]*rAlphaAUfs[phasei])
+            /fvc::interpolate(phase.rho());
+
+        phasei++;
+    }
+
+    // Update the fixedFluxPressure BCs to ensure flux consistency
+    {
+        surfaceScalarField::GeometricBoundaryField phib(phi.boundaryField());
+        phib = 0;
+        phasei = 0;
+        forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+        {
+            phaseModel& phase = iter();
+
+            phib +=
+                alphafs[phasei].boundaryField()
+               *(mesh.Sf().boundaryField() & phase.U().boundaryField());
+
+            phasei++;
+        }
+
+        setSnGrad<fixedFluxPressureFvPatchScalarField>
+        (
+            p_rgh.boundaryField(),
+            (
+                phiHbyA.boundaryField() - MRF.relative(phib)
+            )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
+        );
+    }
+
+    while (pimple.correctNonOrthogonal())
+    {
+        fvScalarMatrix pEqnIncomp
+        (
+            fvc::div(phiHbyA)
+          - fvm::laplacian(rAUf, p_rgh)
+        );
+
+        pEqnIncomp.setReference(pRefCell, pRefValue);
+
+        solve
+        (
+            // (
+            //     (alpha1/rho1)*pEqnComp1()
+            //   + (alpha2/rho2)*pEqnComp2()
+            // ) +
+            pEqnIncomp,
+            mesh.solver(p_rgh.select(pimple.finalInnerIter()))
+        );
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            surfaceScalarField mSfGradp("mSfGradp", pEqnIncomp.flux()/rAUf);
+
+            phasei = 0;
+            phi = dimensionedScalar("phi", phi.dimensions(), 0);
+            forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+            {
+                phaseModel& phase = iter();
+
+                phase.phi() =
+                    phiHbyAs[phasei]
+                  + rAlphaAUfs[phasei]*mSfGradp/fvc::interpolate(phase.rho());
+                phi +=
+                    alphafs[phasei]*phiHbyAs[phasei]
+                  + mag(alphafs[phasei]*rAlphaAUfs[phasei])
+                   *mSfGradp/fvc::interpolate(phase.rho());
+
+                phasei++;
+            }
+
+            // dgdt =
+
+            // (
+            //     pos(alpha2)*(pEqnComp2 & p)/rho2
+            //   - pos(alpha1)*(pEqnComp1 & p)/rho1
+            // );
+
+            p_rgh.relax();
+
+            p = p_rgh + rho*gh;
+
+            mSfGradp = pEqnIncomp.flux()/rAUf;
+
+            phasei = 0;
+            forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+            {
+                phaseModel& phase = iter();
+
+                phase.U() =
+                    HbyAs[phasei]
+                  + fvc::reconstruct
+                    (
+                        rAlphaAUfs[phasei]
+                       *(
+                            fvc::interpolate(phase.rho() - rho)
+                           *(g & mesh.Sf())
+                          - ghSnGradRho
+                          + mSfGradp
+                        )
+                    )/phase.rho();
+
+                phase.U().correctBoundaryConditions();
+
+                phasei++;
+            }
+        }
+    }
+
+    //p = max(p, pMin);
+
+    // rho1 = rho10 + psi1*p_rgh;
+    // rho2 = rho20 + psi2*p_rgh;
+
+    // Dp1Dt = fvc::DDt(phi1, p_rgh);
+    // Dp2Dt = fvc::DDt(phi2, p_rgh);
+}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
new file mode 100644
index 0000000000..cb90ee1196
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
@@ -0,0 +1,143 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    reactingMultiphaseEulerFoam
+
+Description
+    Solver for a system of any number of compressible fluid phases with a
+    common pressure, but otherwise separate properties. The type of phase model
+    is run time selectable and can optionally represent multiple species and
+    in-phase reactions. The phase system is also run time selectable and can
+    optionally represent different types of momentun, heat and mass transfer.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "multiphaseSystem.H"
+#include "fixedFluxPressureFvPatchScalarField.H"
+#include "pimpleControl.H"
+#include "localEulerDdtScheme.H"
+#include "fvcSmooth.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+
+    #include "createTime.H"
+    #include "createMesh.H"
+
+    pimpleControl pimple(mesh);
+
+    #include "createTimeControls.H"
+    #include "createRDeltaT.H"
+    #include "createFields.H"
+
+    if (!LTS)
+    {
+        #include "CourantNo.H"
+        #include "setInitialDeltaT.H"
+    }
+
+    // Switch faceMomentum
+    // (
+    //     pimple.dict().lookupOrDefault<Switch>("faceMomentum", false)
+    // );
+
+    // Switch implicitPhasePressure
+    // (
+    //     mesh.solverDict(alpha1.name()).lookupOrDefault<Switch>
+    //     (
+    //         "implicitPhasePressure", false
+    //     )
+    // );
+
+    //#include "pUf/createDDtU.H"
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    Info<< "\nStarting time loop\n" << endl;
+
+    while (runTime.run())
+    {
+        #include "readTimeControls.H"
+
+        if (LTS)
+        {
+            #include "setRDeltaT.H"
+        }
+        else
+        {
+            #include "CourantNo.H"
+            #include "setDeltaT.H"
+        }
+
+        runTime++;
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
+        // --- Pressure-velocity PIMPLE corrector loop
+        while (pimple.loop())
+        {
+            fluid.solve();
+            fluid.correct();
+
+            #include "YEqns.H"
+
+            // if (faceMomentum)
+            // {
+            //     #include "pUf/UEqns.H"
+            //     #include "EEqns.H"
+            //     #include "pUf/pEqn.H"
+            //     #include "pUf/DDtU.H"
+            // }
+            // else
+            {
+                #include "pU/UEqns.H"
+                #include "EEqns.H"
+                #include "pU/pEqn.H"
+            }
+
+            fluid.correctKinematics();
+
+            if (pimple.turbCorr())
+            {
+                fluid.correctTurbulence();
+            }
+        }
+
+        runTime.write();
+
+        Info<< "ExecutionTime = "
+            << runTime.elapsedCpuTime()
+            << " s\n\n" << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
new file mode 100644
index 0000000000..3a609e41a8
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
@@ -0,0 +1,36 @@
+{
+    volScalarField& rDeltaT = trDeltaT();
+
+    scalar rDeltaTSmoothingCoeff
+    (
+        runTime.controlDict().lookupOrDefault<scalar>
+        (
+            "rDeltaTSmoothingCoeff",
+            0.02
+        )
+    );
+
+    surfaceScalarField maxPhi("maxPhi", phi);
+
+    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    {
+        maxPhi = max(maxPhi, mag(iter().phi()));
+    }
+
+    // Set the reciprocal time-step from the local Courant number
+    rDeltaT.dimensionedInternalField() = max
+    (
+        1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT),
+        fvc::surfaceSum(maxPhi)().dimensionedInternalField()
+       /((2*maxCo)*mesh.V())
+    );
+
+    // Update tho boundary values of the reciprocal time-step
+    rDeltaT.correctBoundaryConditions();
+
+    fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
+
+    Info<< "Flow time scale min/max = "
+        << gMin(1/rDeltaT.internalField())
+        << ", " << gMax(1/rDeltaT.internalField()) << endl;
+}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
index 27db7d1a36..684e5ede43 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H
@@ -50,8 +50,14 @@
 
 fluid.correctThermo();
 
-Info<< "  phase1.thermo().T(): " << min(phase1.thermo().T()).value()
-    << " - " << max(phase1.thermo().T()).value() << endl;
+Info<< phase1.name() << " min/max T "
+    << min(phase1.thermo().T()).value()
+    << " - "
+    << max(phase1.thermo().T()).value()
+    << endl;
 
-Info<< "  phase2.thermo().T(): " << min(phase2.thermo().T()).value()
-    << " - " << max(phase2.thermo().T()).value() << endl;
+Info<< phase2.name() << " min/max T "
+    << min(phase2.thermo().T()).value()
+    << " - "
+    << max(phase2.thermo().T()).value()
+    << endl;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
index 19f2d473b9..5ffc70ec84 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
@@ -237,58 +237,72 @@ while (pimple.correct())
     // Construct the compressibility parts of the pressure equation
     if (pimple.transonic())
     {
-        surfaceScalarField phid1
-        (
-            IOobject::groupName("phid", phase1.name()),
-            fvc::interpolate(psi1)*phi1
-        );
-        surfaceScalarField phid2
-        (
-            IOobject::groupName("phid", phase2.name()),
-            fvc::interpolate(psi2)*phi2
-        );
-
-        pEqnComp1 =
+        if (phase1.compressible())
+        {
+            surfaceScalarField phid1
             (
-                phase1.continuityError() - fluid.dmdt()
-              - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
-            )/rho1
-          + (alpha1/rho1)*correction
-            (
-                psi1*fvm::ddt(p_rgh)
-              + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
+                IOobject::groupName("phid", phase1.name()),
+                fvc::interpolate(psi1)*phi1
             );
-        deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
-        pEqnComp1().relax();
 
-        pEqnComp2 =
+            pEqnComp1 =
+                (
+                    phase1.continuityError() - fluid.dmdt()
+                  - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
+                )/rho1
+              + (alpha1/rho1)*correction
+                (
+                    psi1*fvm::ddt(p_rgh)
+                  + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
+                );
+
+            deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
+            pEqnComp1().relax();
+        }
+
+        if (phase2.compressible())
+        {
+            surfaceScalarField phid2
             (
-                phase2.continuityError() + fluid.dmdt()
-              - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
-            )/rho2
-          + (alpha2/rho2)*correction
-            (
-                psi2*fvm::ddt(p_rgh)
-              + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
+                IOobject::groupName("phid", phase2.name()),
+                fvc::interpolate(psi2)*phi2
             );
-        deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
-        pEqnComp2().relax();
+
+            pEqnComp2 =
+                (
+                    phase2.continuityError() + fluid.dmdt()
+                  - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
+                )/rho2
+               + (alpha2/rho2)*correction
+                (
+                    psi2*fvm::ddt(p_rgh)
+                  + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
+                );
+            deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
+            pEqnComp2().relax();
+        }
     }
     else
     {
-        pEqnComp1 =
-            (
-                phase1.continuityError() - fluid.dmdt()
-              - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
-            )/rho1
-          + (alpha1*psi1/rho1)*correction(fvm::ddt(p_rgh));
+        if (phase1.compressible())
+        {
+            pEqnComp1 =
+                (
+                    phase1.continuityError() - fluid.dmdt()
+                  - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
+                )/rho1
+              + (alpha1*psi1/rho1)*correction(fvm::ddt(p_rgh));
+        }
 
-        pEqnComp2 =
-            (
-                phase2.continuityError() + fluid.dmdt()
-              - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
-            )/rho2
-          + (alpha2*psi2/rho2)*correction(fvm::ddt(p_rgh));
+        if (phase2.compressible())
+        {
+            pEqnComp2 =
+                (
+                    phase2.continuityError() + fluid.dmdt()
+                  - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
+                )/rho2
+              + (alpha2*psi2/rho2)*correction(fvm::ddt(p_rgh));
+        }
     }
 
     // Cache p prior to solve for density update
@@ -304,11 +318,25 @@ while (pimple.correct())
           - fvm::laplacian(rAUf, p_rgh)
         );
 
-        solve
-        (
-            pEqnComp1() + pEqnComp2() + pEqnIncomp,
-            mesh.solver(p_rgh.select(pimple.finalInnerIter()))
-        );
+        {
+            fvScalarMatrix pEqn(pEqnIncomp);
+
+            if (phase1.compressible())
+            {
+                pEqn += pEqnComp1();
+            }
+
+            if (phase2.compressible())
+            {
+                pEqn += pEqnComp2();
+            }
+
+            solve
+            (
+                pEqn,
+                mesh.solver(p_rgh.select(pimple.finalInnerIter()))
+            );
+        }
 
         // Correct fluxes and velocities on last non-orthogonal iteration
         if (pimple.finalNonOrthogonalIter())
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
index ac5bbc54b1..c861bbec90 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     "div\(phi,alpha.*\)"    Gauss vanLeer;
     "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
 
-    "div\(phiAlpha.*,U.*\)" Gauss limitedLinearV 1;
+    "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
     div(Rc)                 Gauss linear;
     "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
 }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
index acf13bc703..bed046cf3a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     "div\(phi,alpha.*\)"    Gauss vanLeer;
     "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
 
-    "div\(phiAlpha.*,U.*\)" Gauss limitedLinearV 1;
+    "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
     div(Rc)                 Gauss linear;
     "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
 }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
index acf13bc703..bed046cf3a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     "div\(phi,alpha.*\)"    Gauss vanLeer;
     "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
 
-    "div\(phiAlpha.*,U.*\)" Gauss limitedLinearV 1;
+    "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
     div(Rc)                 Gauss linear;
     "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
 }
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
index acf13bc703..bed046cf3a 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
     "div\(phi,alpha.*\)"    Gauss vanLeer;
     "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
 
-    "div\(phiAlpha.*,U.*\)" Gauss limitedLinearV 1;
+    "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
     div(Rc)                 Gauss linear;
     "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
 }
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air
new file mode 100644
index 0000000000..9c0fd4206c
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.air
@@ -0,0 +1,45 @@
+/*--------------------------------*- 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      Tair;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions          [0 0 0 1 0 0 0];
+
+internalField       uniform 300;
+
+boundaryField
+{
+    walls
+    {
+        type               zeroGradient;
+    }
+    outlet
+    {
+        type               inletOutlet;
+        phi                phi.air;
+        inletValue         $internalField;
+        value              $internalField;
+    }
+    inlet
+    {
+        type               fixedValue;
+        value              $internalField;
+    }
+    frontAndBackPlanes
+    {
+        type               empty;
+    }
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water
new file mode 100644
index 0000000000..e592c501d5
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/T.water
@@ -0,0 +1,45 @@
+/*--------------------------------*- 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      Twater;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions          [0 0 0 1 0 0 0];
+
+internalField       uniform 350;
+
+boundaryField
+{
+    walls
+    {
+        type               zeroGradient;
+    }
+    outlet
+    {
+        type               inletOutlet;
+        phi                phi.water;
+        inletValue         $internalField;
+        value              $internalField;
+    }
+    inlet
+    {
+        type               fixedValue;
+        value              $internalField;
+    }
+    frontAndBackPlanes
+    {
+        type               empty;
+    }
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/Theta b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/Theta
new file mode 100644
index 0000000000..4cfbc0bbea
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/Theta
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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      Theta;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions          [0 2 -2 0 0 0 0];
+
+internalField   uniform 0.0;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 1.0e-7;
+    }
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 1.0e-7;
+        value           uniform 1.0e-7;
+    }
+
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.air
new file mode 100644
index 0000000000..e81fffac06
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.air
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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      binary;
+    class       volVectorField;
+    object      U.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0.1 0);
+
+boundaryField
+{
+    inlet
+    {
+        type               fixedValue;
+        value              $internalField;
+    }
+    outlet
+    {
+        type               pressureInletOutletVelocity;
+        phi                phi.air;
+        value              $internalField;
+    }
+    walls
+    {
+        type               fixedValue;
+        value              uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.water
new file mode 100644
index 0000000000..aab00fd78b
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/U.water
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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      binary;
+    class       volVectorField;
+    object      U.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    inlet
+    {
+        type               fixedValue;
+        value              $internalField;
+    }
+    outlet
+    {
+        type               pressureInletOutletVelocity;
+        phi                phi.water;
+        value              $internalField;
+    }
+    walls
+    {
+        type               fixedValue;
+        value              uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air
new file mode 100644
index 0000000000..1b1a35684a
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air
@@ -0,0 +1,1926 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0.5;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.air;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
new file mode 100644
index 0000000000..4472b0c635
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.air.org
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0.5;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.air;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water
new file mode 100644
index 0000000000..92b1a774aa
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water
@@ -0,0 +1,1926 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+1875
+(
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+)
+;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0.5;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.water;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water.org b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water.org
new file mode 100644
index 0000000000..75a49e4169
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/alpha.water.org
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 1;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 0.5;
+    }
+    outlet
+    {
+        type            inletOutlet;
+        phi             phi.water;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p
new file mode 100644
index 0000000000..0af317df79
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p
@@ -0,0 +1,40 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions          [1 -1 -2 0 0 0 0];
+
+internalField       uniform 1e5;
+
+boundaryField
+{
+    inlet
+    {
+        type               calculated;
+        value              $internalField;
+    }
+    outlet
+    {
+        type               calculated;
+        value              $internalField;
+    }
+    walls
+    {
+        type               calculated;
+        value              $internalField;
+    }
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
new file mode 100644
index 0000000000..de5ac9e437
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0/p_rgh
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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 1e5;
+
+boundaryField
+{
+    inlet
+    {
+        type               fixedFluxPressure;
+        value              $internalField;
+    }
+    outlet
+    {
+        type               prghPressure;
+        p                  $internalField;
+        value              $internalField;
+    }
+    walls
+    {
+        type               fixedFluxPressure;
+        value              $internalField;
+    }
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
new file mode 100644
index 0000000000..0cc222ca34
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- 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       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
new file mode 100644
index 0000000000..f7590f98f3
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -0,0 +1,169 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      phaseProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type heatAndMomentumTransferMultiphaseSystem;
+
+phases (air water);
+
+air
+{
+    type            purePhaseModel;
+    diameterModel   isothermal;
+    isothermalCoeffs
+    {
+        d0              3e-3;
+        p0              1e5;
+    }
+
+    residualAlpha   1e-6;
+}
+
+water
+{
+    type            purePhaseModel;
+    diameterModel   constant;
+    constantCoeffs
+    {
+        d               1e-4;
+    }
+
+    residualAlpha   1e-6;
+}
+
+blending
+{
+    default
+    {
+        type            linear;
+        minFullyContinuousAlpha.air 0.7;
+        minPartlyContinuousAlpha.air 0.5;
+        minFullyContinuousAlpha.water 0.7;
+        minPartlyContinuousAlpha.water 0.5;
+    }
+}
+
+surfaceTension
+(
+    (air and water)
+    {
+        type            constant;
+        sigma           0.07;
+    }
+);
+
+interfaceCompression
+();
+
+aspectRatio
+(
+    (air in water)
+    {
+        type            constant;
+        E0              1.0;
+    }
+
+    (water in air)
+    {
+        type            constant;
+        E0              1.0;
+    }
+);
+
+drag
+(
+    (air in water)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (water in air)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (air and water)
+    {
+        type            segregated;
+
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+);
+
+virtualMass
+(
+    (air in water)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (water in air)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+);
+
+heatTransfer
+(
+    (air in water)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-4;
+    }
+
+    (water in air)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-4;
+    }
+);
+
+lift
+(
+);
+
+wallLubrication
+(
+);
+
+turbulentDispersion
+(
+);
+
+// Minimum allowable pressure
+pMin            10000;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary
new file mode 100644
index 0000000000..4564ccc46a
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/polyMesh/boundary
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+4
+(
+    inlet
+    {
+        type            patch;
+        nFaces          25;
+        startFace       3650;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          25;
+        startFace       3675;
+    }
+    walls
+    {
+        type            wall;
+        inGroups        1(wall);
+        nFaces          150;
+        startFace       3700;
+    }
+    defaultFaces
+    {
+        type            empty;
+        inGroups        1(empty);
+        nFaces          3750;
+        startFace       3850;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
new file mode 100644
index 0000000000..befc0aeae4
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      thermophysicalProperties.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState perfectGas;
+    specie          specie;
+    energy          sensibleInternalEnergy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   28.9;
+    }
+    thermodynamics
+    {
+        Cp          1007;
+        Hf          0;
+    }
+    transport
+    {
+        mu          1.84e-05;
+        Pr          0.7;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
new file mode 100644
index 0000000000..c44c005d3b
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@@ -0,0 +1,54 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      thermophysicalProperties.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState perfectFluid;
+    specie          specie;
+    energy          sensibleInternalEnergy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   18;
+    }
+    equationOfState
+    {
+        R           3000;
+        rho0        1027;
+    }
+    thermodynamics
+    {
+        Cp          4195;
+        Hf          0;
+    }
+    transport
+    {
+        mu          3.645e-4;
+        Pr          2.289;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
new file mode 100644
index 0000000000..1296429b72
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
new file mode 100644
index 0000000000..7f0d75a82f
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
new file mode 100644
index 0000000000..d03967afdc
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
@@ -0,0 +1,61 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (0 0 0)
+    (0.15 0 0)
+    (0.15 1 0)
+    (0 1 0)
+    (0 0 0.1)
+    (0.15 0 0.1)
+    (0.15 1 0.1)
+    (0 1 0.1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (25 75 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+patches
+(
+    patch inlet
+    (
+        (1 5 4 0)
+    )
+    patch outlet
+    (
+        (3 7 6 2)
+    )
+    wall walls
+    (
+        (0 4 7 3)
+        (2 6 5 1)
+    )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
new file mode 100644
index 0000000000..c718db4669
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict
@@ -0,0 +1,95 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     reactingMultiphaseEulerFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         100;
+
+deltaT          0.005;
+
+writeControl    runTime;
+
+writeInterval   1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  no;
+
+maxCo           0.5;
+
+maxDeltaT       1;
+
+functions0
+{
+    fieldAverage1
+    {
+        type            fieldAverage;
+        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        outputControl   outputTime;
+        fields
+        (
+            U.air
+            {
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
+            }
+
+            U.water
+            {
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
+            }
+
+            alpha.air
+            {
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
+            }
+
+            p
+            {
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
+            }
+        );
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
new file mode 100644
index 0000000000..3560150851
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@@ -0,0 +1,63 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default                         none;
+
+    div(phi,alpha.air)              Gauss vanLeer;
+    div(phi,alpha.water)            Gauss vanLeer;
+    div(phir,alpha.water,alpha.air) Gauss vanLeer;
+    div(phir,alpha.air,alpha.water) Gauss vanLeer;
+
+    "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
+    "div\(phi.*,U.*\)"              Gauss limitedLinearV 1;
+
+    "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
+    "div\(alphaPhi.*,p\)"           Gauss limitedLinear 1;
+
+    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear uncorrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         uncorrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
new file mode 100644
index 0000000000..06c5db7aee
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution
@@ -0,0 +1,82 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.*"
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 2;
+    }
+
+    p_rgh
+    {
+        solver          GAMG;
+        smoother        DIC;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        nFinestSweeps   2;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+        tolerance       1e-8;
+        relTol          0;
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        relTol          0;
+    }
+
+    "U.*"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-5;
+        relTol          0;
+        minIter         1;
+    }
+
+    "e.*"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
+        minIter         1;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors 3;
+    nCorrectors      1;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    equations
+    {
+        ".*"            1;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
new file mode 100644
index 0000000000..93d742ba74
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
@@ -0,0 +1,36 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha.air 1
+);
+
+regions
+(
+    boxToCell
+    {
+        box (0 0 -0.1) (0.15 0.701 0.1);
+        fieldValues
+        (
+            volScalarFieldValue alpha.air 0
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U
new file mode 100644
index 0000000000..b82b7ce18a
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    rightWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    atmosphere
+    {
+        type            fluxCorrectedVelocity;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.air
new file mode 100644
index 0000000000..abef789c9c
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.air
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      U.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    rightWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    atmosphere
+    {
+        type            fluxCorrectedVelocity;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.mercury
new file mode 100644
index 0000000000..c9a998697d
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.mercury
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      U.mercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    rightWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    atmosphere
+    {
+        type            fluxCorrectedVelocity;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.oil
new file mode 100644
index 0000000000..1820dbd6d6
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.oil
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      U.oil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    rightWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    atmosphere
+    {
+        type            fluxCorrectedVelocity;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.water
new file mode 100644
index 0000000000..4977c8a6d5
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.water
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      Uwater;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    rightWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    atmosphere
+    {
+        type            fluxCorrectedVelocity;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.air
new file mode 100644
index 0000000000..be8307fdf2
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.air
@@ -0,0 +1,79 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            alphaContactAngle;
+        thetaProperties
+        (
+            ( water air ) 90 0 0 0
+            ( oil air ) 90 0 0 0
+            ( mercury air ) 90 0 0 0
+            ( water oil ) 90 0 0 0
+            ( water mercury ) 90 0 0 0
+            ( oil mercury ) 90 0 0 0
+        );
+        value           uniform 0;
+    }
+    rightWall
+    {
+        type            alphaContactAngle;
+        thetaProperties
+        (
+            ( water air ) 90 0 0 0
+            ( oil air ) 90 0 0 0
+            ( mercury air ) 90 0 0 0
+            ( water oil ) 90 0 0 0
+            ( water mercury ) 90 0 0 0
+            ( oil mercury ) 90 0 0 0
+        );
+        value           uniform 1;
+    }
+    lowerWall
+    {
+        type            alphaContactAngle;
+        thetaProperties
+        (
+            ( water air ) 90 0 0 0
+            ( oil air ) 90 0 0 0
+            ( mercury air ) 90 0 0 0
+            ( water oil ) 90 0 0 0
+            ( water mercury ) 90 0 0 0
+            ( oil mercury ) 90 0 0 0
+        );
+        value           uniform 0;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.mercury
new file mode 100644
index 0000000000..d224de9509
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.mercury
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.mercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.oil
new file mode 100644
index 0000000000..bfcff63aed
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.oil
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.oil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.water
new file mode 100644
index 0000000000..cf96bb9d9f
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.water
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alphas b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alphas
new file mode 100644
index 0000000000..10e3ea7a07
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alphas
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alphas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            zeroGradient;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/p_rgh
new file mode 100644
index 0000000000..22671e295d
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/p_rgh
@@ -0,0 +1,59 @@
+/*--------------------------------*- 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 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    rightWall
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    lowerWall
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    atmosphere
+    {
+        type            totalPressure;
+        p0              uniform 0;
+        U               U.air;
+        phi             phi.air;
+        rho             rho;
+        psi             none;
+        gamma           1;
+        value           uniform 0;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allclean
new file mode 100755
index 0000000000..7ac8041872
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allclean
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+\rm -rf 0
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allrun
new file mode 100755
index 0000000000..81cae15eab
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allrun
@@ -0,0 +1,17 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Set application name
+application=`getApplication`
+
+\rm -rf 0
+cp -r 0.org 0
+
+runApplication blockMesh
+runApplication setFields
+runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/g
new file mode 100644
index 0000000000..0cc222ca34
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- 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       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/motionProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/motionProperties
new file mode 100644
index 0000000000..93e0701984
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/motionProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      motionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+movingFvMesh    staticFvMesh;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/polyMesh/boundary
new file mode 100644
index 0000000000..79ef3a79e1
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/polyMesh/boundary
@@ -0,0 +1,56 @@
+/*--------------------------------*- 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       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+5
+(
+    leftWall
+    {
+        type            wall;
+        inGroups        1(wall);
+        nFaces          50;
+        startFace       4432;
+    }
+    rightWall
+    {
+        type            wall;
+        inGroups        1(wall);
+        nFaces          50;
+        startFace       4482;
+    }
+    lowerWall
+    {
+        type            wall;
+        inGroups        1(wall);
+        nFaces          62;
+        startFace       4532;
+    }
+    atmosphere
+    {
+        type            patch;
+        nFaces          46;
+        startFace       4594;
+    }
+    defaultFaces
+    {
+        type            empty;
+        inGroups        1(empty);
+        nFaces          4536;
+        startFace       4640;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/transportProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/transportProperties
new file mode 100644
index 0000000000..c74003969a
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/transportProperties
@@ -0,0 +1,236 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phases
+(
+     water
+     {
+         nu         1e-06;
+         kappa      1e-06;
+         Cp         4195;
+         rho        1000;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d               1e-3;
+         }
+     }
+
+     oil
+     {
+         nu         1e-06;
+         kappa      1e-06;
+         Cp         4195;
+         rho        500;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d               1e-3;
+         }
+     }
+
+     mercury
+     {
+         nu         1.125e-07;
+         kappa      1e-06;
+         Cp         4195;
+         rho        13529;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d               1e-3;
+         }
+     }
+
+     air
+     {
+         nu         1.48e-05;
+         kappa      2.63e-2;
+         Cp         1007;
+         rho        1;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d              3e-3;
+         }
+     }
+);
+
+sigmas
+(
+    (air water)     0.07
+    (air oil)       0.07
+    (air mercury)   0.07
+);
+
+interfaceCompression
+(
+    (air water)     1
+    (air oil)       1
+    (air mercury)   1
+);
+
+virtualMass
+(
+);
+
+drag
+(
+    (air water)
+    {
+        type blended;
+
+        air
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        water
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+
+    (air oil)
+    {
+        type blended;
+
+        air
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        oil
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+
+    (air mercury)
+    {
+        type blended;
+
+        air
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        mercury
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+
+    (water oil)
+    {
+        type blended;
+
+        water
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        oil
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+
+    (water mercury)
+    {
+        type blended;
+
+        water
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        mercury
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+
+    (oil mercury)
+    {
+        type blended;
+
+        oil
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        mercury
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+);
+
+
+// This is a dummy to support the Smagorinsky model
+transportModel  Newtonian;
+nu              [0 2 -1 0 0 0 0] 0;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties
new file mode 100644
index 0000000000..c2c3b28a1b
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/blockMeshDict
new file mode 100644
index 0000000000..11344be6ac
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/blockMeshDict
@@ -0,0 +1,108 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.146;
+
+vertices
+(
+    (0 0 0)
+    (2 0 0)
+    (2.16438 0 0)
+    (4 0 0)
+    (0 0.32876 0)
+    (2 0.32876 0)
+    (2.16438 0.32876 0)
+    (4 0.32876 0)
+    (0 4 0)
+    (2 4 0)
+    (2.16438 4 0)
+    (4 4 0)
+    (0 0 0.1)
+    (2 0 0.1)
+    (2.16438 0 0.1)
+    (4 0 0.1)
+    (0 0.32876 0.1)
+    (2 0.32876 0.1)
+    (2.16438 0.32876 0.1)
+    (4 0.32876 0.1)
+    (0 4 0.1)
+    (2 4 0.1)
+    (2.16438 4 0.1)
+    (4 4 0.1)
+);
+
+blocks
+(
+    hex (0 1 5 4 12 13 17 16) (23 8 1) simpleGrading (1 1 1)
+    hex (2 3 7 6 14 15 19 18) (19 8 1) simpleGrading (1 1 1)
+    hex (4 5 9 8 16 17 21 20) (23 42 1) simpleGrading (1 1 1)
+    hex (5 6 10 9 17 18 22 21) (4 42 1) simpleGrading (1 1 1)
+    hex (6 7 11 10 18 19 23 22) (19 42 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    leftWall
+    {
+        type wall;
+        faces
+        (
+            (0 12 16 4)
+            (4 16 20 8)
+        );
+    }
+    rightWall
+    {
+        type wall;
+        faces
+        (
+            (7 19 15 3)
+            (11 23 19 7)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 1 13 12)
+            (1 5 17 13)
+            (5 6 18 17)
+            (2 14 18 6)
+            (2 3 15 14)
+        );
+    }
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (8 20 21 9)
+            (9 21 22 10)
+            (10 22 23 11)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/controlDict
new file mode 100644
index 0000000000..bb472a3e63
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/controlDict
@@ -0,0 +1,56 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     reactingMultiphaseEulerFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         6;
+
+deltaT          0.001;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.05;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.5;
+maxAlphaCo      0.5;
+
+maxDeltaT       1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/decomposeParDict
new file mode 100644
index 0000000000..652d42b195
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/decomposeParDict
@@ -0,0 +1,45 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 4;
+
+method          simple;
+
+simpleCoeffs
+{
+    n               (2 2 1);
+    delta           0.001;
+}
+
+hierarchicalCoeffs
+{
+    n               (1 1 1);
+    delta           0.001;
+    order           xyz;
+}
+
+manualCoeffs
+{
+    dataFile        "";
+}
+
+distributed     no;
+
+roots           ( );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes
new file mode 100644
index 0000000000..bed046cf3a
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes
@@ -0,0 +1,53 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    "div\(phi,alpha.*\)"    Gauss vanLeer;
+    "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
+
+    "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
+    div(Rc)                 Gauss linear;
+    "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSolution
new file mode 100644
index 0000000000..831f8a3740
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSolution
@@ -0,0 +1,98 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.*"
+    {
+        nAlphaSubCycles 3;
+    }
+
+    p_rgh
+    {
+        solver          GAMG;
+        tolerance       1e-7;
+        relTol          0.05;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        nFinestSweeps   2;
+        cacheAgglomeration on;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    p_rghFinal
+    {
+        solver          PCG;
+        preconditioner
+        {
+            preconditioner  GAMG;
+            tolerance       1e-7;
+            relTol          0;
+            nVcycles        2;
+            smoother        GaussSeidel;
+            nPreSweeps      0;
+            nPostSweeps     2;
+            nFinestSweeps   2;
+            cacheAgglomeration on;
+            nCellsInCoarsestLevel 10;
+            agglomerator    faceAreaPair;
+            mergeLevels     1;
+        }
+        tolerance       1e-7;
+        relTol          0;
+        maxIter         20;
+    }
+
+    pcorr
+    {
+        $p_rghFinal;
+        tolerance       1e-5;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-8;
+        relTol          0.1;
+        nSweeps         1;
+    }
+
+    UFinal
+    {
+        $U;
+        tolerance       1e-7;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    nCorrectors     3;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    "U.*"           1;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/setFieldsDict
new file mode 100644
index 0000000000..b277afb1c5
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/setFieldsDict
@@ -0,0 +1,65 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha.air 1
+    volScalarFieldValue alpha.water 0
+    volScalarFieldValue alpha.oil 0
+    volScalarFieldValue alpha.mercury 0
+    volVectorFieldValue U (0 0 0)
+);
+
+regions
+(
+    boxToCell
+    {
+        box (0 0 -1) (0.1461 0.292 1);
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 1
+            volScalarFieldValue alpha.oil 0
+            volScalarFieldValue alpha.mercury 0
+            volScalarFieldValue alpha.air 0
+        );
+    }
+    boxToCell
+    {
+        box (0.1461 0 -1) (0.2922 0.292 1);
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 0
+            volScalarFieldValue alpha.oil 1
+            volScalarFieldValue alpha.mercury 0
+            volScalarFieldValue alpha.air 0
+        );
+    }
+    boxToCell
+    {
+        box (0 0 -1) (0.1461 0.1 1);
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 0
+            volScalarFieldValue alpha.oil 0
+            volScalarFieldValue alpha.mercury 1
+            volScalarFieldValue alpha.air 0
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U
new file mode 100644
index 0000000000..b82b7ce18a
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    rightWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    atmosphere
+    {
+        type            fluxCorrectedVelocity;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.air
new file mode 100644
index 0000000000..abef789c9c
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.air
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      U.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    rightWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    atmosphere
+    {
+        type            fluxCorrectedVelocity;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.mercury
new file mode 100644
index 0000000000..c9a998697d
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.mercury
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      U.mercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    rightWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    atmosphere
+    {
+        type            fluxCorrectedVelocity;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.oil
new file mode 100644
index 0000000000..1820dbd6d6
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.oil
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      U.oil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    rightWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    atmosphere
+    {
+        type            fluxCorrectedVelocity;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.water
new file mode 100644
index 0000000000..4977c8a6d5
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.water
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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       volVectorField;
+    location    "0";
+    object      Uwater;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    rightWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    atmosphere
+    {
+        type            fluxCorrectedVelocity;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.air
new file mode 100644
index 0000000000..be8307fdf2
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.air
@@ -0,0 +1,79 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            alphaContactAngle;
+        thetaProperties
+        (
+            ( water air ) 90 0 0 0
+            ( oil air ) 90 0 0 0
+            ( mercury air ) 90 0 0 0
+            ( water oil ) 90 0 0 0
+            ( water mercury ) 90 0 0 0
+            ( oil mercury ) 90 0 0 0
+        );
+        value           uniform 0;
+    }
+    rightWall
+    {
+        type            alphaContactAngle;
+        thetaProperties
+        (
+            ( water air ) 90 0 0 0
+            ( oil air ) 90 0 0 0
+            ( mercury air ) 90 0 0 0
+            ( water oil ) 90 0 0 0
+            ( water mercury ) 90 0 0 0
+            ( oil mercury ) 90 0 0 0
+        );
+        value           uniform 1;
+    }
+    lowerWall
+    {
+        type            alphaContactAngle;
+        thetaProperties
+        (
+            ( water air ) 90 0 0 0
+            ( oil air ) 90 0 0 0
+            ( mercury air ) 90 0 0 0
+            ( water oil ) 90 0 0 0
+            ( water mercury ) 90 0 0 0
+            ( oil mercury ) 90 0 0 0
+        );
+        value           uniform 0;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 1;
+        value           uniform 1;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury
new file mode 100644
index 0000000000..d224de9509
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.mercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.oil
new file mode 100644
index 0000000000..bfcff63aed
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.oil
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.oil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.water
new file mode 100644
index 0000000000..cf96bb9d9f
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.water
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alphas b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alphas
new file mode 100644
index 0000000000..10e3ea7a07
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alphas
@@ -0,0 +1,47 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      alphas;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            zeroGradient;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/p_rgh
new file mode 100644
index 0000000000..cfabea4db1
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/p_rgh
@@ -0,0 +1,59 @@
+/*--------------------------------*- 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 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    rightWall
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    lowerWall
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+
+    atmosphere
+    {
+        type            totalPressure;
+        p0              uniform 0;
+        U               U;
+        phi             phi;
+        rho             rho;
+        psi             none;
+        gamma           1;
+        value           uniform 0;
+    }
+
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allclean b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allclean
new file mode 100755
index 0000000000..7ac8041872
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allclean
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+\rm -rf 0
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allrun
new file mode 100755
index 0000000000..33fca4c7bd
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allrun
@@ -0,0 +1,19 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Set application name
+application=`getApplication`
+
+\rm -rf 0
+cp -r 0.org 0
+
+runApplication blockMesh
+runApplication setFields
+runApplication decomposePar
+runParallel $application 4
+runApplication reconstructPar
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/g
new file mode 100644
index 0000000000..0cc222ca34
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- 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       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/motionProperties
new file mode 100644
index 0000000000..93e0701984
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/motionProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      motionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+movingFvMesh    staticFvMesh;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary
new file mode 100644
index 0000000000..f1ec545053
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary
@@ -0,0 +1,56 @@
+/*--------------------------------*- 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       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+5
+(
+    leftWall
+    {
+        type            wall;
+        inGroups        1(wall);
+        nFaces          195;
+        startFace       68014;
+    }
+    rightWall
+    {
+        type            wall;
+        inGroups        1(wall);
+        nFaces          195;
+        startFace       68209;
+    }
+    lowerWall
+    {
+        type            wall;
+        inGroups        1(wall);
+        nFaces          206;
+        startFace       68404;
+    }
+    atmosphere
+    {
+        type            patch;
+        nFaces          176;
+        startFace       68610;
+    }
+    defaultFaces
+    {
+        type            empty;
+        inGroups        1(empty);
+        nFaces          68400;
+        startFace       68786;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/transportProperties
new file mode 100644
index 0000000000..c74003969a
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/transportProperties
@@ -0,0 +1,236 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phases
+(
+     water
+     {
+         nu         1e-06;
+         kappa      1e-06;
+         Cp         4195;
+         rho        1000;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d               1e-3;
+         }
+     }
+
+     oil
+     {
+         nu         1e-06;
+         kappa      1e-06;
+         Cp         4195;
+         rho        500;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d               1e-3;
+         }
+     }
+
+     mercury
+     {
+         nu         1.125e-07;
+         kappa      1e-06;
+         Cp         4195;
+         rho        13529;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d               1e-3;
+         }
+     }
+
+     air
+     {
+         nu         1.48e-05;
+         kappa      2.63e-2;
+         Cp         1007;
+         rho        1;
+
+         diameterModel constant;
+         constantCoeffs
+         {
+             d              3e-3;
+         }
+     }
+);
+
+sigmas
+(
+    (air water)     0.07
+    (air oil)       0.07
+    (air mercury)   0.07
+);
+
+interfaceCompression
+(
+    (air water)     1
+    (air oil)       1
+    (air mercury)   1
+);
+
+virtualMass
+(
+);
+
+drag
+(
+    (air water)
+    {
+        type blended;
+
+        air
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        water
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+
+    (air oil)
+    {
+        type blended;
+
+        air
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        oil
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+
+    (air mercury)
+    {
+        type blended;
+
+        air
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        mercury
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+
+    (water oil)
+    {
+        type blended;
+
+        water
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        oil
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+
+    (water mercury)
+    {
+        type blended;
+
+        water
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        mercury
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+
+    (oil mercury)
+    {
+        type blended;
+
+        oil
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        mercury
+        {
+            type SchillerNaumann;
+            residualPhaseFraction 0;
+            residualSlip 0;
+        }
+
+        residualPhaseFraction 1e-3;
+        residualSlip 1e-3;
+    }
+);
+
+
+// This is a dummy to support the Smagorinsky model
+transportModel  Newtonian;
+nu              [0 2 -1 0 0 0 0] 0;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
new file mode 100644
index 0000000000..c2c3b28a1b
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/blockMeshDict
new file mode 100644
index 0000000000..fd11bf53fd
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/blockMeshDict
@@ -0,0 +1,108 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.146;
+
+vertices
+(
+    (0 0 0)
+    (2 0 0)
+    (2.16438 0 0)
+    (4 0 0)
+    (0 0.32876 0)
+    (2 0.32876 0)
+    (2.16438 0.32876 0)
+    (4 0.32876 0)
+    (0 4 0)
+    (2 4 0)
+    (2.16438 4 0)
+    (4 4 0)
+    (0 0 0.1)
+    (2 0 0.1)
+    (2.16438 0 0.1)
+    (4 0 0.1)
+    (0 0.32876 0.1)
+    (2 0.32876 0.1)
+    (2.16438 0.32876 0.1)
+    (4 0.32876 0.1)
+    (0 4 0.1)
+    (2 4 0.1)
+    (2.16438 4 0.1)
+    (4 4 0.1)
+);
+
+blocks
+(
+    hex (0 1 5 4 12 13 17 16) (92 15 1) simpleGrading (1 1 1)
+    hex (2 3 7 6 14 15 19 18) (76 15 1) simpleGrading (1 1 1)
+    hex (4 5 9 8 16 17 21 20) (92 180 1) simpleGrading (1 1 1)
+    hex (5 6 10 9 17 18 22 21) (8 180 1) simpleGrading (1 1 1)
+    hex (6 7 11 10 18 19 23 22) (76 180 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    leftWall
+    {
+        type wall;
+        faces
+        (
+            (0 12 16 4)
+            (4 16 20 8)
+        );
+    }
+    rightWall
+    {
+        type wall;
+        faces
+        (
+            (7 19 15 3)
+            (11 23 19 7)
+        );
+    }
+    lowerWall
+    {
+        type wall;
+        faces
+        (
+            (0 1 13 12)
+            (1 5 17 13)
+            (5 6 18 17)
+            (2 14 18 6)
+            (2 3 15 14)
+        );
+    }
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (8 20 21 9)
+            (9 21 22 10)
+            (10 22 23 11)
+        );
+    }
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/controlDict
new file mode 100644
index 0000000000..be82da29a5
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/controlDict
@@ -0,0 +1,56 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     reactingMultiphaseEulerFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         6;
+
+deltaT          0.001;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.01;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.5;
+maxAlphaCo      0.5;
+
+maxDeltaT       1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/decomposeParDict
new file mode 100644
index 0000000000..652d42b195
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/decomposeParDict
@@ -0,0 +1,45 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 4;
+
+method          simple;
+
+simpleCoeffs
+{
+    n               (2 2 1);
+    delta           0.001;
+}
+
+hierarchicalCoeffs
+{
+    n               (1 1 1);
+    delta           0.001;
+    order           xyz;
+}
+
+manualCoeffs
+{
+    dataFile        "";
+}
+
+distributed     no;
+
+roots           ( );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSchemes
new file mode 100644
index 0000000000..bed046cf3a
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSchemes
@@ -0,0 +1,53 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    "div\(phi,alpha.*\)"    Gauss vanLeer;
+    "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
+
+    "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
+    div(Rc)                 Gauss linear;
+    "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSolution
new file mode 100644
index 0000000000..831f8a3740
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSolution
@@ -0,0 +1,98 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.*"
+    {
+        nAlphaSubCycles 3;
+    }
+
+    p_rgh
+    {
+        solver          GAMG;
+        tolerance       1e-7;
+        relTol          0.05;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        nFinestSweeps   2;
+        cacheAgglomeration on;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    p_rghFinal
+    {
+        solver          PCG;
+        preconditioner
+        {
+            preconditioner  GAMG;
+            tolerance       1e-7;
+            relTol          0;
+            nVcycles        2;
+            smoother        GaussSeidel;
+            nPreSweeps      0;
+            nPostSweeps     2;
+            nFinestSweeps   2;
+            cacheAgglomeration on;
+            nCellsInCoarsestLevel 10;
+            agglomerator    faceAreaPair;
+            mergeLevels     1;
+        }
+        tolerance       1e-7;
+        relTol          0;
+        maxIter         20;
+    }
+
+    pcorr
+    {
+        $p_rghFinal;
+        tolerance       1e-5;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-8;
+        relTol          0.1;
+        nSweeps         1;
+    }
+
+    UFinal
+    {
+        $U;
+        tolerance       1e-7;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    nCorrectors     3;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    "U.*"           1;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/setFieldsDict
new file mode 100644
index 0000000000..b277afb1c5
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/setFieldsDict
@@ -0,0 +1,65 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha.air 1
+    volScalarFieldValue alpha.water 0
+    volScalarFieldValue alpha.oil 0
+    volScalarFieldValue alpha.mercury 0
+    volVectorFieldValue U (0 0 0)
+);
+
+regions
+(
+    boxToCell
+    {
+        box (0 0 -1) (0.1461 0.292 1);
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 1
+            volScalarFieldValue alpha.oil 0
+            volScalarFieldValue alpha.mercury 0
+            volScalarFieldValue alpha.air 0
+        );
+    }
+    boxToCell
+    {
+        box (0.1461 0 -1) (0.2922 0.292 1);
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 0
+            volScalarFieldValue alpha.oil 1
+            volScalarFieldValue alpha.mercury 0
+            volScalarFieldValue alpha.air 0
+        );
+    }
+    boxToCell
+    {
+        box (0 0 -1) (0.1461 0.1 1);
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 0
+            volScalarFieldValue alpha.oil 0
+            volScalarFieldValue alpha.mercury 1
+            volScalarFieldValue alpha.air 0
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.air
new file mode 100644
index 0000000000..328ba98e8d
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.air
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      T.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+        value           uniform 300;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+        value           uniform 300;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.mercury
new file mode 100644
index 0000000000..7e5ba636aa
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.mercury
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      T.mercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+        value           uniform 300;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+        value           uniform 300;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.oil
new file mode 100644
index 0000000000..bd22fff2fe
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.oil
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      T.oil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+        value           uniform 300;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+        value           uniform 300;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.water
new file mode 100644
index 0000000000..0671cbf1ad
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/T.water
@@ -0,0 +1,48 @@
+/*--------------------------------*- 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;
+    location    "0";
+    object      T.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0];
+
+internalField   uniform 300;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+        value           uniform 300;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+        value           uniform 300;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/Theta b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/Theta
new file mode 100644
index 0000000000..b18d202df8
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/Theta
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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      Theta;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air
new file mode 100644
index 0000000000..6c91343655
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.air
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury
new file mode 100644
index 0000000000..44441b84d8
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.mercury
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U.mercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil
new file mode 100644
index 0000000000..9f6f8f999c
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.oil
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U.oil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water
new file mode 100644
index 0000000000..65f9af410b
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/U.water
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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       volVectorField;
+    object      U.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    stator
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
new file mode 100644
index 0000000000..1b2bf4793d
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.air
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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      alpha.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.1;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.mercury
new file mode 100644
index 0000000000..a75393eb38
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.mercury
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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      alpha.mercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.1;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.oil
new file mode 100644
index 0000000000..fe67cfa6ad
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.oil
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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      alpha.oil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.1;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.water
new file mode 100644
index 0000000000..8e47199187
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/alpha.water
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.7;
+
+boundaryField
+{
+    rotor
+    {
+        type            zeroGradient;
+    }
+
+    stator
+    {
+        type            zeroGradient;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p
new file mode 100644
index 0000000000..515add92db
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions          [1 -1 -2 0 0 0 0];
+
+internalField       uniform 1e5;
+
+boundaryField
+{
+    rotor
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    stator
+    {
+        type            calculated;
+        value           $internalField;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
new file mode 100644
index 0000000000..1e32488272
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0/p_rgh
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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 0;
+
+boundaryField
+{
+    rotor
+    {
+        type            fixedFluxPressure;
+        value           $internalField;
+    }
+
+    stator
+    {
+        type            fixedFluxPressure;
+        value           $internalField;
+    }
+
+    front
+    {
+        type            empty;
+    }
+
+    back
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
new file mode 100755
index 0000000000..349ea685ea
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun
@@ -0,0 +1,12 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication ./makeMesh
+runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
new file mode 100644
index 0000000000..c604aa7e2c
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
@@ -0,0 +1,31 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      MRFProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+MRF1
+{
+    cellZone    rotor;
+    active      yes;
+
+    // Fixed patches (by default they 'move' with the MRF zone)
+    nonRotatingPatches ();
+
+    origin    (0 0 0);
+    axis      (0 0 1);
+    omega     constant 10.472;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
new file mode 100644
index 0000000000..508d658494
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- 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       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 0);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
new file mode 100644
index 0000000000..a2f2f7ba11
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -0,0 +1,456 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      phaseProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+type heatAndMomentumTransferMultiphaseSystem;
+
+phases (water oil mercury air);
+
+water
+{
+    type            purePhaseModel;
+    diameterModel   constant;
+    constantCoeffs
+    {
+        d               1e-3;
+    }
+
+    residualAlpha 1e-3;
+}
+
+oil
+{
+    type            purePhaseModel;
+    diameterModel constant;
+    constantCoeffs
+    {
+        d               1e-3;
+    }
+
+    residualAlpha 1e-3;
+}
+
+mercury
+{
+    type            purePhaseModel;
+    diameterModel constant;
+    constantCoeffs
+    {
+        d               1e-3;
+    }
+
+    residualAlpha 1e-3;
+}
+
+air
+{
+    type            purePhaseModel;
+    diameterModel   isothermal;
+    isothermalCoeffs
+    {
+        d0              1e-3;
+        p0              1e5;
+    }
+
+    residualAlpha 1e-3;
+}
+
+blending
+{
+    default
+    {
+        type            linear;
+        minFullyContinuousAlpha.water 0.7;
+        minPartlyContinuousAlpha.water 0.5;
+        minFullyContinuousAlpha.oil 0.7;
+        minPartlyContinuousAlpha.oil 0.5;
+        minFullyContinuousAlpha.mercury 0.7;
+        minPartlyContinuousAlpha.mercury 0.5;
+        minFullyContinuousAlpha.air 0.7;
+        minPartlyContinuousAlpha.air 0.5;
+    }
+}
+
+surfaceTension
+(
+    (air and water)
+    {
+        type            constant;
+        sigma           0.07;
+    }
+    (air and oil)
+    {
+        type            constant;
+        sigma           0.07;
+    }
+    (air and mercury)
+    {
+        type            constant;
+        sigma           0.07;
+    }
+    (water and oil)
+    {
+        type            constant;
+        sigma           0;
+    }
+    (water and mercury)
+    {
+        type            constant;
+        sigma           0;
+    }
+    (oil and mercury)
+    {
+        type            constant;
+        sigma           0;
+    }
+);
+
+interfaceCompression
+(
+    (air and water)     0
+    (air and oil)       0
+    (air and mercury)   0
+    (water and oil)     0
+    (water and mercury) 0
+    (oil and mercury)   0
+);
+
+aspectRatio
+();
+
+drag
+(
+    (air in water)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (water in air)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (air and water)
+    {
+        type            segregated;
+
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+
+    (air in oil)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (oil in air)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (air and oil)
+    {
+        type            segregated;
+
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+
+    (air in mercury)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (mercury in air)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (air and mercury)
+    {
+        type            segregated;
+
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+
+
+    (water in oil)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (oil in water)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (water and oil)
+    {
+        type            segregated;
+
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+
+    (water in mercury)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (mercury in water)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (water and mercury)
+    {
+        type            segregated;
+
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+
+
+    (oil in mercury)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (mercury in oil)
+    {
+        type            SchillerNaumann;
+
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (oil and mercury)
+    {
+        type            segregated;
+
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+);
+
+virtualMass
+(
+    (air in water)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (air in oil)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (air in mercury)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+);
+
+heatTransfer
+(
+    (air in water)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+
+    (water in air)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+
+    (air in oil)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+
+    (oil in air)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+
+    (air in mercury)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+
+    (mercury in air)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+
+
+    (water in oil)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+
+    (oil in water)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+
+    (water in mercury)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+
+    (mercury in water)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+
+
+    (oil in mercury)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+
+    (mercury in oil)
+    {
+        type            RanzMarshall;
+        residualAlpha   1e-3;
+    }
+);
+
+wallLubrication
+();
+
+turbulentDispersion
+();
+
+// Minimum allowable pressure
+pMin            10000;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
new file mode 100644
index 0000000000..5c2a6cf99c
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/polyMesh/boundary
@@ -0,0 +1,50 @@
+/*--------------------------------*- 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       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+4
+(
+    rotor
+    {
+        type            wall;
+        inGroups        1(wall);
+        nFaces          192;
+        startFace       5952;
+    }
+    stator
+    {
+        type            wall;
+        inGroups        1(wall);
+        nFaces          192;
+        startFace       6144;
+    }
+    front
+    {
+        type            empty;
+        inGroups        1(empty);
+        nFaces          3072;
+        startFace       6336;
+    }
+    back
+    {
+        type            empty;
+        inGroups        1(empty);
+        nFaces          3072;
+        startFace       9408;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
new file mode 100644
index 0000000000..befc0aeae4
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@@ -0,0 +1,49 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      thermophysicalProperties.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState perfectGas;
+    specie          specie;
+    energy          sensibleInternalEnergy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   28.9;
+    }
+    thermodynamics
+    {
+        Cp          1007;
+        Hf          0;
+    }
+    transport
+    {
+        mu          1.84e-05;
+        Pr          0.7;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
new file mode 100644
index 0000000000..864b73f24e
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury
@@ -0,0 +1,53 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      thermophysicalProperties.oil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleInternalEnergy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   200;
+    }
+    equationOfState
+    {
+        rho         13529;
+    }
+    thermodynamics
+    {
+        Cp          135;
+        Hf          0;
+    }
+    transport
+    {
+        mu          8.6e-4;
+        Pr          111;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
new file mode 100644
index 0000000000..7c0d16aa90
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil
@@ -0,0 +1,53 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      thermophysicalProperties.oil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleInternalEnergy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   160;
+    }
+    equationOfState
+    {
+        rho         500;
+    }
+    thermodynamics
+    {
+        Cp          4195;
+        Hf          0;
+    }
+    transport
+    {
+        mu          5e-4;
+        Pr          1;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
new file mode 100644
index 0000000000..c44c005d3b
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@@ -0,0 +1,54 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      thermophysicalProperties.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState perfectFluid;
+    specie          specie;
+    energy          sensibleInternalEnergy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   18;
+    }
+    equationOfState
+    {
+        R           3000;
+        rho0        1027;
+    }
+    thermodynamics
+    {
+        Cp          4195;
+        Hf          0;
+    }
+    transport
+    {
+        mu          3.645e-4;
+        Pr          2.289;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
new file mode 100644
index 0000000000..1296429b72
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
new file mode 100644
index 0000000000..cf1ca5634d
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties.mercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
new file mode 100644
index 0000000000..eb2604b78c
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties.oil;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
new file mode 100644
index 0000000000..7f0d75a82f
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
@@ -0,0 +1,20 @@
+/*--------------------------------*- 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;
+    location    "constant";
+    object      turbulenceProperties.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/makeMesh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/makeMesh
new file mode 100755
index 0000000000..4d667956a0
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/makeMesh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+m4 < system/blockMeshDict.m4 > system/blockMeshDict
+blockMesh
+topoSet
+setsToZones -noFlipMap
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4 b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
new file mode 100644
index 0000000000..a93868498b
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/blockMeshDict.m4
@@ -0,0 +1,818 @@
+/*--------------------------------*- 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      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// General macros to create 2D/extruded-2D meshes
+
+changecom(//)changequote([,])
+define(calc, [esyscmd(perl -e 'print ($1)')])
+define(VCOUNT, 0)
+define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))])
+define(pi, 3.14159265)
+
+define(hex2D, hex ($1b $2b $3b $4b $1t $2t $3t $4t))
+define(quad2D, ($1b $2b $2t $1t))
+define(frontQuad, ($1t $2t $3t $4t))
+define(backQuad, ($1b $4b $3b $2b))
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.1;
+
+// Hub radius
+define(r, 0.2)
+
+// Impeller-tip radius
+define(rb, 0.5)
+
+// Baffle-tip radius
+define(Rb, 0.7)
+
+// Tank radius
+define(R, 1)
+
+// MRF region radius
+define(ri, calc(0.5*(rb + Rb)))
+
+// Thickness of 2D slab
+define(z, 0.1)
+
+// Base z
+define(Zb, 0)
+
+// Top z
+define(Zt, calc(Zb + z))
+
+// Number of cells radially between hub and impeller tip
+define(Nr, 12)
+
+// Number of cells radially in each of the two regions between
+// impeller and baffle tips
+define(Ni, 4)
+
+// Number of cells radially between baffle tip and tank
+define(NR, 12)
+
+// Number of cells azimuthally in each of the 8 blocks
+define(Na, 12)
+
+// Number of cells in the thickness of the slab
+define(Nz, 1)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+define(vert, (x$1$2 y$1$2 $3))
+define(evert, (ex$1$2 ey$1$2 $3))
+
+define(a0, 0)
+define(a1, -45)
+define(a2, -90)
+define(a3, -135)
+define(a4, 180)
+define(a5, 135)
+define(a6, 90)
+define(a7, 45)
+
+define(ea0, -22.5)
+define(ea1, -67.5)
+define(ea2, -112.5)
+define(ea3, -157.5)
+define(ea4, 157.5)
+define(ea5, 112.5)
+define(ea6, 67.5)
+define(ea7, 22.5)
+
+define(ca0, calc(cos((pi/180)*a0)))
+define(ca1, calc(cos((pi/180)*a1)))
+define(ca2, calc(cos((pi/180)*a2)))
+define(ca3, calc(cos((pi/180)*a3)))
+define(ca4, calc(cos((pi/180)*a4)))
+define(ca5, calc(cos((pi/180)*a5)))
+define(ca6, calc(cos((pi/180)*a6)))
+define(ca7, calc(cos((pi/180)*a7)))
+
+define(sa0, calc(sin((pi/180)*a0)))
+define(sa1, calc(sin((pi/180)*a1)))
+define(sa2, calc(sin((pi/180)*a2)))
+define(sa3, calc(sin((pi/180)*a3)))
+define(sa4, calc(sin((pi/180)*a4)))
+define(sa5, calc(sin((pi/180)*a5)))
+define(sa6, calc(sin((pi/180)*a6)))
+define(sa7, calc(sin((pi/180)*a7)))
+
+define(cea0, calc(cos((pi/180)*ea0)))
+define(cea1, calc(cos((pi/180)*ea1)))
+define(cea2, calc(cos((pi/180)*ea2)))
+define(cea3, calc(cos((pi/180)*ea3)))
+define(cea4, calc(cos((pi/180)*ea4)))
+define(cea5, calc(cos((pi/180)*ea5)))
+define(cea6, calc(cos((pi/180)*ea6)))
+define(cea7, calc(cos((pi/180)*ea7)))
+
+define(sea0, calc(sin((pi/180)*ea0)))
+define(sea1, calc(sin((pi/180)*ea1)))
+define(sea2, calc(sin((pi/180)*ea2)))
+define(sea3, calc(sin((pi/180)*ea3)))
+define(sea4, calc(sin((pi/180)*ea4)))
+define(sea5, calc(sin((pi/180)*ea5)))
+define(sea6, calc(sin((pi/180)*ea6)))
+define(sea7, calc(sin((pi/180)*ea7)))
+
+define(x00, calc(r*ca0))
+define(x01, calc(r*ca1))
+define(x02, calc(r*ca2))
+define(x03, calc(r*ca3))
+define(x04, calc(r*ca4))
+define(x05, calc(r*ca5))
+define(x06, calc(r*ca6))
+define(x07, calc(r*ca7))
+
+define(x10, calc(rb*ca0))
+define(x11, calc(rb*ca1))
+define(x12, calc(rb*ca2))
+define(x13, calc(rb*ca3))
+define(x14, calc(rb*ca4))
+define(x15, calc(rb*ca5))
+define(x16, calc(rb*ca6))
+define(x17, calc(rb*ca7))
+
+define(x20, calc(ri*ca0))
+define(x21, calc(ri*ca1))
+define(x22, calc(ri*ca2))
+define(x23, calc(ri*ca3))
+define(x24, calc(ri*ca4))
+define(x25, calc(ri*ca5))
+define(x26, calc(ri*ca6))
+define(x27, calc(ri*ca7))
+
+define(x30, calc(Rb*ca0))
+define(x31, calc(Rb*ca1))
+define(x32, calc(Rb*ca2))
+define(x33, calc(Rb*ca3))
+define(x34, calc(Rb*ca4))
+define(x35, calc(Rb*ca5))
+define(x36, calc(Rb*ca6))
+define(x37, calc(Rb*ca7))
+
+define(x40, calc(R*ca0))
+define(x41, calc(R*ca1))
+define(x42, calc(R*ca2))
+define(x43, calc(R*ca3))
+define(x44, calc(R*ca4))
+define(x45, calc(R*ca5))
+define(x46, calc(R*ca6))
+define(x47, calc(R*ca7))
+
+define(y00, calc(r*sa0))
+define(y01, calc(r*sa1))
+define(y02, calc(r*sa2))
+define(y03, calc(r*sa3))
+define(y04, calc(r*sa4))
+define(y05, calc(r*sa5))
+define(y06, calc(r*sa6))
+define(y07, calc(r*sa7))
+
+define(y10, calc(rb*sa0))
+define(y11, calc(rb*sa1))
+define(y12, calc(rb*sa2))
+define(y13, calc(rb*sa3))
+define(y14, calc(rb*sa4))
+define(y15, calc(rb*sa5))
+define(y16, calc(rb*sa6))
+define(y17, calc(rb*sa7))
+
+define(y20, calc(ri*sa0))
+define(y21, calc(ri*sa1))
+define(y22, calc(ri*sa2))
+define(y23, calc(ri*sa3))
+define(y24, calc(ri*sa4))
+define(y25, calc(ri*sa5))
+define(y26, calc(ri*sa6))
+define(y27, calc(ri*sa7))
+
+define(y30, calc(Rb*sa0))
+define(y31, calc(Rb*sa1))
+define(y32, calc(Rb*sa2))
+define(y33, calc(Rb*sa3))
+define(y34, calc(Rb*sa4))
+define(y35, calc(Rb*sa5))
+define(y36, calc(Rb*sa6))
+define(y37, calc(Rb*sa7))
+
+define(y40, calc(R*sa0))
+define(y41, calc(R*sa1))
+define(y42, calc(R*sa2))
+define(y43, calc(R*sa3))
+define(y44, calc(R*sa4))
+define(y45, calc(R*sa5))
+define(y46, calc(R*sa6))
+define(y47, calc(R*sa7))
+
+define(ex00, calc(r*cea0))
+define(ex01, calc(r*cea1))
+define(ex02, calc(r*cea2))
+define(ex03, calc(r*cea3))
+define(ex04, calc(r*cea4))
+define(ex05, calc(r*cea5))
+define(ex06, calc(r*cea6))
+define(ex07, calc(r*cea7))
+
+define(ex10, calc(rb*cea0))
+define(ex11, calc(rb*cea1))
+define(ex12, calc(rb*cea2))
+define(ex13, calc(rb*cea3))
+define(ex14, calc(rb*cea4))
+define(ex15, calc(rb*cea5))
+define(ex16, calc(rb*cea6))
+define(ex17, calc(rb*cea7))
+
+define(ex20, calc(ri*cea0))
+define(ex21, calc(ri*cea1))
+define(ex22, calc(ri*cea2))
+define(ex23, calc(ri*cea3))
+define(ex24, calc(ri*cea4))
+define(ex25, calc(ri*cea5))
+define(ex26, calc(ri*cea6))
+define(ex27, calc(ri*cea7))
+
+define(ex30, calc(Rb*cea0))
+define(ex31, calc(Rb*cea1))
+define(ex32, calc(Rb*cea2))
+define(ex33, calc(Rb*cea3))
+define(ex34, calc(Rb*cea4))
+define(ex35, calc(Rb*cea5))
+define(ex36, calc(Rb*cea6))
+define(ex37, calc(Rb*cea7))
+
+define(ex40, calc(R*cea0))
+define(ex41, calc(R*cea1))
+define(ex42, calc(R*cea2))
+define(ex43, calc(R*cea3))
+define(ex44, calc(R*cea4))
+define(ex45, calc(R*cea5))
+define(ex46, calc(R*cea6))
+define(ex47, calc(R*cea7))
+
+define(ey00, calc(r*sea0))
+define(ey01, calc(r*sea1))
+define(ey02, calc(r*sea2))
+define(ey03, calc(r*sea3))
+define(ey04, calc(r*sea4))
+define(ey05, calc(r*sea5))
+define(ey06, calc(r*sea6))
+define(ey07, calc(r*sea7))
+
+define(ey10, calc(rb*sea0))
+define(ey11, calc(rb*sea1))
+define(ey12, calc(rb*sea2))
+define(ey13, calc(rb*sea3))
+define(ey14, calc(rb*sea4))
+define(ey15, calc(rb*sea5))
+define(ey16, calc(rb*sea6))
+define(ey17, calc(rb*sea7))
+
+define(ey20, calc(ri*sea0))
+define(ey21, calc(ri*sea1))
+define(ey22, calc(ri*sea2))
+define(ey23, calc(ri*sea3))
+define(ey24, calc(ri*sea4))
+define(ey25, calc(ri*sea5))
+define(ey26, calc(ri*sea6))
+define(ey27, calc(ri*sea7))
+
+define(ey30, calc(Rb*sea0))
+define(ey31, calc(Rb*sea1))
+define(ey32, calc(Rb*sea2))
+define(ey33, calc(Rb*sea3))
+define(ey34, calc(Rb*sea4))
+define(ey35, calc(Rb*sea5))
+define(ey36, calc(Rb*sea6))
+define(ey37, calc(Rb*sea7))
+
+define(ey40, calc(R*sea0))
+define(ey41, calc(R*sea1))
+define(ey42, calc(R*sea2))
+define(ey43, calc(R*sea3))
+define(ey44, calc(R*sea4))
+define(ey45, calc(R*sea5))
+define(ey46, calc(R*sea6))
+define(ey47, calc(R*sea7))
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+vertices
+(
+    vert(0, 0, Zb) vlabel(r0b)
+    vert(0, 0, Zb) vlabel(r0sb)
+    vert(0, 1, Zb) vlabel(r1b)
+    vert(0, 2, Zb) vlabel(r2b)
+    vert(0, 2, Zb) vlabel(r2sb)
+    vert(0, 3, Zb) vlabel(r3b)
+    vert(0, 4, Zb) vlabel(r4b)
+    vert(0, 4, Zb) vlabel(r4sb)
+    vert(0, 5, Zb) vlabel(r5b)
+    vert(0, 6, Zb) vlabel(r6b)
+    vert(0, 6, Zb) vlabel(r6sb)
+    vert(0, 7, Zb) vlabel(r7b)
+
+    vert(1, 0, Zb) vlabel(rb0b)
+    vert(1, 1, Zb) vlabel(rb1b)
+    vert(1, 2, Zb) vlabel(rb2b)
+    vert(1, 3, Zb) vlabel(rb3b)
+    vert(1, 4, Zb) vlabel(rb4b)
+    vert(1, 5, Zb) vlabel(rb5b)
+    vert(1, 6, Zb) vlabel(rb6b)
+    vert(1, 7, Zb) vlabel(rb7b)
+
+    vert(2, 0, Zb) vlabel(ri0b)
+    vert(2, 1, Zb) vlabel(ri1b)
+    vert(2, 2, Zb) vlabel(ri2b)
+    vert(2, 3, Zb) vlabel(ri3b)
+    vert(2, 4, Zb) vlabel(ri4b)
+    vert(2, 5, Zb) vlabel(ri5b)
+    vert(2, 6, Zb) vlabel(ri6b)
+    vert(2, 7, Zb) vlabel(ri7b)
+
+    vert(3, 0, Zb) vlabel(Rb0b)
+    vert(3, 1, Zb) vlabel(Rb1b)
+    vert(3, 2, Zb) vlabel(Rb2b)
+    vert(3, 3, Zb) vlabel(Rb3b)
+    vert(3, 4, Zb) vlabel(Rb4b)
+    vert(3, 5, Zb) vlabel(Rb5b)
+    vert(3, 6, Zb) vlabel(Rb6b)
+    vert(3, 7, Zb) vlabel(Rb7b)
+
+    vert(4, 0, Zb) vlabel(R0b)
+    vert(4, 1, Zb) vlabel(R1b)
+    vert(4, 1, Zb) vlabel(R1sb)
+    vert(4, 2, Zb) vlabel(R2b)
+    vert(4, 3, Zb) vlabel(R3b)
+    vert(4, 3, Zb) vlabel(R3sb)
+    vert(4, 4, Zb) vlabel(R4b)
+    vert(4, 5, Zb) vlabel(R5b)
+    vert(4, 5, Zb) vlabel(R5sb)
+    vert(4, 6, Zb) vlabel(R6b)
+    vert(4, 7, Zb) vlabel(R7b)
+    vert(4, 7, Zb) vlabel(R7sb)
+
+    vert(0, 0, Zt) vlabel(r0t)
+    vert(0, 0, Zt) vlabel(r0st)
+    vert(0, 1, Zt) vlabel(r1t)
+    vert(0, 2, Zt) vlabel(r2t)
+    vert(0, 2, Zt) vlabel(r2st)
+    vert(0, 3, Zt) vlabel(r3t)
+    vert(0, 4, Zt) vlabel(r4t)
+    vert(0, 4, Zt) vlabel(r4st)
+    vert(0, 5, Zt) vlabel(r5t)
+    vert(0, 6, Zt) vlabel(r6t)
+    vert(0, 6, Zt) vlabel(r6st)
+    vert(0, 7, Zt) vlabel(r7t)
+
+    vert(1, 0, Zt) vlabel(rb0t)
+    vert(1, 1, Zt) vlabel(rb1t)
+    vert(1, 2, Zt) vlabel(rb2t)
+    vert(1, 3, Zt) vlabel(rb3t)
+    vert(1, 4, Zt) vlabel(rb4t)
+    vert(1, 5, Zt) vlabel(rb5t)
+    vert(1, 6, Zt) vlabel(rb6t)
+    vert(1, 7, Zt) vlabel(rb7t)
+
+    vert(2, 0, Zt) vlabel(ri0t)
+    vert(2, 1, Zt) vlabel(ri1t)
+    vert(2, 2, Zt) vlabel(ri2t)
+    vert(2, 3, Zt) vlabel(ri3t)
+    vert(2, 4, Zt) vlabel(ri4t)
+    vert(2, 5, Zt) vlabel(ri5t)
+    vert(2, 6, Zt) vlabel(ri6t)
+    vert(2, 7, Zt) vlabel(ri7t)
+
+    vert(3, 0, Zt) vlabel(Rb0t)
+    vert(3, 1, Zt) vlabel(Rb1t)
+    vert(3, 2, Zt) vlabel(Rb2t)
+    vert(3, 3, Zt) vlabel(Rb3t)
+    vert(3, 4, Zt) vlabel(Rb4t)
+    vert(3, 5, Zt) vlabel(Rb5t)
+    vert(3, 6, Zt) vlabel(Rb6t)
+    vert(3, 7, Zt) vlabel(Rb7t)
+
+    vert(4, 0, Zt) vlabel(R0t)
+    vert(4, 1, Zt) vlabel(R1t)
+    vert(4, 1, Zt) vlabel(R1st)
+    vert(4, 2, Zt) vlabel(R2t)
+    vert(4, 3, Zt) vlabel(R3t)
+    vert(4, 3, Zt) vlabel(R3st)
+    vert(4, 4, Zt) vlabel(R4t)
+    vert(4, 5, Zt) vlabel(R5t)
+    vert(4, 5, Zt) vlabel(R5st)
+    vert(4, 6, Zt) vlabel(R6t)
+    vert(4, 7, Zt) vlabel(R7t)
+    vert(4, 7, Zt) vlabel(R7st)
+);
+
+blocks
+(
+    // block0
+    hex2D(r0, r1, rb1, rb0)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(r1, r2s, rb2, rb1)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(r2, r3, rb3, rb2)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(r3, r4s, rb4, rb3)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(r4, r5, rb5, rb4)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(r5, r6s, rb6, rb5)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(r6, r7, rb7, rb6)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(r7, r0s, rb0, rb7)
+    rotor
+    (Na Nr Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(rb0, rb1, ri1, ri0)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(rb1, rb2, ri2, ri1)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(rb2, rb3, ri3, ri2)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(rb3, rb4, ri4, ri3)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(rb4, rb5, ri5, ri4)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(rb5, rb6, ri6, ri5)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(rb6, rb7, ri7, ri6)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(rb7, rb0, ri0, ri7)
+    rotor
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(ri0, ri1, Rb1, Rb0)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(ri1, ri2, Rb2, Rb1)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(ri2, ri3, Rb3, Rb2)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(ri3, ri4, Rb4, Rb3)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(ri4, ri5, Rb5, Rb4)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(ri5, ri6, Rb6, Rb5)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(ri6, ri7, Rb7, Rb6)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(ri7, ri0, Rb0, Rb7)
+    (Na Ni Nz)
+    simpleGrading (1 1 1)
+
+    // block0
+    hex2D(Rb0, Rb1, R1s, R0)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block1
+    hex2D(Rb1, Rb2, R2, R1)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block2
+    hex2D(Rb2, Rb3, R3s, R2)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block3
+    hex2D(Rb3, Rb4, R4, R3)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block4
+    hex2D(Rb4, Rb5, R5s, R4)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block5
+    hex2D(Rb5, Rb6, R6, R5)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block6
+    hex2D(Rb6, Rb7, R7s, R6)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+
+    // block7
+    hex2D(Rb7, Rb0, R0, R7)
+    (Na NR Nz)
+    simpleGrading (1 1 1)
+);
+
+edges
+(
+    arc r0b r1b evert(0, 0, Zb)
+    arc r1b r2sb evert(0, 1, Zb)
+    arc r2b r3b evert(0, 2, Zb)
+    arc r3b r4sb evert(0, 3, Zb)
+    arc r4b r5b evert(0, 4, Zb)
+    arc r5b r6sb evert(0, 5, Zb)
+    arc r6b r7b evert(0, 6, Zb)
+    arc r7b r0sb evert(0, 7, Zb)
+
+    arc rb0b rb1b evert(1, 0, Zb)
+    arc rb1b rb2b evert(1, 1, Zb)
+    arc rb2b rb3b evert(1, 2, Zb)
+    arc rb3b rb4b evert(1, 3, Zb)
+    arc rb4b rb5b evert(1, 4, Zb)
+    arc rb5b rb6b evert(1, 5, Zb)
+    arc rb6b rb7b evert(1, 6, Zb)
+    arc rb7b rb0b evert(1, 7, Zb)
+
+    arc ri0b ri1b evert(2, 0, Zb)
+    arc ri1b ri2b evert(2, 1, Zb)
+    arc ri2b ri3b evert(2, 2, Zb)
+    arc ri3b ri4b evert(2, 3, Zb)
+    arc ri4b ri5b evert(2, 4, Zb)
+    arc ri5b ri6b evert(2, 5, Zb)
+    arc ri6b ri7b evert(2, 6, Zb)
+    arc ri7b ri0b evert(2, 7, Zb)
+
+    arc Rb0b Rb1b evert(3, 0, Zb)
+    arc Rb1b Rb2b evert(3, 1, Zb)
+    arc Rb2b Rb3b evert(3, 2, Zb)
+    arc Rb3b Rb4b evert(3, 3, Zb)
+    arc Rb4b Rb5b evert(3, 4, Zb)
+    arc Rb5b Rb6b evert(3, 5, Zb)
+    arc Rb6b Rb7b evert(3, 6, Zb)
+    arc Rb7b Rb0b evert(3, 7, Zb)
+
+    arc R0b R1sb evert(4, 0, Zb)
+    arc R1b R2b evert(4, 1, Zb)
+    arc R2b R3sb evert(4, 2, Zb)
+    arc R3b R4b evert(4, 3, Zb)
+    arc R4b R5sb evert(4, 4, Zb)
+    arc R5b R6b evert(4, 5, Zb)
+    arc R6b R7sb evert(4, 6, Zb)
+    arc R7b R0b evert(4, 7, Zb)
+
+    arc r0t r1t evert(0, 0, Zt)
+    arc r1t r2st evert(0, 1, Zt)
+    arc r2t r3t evert(0, 2, Zt)
+    arc r3t r4st evert(0, 3, Zt)
+    arc r4t r5t evert(0, 4, Zt)
+    arc r5t r6st evert(0, 5, Zt)
+    arc r6t r7t evert(0, 6, Zt)
+    arc r7t r0st evert(0, 7, Zt)
+
+    arc rb0t rb1t evert(1, 0, Zt)
+    arc rb1t rb2t evert(1, 1, Zt)
+    arc rb2t rb3t evert(1, 2, Zt)
+    arc rb3t rb4t evert(1, 3, Zt)
+    arc rb4t rb5t evert(1, 4, Zt)
+    arc rb5t rb6t evert(1, 5, Zt)
+    arc rb6t rb7t evert(1, 6, Zt)
+    arc rb7t rb0t evert(1, 7, Zt)
+
+    arc ri0t ri1t evert(2, 0, Zt)
+    arc ri1t ri2t evert(2, 1, Zt)
+    arc ri2t ri3t evert(2, 2, Zt)
+    arc ri3t ri4t evert(2, 3, Zt)
+    arc ri4t ri5t evert(2, 4, Zt)
+    arc ri5t ri6t evert(2, 5, Zt)
+    arc ri6t ri7t evert(2, 6, Zt)
+    arc ri7t ri0t evert(2, 7, Zt)
+
+    arc Rb0t Rb1t evert(3, 0, Zt)
+    arc Rb1t Rb2t evert(3, 1, Zt)
+    arc Rb2t Rb3t evert(3, 2, Zt)
+    arc Rb3t Rb4t evert(3, 3, Zt)
+    arc Rb4t Rb5t evert(3, 4, Zt)
+    arc Rb5t Rb6t evert(3, 5, Zt)
+    arc Rb6t Rb7t evert(3, 6, Zt)
+    arc Rb7t Rb0t evert(3, 7, Zt)
+
+    arc R0t R1st evert(4, 0, Zt)
+    arc R1t R2t evert(4, 1, Zt)
+    arc R2t R3st evert(4, 2, Zt)
+    arc R3t R4t evert(4, 3, Zt)
+    arc R4t R5st evert(4, 4, Zt)
+    arc R5t R6t evert(4, 5, Zt)
+    arc R6t R7st evert(4, 6, Zt)
+    arc R7t R0t evert(4, 7, Zt)
+);
+
+patches
+(
+    wall rotor
+    (
+        quad2D(r0, r1)
+        quad2D(r1, r2s)
+        quad2D(r2, r3)
+        quad2D(r3, r4s)
+        quad2D(r4, r5)
+        quad2D(r5, r6s)
+        quad2D(r6, r7)
+        quad2D(r7, r0s)
+
+        quad2D(r0, rb0)
+        quad2D(r0s, rb0)
+
+        quad2D(r2, rb2)
+        quad2D(r2s, rb2)
+
+        quad2D(r4, rb4)
+        quad2D(r4s, rb4)
+
+        quad2D(r6, rb6)
+        quad2D(r6s, rb6)
+    )
+
+    wall stator
+    (
+        quad2D(R0, R1s)
+        quad2D(R1, R2)
+        quad2D(R2, R3s)
+        quad2D(R3, R4)
+        quad2D(R4, R5s)
+        quad2D(R5, R6)
+        quad2D(R6, R7s)
+        quad2D(R7, R0)
+
+        quad2D(R1, Rb1)
+        quad2D(R1s, Rb1)
+
+        quad2D(R3, Rb3)
+        quad2D(R3s, Rb3)
+
+        quad2D(R5, Rb5)
+        quad2D(R5s, Rb5)
+
+        quad2D(R7, Rb7)
+        quad2D(R7s, Rb7)
+    )
+
+    empty front
+    (
+        frontQuad(r0, r1, rb1, rb0)
+        frontQuad(r1, r2s, rb2, rb1)
+        frontQuad(r2, r3, rb3, rb2)
+        frontQuad(r3, r4s, rb4, rb3)
+        frontQuad(r4, r5, rb5, rb4)
+        frontQuad(r5, r6s, rb6, rb5)
+        frontQuad(r6, r7, rb7, rb6)
+        frontQuad(r7, r0s, rb0, rb7)
+        frontQuad(rb0, rb1, ri1, ri0)
+        frontQuad(rb1, rb2, ri2, ri1)
+        frontQuad(rb2, rb3, ri3, ri2)
+        frontQuad(rb3, rb4, ri4, ri3)
+        frontQuad(rb4, rb5, ri5, ri4)
+        frontQuad(rb5, rb6, ri6, ri5)
+        frontQuad(rb6, rb7, ri7, ri6)
+        frontQuad(rb7, rb0, ri0, ri7)
+        frontQuad(ri0, ri1, Rb1, Rb0)
+        frontQuad(ri1, ri2, Rb2, Rb1)
+        frontQuad(ri2, ri3, Rb3, Rb2)
+        frontQuad(ri3, ri4, Rb4, Rb3)
+        frontQuad(ri4, ri5, Rb5, Rb4)
+        frontQuad(ri5, ri6, Rb6, Rb5)
+        frontQuad(ri6, ri7, Rb7, Rb6)
+        frontQuad(ri7, ri0, Rb0, Rb7)
+        frontQuad(Rb0, Rb1, R1s, R0)
+        frontQuad(Rb1, Rb2, R2, R1)
+        frontQuad(Rb2, Rb3, R3s, R2)
+        frontQuad(Rb3, Rb4, R4, R3)
+        frontQuad(Rb4, Rb5, R5s, R4)
+        frontQuad(Rb5, Rb6, R6, R5)
+        frontQuad(Rb6, Rb7, R7s, R6)
+        frontQuad(Rb7, Rb0, R0, R7)
+    )
+
+    empty back
+    (
+        backQuad(r0, r1, rb1, rb0)
+        backQuad(r1, r2s, rb2, rb1)
+        backQuad(r2, r3, rb3, rb2)
+        backQuad(r3, r4s, rb4, rb3)
+        backQuad(r4, r5, rb5, rb4)
+        backQuad(r5, r6s, rb6, rb5)
+        backQuad(r6, r7, rb7, rb6)
+        backQuad(r7, r0s, rb0, rb7)
+        backQuad(rb0, rb1, ri1, ri0)
+        backQuad(rb1, rb2, ri2, ri1)
+        backQuad(rb2, rb3, ri3, ri2)
+        backQuad(rb3, rb4, ri4, ri3)
+        backQuad(rb4, rb5, ri5, ri4)
+        backQuad(rb5, rb6, ri6, ri5)
+        backQuad(rb6, rb7, ri7, ri6)
+        backQuad(rb7, rb0, ri0, ri7)
+        backQuad(ri0, ri1, Rb1, Rb0)
+        backQuad(ri1, ri2, Rb2, Rb1)
+        backQuad(ri2, ri3, Rb3, Rb2)
+        backQuad(ri3, ri4, Rb4, Rb3)
+        backQuad(ri4, ri5, Rb5, Rb4)
+        backQuad(ri5, ri6, Rb6, Rb5)
+        backQuad(ri6, ri7, Rb7, Rb6)
+        backQuad(ri7, ri0, Rb0, Rb7)
+        backQuad(Rb0, Rb1, R1s, R0)
+        backQuad(Rb1, Rb2, R2, R1)
+        backQuad(Rb2, Rb3, R3s, R2)
+        backQuad(Rb3, Rb4, R4, R3)
+        backQuad(Rb4, Rb5, R5s, R4)
+        backQuad(Rb5, Rb6, R6, R5)
+        backQuad(Rb6, Rb7, R7s, R6)
+        backQuad(Rb7, Rb0, R0, R7)
+    )
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
new file mode 100644
index 0000000000..8ac877bb69
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict
@@ -0,0 +1,55 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     reactingMultiphaseEulerFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         5;
+
+deltaT          1e-4;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.5;
+
+maxDeltaT       1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
new file mode 100644
index 0000000000..4cd730fdd3
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@@ -0,0 +1,58 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    "div\(phi,alpha.*\)"    Gauss vanLeer;
+    "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
+
+    "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
+    "div\(phi.*,U.*\)"              Gauss limitedLinearV 1;
+
+    "div\(alphaRhoPhi.*,(h|e).*\)"  Gauss limitedLinear 1;
+    "div\(alphaRhoPhi.*,K.*\)"      Gauss limitedLinear 1;
+    "div\(alphaPhi.*,p\)"           Gauss limitedLinear 1;
+
+    "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
new file mode 100644
index 0000000000..a49313e5c0
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
@@ -0,0 +1,109 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.*"
+    {
+        nAlphaSubCycles 2;
+    }
+
+    p_rgh
+    {
+        solver          GAMG;
+        tolerance       1e-7;
+        relTol          0.01;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        nFinestSweeps   2;
+        cacheAgglomeration on;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    p_rghFinal
+    {
+        solver          PCG;
+        preconditioner
+        {
+            preconditioner  GAMG;
+            tolerance       1e-7;
+            relTol          0;
+            nVcycles        2;
+            smoother        GaussSeidel;
+            nPreSweeps      0;
+            nPostSweeps     2;
+            nFinestSweeps   2;
+            cacheAgglomeration on;
+            nCellsInCoarsestLevel 10;
+            agglomerator    faceAreaPair;
+            mergeLevels     1;
+        }
+        tolerance       1e-7;
+        relTol          0;
+        maxIter         30;
+    }
+
+    pcorr
+    {
+        $p_rghFinal;
+        tolerance       1e-5;
+        relTol          0;
+    }
+
+    "U.*"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-5;
+        relTol          0;
+        minIter         1;
+    }
+
+    "e.*"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
+        minIter         1;
+        maxIter         10;
+    }
+}
+
+PIMPLE
+{
+    nOuterCorrectors     1;
+    nCorrectors     3;
+    nNonOrthogonalCorrectors 0;
+
+    pRefCell        0;
+    pRefValue       0;
+}
+
+relaxationFactors
+{
+    equations
+    {
+        ".*"            1;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
new file mode 100644
index 0000000000..bf749449bf
--- /dev/null
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@@ -0,0 +1,32 @@
+/*--------------------------------*- 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;
+    location    "system";
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    {
+        name    rotor;
+        type    cellSet;
+        action  new;
+        source  zoneToCell;
+        sourceInfo
+        {
+            name rotor;
+        }
+    }
+);
+
+// ************************************************************************* //

From 8d21b380efcaf4631ba1d814dd6042491c1f7d38 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 11 Sep 2015 17:52:43 +0100
Subject: [PATCH 40/70] Renamed phiAlpha -P alphaPhi for consistency with
 Euler-Euler solvers

---
 .../compressibleInterFoam/alphaEqns.H         |  6 +--
 .../multiphaseMixtureThermo.C                 | 20 ++++-----
 .../multiphase/driftFluxFoam/alphaEqn.H       | 32 +++++++-------
 .../driftFluxFoam/alphaEqnSubCycle.H          | 16 +++----
 .../multiphase/driftFluxFoam/createFields.H   |  2 +-
 .../solvers/multiphase/interFoam/alphaEqn.H   | 38 ++++++++---------
 .../multiphase/interFoam/createFields.H       |  6 +--
 .../interFoam/interMixingFoam/alphaEqns.H     | 42 +++++++++----------
 .../interPhaseChangeFoam/alphaEqn.H           | 22 +++++-----
 .../multiphaseMixture/multiphaseMixture.C     | 20 ++++-----
 .../multiphase/twoLiquidMixingFoam/alphaEqn.H |  6 +--
 11 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H b/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H
index 41ed1cf9c0..51dad81e77 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/alphaEqns.H
@@ -45,7 +45,7 @@
         }
 
 
-        surfaceScalarField phiAlpha1
+        surfaceScalarField alphaPhi1
         (
             fvc::flux
             (
@@ -66,7 +66,7 @@
             geometricOneField(),
             alpha1,
             phi,
-            phiAlpha1,
+            alphaPhi1,
             Sp,
             Su,
             1,
@@ -75,7 +75,7 @@
 
         surfaceScalarField rho1f(fvc::interpolate(rho1));
         surfaceScalarField rho2f(fvc::interpolate(rho2));
-        rhoPhi = phiAlpha1*(rho1f - rho2f) + phi*rho2f;
+        rhoPhi = alphaPhi1*(rho1f - rho2f) + phi*rho2f;
 
         alpha2 = scalar(1) - alpha1;
     }
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index 6eda25f9ff..7733cf1364 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -942,14 +942,14 @@ void Foam::multiphaseMixtureThermo::solveAlphas
     surfaceScalarField phic(mag(phi_/mesh_.magSf()));
     phic = min(cAlpha*phic, max(phic));
 
-    PtrList<surfaceScalarField> phiAlphaCorrs(phases_.size());
+    PtrList<surfaceScalarField> alphaPhiCorrs(phases_.size());
     int phasei = 0;
 
     forAllIter(PtrDictionary<phaseModel>, phases_, phase)
     {
         phaseModel& alpha = phase();
 
-        phiAlphaCorrs.set
+        alphaPhiCorrs.set
         (
             phasei,
             new surfaceScalarField
@@ -964,7 +964,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
             )
         );
 
-        surfaceScalarField& phiAlphaCorr = phiAlphaCorrs[phasei];
+        surfaceScalarField& alphaPhiCorr = alphaPhiCorrs[phasei];
 
         forAllIter(PtrDictionary<phaseModel>, phases_, phase2)
         {
@@ -974,7 +974,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
 
             surfaceScalarField phir(phic*nHatf(alpha, alpha2));
 
-            phiAlphaCorr += fvc::flux
+            alphaPhiCorr += fvc::flux
             (
                 -fvc::flux(-phir, alpha2, alpharScheme),
                 alpha,
@@ -988,7 +988,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
             geometricOneField(),
             alpha,
             phi_,
-            phiAlphaCorr,
+            alphaPhiCorr,
             zeroField(),
             zeroField(),
             1,
@@ -999,7 +999,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
         phasei++;
     }
 
-    MULES::limitSum(phiAlphaCorrs);
+    MULES::limitSum(alphaPhiCorrs);
 
     rhoPhi_ = dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0);
 
@@ -1025,8 +1025,8 @@ void Foam::multiphaseMixtureThermo::solveAlphas
     {
         phaseModel& alpha = phase();
 
-        surfaceScalarField& phiAlpha = phiAlphaCorrs[phasei];
-        phiAlpha += upwind<scalar>(mesh_, phi_).flux(alpha);
+        surfaceScalarField& alphaPhi = alphaPhiCorrs[phasei];
+        alphaPhi += upwind<scalar>(mesh_, phi_).flux(alpha);
 
         volScalarField::DimensionedInternalField Sp
         (
@@ -1096,12 +1096,12 @@ void Foam::multiphaseMixtureThermo::solveAlphas
         (
             geometricOneField(),
             alpha,
-            phiAlpha,
+            alphaPhi,
             Sp,
             Su
         );
 
-        rhoPhi_ += fvc::interpolate(alpha.thermo().rho())*phiAlpha;
+        rhoPhi_ += fvc::interpolate(alpha.thermo().rho())*alphaPhi;
 
         Info<< alpha.name() << " volume fraction, min, max = "
             << alpha.weightedAverage(mesh_.V()).value()
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
index 954b2a8b3a..68f027cd24 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
@@ -23,32 +23,32 @@
             << "  Max(" << alpha1.name() << ") = " << max(alpha1).value()
             << endl;
 
-        tmp<surfaceScalarField> tphiAlphaUD(alpha1Eqn.flux());
-        phiAlpha = tphiAlphaUD();
+        tmp<surfaceScalarField> talphaPhiUD(alpha1Eqn.flux());
+        alphaPhi = talphaPhiUD();
 
-        if (alphaApplyPrevCorr && tphiAlphaCorr0.valid())
+        if (alphaApplyPrevCorr && talphaPhiCorr0.valid())
         {
             Info<< "Applying the previous iteration correction flux" << endl;
 
             MULES::correct
             (
                 alpha1,
-                phiAlpha,
-                tphiAlphaCorr0(),
+                alphaPhi,
+                talphaPhiCorr0(),
                 mixture.alphaMax(),
                 0
             );
 
-            phiAlpha += tphiAlphaCorr0();
+            alphaPhi += talphaPhiCorr0();
         }
 
         // Cache the upwind-flux
-        tphiAlphaCorr0 = tphiAlphaUD;
+        talphaPhiCorr0 = talphaPhiUD;
     }
 
     for (int aCorr=0; aCorr<nAlphaCorr; aCorr++)
     {
-        tmp<surfaceScalarField> tphiAlphaUn
+        tmp<surfaceScalarField> talphaPhiUn
         (
             fvc::flux
             (
@@ -66,14 +66,14 @@
 
         if (MULESCorr)
         {
-            tmp<surfaceScalarField> tphiAlphaCorr(tphiAlphaUn() - phiAlpha);
+            tmp<surfaceScalarField> talphaPhiCorr(talphaPhiUn() - alphaPhi);
             volScalarField alpha10("alpha10", alpha1);
 
             MULES::correct
             (
                 alpha1,
-                tphiAlphaUn(),
-                tphiAlphaCorr(),
+                talphaPhiUn(),
+                talphaPhiCorr(),
                 mixture.alphaMax(),
                 0
             );
@@ -81,23 +81,23 @@
             // Under-relax the correction for all but the 1st corrector
             if (aCorr == 0)
             {
-                phiAlpha += tphiAlphaCorr();
+                alphaPhi += talphaPhiCorr();
             }
             else
             {
                 alpha1 = 0.5*alpha1 + 0.5*alpha10;
-                phiAlpha += 0.5*tphiAlphaCorr();
+                alphaPhi += 0.5*talphaPhiCorr();
             }
         }
         else
         {
-            phiAlpha = tphiAlphaUn;
+            alphaPhi = talphaPhiUn;
 
             MULES::explicitSolve
             (
                 alpha1,
                 phi,
-                phiAlpha,
+                alphaPhi,
                 mixture.alphaMax(),
                 0
             );
@@ -106,7 +106,7 @@
 
     if (alphaApplyPrevCorr && MULESCorr)
     {
-        tphiAlphaCorr0 = phiAlpha - tphiAlphaCorr0;
+        talphaPhiCorr0 = alphaPhi - talphaPhiCorr0;
     }
 
     alpha2 = 1.0 - alpha1;
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
index 956bacf48d..b586e77fad 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
@@ -1,9 +1,9 @@
 {
-    surfaceScalarField phiAlpha
+    surfaceScalarField alphaPhi
     (
         IOobject
         (
-            "phiAlpha",
+            "alphaPhi",
             runTime.timeName(),
             mesh
         ),
@@ -19,11 +19,11 @@
     if (nAlphaSubCycles > 1)
     {
         dimensionedScalar totalDeltaT = runTime.deltaT();
-        surfaceScalarField phiAlphaSum
+        surfaceScalarField alphaPhiSum
         (
             IOobject
             (
-                "phiAlphaSum",
+                "alphaPhiSum",
                 runTime.timeName(),
                 mesh
             ),
@@ -38,10 +38,10 @@
         )
         {
             #include "alphaEqn.H"
-            phiAlphaSum += (runTime.deltaT()/totalDeltaT)*phiAlpha;
+            alphaPhiSum += (runTime.deltaT()/totalDeltaT)*alphaPhi;
         }
 
-        phiAlpha = phiAlphaSum;
+        alphaPhi = alphaPhiSum;
     }
     else
     {
@@ -59,7 +59,7 @@
 
         alpha1Eqn.solve(mesh.solver("alpha1Diffusion"));
 
-        phiAlpha += alpha1Eqn.flux();
+        alphaPhi += alpha1Eqn.flux();
         alpha2 = 1.0 - alpha1;
 
         Info<< "Phase-1 volume fraction = "
@@ -69,6 +69,6 @@
             << endl;
     }
 
-    rhoPhi = phiAlpha*(rho1 - rho2) + phi*rho2;
+    rhoPhi = alphaPhi*(rho1 - rho2) + phi*rho2;
     rho = mixture.rho();
 }
diff --git a/applications/solvers/multiphase/driftFluxFoam/createFields.H b/applications/solvers/multiphase/driftFluxFoam/createFields.H
index d2e8d1d93e..65d3d38eae 100644
--- a/applications/solvers/multiphase/driftFluxFoam/createFields.H
+++ b/applications/solvers/multiphase/driftFluxFoam/createFields.H
@@ -135,4 +135,4 @@ mesh.setFluxRequired(p_rgh.name());
 mesh.setFluxRequired(alpha1.name());
 
 // MULES Correction
-tmp<surfaceScalarField> tphiAlphaCorr0;
+tmp<surfaceScalarField> talphaPhiCorr0;
diff --git a/applications/solvers/multiphase/interFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/alphaEqn.H
index 4405c58015..a2e9097e30 100644
--- a/applications/solvers/multiphase/interFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interFoam/alphaEqn.H
@@ -98,19 +98,19 @@
             << "  Max(" << alpha1.name() << ") = " << max(alpha1).value()
             << endl;
 
-        tmp<surfaceScalarField> tphiAlphaUD(alpha1Eqn.flux());
-        phiAlpha = tphiAlphaUD();
+        tmp<surfaceScalarField> talphaPhiUD(alpha1Eqn.flux());
+        alphaPhi = talphaPhiUD();
 
-        if (alphaApplyPrevCorr && tphiAlphaCorr0.valid())
+        if (alphaApplyPrevCorr && talphaPhiCorr0.valid())
         {
             Info<< "Applying the previous iteration compression flux" << endl;
-            MULES::correct(alpha1, phiAlpha, tphiAlphaCorr0(), 1, 0);
+            MULES::correct(alpha1, alphaPhi, talphaPhiCorr0(), 1, 0);
 
-            phiAlpha += tphiAlphaCorr0();
+            alphaPhi += talphaPhiCorr0();
         }
 
         // Cache the upwind-flux
-        tphiAlphaCorr0 = tphiAlphaUD;
+        talphaPhiCorr0 = talphaPhiUD;
 
         alpha2 = 1.0 - alpha1;
 
@@ -122,7 +122,7 @@
     {
         surfaceScalarField phir(phic*mixture.nHatf());
 
-        tmp<surfaceScalarField> tphiAlphaUn
+        tmp<surfaceScalarField> talphaPhiUn
         (
             fvc::flux
             (
@@ -141,33 +141,33 @@
         // Calculate the Crank-Nicolson off-centred alpha flux
         if (ocCoeff > 0)
         {
-            tphiAlphaUn =
-                cnCoeff*tphiAlphaUn + (1.0 - cnCoeff)*phiAlpha.oldTime();
+            talphaPhiUn =
+                cnCoeff*talphaPhiUn + (1.0 - cnCoeff)*alphaPhi.oldTime();
         }
 
         if (MULESCorr)
         {
-            tmp<surfaceScalarField> tphiAlphaCorr(tphiAlphaUn() - phiAlpha);
+            tmp<surfaceScalarField> talphaPhiCorr(talphaPhiUn() - alphaPhi);
             volScalarField alpha10("alpha10", alpha1);
 
-            MULES::correct(alpha1, tphiAlphaUn(), tphiAlphaCorr(), 1, 0);
+            MULES::correct(alpha1, talphaPhiUn(), talphaPhiCorr(), 1, 0);
 
             // Under-relax the correction for all but the 1st corrector
             if (aCorr == 0)
             {
-                phiAlpha += tphiAlphaCorr();
+                alphaPhi += talphaPhiCorr();
             }
             else
             {
                 alpha1 = 0.5*alpha1 + 0.5*alpha10;
-                phiAlpha += 0.5*tphiAlphaCorr();
+                alphaPhi += 0.5*talphaPhiCorr();
             }
         }
         else
         {
-            phiAlpha = tphiAlphaUn;
+            alphaPhi = talphaPhiUn;
 
-            MULES::explicitSolve(alpha1, phiCN, phiAlpha, 1, 0);
+            MULES::explicitSolve(alpha1, phiCN, alphaPhi, 1, 0);
         }
 
         alpha2 = 1.0 - alpha1;
@@ -177,7 +177,7 @@
 
     if (alphaApplyPrevCorr && MULESCorr)
     {
-        tphiAlphaCorr0 = phiAlpha - tphiAlphaCorr0;
+        talphaPhiCorr0 = alphaPhi - talphaPhiCorr0;
     }
 
     if
@@ -186,18 +186,18 @@
      == fv::EulerDdtScheme<vector>::typeName
     )
     {
-        rhoPhi = phiAlpha*(rho1 - rho2) + phiCN*rho2;
+        rhoPhi = alphaPhi*(rho1 - rho2) + phiCN*rho2;
     }
     else
     {
         if (ocCoeff > 0)
         {
             // Calculate the end-of-time-step alpha flux
-            phiAlpha = (phiAlpha - (1.0 - cnCoeff)*phiAlpha.oldTime())/cnCoeff;
+            alphaPhi = (alphaPhi - (1.0 - cnCoeff)*alphaPhi.oldTime())/cnCoeff;
         }
 
         // Calculate the end-of-time-step mass flux
-        rhoPhi = phiAlpha*(rho1 - rho2) + phi*rho2;
+        rhoPhi = alphaPhi*(rho1 - rho2) + phi*rho2;
     }
 
     Info<< "Phase-1 volume fraction = "
diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index fc682190ce..c3e65f24e3 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -121,11 +121,11 @@ mesh.setFluxRequired(p_rgh.name());
 mesh.setFluxRequired(alpha1.name());
 
 // MULES flux from previous time-step
-surfaceScalarField phiAlpha
+surfaceScalarField alphaPhi
 (
     IOobject
     (
-        "phiAlpha",
+        "alphaPhi",
         runTime.timeName(),
         mesh,
         IOobject::READ_IF_PRESENT,
@@ -135,4 +135,4 @@ surfaceScalarField phiAlpha
 );
 
 // MULES Correction
-tmp<surfaceScalarField> tphiAlphaCorr0;
+tmp<surfaceScalarField> talphaPhiCorr0;
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H
index 9585905c08..d720aa97f6 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H
@@ -40,7 +40,7 @@
 
 
         // Create the complete convection flux for alpha1
-        surfaceScalarField phiAlpha1
+        surfaceScalarField alphaPhi1
         (
             fvc::flux
             (
@@ -63,13 +63,13 @@
         );
 
         // Create the bounded (upwind) flux for alpha1
-        surfaceScalarField phiAlpha1BD
+        surfaceScalarField alphaPhi1BD
         (
             upwind<scalar>(mesh, phi).flux(alpha1)
         );
 
         // Calculate the flux correction for alpha1
-        phiAlpha1 -= phiAlpha1BD;
+        alphaPhi1 -= alphaPhi1BD;
 
         // Calculate the limiter for alpha1
         if (LTS)
@@ -83,8 +83,8 @@
                 rDeltaT,
                 geometricOneField(),
                 alpha1,
-                phiAlpha1BD,
-                phiAlpha1,
+                alphaPhi1BD,
+                alphaPhi1,
                 zeroField(),
                 zeroField(),
                 1,
@@ -99,8 +99,8 @@
                 1.0/runTime.deltaT().value(),
                 geometricOneField(),
                 alpha1,
-                phiAlpha1BD,
-                phiAlpha1,
+                alphaPhi1BD,
+                alphaPhi1,
                 zeroField(),
                 zeroField(),
                 1,
@@ -109,7 +109,7 @@
         }
 
         // Create the complete flux for alpha2
-        surfaceScalarField phiAlpha2
+        surfaceScalarField alphaPhi2
         (
             fvc::flux
             (
@@ -126,13 +126,13 @@
         );
 
         // Create the bounded (upwind) flux for alpha2
-        surfaceScalarField phiAlpha2BD
+        surfaceScalarField alphaPhi2BD
         (
             upwind<scalar>(mesh, phi).flux(alpha2)
         );
 
         // Calculate the flux correction for alpha2
-        phiAlpha2 -= phiAlpha2BD;
+        alphaPhi2 -= alphaPhi2BD;
 
         // Further limit the limiter for alpha2
         if (LTS)
@@ -146,8 +146,8 @@
                 rDeltaT,
                 geometricOneField(),
                 alpha2,
-                phiAlpha2BD,
-                phiAlpha2,
+                alphaPhi2BD,
+                alphaPhi2,
                 zeroField(),
                 zeroField(),
                 1,
@@ -162,8 +162,8 @@
                 1.0/runTime.deltaT().value(),
                 geometricOneField(),
                 alpha2,
-                phiAlpha2BD,
-                phiAlpha2,
+                alphaPhi2BD,
+                alphaPhi2,
                 zeroField(),
                 zeroField(),
                 1,
@@ -172,32 +172,32 @@
         }
 
         // Construct the limited fluxes
-        phiAlpha1 = phiAlpha1BD + lambda*phiAlpha1;
-        phiAlpha2 = phiAlpha2BD + lambda*phiAlpha2;
+        alphaPhi1 = alphaPhi1BD + lambda*alphaPhi1;
+        alphaPhi2 = alphaPhi2BD + lambda*alphaPhi2;
 
         // Solve for alpha1
-        solve(fvm::ddt(alpha1) + fvc::div(phiAlpha1));
+        solve(fvm::ddt(alpha1) + fvc::div(alphaPhi1));
 
         // Create the diffusion coefficients for alpha2<->alpha3
         volScalarField Dc23(D23*max(alpha3, scalar(0))*pos(alpha2));
         volScalarField Dc32(D23*max(alpha2, scalar(0))*pos(alpha3));
 
         // Add the diffusive flux for alpha3->alpha2
-        phiAlpha2 -= fvc::interpolate(Dc32)*mesh.magSf()*fvc::snGrad(alpha1);
+        alphaPhi2 -= fvc::interpolate(Dc32)*mesh.magSf()*fvc::snGrad(alpha1);
 
         // Solve for alpha2
         fvScalarMatrix alpha2Eqn
         (
             fvm::ddt(alpha2)
-          + fvc::div(phiAlpha2)
+          + fvc::div(alphaPhi2)
           - fvm::laplacian(Dc23 + Dc32, alpha2)
         );
         alpha2Eqn.solve();
 
         // Construct the complete mass flux
         rhoPhi =
-              phiAlpha1*(rho1 - rho3)
-            + (phiAlpha2 + alpha2Eqn.flux())*(rho2 - rho3)
+              alphaPhi1*(rho1 - rho3)
+            + (alphaPhi2 + alpha2Eqn.flux())*(rho2 - rho3)
             + phi*rho3;
 
         alpha3 = 1.0 - alpha1 - alpha2;
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
index bf506c2a70..172676b97f 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaEqn.H
@@ -10,7 +10,7 @@
     const volScalarField& vDotvAlphal = vDotAlphal[1]();
     const volScalarField vDotvmcAlphal(vDotvAlphal - vDotcAlphal);
 
-    tmp<surfaceScalarField> tphiAlpha;
+    tmp<surfaceScalarField> talphaPhi;
 
     if (MULESCorr)
     {
@@ -37,14 +37,14 @@
             << "  Max(" << alpha1.name() << ") = " << max(alpha1).value()
             << endl;
 
-        tphiAlpha = alpha1Eqn.flux();
+        talphaPhi = alpha1Eqn.flux();
     }
 
     volScalarField alpha10("alpha10", alpha1);
 
     for (int aCorr=0; aCorr<nAlphaCorr; aCorr++)
     {
-        tmp<surfaceScalarField> tphiAlphaCorr
+        tmp<surfaceScalarField> talphaPhiCorr
         (
             fvc::flux
             (
@@ -62,7 +62,7 @@
 
         if (MULESCorr)
         {
-            tphiAlphaCorr() -= tphiAlpha();
+            talphaPhiCorr() -= talphaPhi();
 
             volScalarField alpha100("alpha100", alpha10);
             alpha10 = alpha1;
@@ -71,8 +71,8 @@
             (
                 geometricOneField(),
                 alpha1,
-                tphiAlpha(),
-                tphiAlphaCorr(),
+                talphaPhi(),
+                talphaPhiCorr(),
                 vDotvmcAlphal,
                 (
                     divU*(alpha10 - alpha100)
@@ -85,12 +85,12 @@
             // Under-relax the correction for all but the 1st corrector
             if (aCorr == 0)
             {
-                tphiAlpha() += tphiAlphaCorr();
+                talphaPhi() += talphaPhiCorr();
             }
             else
             {
                 alpha1 = 0.5*alpha1 + 0.5*alpha10;
-                tphiAlpha() += 0.5*tphiAlphaCorr();
+                talphaPhi() += 0.5*talphaPhiCorr();
             }
         }
         else
@@ -100,20 +100,20 @@
                 geometricOneField(),
                 alpha1,
                 phi,
-                tphiAlphaCorr(),
+                talphaPhiCorr(),
                 vDotvmcAlphal,
                 (divU*alpha1 + vDotcAlphal)(),
                 1,
                 0
             );
 
-            tphiAlpha = tphiAlphaCorr;
+            talphaPhi = talphaPhiCorr;
         }
 
         alpha2 = 1.0 - alpha1;
     }
 
-    rhoPhi = tphiAlpha()*(rho1 - rho2) + phi*rho2;
+    rhoPhi = talphaPhi()*(rho1 - rho2) + phi*rho2;
 
     Info<< "Liquid phase volume fraction = "
         << alpha1.weightedAverage(mesh.V()).value()
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index 16d1b5f809..f1305897ba 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -573,14 +573,14 @@ void Foam::multiphaseMixture::solveAlphas
     surfaceScalarField phic(mag(phi_/mesh_.magSf()));
     phic = min(cAlpha*phic, max(phic));
 
-    PtrList<surfaceScalarField> phiAlphaCorrs(phases_.size());
+    PtrList<surfaceScalarField> alphaPhiCorrs(phases_.size());
     int phasei = 0;
 
     forAllIter(PtrDictionary<phase>, phases_, iter)
     {
         phase& alpha = iter();
 
-        phiAlphaCorrs.set
+        alphaPhiCorrs.set
         (
             phasei,
             new surfaceScalarField
@@ -595,7 +595,7 @@ void Foam::multiphaseMixture::solveAlphas
             )
         );
 
-        surfaceScalarField& phiAlphaCorr = phiAlphaCorrs[phasei];
+        surfaceScalarField& alphaPhiCorr = alphaPhiCorrs[phasei];
 
         forAllIter(PtrDictionary<phase>, phases_, iter2)
         {
@@ -605,7 +605,7 @@ void Foam::multiphaseMixture::solveAlphas
 
             surfaceScalarField phir(phic*nHatf(alpha, alpha2));
 
-            phiAlphaCorr += fvc::flux
+            alphaPhiCorr += fvc::flux
             (
                 -fvc::flux(-phir, alpha2, alpharScheme),
                 alpha,
@@ -619,7 +619,7 @@ void Foam::multiphaseMixture::solveAlphas
             geometricOneField(),
             alpha,
             phi_,
-            phiAlphaCorr,
+            alphaPhiCorr,
             zeroField(),
             zeroField(),
             1,
@@ -630,7 +630,7 @@ void Foam::multiphaseMixture::solveAlphas
         phasei++;
     }
 
-    MULES::limitSum(phiAlphaCorrs);
+    MULES::limitSum(alphaPhiCorrs);
 
     rhoPhi_ = dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0);
 
@@ -652,19 +652,19 @@ void Foam::multiphaseMixture::solveAlphas
     {
         phase& alpha = iter();
 
-        surfaceScalarField& phiAlpha = phiAlphaCorrs[phasei];
-        phiAlpha += upwind<scalar>(mesh_, phi_).flux(alpha);
+        surfaceScalarField& alphaPhi = alphaPhiCorrs[phasei];
+        alphaPhi += upwind<scalar>(mesh_, phi_).flux(alpha);
 
         MULES::explicitSolve
         (
             geometricOneField(),
             alpha,
-            phiAlpha,
+            alphaPhi,
             zeroField(),
             zeroField()
         );
 
-        rhoPhi_ += phiAlpha*alpha.rho();
+        rhoPhi_ += alphaPhi*alpha.rho();
 
         Info<< alpha.name() << " volume fraction, min, max = "
             << alpha.weightedAverage(mesh_.V()).value()
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
index bd10646871..5344fb75f2 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
@@ -1,7 +1,7 @@
 {
     word alphaScheme("div(phi,alpha)");
 
-    surfaceScalarField phiAlpha
+    surfaceScalarField alphaPhi
     (
         phi.name() + alpha1.name(),
         fvc::flux
@@ -12,9 +12,9 @@
         )
     );
 
-    MULES::explicitSolve(alpha1, phi, phiAlpha, 1, 0);
+    MULES::explicitSolve(alpha1, phi, alphaPhi, 1, 0);
 
-    rhoPhi = phiAlpha*(rho1 - rho2) + phi*rho2;
+    rhoPhi = alphaPhi*(rho1 - rho2) + phi*rho2;
 
     Info<< "Phase-1 volume fraction = "
         << alpha1.weightedAverage(mesh.Vsc()).value()

From c06eb9be0951dc40a8544de4dbddd5f38560e57f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 11 Sep 2015 17:53:21 +0100
Subject: [PATCH 41/70] reactingMultiphaseEulerFoam: Removed incomplete
 tutorial cases

---
 .../laminar/damBreak4phase/0.org/U            |  51 ----
 .../laminar/damBreak4phase/0.org/U.air        |  51 ----
 .../laminar/damBreak4phase/0.org/U.mercury    |  51 ----
 .../laminar/damBreak4phase/0.org/U.oil        |  51 ----
 .../laminar/damBreak4phase/0.org/U.water      |  51 ----
 .../laminar/damBreak4phase/0.org/alpha.air    |  79 ------
 .../damBreak4phase/0.org/alpha.mercury        |  49 ----
 .../laminar/damBreak4phase/0.org/alpha.oil    |  49 ----
 .../laminar/damBreak4phase/0.org/alpha.water  |  49 ----
 .../laminar/damBreak4phase/0.org/alphas       |  47 ----
 .../laminar/damBreak4phase/0.org/p_rgh        |  59 -----
 .../laminar/damBreak4phase/Allclean           |  11 -
 .../laminar/damBreak4phase/Allrun             |  17 --
 .../laminar/damBreak4phase/constant/g         |  22 --
 .../damBreak4phase/constant/motionProperties  |  21 --
 .../damBreak4phase/constant/polyMesh/boundary |  56 -----
 .../constant/transportProperties              | 236 ------------------
 .../constant/turbulenceProperties             |  21 --
 .../damBreak4phase/system/blockMeshDict       | 108 --------
 .../laminar/damBreak4phase/system/controlDict |  56 -----
 .../damBreak4phase/system/decomposeParDict    |  45 ----
 .../laminar/damBreak4phase/system/fvSchemes   |  53 ----
 .../laminar/damBreak4phase/system/fvSolution  |  98 --------
 .../damBreak4phase/system/setFieldsDict       |  65 -----
 .../laminar/damBreak4phaseFine/0.org/U        |  51 ----
 .../laminar/damBreak4phaseFine/0.org/U.air    |  51 ----
 .../damBreak4phaseFine/0.org/U.mercury        |  51 ----
 .../laminar/damBreak4phaseFine/0.org/U.oil    |  51 ----
 .../laminar/damBreak4phaseFine/0.org/U.water  |  51 ----
 .../damBreak4phaseFine/0.org/alpha.air        |  79 ------
 .../damBreak4phaseFine/0.org/alpha.mercury    |  49 ----
 .../damBreak4phaseFine/0.org/alpha.oil        |  49 ----
 .../damBreak4phaseFine/0.org/alpha.water      |  49 ----
 .../laminar/damBreak4phaseFine/0.org/alphas   |  47 ----
 .../laminar/damBreak4phaseFine/0.org/p_rgh    |  59 -----
 .../laminar/damBreak4phaseFine/Allclean       |  11 -
 .../laminar/damBreak4phaseFine/Allrun         |  19 --
 .../laminar/damBreak4phaseFine/constant/g     |  22 --
 .../constant/motionProperties                 |  21 --
 .../constant/polyMesh/boundary                |  56 -----
 .../constant/transportProperties              | 236 ------------------
 .../constant/turbulenceProperties             |  21 --
 .../damBreak4phaseFine/system/blockMeshDict   | 108 --------
 .../damBreak4phaseFine/system/controlDict     |  56 -----
 .../system/decomposeParDict                   |  45 ----
 .../damBreak4phaseFine/system/fvSchemes       |  53 ----
 .../damBreak4phaseFine/system/fvSolution      |  98 --------
 .../damBreak4phaseFine/system/setFieldsDict   |  65 -----
 .../mixerVessel2D/constant/phaseProperties    |   3 +
 49 files changed, 3 insertions(+), 2794 deletions(-)
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.air
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.mercury
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.oil
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.water
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.air
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.mercury
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.oil
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.water
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alphas
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/p_rgh
 delete mode 100755 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allclean
 delete mode 100755 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allrun
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/g
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/motionProperties
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/polyMesh/boundary
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/transportProperties
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/blockMeshDict
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/controlDict
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/decomposeParDict
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSolution
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/setFieldsDict
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.air
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.mercury
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.oil
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.water
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.air
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.oil
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.water
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alphas
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/p_rgh
 delete mode 100755 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allclean
 delete mode 100755 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allrun
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/g
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/motionProperties
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/transportProperties
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/blockMeshDict
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/controlDict
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/decomposeParDict
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSchemes
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSolution
 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/setFieldsDict

diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U
deleted file mode 100644
index b82b7ce18a..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U
+++ /dev/null
@@ -1,51 +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       volVectorField;
-    location    "0";
-    object      U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    rightWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    atmosphere
-    {
-        type            fluxCorrectedVelocity;
-        value           uniform (0 0 0);
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.air
deleted file mode 100644
index abef789c9c..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.air
+++ /dev/null
@@ -1,51 +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       volVectorField;
-    location    "0";
-    object      U.air;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    rightWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    atmosphere
-    {
-        type            fluxCorrectedVelocity;
-        value           uniform (0 0 0);
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.mercury
deleted file mode 100644
index c9a998697d..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.mercury
+++ /dev/null
@@ -1,51 +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       volVectorField;
-    location    "0";
-    object      U.mercury;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    rightWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    atmosphere
-    {
-        type            fluxCorrectedVelocity;
-        value           uniform (0 0 0);
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.oil
deleted file mode 100644
index 1820dbd6d6..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.oil
+++ /dev/null
@@ -1,51 +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       volVectorField;
-    location    "0";
-    object      U.oil;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    rightWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    atmosphere
-    {
-        type            fluxCorrectedVelocity;
-        value           uniform (0 0 0);
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.water
deleted file mode 100644
index 4977c8a6d5..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/U.water
+++ /dev/null
@@ -1,51 +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       volVectorField;
-    location    "0";
-    object      Uwater;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    rightWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    atmosphere
-    {
-        type            fluxCorrectedVelocity;
-        value           uniform (0 0 0);
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.air
deleted file mode 100644
index be8307fdf2..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.air
+++ /dev/null
@@ -1,79 +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       volScalarField;
-    location    "0";
-    object      alpha.air;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            alphaContactAngle;
-        thetaProperties
-        (
-            ( water air ) 90 0 0 0
-            ( oil air ) 90 0 0 0
-            ( mercury air ) 90 0 0 0
-            ( water oil ) 90 0 0 0
-            ( water mercury ) 90 0 0 0
-            ( oil mercury ) 90 0 0 0
-        );
-        value           uniform 0;
-    }
-    rightWall
-    {
-        type            alphaContactAngle;
-        thetaProperties
-        (
-            ( water air ) 90 0 0 0
-            ( oil air ) 90 0 0 0
-            ( mercury air ) 90 0 0 0
-            ( water oil ) 90 0 0 0
-            ( water mercury ) 90 0 0 0
-            ( oil mercury ) 90 0 0 0
-        );
-        value           uniform 1;
-    }
-    lowerWall
-    {
-        type            alphaContactAngle;
-        thetaProperties
-        (
-            ( water air ) 90 0 0 0
-            ( oil air ) 90 0 0 0
-            ( mercury air ) 90 0 0 0
-            ( water oil ) 90 0 0 0
-            ( water mercury ) 90 0 0 0
-            ( oil mercury ) 90 0 0 0
-        );
-        value           uniform 0;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 1;
-        value           uniform 1;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.mercury
deleted file mode 100644
index d224de9509..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.mercury
+++ /dev/null
@@ -1,49 +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       volScalarField;
-    location    "0";
-    object      alpha.mercury;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.oil
deleted file mode 100644
index bfcff63aed..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.oil
+++ /dev/null
@@ -1,49 +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       volScalarField;
-    location    "0";
-    object      alpha.oil;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.water
deleted file mode 100644
index cf96bb9d9f..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alpha.water
+++ /dev/null
@@ -1,49 +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       volScalarField;
-    location    "0";
-    object      alpha.water;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alphas b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alphas
deleted file mode 100644
index 10e3ea7a07..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/alphas
+++ /dev/null
@@ -1,47 +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       volScalarField;
-    location    "0";
-    object      alphas;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            zeroGradient;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/p_rgh
deleted file mode 100644
index 22671e295d..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/0.org/p_rgh
+++ /dev/null
@@ -1,59 +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       volScalarField;
-    object      p_rgh;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -2 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedFluxPressure;
-        value           uniform 0;
-    }
-
-    rightWall
-    {
-        type            fixedFluxPressure;
-        value           uniform 0;
-    }
-
-    lowerWall
-    {
-        type            fixedFluxPressure;
-        value           uniform 0;
-    }
-
-    atmosphere
-    {
-        type            totalPressure;
-        p0              uniform 0;
-        U               U.air;
-        phi             phi.air;
-        rho             rho;
-        psi             none;
-        gamma           1;
-        value           uniform 0;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allclean
deleted file mode 100755
index 7ac8041872..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allclean
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-
-\rm -rf 0
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allrun
deleted file mode 100755
index 81cae15eab..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/Allrun
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Set application name
-application=`getApplication`
-
-\rm -rf 0
-cp -r 0.org 0
-
-runApplication blockMesh
-runApplication setFields
-runApplication $application
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/g
deleted file mode 100644
index 0cc222ca34..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/g
+++ /dev/null
@@ -1,22 +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       uniformDimensionedVectorField;
-    location    "constant";
-    object      g;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -2 0 0 0 0];
-value           (0 -9.81 0);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/motionProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/motionProperties
deleted file mode 100644
index 93e0701984..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/motionProperties
+++ /dev/null
@@ -1,21 +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;
-    location    "constant";
-    object      motionProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-movingFvMesh    staticFvMesh;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/polyMesh/boundary
deleted file mode 100644
index 79ef3a79e1..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/polyMesh/boundary
+++ /dev/null
@@ -1,56 +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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    leftWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4432;
-    }
-    rightWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          50;
-        startFace       4482;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          62;
-        startFace       4532;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          46;
-        startFace       4594;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          4536;
-        startFace       4640;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/transportProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/transportProperties
deleted file mode 100644
index c74003969a..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/transportProperties
+++ /dev/null
@@ -1,236 +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;
-    location    "constant";
-    object      transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-phases
-(
-     water
-     {
-         nu         1e-06;
-         kappa      1e-06;
-         Cp         4195;
-         rho        1000;
-
-         diameterModel constant;
-         constantCoeffs
-         {
-             d               1e-3;
-         }
-     }
-
-     oil
-     {
-         nu         1e-06;
-         kappa      1e-06;
-         Cp         4195;
-         rho        500;
-
-         diameterModel constant;
-         constantCoeffs
-         {
-             d               1e-3;
-         }
-     }
-
-     mercury
-     {
-         nu         1.125e-07;
-         kappa      1e-06;
-         Cp         4195;
-         rho        13529;
-
-         diameterModel constant;
-         constantCoeffs
-         {
-             d               1e-3;
-         }
-     }
-
-     air
-     {
-         nu         1.48e-05;
-         kappa      2.63e-2;
-         Cp         1007;
-         rho        1;
-
-         diameterModel constant;
-         constantCoeffs
-         {
-             d              3e-3;
-         }
-     }
-);
-
-sigmas
-(
-    (air water)     0.07
-    (air oil)       0.07
-    (air mercury)   0.07
-);
-
-interfaceCompression
-(
-    (air water)     1
-    (air oil)       1
-    (air mercury)   1
-);
-
-virtualMass
-(
-);
-
-drag
-(
-    (air water)
-    {
-        type blended;
-
-        air
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        water
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-
-    (air oil)
-    {
-        type blended;
-
-        air
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        oil
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-
-    (air mercury)
-    {
-        type blended;
-
-        air
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        mercury
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-
-    (water oil)
-    {
-        type blended;
-
-        water
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        oil
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-
-    (water mercury)
-    {
-        type blended;
-
-        water
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        mercury
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-
-    (oil mercury)
-    {
-        type blended;
-
-        oil
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        mercury
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-);
-
-
-// This is a dummy to support the Smagorinsky model
-transportModel  Newtonian;
-nu              [0 2 -1 0 0 0 0] 0;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties
deleted file mode 100644
index c2c3b28a1b..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties
+++ /dev/null
@@ -1,21 +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;
-    location    "constant";
-    object      turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-simulationType  laminar;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/blockMeshDict
deleted file mode 100644
index 11344be6ac..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/blockMeshDict
+++ /dev/null
@@ -1,108 +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      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.146;
-
-vertices
-(
-    (0 0 0)
-    (2 0 0)
-    (2.16438 0 0)
-    (4 0 0)
-    (0 0.32876 0)
-    (2 0.32876 0)
-    (2.16438 0.32876 0)
-    (4 0.32876 0)
-    (0 4 0)
-    (2 4 0)
-    (2.16438 4 0)
-    (4 4 0)
-    (0 0 0.1)
-    (2 0 0.1)
-    (2.16438 0 0.1)
-    (4 0 0.1)
-    (0 0.32876 0.1)
-    (2 0.32876 0.1)
-    (2.16438 0.32876 0.1)
-    (4 0.32876 0.1)
-    (0 4 0.1)
-    (2 4 0.1)
-    (2.16438 4 0.1)
-    (4 4 0.1)
-);
-
-blocks
-(
-    hex (0 1 5 4 12 13 17 16) (23 8 1) simpleGrading (1 1 1)
-    hex (2 3 7 6 14 15 19 18) (19 8 1) simpleGrading (1 1 1)
-    hex (4 5 9 8 16 17 21 20) (23 42 1) simpleGrading (1 1 1)
-    hex (5 6 10 9 17 18 22 21) (4 42 1) simpleGrading (1 1 1)
-    hex (6 7 11 10 18 19 23 22) (19 42 1) simpleGrading (1 1 1)
-);
-
-edges
-(
-);
-
-boundary
-(
-    leftWall
-    {
-        type wall;
-        faces
-        (
-            (0 12 16 4)
-            (4 16 20 8)
-        );
-    }
-    rightWall
-    {
-        type wall;
-        faces
-        (
-            (7 19 15 3)
-            (11 23 19 7)
-        );
-    }
-    lowerWall
-    {
-        type wall;
-        faces
-        (
-            (0 1 13 12)
-            (1 5 17 13)
-            (5 6 18 17)
-            (2 14 18 6)
-            (2 3 15 14)
-        );
-    }
-    atmosphere
-    {
-        type patch;
-        faces
-        (
-            (8 20 21 9)
-            (9 21 22 10)
-            (10 22 23 11)
-        );
-    }
-);
-
-mergePatchPairs
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/controlDict
deleted file mode 100644
index bb472a3e63..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/controlDict
+++ /dev/null
@@ -1,56 +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;
-    location    "system";
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application     reactingMultiphaseEulerFoam;
-
-startFrom       startTime;
-
-startTime       0;
-
-stopAt          endTime;
-
-endTime         6;
-
-deltaT          0.001;
-
-writeControl    adjustableRunTime;
-
-writeInterval   0.05;
-
-purgeWrite      0;
-
-writeFormat     ascii;
-
-writePrecision  6;
-
-writeCompression uncompressed;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable yes;
-
-adjustTimeStep  yes;
-
-maxCo           0.5;
-maxAlphaCo      0.5;
-
-maxDeltaT       1;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/decomposeParDict
deleted file mode 100644
index 652d42b195..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/decomposeParDict
+++ /dev/null
@@ -1,45 +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;
-    location    "system";
-    object      decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 4;
-
-method          simple;
-
-simpleCoeffs
-{
-    n               (2 2 1);
-    delta           0.001;
-}
-
-hierarchicalCoeffs
-{
-    n               (1 1 1);
-    delta           0.001;
-    order           xyz;
-}
-
-manualCoeffs
-{
-    dataFile        "";
-}
-
-distributed     no;
-
-roots           ( );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes
deleted file mode 100644
index bed046cf3a..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSchemes
+++ /dev/null
@@ -1,53 +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;
-    location    "system";
-    object      fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
-    default         Euler;
-}
-
-gradSchemes
-{
-    default         Gauss linear;
-}
-
-divSchemes
-{
-    "div\(phi,alpha.*\)"    Gauss vanLeer;
-    "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
-
-    "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
-    div(Rc)                 Gauss linear;
-    "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
-}
-
-laplacianSchemes
-{
-    default         Gauss linear corrected;
-}
-
-interpolationSchemes
-{
-    default         linear;
-}
-
-snGradSchemes
-{
-    default         corrected;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSolution
deleted file mode 100644
index 831f8a3740..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/fvSolution
+++ /dev/null
@@ -1,98 +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;
-    location    "system";
-    object      fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
-    "alpha.*"
-    {
-        nAlphaSubCycles 3;
-    }
-
-    p_rgh
-    {
-        solver          GAMG;
-        tolerance       1e-7;
-        relTol          0.05;
-        smoother        GaussSeidel;
-        nPreSweeps      0;
-        nPostSweeps     2;
-        nFinestSweeps   2;
-        cacheAgglomeration on;
-        nCellsInCoarsestLevel 10;
-        agglomerator    faceAreaPair;
-        mergeLevels     1;
-    }
-
-    p_rghFinal
-    {
-        solver          PCG;
-        preconditioner
-        {
-            preconditioner  GAMG;
-            tolerance       1e-7;
-            relTol          0;
-            nVcycles        2;
-            smoother        GaussSeidel;
-            nPreSweeps      0;
-            nPostSweeps     2;
-            nFinestSweeps   2;
-            cacheAgglomeration on;
-            nCellsInCoarsestLevel 10;
-            agglomerator    faceAreaPair;
-            mergeLevels     1;
-        }
-        tolerance       1e-7;
-        relTol          0;
-        maxIter         20;
-    }
-
-    pcorr
-    {
-        $p_rghFinal;
-        tolerance       1e-5;
-        relTol          0;
-    }
-
-    U
-    {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        tolerance       1e-8;
-        relTol          0.1;
-        nSweeps         1;
-    }
-
-    UFinal
-    {
-        $U;
-        tolerance       1e-7;
-        relTol          0;
-    }
-}
-
-PIMPLE
-{
-    nCorrectors     3;
-    nNonOrthogonalCorrectors 0;
-}
-
-relaxationFactors
-{
-    "U.*"           1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/setFieldsDict
deleted file mode 100644
index b277afb1c5..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/system/setFieldsDict
+++ /dev/null
@@ -1,65 +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;
-    location    "system";
-    object      setFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defaultFieldValues
-(
-    volScalarFieldValue alpha.air 1
-    volScalarFieldValue alpha.water 0
-    volScalarFieldValue alpha.oil 0
-    volScalarFieldValue alpha.mercury 0
-    volVectorFieldValue U (0 0 0)
-);
-
-regions
-(
-    boxToCell
-    {
-        box (0 0 -1) (0.1461 0.292 1);
-        fieldValues
-        (
-            volScalarFieldValue alpha.water 1
-            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alpha.air 0
-        );
-    }
-    boxToCell
-    {
-        box (0.1461 0 -1) (0.2922 0.292 1);
-        fieldValues
-        (
-            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alpha.oil 1
-            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alpha.air 0
-        );
-    }
-    boxToCell
-    {
-        box (0 0 -1) (0.1461 0.1 1);
-        fieldValues
-        (
-            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alpha.mercury 1
-            volScalarFieldValue alpha.air 0
-        );
-    }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U
deleted file mode 100644
index b82b7ce18a..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U
+++ /dev/null
@@ -1,51 +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       volVectorField;
-    location    "0";
-    object      U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    rightWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    atmosphere
-    {
-        type            fluxCorrectedVelocity;
-        value           uniform (0 0 0);
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.air
deleted file mode 100644
index abef789c9c..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.air
+++ /dev/null
@@ -1,51 +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       volVectorField;
-    location    "0";
-    object      U.air;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    rightWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    atmosphere
-    {
-        type            fluxCorrectedVelocity;
-        value           uniform (0 0 0);
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.mercury
deleted file mode 100644
index c9a998697d..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.mercury
+++ /dev/null
@@ -1,51 +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       volVectorField;
-    location    "0";
-    object      U.mercury;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    rightWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    atmosphere
-    {
-        type            fluxCorrectedVelocity;
-        value           uniform (0 0 0);
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.oil
deleted file mode 100644
index 1820dbd6d6..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.oil
+++ /dev/null
@@ -1,51 +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       volVectorField;
-    location    "0";
-    object      U.oil;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    rightWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    atmosphere
-    {
-        type            fluxCorrectedVelocity;
-        value           uniform (0 0 0);
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.water
deleted file mode 100644
index 4977c8a6d5..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/U.water
+++ /dev/null
@@ -1,51 +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       volVectorField;
-    location    "0";
-    object      Uwater;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    rightWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    atmosphere
-    {
-        type            fluxCorrectedVelocity;
-        value           uniform (0 0 0);
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.air
deleted file mode 100644
index be8307fdf2..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.air
+++ /dev/null
@@ -1,79 +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       volScalarField;
-    location    "0";
-    object      alpha.air;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            alphaContactAngle;
-        thetaProperties
-        (
-            ( water air ) 90 0 0 0
-            ( oil air ) 90 0 0 0
-            ( mercury air ) 90 0 0 0
-            ( water oil ) 90 0 0 0
-            ( water mercury ) 90 0 0 0
-            ( oil mercury ) 90 0 0 0
-        );
-        value           uniform 0;
-    }
-    rightWall
-    {
-        type            alphaContactAngle;
-        thetaProperties
-        (
-            ( water air ) 90 0 0 0
-            ( oil air ) 90 0 0 0
-            ( mercury air ) 90 0 0 0
-            ( water oil ) 90 0 0 0
-            ( water mercury ) 90 0 0 0
-            ( oil mercury ) 90 0 0 0
-        );
-        value           uniform 1;
-    }
-    lowerWall
-    {
-        type            alphaContactAngle;
-        thetaProperties
-        (
-            ( water air ) 90 0 0 0
-            ( oil air ) 90 0 0 0
-            ( mercury air ) 90 0 0 0
-            ( water oil ) 90 0 0 0
-            ( water mercury ) 90 0 0 0
-            ( oil mercury ) 90 0 0 0
-        );
-        value           uniform 0;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 1;
-        value           uniform 1;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury
deleted file mode 100644
index d224de9509..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury
+++ /dev/null
@@ -1,49 +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       volScalarField;
-    location    "0";
-    object      alpha.mercury;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.oil
deleted file mode 100644
index bfcff63aed..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.oil
+++ /dev/null
@@ -1,49 +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       volScalarField;
-    location    "0";
-    object      alpha.oil;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.water
deleted file mode 100644
index cf96bb9d9f..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alpha.water
+++ /dev/null
@@ -1,49 +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       volScalarField;
-    location    "0";
-    object      alpha.water;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alphas b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alphas
deleted file mode 100644
index 10e3ea7a07..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/alphas
+++ /dev/null
@@ -1,47 +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       volScalarField;
-    location    "0";
-    object      alphas;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            zeroGradient;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/p_rgh
deleted file mode 100644
index cfabea4db1..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/0.org/p_rgh
+++ /dev/null
@@ -1,59 +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       volScalarField;
-    object      p_rgh;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -2 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedFluxPressure;
-        value           uniform 0;
-    }
-
-    rightWall
-    {
-        type            fixedFluxPressure;
-        value           uniform 0;
-    }
-
-    lowerWall
-    {
-        type            fixedFluxPressure;
-        value           uniform 0;
-    }
-
-    atmosphere
-    {
-        type            totalPressure;
-        p0              uniform 0;
-        U               U;
-        phi             phi;
-        rho             rho;
-        psi             none;
-        gamma           1;
-        value           uniform 0;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allclean b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allclean
deleted file mode 100755
index 7ac8041872..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allclean
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-
-\rm -rf 0
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allrun
deleted file mode 100755
index 33fca4c7bd..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/Allrun
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Set application name
-application=`getApplication`
-
-\rm -rf 0
-cp -r 0.org 0
-
-runApplication blockMesh
-runApplication setFields
-runApplication decomposePar
-runParallel $application 4
-runApplication reconstructPar
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/g
deleted file mode 100644
index 0cc222ca34..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/g
+++ /dev/null
@@ -1,22 +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       uniformDimensionedVectorField;
-    location    "constant";
-    object      g;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -2 0 0 0 0];
-value           (0 -9.81 0);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/motionProperties
deleted file mode 100644
index 93e0701984..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/motionProperties
+++ /dev/null
@@ -1,21 +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;
-    location    "constant";
-    object      motionProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-movingFvMesh    staticFvMesh;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary
deleted file mode 100644
index f1ec545053..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary
+++ /dev/null
@@ -1,56 +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       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    leftWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          195;
-        startFace       68014;
-    }
-    rightWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          195;
-        startFace       68209;
-    }
-    lowerWall
-    {
-        type            wall;
-        inGroups        1(wall);
-        nFaces          206;
-        startFace       68404;
-    }
-    atmosphere
-    {
-        type            patch;
-        nFaces          176;
-        startFace       68610;
-    }
-    defaultFaces
-    {
-        type            empty;
-        inGroups        1(empty);
-        nFaces          68400;
-        startFace       68786;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/transportProperties
deleted file mode 100644
index c74003969a..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/transportProperties
+++ /dev/null
@@ -1,236 +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;
-    location    "constant";
-    object      transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-phases
-(
-     water
-     {
-         nu         1e-06;
-         kappa      1e-06;
-         Cp         4195;
-         rho        1000;
-
-         diameterModel constant;
-         constantCoeffs
-         {
-             d               1e-3;
-         }
-     }
-
-     oil
-     {
-         nu         1e-06;
-         kappa      1e-06;
-         Cp         4195;
-         rho        500;
-
-         diameterModel constant;
-         constantCoeffs
-         {
-             d               1e-3;
-         }
-     }
-
-     mercury
-     {
-         nu         1.125e-07;
-         kappa      1e-06;
-         Cp         4195;
-         rho        13529;
-
-         diameterModel constant;
-         constantCoeffs
-         {
-             d               1e-3;
-         }
-     }
-
-     air
-     {
-         nu         1.48e-05;
-         kappa      2.63e-2;
-         Cp         1007;
-         rho        1;
-
-         diameterModel constant;
-         constantCoeffs
-         {
-             d              3e-3;
-         }
-     }
-);
-
-sigmas
-(
-    (air water)     0.07
-    (air oil)       0.07
-    (air mercury)   0.07
-);
-
-interfaceCompression
-(
-    (air water)     1
-    (air oil)       1
-    (air mercury)   1
-);
-
-virtualMass
-(
-);
-
-drag
-(
-    (air water)
-    {
-        type blended;
-
-        air
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        water
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-
-    (air oil)
-    {
-        type blended;
-
-        air
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        oil
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-
-    (air mercury)
-    {
-        type blended;
-
-        air
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        mercury
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-
-    (water oil)
-    {
-        type blended;
-
-        water
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        oil
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-
-    (water mercury)
-    {
-        type blended;
-
-        water
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        mercury
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-
-    (oil mercury)
-    {
-        type blended;
-
-        oil
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        mercury
-        {
-            type SchillerNaumann;
-            residualPhaseFraction 0;
-            residualSlip 0;
-        }
-
-        residualPhaseFraction 1e-3;
-        residualSlip 1e-3;
-    }
-);
-
-
-// This is a dummy to support the Smagorinsky model
-transportModel  Newtonian;
-nu              [0 2 -1 0 0 0 0] 0;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
deleted file mode 100644
index c2c3b28a1b..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties
+++ /dev/null
@@ -1,21 +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;
-    location    "constant";
-    object      turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-simulationType  laminar;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/blockMeshDict
deleted file mode 100644
index fd11bf53fd..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/blockMeshDict
+++ /dev/null
@@ -1,108 +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      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.146;
-
-vertices
-(
-    (0 0 0)
-    (2 0 0)
-    (2.16438 0 0)
-    (4 0 0)
-    (0 0.32876 0)
-    (2 0.32876 0)
-    (2.16438 0.32876 0)
-    (4 0.32876 0)
-    (0 4 0)
-    (2 4 0)
-    (2.16438 4 0)
-    (4 4 0)
-    (0 0 0.1)
-    (2 0 0.1)
-    (2.16438 0 0.1)
-    (4 0 0.1)
-    (0 0.32876 0.1)
-    (2 0.32876 0.1)
-    (2.16438 0.32876 0.1)
-    (4 0.32876 0.1)
-    (0 4 0.1)
-    (2 4 0.1)
-    (2.16438 4 0.1)
-    (4 4 0.1)
-);
-
-blocks
-(
-    hex (0 1 5 4 12 13 17 16) (92 15 1) simpleGrading (1 1 1)
-    hex (2 3 7 6 14 15 19 18) (76 15 1) simpleGrading (1 1 1)
-    hex (4 5 9 8 16 17 21 20) (92 180 1) simpleGrading (1 1 1)
-    hex (5 6 10 9 17 18 22 21) (8 180 1) simpleGrading (1 1 1)
-    hex (6 7 11 10 18 19 23 22) (76 180 1) simpleGrading (1 1 1)
-);
-
-edges
-(
-);
-
-boundary
-(
-    leftWall
-    {
-        type wall;
-        faces
-        (
-            (0 12 16 4)
-            (4 16 20 8)
-        );
-    }
-    rightWall
-    {
-        type wall;
-        faces
-        (
-            (7 19 15 3)
-            (11 23 19 7)
-        );
-    }
-    lowerWall
-    {
-        type wall;
-        faces
-        (
-            (0 1 13 12)
-            (1 5 17 13)
-            (5 6 18 17)
-            (2 14 18 6)
-            (2 3 15 14)
-        );
-    }
-    atmosphere
-    {
-        type patch;
-        faces
-        (
-            (8 20 21 9)
-            (9 21 22 10)
-            (10 22 23 11)
-        );
-    }
-);
-
-mergePatchPairs
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/controlDict
deleted file mode 100644
index be82da29a5..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/controlDict
+++ /dev/null
@@ -1,56 +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;
-    location    "system";
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application     reactingMultiphaseEulerFoam;
-
-startFrom       startTime;
-
-startTime       0;
-
-stopAt          endTime;
-
-endTime         6;
-
-deltaT          0.001;
-
-writeControl    adjustableRunTime;
-
-writeInterval   0.01;
-
-purgeWrite      0;
-
-writeFormat     binary;
-
-writePrecision  6;
-
-writeCompression uncompressed;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable yes;
-
-adjustTimeStep  yes;
-
-maxCo           0.5;
-maxAlphaCo      0.5;
-
-maxDeltaT       1;
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/decomposeParDict
deleted file mode 100644
index 652d42b195..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/decomposeParDict
+++ /dev/null
@@ -1,45 +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;
-    location    "system";
-    object      decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 4;
-
-method          simple;
-
-simpleCoeffs
-{
-    n               (2 2 1);
-    delta           0.001;
-}
-
-hierarchicalCoeffs
-{
-    n               (1 1 1);
-    delta           0.001;
-    order           xyz;
-}
-
-manualCoeffs
-{
-    dataFile        "";
-}
-
-distributed     no;
-
-roots           ( );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSchemes
deleted file mode 100644
index bed046cf3a..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSchemes
+++ /dev/null
@@ -1,53 +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;
-    location    "system";
-    object      fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
-    default         Euler;
-}
-
-gradSchemes
-{
-    default         Gauss linear;
-}
-
-divSchemes
-{
-    "div\(phi,alpha.*\)"    Gauss vanLeer;
-    "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
-
-    "div\(alphaPhi.*,U.*\)" Gauss limitedLinearV 1;
-    div(Rc)                 Gauss linear;
-    "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
-}
-
-laplacianSchemes
-{
-    default         Gauss linear corrected;
-}
-
-interpolationSchemes
-{
-    default         linear;
-}
-
-snGradSchemes
-{
-    default         corrected;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSolution
deleted file mode 100644
index 831f8a3740..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/fvSolution
+++ /dev/null
@@ -1,98 +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;
-    location    "system";
-    object      fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
-    "alpha.*"
-    {
-        nAlphaSubCycles 3;
-    }
-
-    p_rgh
-    {
-        solver          GAMG;
-        tolerance       1e-7;
-        relTol          0.05;
-        smoother        GaussSeidel;
-        nPreSweeps      0;
-        nPostSweeps     2;
-        nFinestSweeps   2;
-        cacheAgglomeration on;
-        nCellsInCoarsestLevel 10;
-        agglomerator    faceAreaPair;
-        mergeLevels     1;
-    }
-
-    p_rghFinal
-    {
-        solver          PCG;
-        preconditioner
-        {
-            preconditioner  GAMG;
-            tolerance       1e-7;
-            relTol          0;
-            nVcycles        2;
-            smoother        GaussSeidel;
-            nPreSweeps      0;
-            nPostSweeps     2;
-            nFinestSweeps   2;
-            cacheAgglomeration on;
-            nCellsInCoarsestLevel 10;
-            agglomerator    faceAreaPair;
-            mergeLevels     1;
-        }
-        tolerance       1e-7;
-        relTol          0;
-        maxIter         20;
-    }
-
-    pcorr
-    {
-        $p_rghFinal;
-        tolerance       1e-5;
-        relTol          0;
-    }
-
-    U
-    {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        tolerance       1e-8;
-        relTol          0.1;
-        nSweeps         1;
-    }
-
-    UFinal
-    {
-        $U;
-        tolerance       1e-7;
-        relTol          0;
-    }
-}
-
-PIMPLE
-{
-    nCorrectors     3;
-    nNonOrthogonalCorrectors 0;
-}
-
-relaxationFactors
-{
-    "U.*"           1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/setFieldsDict
deleted file mode 100644
index b277afb1c5..0000000000
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phaseFine/system/setFieldsDict
+++ /dev/null
@@ -1,65 +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;
-    location    "system";
-    object      setFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defaultFieldValues
-(
-    volScalarFieldValue alpha.air 1
-    volScalarFieldValue alpha.water 0
-    volScalarFieldValue alpha.oil 0
-    volScalarFieldValue alpha.mercury 0
-    volVectorFieldValue U (0 0 0)
-);
-
-regions
-(
-    boxToCell
-    {
-        box (0 0 -1) (0.1461 0.292 1);
-        fieldValues
-        (
-            volScalarFieldValue alpha.water 1
-            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alpha.air 0
-        );
-    }
-    boxToCell
-    {
-        box (0.1461 0 -1) (0.2922 0.292 1);
-        fieldValues
-        (
-            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alpha.oil 1
-            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alpha.air 0
-        );
-    }
-    boxToCell
-    {
-        box (0 0 -1) (0.1461 0.1 1);
-        fieldValues
-        (
-            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alpha.mercury 1
-            volScalarFieldValue alpha.air 0
-        );
-    }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index a2f2f7ba11..371c656ea3 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -443,6 +443,9 @@ heatTransfer
     }
 );
 
+lift
+();
+
 wallLubrication
 ();
 

From 3226b03d63d646fa5766bdd5cd64902b3c4860d6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sat, 12 Sep 2015 23:32:11 +0100
Subject: [PATCH 42/70] wmake/rules/linuxPPC64leGcc/linuxPPC64leGcc: Updated
 link options Patch provided by Bruno Santos Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1846

---
 wmake/rules/linuxPPC64leGcc/linuxPPC64leGcc | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 wmake/rules/linuxPPC64leGcc/linuxPPC64leGcc

diff --git a/wmake/rules/linuxPPC64leGcc/linuxPPC64leGcc b/wmake/rules/linuxPPC64leGcc/linuxPPC64leGcc
new file mode 100644
index 0000000000..284007b730
--- /dev/null
+++ b/wmake/rules/linuxPPC64leGcc/linuxPPC64leGcc
@@ -0,0 +1,24 @@
+SUFFIXES += .C
+
+c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
+
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
+CC          = g++ -m64 -mcpu=power8
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed

From 07e0e27c4a6bdd20b43ccde53af20ee6d4a78f18 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 13 Sep 2015 21:21:51 +0100
Subject: [PATCH 43/70] Renamed file Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1846

---
 wmake/rules/linuxPPC64leGcc/c++             |  4 ++--
 wmake/rules/linuxPPC64leGcc/linuxPPC64leGcc | 24 ---------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 wmake/rules/linuxPPC64leGcc/linuxPPC64leGcc

diff --git a/wmake/rules/linuxPPC64leGcc/c++ b/wmake/rules/linuxPPC64leGcc/c++
index 0eec42b85e..284007b730 100644
--- a/wmake/rules/linuxPPC64leGcc/c++
+++ b/wmake/rules/linuxPPC64leGcc/c++
@@ -20,5 +20,5 @@ cpptoo      = $(Ctoo)
 
 LINK_LIBS   = $(c++DBUG)
 
-LINKLIBSO   = $(CC) $(c++FLAGS) -shared
-LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed
diff --git a/wmake/rules/linuxPPC64leGcc/linuxPPC64leGcc b/wmake/rules/linuxPPC64leGcc/linuxPPC64leGcc
deleted file mode 100644
index 284007b730..0000000000
--- a/wmake/rules/linuxPPC64leGcc/linuxPPC64leGcc
+++ /dev/null
@@ -1,24 +0,0 @@
-SUFFIXES += .C
-
-c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
-
-# Suppress some warnings for flex++ and CGAL
-c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
-
-CC          = g++ -m64 -mcpu=power8
-
-include $(RULES)/c++$(WM_COMPILE_OPTION)
-
-ptFLAGS     = -DNoRepository -ftemplate-depth-100
-
-c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
-
-Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-LINK_LIBS   = $(c++DBUG)
-
-LINKLIBSO   = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
-LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed

From bb0898d2e085275d62e82c199924099cd5516c46 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 13 Sep 2015 22:21:53 +0100
Subject: [PATCH 44/70] globalMeshData: Changed the communicator for the
 reductions Avoids problems with overlapping communicationbetween these
 reductions and the calculation of deltaCoeffs.  This is a temporary fix while
 code reorganizations are undertaken to ensure the globalMeshData is updated
 before deltaCoeffs are requested.

Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1780
---
 .../polyMesh/globalMeshData/globalMeshData.C  | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 2739e828b3..b36a0e9579 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -2746,22 +2746,44 @@ void Foam::globalMeshData::updateMesh()
         Pout<< "globalMeshData : merge dist:" << tolDim << endl;
     }
 
+    // *** Temporary hack to avoid problems with overlapping communication
+    // *** between these reductions and the calculation of deltaCoeffs
+    label comm = UPstream::worldComm + 1;
+
     // Total number of faces.
-    nTotalFaces_ = returnReduce(mesh_.nFaces(), sumOp<label>());
+    nTotalFaces_ = returnReduce
+    (
+        mesh_.nFaces(),
+        sumOp<label>(),
+        Pstream::msgType(),
+        comm
+    );
 
     if (debug)
     {
         Pout<< "globalMeshData : nTotalFaces_:" << nTotalFaces_ << endl;
     }
 
-    nTotalCells_ = returnReduce(mesh_.nCells(), sumOp<label>());
+    nTotalCells_ = returnReduce
+    (
+        mesh_.nCells(),
+        sumOp<label>(),
+        Pstream::msgType(),
+        comm
+    );
 
     if (debug)
     {
         Pout<< "globalMeshData : nTotalCells_:" << nTotalCells_ << endl;
     }
 
-    nTotalPoints_ = returnReduce(mesh_.nPoints(), sumOp<label>());
+    nTotalPoints_ = returnReduce
+    (
+        mesh_.nPoints(),
+        sumOp<label>(),
+        Pstream::msgType(),
+        comm
+    );
 
     if (debug)
     {

From 15c7b16c2089f7014624a99eaee1a1cc1695d6fa Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 16 Sep 2015 21:25:09 +0100
Subject: [PATCH 45/70] PtrList: Added const_iterator

---
 .../containers/Lists/PtrList/PtrList.H        | 116 ++++++++-
 .../containers/Lists/PtrList/PtrListI.H       | 227 +++++++++++++++++-
 2 files changed, 339 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index 357b078dbf..b3b2924d9f 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,7 @@ Description
     pointer.
 
 SourceFiles
+    PtrListI.H
     PtrList.C
     PtrListIO.C
 
@@ -80,6 +81,34 @@ inline label operator-
     const typename PtrList<T>::iterator&
 );
 
+template<class T>
+inline typename PtrList<T>::const_iterator operator+
+(
+    const typename PtrList<T>::const_iterator&,
+    label
+);
+
+template<class T>
+inline typename PtrList<T>::const_iterator operator+
+(
+    label,
+    const typename PtrList<T>::const_iterator&
+);
+
+template<class T>
+inline typename PtrList<T>::const_iterator operator-
+(
+    const typename PtrList<T>::const_iterator&,
+    label
+);
+
+template<class T>
+inline label operator-
+(
+    const typename PtrList<T>::const_iterator&,
+    const typename PtrList<T>::const_iterator&
+);
+
 template<class T>
 Istream& operator>>(Istream&, PtrList<T>&);
 
@@ -245,7 +274,9 @@ public:
     // Random access iterator for traversing PtrList.
 
         class iterator;
+        class const_iterator;
         friend class iterator;
+        friend class const_iterator;
 
         //- An STL-conforming iterator
         class iterator
@@ -254,6 +285,8 @@ public:
 
         public:
 
+            friend class const_iterator;
+
             //- Construct for a given PtrList entry
             inline iterator(T**);
 
@@ -303,6 +336,87 @@ public:
         inline iterator end();
 
 
+    // STL const_iterator
+    // Random access iterator for traversing PtrList.
+
+        //- An STL-conforming const_iterator
+        class const_iterator
+        {
+            const T* const* ptr_;
+
+        public:
+
+            //- Construct for a given PtrList entry
+            inline const_iterator(const T* const*);
+
+            //- Construct from an iterator
+            inline const_iterator(const iterator&);
+
+
+            // Member operators
+
+                inline bool operator==(const const_iterator&) const;
+                inline bool operator!=(const const_iterator&) const;
+
+                typedef const T& Tref;
+                inline Tref operator*();
+                inline Tref operator()();
+
+                inline const_iterator operator++();
+                inline const_iterator operator++(int);
+
+                inline const_iterator operator--();
+                inline const_iterator operator--(int);
+
+                inline const_iterator operator+=(label);
+
+                friend const_iterator operator+ <T>
+                (
+                    const const_iterator&,
+                    label
+                );
+                friend const_iterator operator+ <T>
+                (
+                    label,
+                    const const_iterator&
+                );
+
+                inline const_iterator operator-=(label);
+
+                friend const_iterator operator- <T>
+                (
+                    const const_iterator&,
+                    label
+                );
+
+                friend label operator- <T>
+                (
+                    const const_iterator&,
+                    const const_iterator&
+                );
+
+                inline const T& operator[](label);
+
+                inline bool operator<(const const_iterator&) const;
+                inline bool operator>(const const_iterator&) const;
+
+                inline bool operator<=(const const_iterator&) const;
+                inline bool operator>=(const const_iterator&) const;
+        };
+
+        //- Return an const_iterator to begin traversing the PtrList.
+        inline const_iterator cbegin() const;
+
+        //- Return an const_iterator to end traversing the PtrList.
+        inline const_iterator cend() const;
+
+        //- Return an const_iterator to begin traversing the PtrList.
+        inline const_iterator begin() const;
+
+        //- Return an const_iterator to end traversing the PtrList.
+        inline const_iterator end() const;
+
+
     // IOstream operator
 
         //- Read List from Istream, discarding contents of existing List.
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
index e6acf7fab6..a2970eb361 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,8 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
 #include "autoPtr.H"
 #include "tmp.H"
 
@@ -373,4 +371,227 @@ inline typename Foam::PtrList<T>::iterator Foam::PtrList<T>::end()
 }
 
 
+// * * * * * * * * * * * * * * * STL const_iterator  * * * * * * * * * * * * //
+
+template<class T>
+inline Foam::PtrList<T>::const_iterator::const_iterator(const T* const* ptr)
+:
+    ptr_(ptr)
+{}
+
+
+template<class T>
+inline Foam::PtrList<T>::const_iterator::const_iterator(const iterator& iter)
+:
+    ptr_(iter.ptr_)
+{}
+
+
+template<class T>
+inline bool Foam::PtrList<T>::const_iterator::operator==
+(
+    const const_iterator& iter
+) const
+{
+    return ptr_ == iter.ptr_;
+}
+
+
+template<class T>
+inline bool Foam::PtrList<T>::const_iterator::operator!=
+(
+    const const_iterator& iter
+) const
+{
+    return ptr_ != iter.ptr_;
+}
+
+
+template<class T>
+inline const T& Foam::PtrList<T>::const_iterator::operator*()
+{
+    return **ptr_;
+}
+
+
+template<class T>
+inline const T& Foam::PtrList<T>::const_iterator::operator()()
+{
+    return operator*();
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::PtrList<T>::const_iterator::operator++()
+{
+    ++ptr_;
+    return *this;
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::PtrList<T>::const_iterator::operator++(int)
+{
+    const_iterator tmp = *this;
+    ++ptr_;
+    return tmp;
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::PtrList<T>::const_iterator::operator--()
+{
+    --ptr_;
+    return *this;
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::PtrList<T>::const_iterator::operator--(int)
+{
+    const_iterator tmp = *this;
+    --ptr_;
+    return tmp;
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::PtrList<T>::const_iterator::operator+=(label n)
+{
+    ptr_ += n;
+    return *this;
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::operator+(const typename PtrList<T>::const_iterator& iter, label n)
+{
+    typename PtrList<T>::const_iterator tmp = iter;
+    return tmp += n;
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::operator+(label n, const typename PtrList<T>::const_iterator& iter)
+{
+    typename PtrList<T>::const_iterator tmp = iter;
+    return tmp += n;
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::PtrList<T>::const_iterator::operator-=(label n)
+{
+    ptr_ -= n;
+    return *this;
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::operator-(const typename PtrList<T>::const_iterator& iter, label n)
+{
+    typename PtrList<T>::const_iterator tmp = iter;
+    return tmp -= n;
+}
+
+
+template<class T>
+inline Foam::label Foam::operator-
+(
+    const typename PtrList<T>::const_iterator& iter1,
+    const typename PtrList<T>::const_iterator& iter2
+)
+{
+    return (iter1.ptr_ - iter2.ptr_)/sizeof(T*);
+}
+
+
+template<class T>
+inline const T& Foam::PtrList<T>::const_iterator::operator[](label n)
+{
+    return *(*this + n);
+}
+
+
+template<class T>
+inline bool Foam::PtrList<T>::const_iterator::operator<
+(
+    const const_iterator& iter
+) const
+{
+    return ptr_ < iter.ptr_;
+}
+
+
+template<class T>
+inline bool Foam::PtrList<T>::const_iterator::operator>
+(
+    const const_iterator& iter
+) const
+{
+    return ptr_ > iter.ptr_;
+}
+
+
+template<class T>
+inline bool Foam::PtrList<T>::const_iterator::operator<=
+(
+    const const_iterator& iter
+) const
+{
+    return ptr_ <= iter.ptr_;
+}
+
+
+template<class T>
+inline bool Foam::PtrList<T>::const_iterator::operator>=
+(
+    const const_iterator& iter
+) const
+{
+    return ptr_ >= iter.ptr_;
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::PtrList<T>::begin() const
+{
+    return ptrs_.begin();
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::PtrList<T>::end() const
+{
+    return ptrs_.end();
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::PtrList<T>::cbegin() const
+{
+    return ptrs_.begin();
+}
+
+
+template<class T>
+inline typename Foam::PtrList<T>::const_iterator
+Foam::PtrList<T>::cend() const
+{
+    return ptrs_.end();
+}
+
+
 // ************************************************************************* //

From 7b5d6114ad150e638b95eab6506f37f034d2d23f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 16 Sep 2015 21:26:26 +0100
Subject: [PATCH 46/70] PtrListDictionary: New form of Dictionary in which the
 list type is PtrList rather than a linked-list

---
 .../test/PtrListDictionary/Make/files         |   3 +
 .../test/PtrListDictionary/Make/options       |   0
 .../Test-PtrListDictionary.C                  | 123 +++++++++++++++++
 .../DictionaryBase/DictionaryBase.H           |   6 +-
 .../PtrDictionary/PtrDictionary.H             |   7 +-
 .../PtrListDictionary/PtrListDictionary.C     | 127 ++++++++++++++++++
 .../PtrListDictionary/PtrListDictionary.H     | 121 +++++++++++++++++
 7 files changed, 381 insertions(+), 6 deletions(-)
 create mode 100644 applications/test/PtrListDictionary/Make/files
 create mode 100644 applications/test/PtrListDictionary/Make/options
 create mode 100644 applications/test/PtrListDictionary/Test-PtrListDictionary.C
 create mode 100644 src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.C
 create mode 100644 src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H

diff --git a/applications/test/PtrListDictionary/Make/files b/applications/test/PtrListDictionary/Make/files
new file mode 100644
index 0000000000..a3c4c87ba4
--- /dev/null
+++ b/applications/test/PtrListDictionary/Make/files
@@ -0,0 +1,3 @@
+Test-PtrListDictionary.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-PtrListDictionary
diff --git a/applications/test/PtrListDictionary/Make/options b/applications/test/PtrListDictionary/Make/options
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/applications/test/PtrListDictionary/Test-PtrListDictionary.C b/applications/test/PtrListDictionary/Test-PtrListDictionary.C
new file mode 100644
index 0000000000..33aa3b2792
--- /dev/null
+++ b/applications/test/PtrListDictionary/Test-PtrListDictionary.C
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#include "OSspecific.H"
+
+#include "scalar.H"
+
+#include "IOstreams.H"
+#include "PtrListDictionary.H"
+
+using namespace Foam;
+
+class Scalar
+{
+    scalar data_;
+
+public:
+
+    Scalar()
+    :
+        data_(0)
+    {}
+
+    Scalar(scalar val)
+    :
+        data_(val)
+    {}
+
+    ~Scalar()
+    {
+        Info<<"delete Scalar: " << data_ << endl;
+    }
+
+    friend Ostream& operator<<(Ostream& os, const Scalar& val)
+    {
+        os  << val.data_;
+        return os;
+    }
+};
+
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    PtrListDictionary<Scalar> scalarDict(10);
+    forAll(scalarDict, i)
+    {
+        word key("ent" + name(i));
+        scalarDict.set(i, key, new Scalar(1.3*i));
+    }
+
+    Info<< nl << "scalarDict1: " << endl;
+    forAll(scalarDict, i)
+    {
+        Info<< "elem " << i << " = " << scalarDict[i] << endl;
+    }
+
+    Scalar* ent8Ptr = scalarDict.lookupPtr("ent8");
+
+    Info<< "ent8 = " << *ent8Ptr << endl;
+
+    PtrListDictionary<Scalar> scalarDict2(15);
+    forAll(scalarDict2, i)
+    {
+        word key("ent" + name(i));
+        scalarDict2.set(i, key, new Scalar(1.3*i));
+    }
+    Info<< nl << "scalarDict2: " << endl;
+    forAll(scalarDict2, i)
+    {
+        Info<< "elem " << i << " = " << scalarDict2[i] << endl;
+    }
+
+    scalarDict.transfer(scalarDict2);
+
+    Scalar* p = scalarDict.lookupPtr("ent8");
+
+    if (p)
+    {
+        Info<< "found: " << *p << endl;
+    }
+    else
+    {
+        Info<< "no p: " << endl;
+    }
+
+    scalarDict.clear();
+
+    Info<< nl << "Done." << endl;
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
index 43634bc93a..f9294eedd0 100644
--- a/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
+++ b/src/OpenFOAM/containers/Dictionaries/DictionaryBase/DictionaryBase.H
@@ -74,13 +74,15 @@ class DictionaryBase
 :
     public IDLListType
 {
-    // Private data
+protected:
+
+    // Protected data
 
         //- HashTable of the entries held on the IDLListType for quick lookup
         HashTable<T*> hashedTs_;
 
 
-    // Private Member functions
+    // Protected Member functions
 
         // Add the IDLListType entries into the HashTable
         void addEntries();
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
index e6d1a5f999..a287e326cb 100644
--- a/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
+++ b/src/OpenFOAM/containers/Dictionaries/PtrDictionary/PtrDictionary.H
@@ -25,11 +25,10 @@ Class
     Foam::PtrDictionary
 
 Description
-    Template dictionary class which does not manages the storage
-    associated with it.
+    Template dictionary class which manages the storage associated with it.
 
-    It is derived from DictionaryBase instantiated on a non-memory managed
-    form of intrusive doubly-linked list of T.
+    It is derived from DictionaryBase instantiated on a memory managed form of
+    intrusive doubly-linked list of \<T\>.
 
 SourceFiles
     PtrDictionary.C
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.C b/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.C
new file mode 100644
index 0000000000..dae34e82fe
--- /dev/null
+++ b/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.C
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "PtrListDictionary.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class T>
+Foam::PtrListDictionary<T>::PtrListDictionary(const label size)
+:
+    DictionaryBase<PtrList<T>, T>(2*size)
+{
+    PtrList<T>::setSize(size);
+}
+
+
+template<class T>
+Foam::PtrListDictionary<T>::PtrListDictionary(const PtrListDictionary& dict)
+:
+    DictionaryBase<PtrList<T>, T>(dict)
+{}
+
+
+template<class T>
+template<class INew>
+Foam::PtrListDictionary<T>::PtrListDictionary(Istream& is, const INew& iNew)
+:
+    DictionaryBase<PtrList<T>, T>(is, iNew)
+{}
+
+
+template<class T>
+Foam::PtrListDictionary<T>::PtrListDictionary(Istream& is)
+:
+    DictionaryBase<PtrList<T>, T>(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class T>
+inline Foam::autoPtr<T> Foam::PtrListDictionary<T>::set
+(
+    const label i,
+    const word& key,
+    T* ptr
+)
+{
+    if (!DictionaryBase<PtrList<T>, T>::hashedTs_.insert(key, ptr))
+    {
+        FatalErrorIn
+        (
+            "PtrListDictionary<T>::set(const label i, const word& key, T* ptr)"
+        )   << "Cannot insert with key '" << key << "' into hash-table"
+            << abort(FatalError);
+    }
+    return PtrList<T>::set(i, ptr);
+}
+
+
+template<class T>
+inline Foam::autoPtr<T> Foam::PtrListDictionary<T>::set
+(
+    const label i,
+    const word& key,
+    autoPtr<T>& aptr
+)
+{
+    T* ptr = aptr.ptr();
+    if (!DictionaryBase<PtrList<T>, T>::hashedTs_.insert(key, ptr))
+    {
+        FatalErrorIn
+        (
+            "PtrListDictionary<T>::"
+            "set(const label i, const word& key, autoPtr<T>& aptr)"
+        )   << "Cannot insert with key '" << key << "' into hash-table"
+            << abort(FatalError);
+    }
+    return PtrList<T>::set(i, ptr);
+}
+
+
+template<class T>
+inline Foam::autoPtr<T> Foam::PtrListDictionary<T>::set
+(
+    const label i,
+    const word& key,
+    tmp<T>& t
+)
+{
+    T* ptr = t.ptr();
+    if (!DictionaryBase<PtrList<T>, T>::hashedTs_.insert(key, ptr))
+    {
+        FatalErrorIn
+        (
+            "PtrListDictionary<T>::"
+            "set(const label i, const word& key, tmp<T>& t)"
+        )   << "Cannot insert with key '" << key << "' into hash-table"
+            << abort(FatalError);
+    }
+    return PtrList<T>::set(i, ptr);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H b/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H
new file mode 100644
index 0000000000..761bccd76e
--- /dev/null
+++ b/src/OpenFOAM/containers/Dictionaries/PtrListDictionary/PtrListDictionary.H
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::PtrListDictionary
+
+Description
+    Template dictionary class which manages the storage associated with it.
+
+    It is derived from DictionaryBase instantiated on the memory managed PtrList
+    of \<T\> to provide ordered indexing in addition to the dictionary lookup.
+
+SourceFiles
+    PtrListDictionary.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PtrListDictionary_H
+#define PtrListDictionary_H
+
+#include "DictionaryBase.H"
+#include "PtrList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class PtrListDictionary Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class T>
+class PtrListDictionary
+:
+    public DictionaryBase<PtrList<T>, T>
+{
+
+public:
+
+    // Constructors
+
+        //- Construct given initial list size
+        PtrListDictionary(const label size);
+
+        //- Copy construct
+        PtrListDictionary(const PtrListDictionary&);
+
+        //- Construct from Istream using given Istream constructor class
+        template<class INew>
+        PtrListDictionary(Istream&, const INew&);
+
+        //- Construct from Istream
+        PtrListDictionary(Istream&);
+
+
+    // Member functions
+
+        //- Set element to pointer provided and return old element
+        autoPtr<T> set(const label, const word& key, T*);
+
+        //- Set element to autoPtr value provided and return old element
+        autoPtr<T> set(const label, const word& key, autoPtr<T>&);
+
+        //- Set element to tmp value provided and return old element
+        autoPtr<T> set(const label, const word& key, tmp<T>&);
+
+
+    // Member operators
+
+        using PtrList<T>::operator[];
+
+        //- Find and return entry
+        const T& operator[](const word& key) const
+        {
+            return *DictionaryBase<PtrList<T>, T>::operator[](key);
+        }
+
+        //- Find and return entry
+        T& operator[](const word& key)
+        {
+            return *DictionaryBase<PtrList<T>, T>::operator[](key);
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PtrListDictionary.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From c31789c34cedf1125861ada123d80a67aa1a9b4e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 16 Sep 2015 21:29:09 +0100
Subject: [PATCH 47/70] reactingEulerFoam: Use PtrListDictionary for list/table
 of phases This makes looping over the phases much simpler which maintaining
 support for phase-name lookup.

---
 .../HeatAndMassTransferPhaseSystem.C          |   2 +-
 .../HeatTransferPhaseSystem.C                 |   2 +-
 ...terfaceCompositionPhaseChangePhaseSystem.C |   2 +-
 .../MomentumTransferPhaseSystem.C             |   2 +-
 .../ThermalPhaseChangePhaseSystem.C           |   2 +-
 .../phaseSystems/phaseSystem/phaseSystem.C    |  22 +-
 .../phaseSystems/phaseSystem/phaseSystem.H    |  12 +-
 .../phaseSystems/phaseSystem/phaseSystemI.H   |   4 +-
 .../phaseSystem/phaseSystemTemplates.H        |   2 +-
 .../reactingMultiphaseEulerFoam/CourantNo.H   |   4 +-
 .../reactingMultiphaseEulerFoam/EEqns.H       |   9 +-
 .../reactingMultiphaseEulerFoam/YEqns.H       |   5 +-
 .../multiphaseSystem/multiphaseSystem.C       |  67 ++--
 .../reactingMultiphaseEulerFoam/pU/UEqns.H    |   8 +-
 .../reactingMultiphaseEulerFoam/pU/pEqn.H     |  77 ++---
 .../reactingMultiphaseEulerFoam/pU/pEqnSave.H | 285 ------------------
 .../reactingMultiphaseEulerFoam/setRDeltaT.H  |   4 +-
 .../twoPhaseSystem/twoPhaseSystem.C           |   4 +-
 18 files changed, 93 insertions(+), 420 deletions(-)
 delete mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqnSave.H

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
index 66d119fd94..bfad310038 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
@@ -270,7 +270,7 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
 
     forAllConstIter
     (
-        phaseSystem::phaseModelTable,
+        phaseSystem::phaseModelList,
         this->phaseModels_,
         phaseModelIter
     )
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
index 67a3918a32..a0881ee33a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
@@ -122,7 +122,7 @@ Foam::HeatTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
 
     forAllConstIter
     (
-        phaseSystem::phaseModelTable,
+        phaseSystem::phaseModelList,
         this->phaseModels_,
         phaseModelIter
     )
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
index 47c994334d..801ceb8caa 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
@@ -71,7 +71,7 @@ massTransfer() const
 
     forAllConstIter
     (
-        phaseSystem::phaseModelTable,
+        phaseSystem::phaseModelList,
         this->phaseModels_,
         phaseModelIter
     )
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index cf7fae6f40..0f5470d26e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -415,7 +415,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
 
     forAllConstIter
     (
-        phaseSystem::phaseModelTable,
+        phaseSystem::phaseModelList,
         this->phaseModels_,
         phaseModelIter
     )
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index ffdb41326e..1eb96b3b26 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -66,7 +66,7 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::massTransfer() const
 
     forAllConstIter
     (
-        phaseSystem::phaseModelTable,
+        phaseSystem::phaseModelList,
         this->phaseModels_,
         phaseModelIter
     )
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
index 31dc2375db..ae23455d88 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
@@ -43,10 +43,10 @@ const Foam::word Foam::phaseSystem::propertiesName("phaseProperties");
 
 Foam::tmp<Foam::surfaceScalarField> Foam::phaseSystem::calcPhi
 (
-    const phaseModelTable& phaseModels
+    const phaseModelList& phaseModels
 ) const
 {
-    phaseModelTable::const_iterator phaseModelIter = phaseModels.begin();
+    phaseModelList::const_iterator phaseModelIter = phaseModels.begin();
 
     tmp<surfaceScalarField> tmpPhi
     (
@@ -196,7 +196,7 @@ Foam::phaseSystem::~phaseSystem()
 
 Foam::tmp<Foam::volScalarField> Foam::phaseSystem::rho() const
 {
-    phaseModelTable::const_iterator phaseModelIter = phaseModels_.begin();
+    phaseModelList::const_iterator phaseModelIter = phaseModels_.begin();
 
     tmp<volScalarField> tmpRho
     (
@@ -214,7 +214,7 @@ Foam::tmp<Foam::volScalarField> Foam::phaseSystem::rho() const
 
 Foam::tmp<Foam::volVectorField> Foam::phaseSystem::U() const
 {
-    phaseModelTable::const_iterator phaseModelIter = phaseModels_.begin();
+    phaseModelList::const_iterator phaseModelIter = phaseModels_.begin();
 
     tmp<volVectorField> tmpU
     (
@@ -266,7 +266,7 @@ void Foam::phaseSystem::solve()
 
 void Foam::phaseSystem::correct()
 {
-    forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
+    forAllIter(phaseModelList, phaseModels_, phaseModelIter)
     {
         phaseModelIter().correct();
     }
@@ -277,7 +277,7 @@ void Foam::phaseSystem::correctKinematics()
 {
     bool updateDpdt = false;
 
-    forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
+    forAllIter(phaseModelList, phaseModels_, phaseModelIter)
     {
         phaseModelIter().correctKinematics();
 
@@ -287,14 +287,14 @@ void Foam::phaseSystem::correctKinematics()
     // Update the pressure time-derivative if required
     if (updateDpdt)
     {
-        dpdt_ = fvc::ddt(phaseModels_.begin()()->thermo().p());
+        dpdt_ = fvc::ddt(phaseModels_.begin()().thermo().p());
     }
 }
 
 
 void Foam::phaseSystem::correctThermo()
 {
-    forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
+    forAllIter(phaseModelList, phaseModels_, phaseModelIter)
     {
         phaseModelIter().correctThermo();
     }
@@ -303,7 +303,7 @@ void Foam::phaseSystem::correctThermo()
 
 void Foam::phaseSystem::correctTurbulence()
 {
-    forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
+    forAllIter(phaseModelList, phaseModels_, phaseModelIter)
     {
         phaseModelIter().correctTurbulence();
     }
@@ -312,7 +312,7 @@ void Foam::phaseSystem::correctTurbulence()
 
 void Foam::phaseSystem::correctEnergyTransport()
 {
-    forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
+    forAllIter(phaseModelList, phaseModels_, phaseModelIter)
     {
         phaseModelIter().correctEnergyTransport();
     }
@@ -325,7 +325,7 @@ bool Foam::phaseSystem::read()
     {
         bool readOK = true;
 
-        forAllIter(phaseModelTable, phaseModels_, phaseModelIter)
+        forAllIter(phaseModelList, phaseModels_, phaseModelIter)
         {
             readOK &= phaseModelIter().read();
         }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index bcb268bdc5..95eb7f6a3f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
@@ -42,7 +42,7 @@ SourceFiles
 #include "phasePair.H"
 #include "orderedPhasePair.H"
 #include "HashPtrTable.H"
-#include "PtrDictionary.H"
+#include "PtrListDictionary.H"
 
 #include "IOMRFZoneList.H"
 #include "fvIOoptionList.H"
@@ -118,7 +118,7 @@ public:
             >
             massTransferTable;
 
-        typedef PtrDictionary<phaseModel> phaseModelTable;
+        typedef PtrListDictionary<phaseModel> phaseModelList;
 
 
 protected:
@@ -162,7 +162,7 @@ protected:
         const fvMesh& mesh_;
 
         //- Phase models
-        phaseModelTable phaseModels_;
+        phaseModelList phaseModels_;
 
         //- Phase pairs
         phasePairTable phasePairs_;
@@ -197,7 +197,7 @@ protected:
         //- Calculate and return the mixture flux
         tmp<surfaceScalarField> calcPhi
         (
-            const phaseModelTable& phaseModels
+            const phaseModelList& phaseModels
         ) const;
 
         //- Generate pairs
@@ -284,10 +284,10 @@ public:
         inline const fvMesh& mesh() const;
 
         //- Constant access the phase models
-        inline const phaseModelTable& phases() const;
+        inline const phaseModelList& phases() const;
 
         //- Access the phase models
-        inline phaseModelTable& phases();
+        inline phaseModelList& phases();
 
         //- Constant access the phase pairs
         inline const phasePairTable& phasePairs() const;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
index 343d31f49b..0f9aef5033 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H
@@ -31,14 +31,14 @@ inline const Foam::fvMesh& Foam::phaseSystem::mesh() const
 }
 
 
-inline const Foam::phaseSystem::phaseModelTable&
+inline const Foam::phaseSystem::phaseModelList&
 Foam::phaseSystem::phases() const
 {
     return phaseModels_;
 }
 
 
-inline Foam::phaseSystem::phaseModelTable&
+inline Foam::phaseSystem::phaseModelList&
 Foam::phaseSystem::phases()
 {
     return phaseModels_;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
index 40d96f9df7..37a3627e1c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
@@ -151,7 +151,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
         HashTable<autoPtr<modelType>, phasePairKey, phasePairKey::hash>
         modelTypeTable;
 
-    forAllConstIter(phaseModelTable, phaseModels_, phaseModelIter)
+    forAllConstIter(phaseModelList, phaseModels_, phaseModelIter)
     {
         modelTypeTable tempModels;
         generatePairsAndSubModels
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H
index df28acb69f..93c97ac4b0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H
@@ -39,12 +39,12 @@ if (mesh.nInternalFaces())
         fvc::surfaceSum(mag(phi))().internalField()
     );
 
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
         sumPhi = max
         (
             sumPhi,
-            fvc::surfaceSum(mag(iter().phi()))().internalField()
+            fvc::surfaceSum(mag(fluid.phases()[phasei].phi()))().internalField()
         );
     }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
index 86150a045d..15a8f6216b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
@@ -6,9 +6,10 @@
 
     phaseSystem::heatTransferTable& heatTransfer = heatTransferPtr();
 
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = fluid.phases()[phasei];
+
         const volScalarField& alpha = phase;
         const volScalarField& rho = phase.rho();
         const volVectorField& U = phase.U();
@@ -35,9 +36,9 @@
 
 fluid.correctThermo();
 
-forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+forAll(fluid.phases(), phasei)
 {
-    phaseModel& phase = iter();
+    phaseModel& phase = fluid.phases()[phasei];
 
     Info<< phase.name() << " min/max T "
         << min(phase.thermo().T()).value()
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H
index 7c4345913d..5a44011fc9 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H
@@ -5,9 +5,10 @@
     phaseSystem::massTransferTable&
         massTransfer(massTransferPtr());
 
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = fluid.phases()[phasei];
+
         PtrList<volScalarField>& Y = phase.Y();
         const volScalarField& alpha = phase;
         const volScalarField& rho = phase.rho();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 276dd4e026..cf765d4c07 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -59,9 +59,9 @@ void Foam::multiphaseSystem::calcAlphas()
     scalar level = 0.0;
     alphas_ == 0.0;
 
-    forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+    forAll(phases(), i)
     {
-        alphas_ += level*iter();
+        alphas_ += level*phases()[i];
         level += 1.0;
     }
 
@@ -72,11 +72,9 @@ void Foam::multiphaseSystem::calcAlphas()
 void Foam::multiphaseSystem::solveAlphas()
 {
     PtrList<surfaceScalarField> alphaPhiCorrs(phases().size());
-    int phasei = 0;
-
-    forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+    forAll(phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = phases()[phasei];
         volScalarField& alpha1 = phase;
 
         phase.alphaPhi() =
@@ -99,9 +97,9 @@ void Foam::multiphaseSystem::solveAlphas()
 
         surfaceScalarField& alphaPhiCorr = alphaPhiCorrs[phasei];
 
-        forAllIter(PtrDictionary<phaseModel>, phases(), iter2)
+        forAll(phases(), phasej)
         {
-            phaseModel& phase2 = iter2();
+            phaseModel& phase2 = phases()[phasej];
             volScalarField& alpha2 = phase2;
 
             if (&phase2 == &phase) continue;
@@ -170,8 +168,6 @@ void Foam::multiphaseSystem::solveAlphas()
             0,
             true
         );
-
-        phasei++;
     }
 
     MULES::limitSum(alphaPhiCorrs);
@@ -191,10 +187,9 @@ void Foam::multiphaseSystem::solveAlphas()
 
     volScalarField divU(fvc::div(fvc::absolute(phi_, phases().first().U())));
 
-    phasei = 0;
-    forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+    forAll(phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = phases()[phasei];
         volScalarField& alpha = phase;
 
         surfaceScalarField& alphaPhic = alphaPhiCorrs[phasei];
@@ -245,9 +240,9 @@ void Foam::multiphaseSystem::solveAlphas()
             }
         }
 
-        forAllConstIter(PtrDictionary<phaseModel>, phases(), iter2)
+        forAll(phases(), phasej)
         {
-            const phaseModel& phase2 = iter2();
+            const phaseModel& phase2 = phases()[phasej];
             const volScalarField& alpha2 = phase2;
 
             if (&phase2 == &phase) continue;
@@ -294,8 +289,6 @@ void Foam::multiphaseSystem::solveAlphas()
             << endl;
 
         sumAlpha += phase;
-
-        phasei++;
     }
 
     Info<< "Phase-sum volume fraction, min, max = "
@@ -506,9 +499,9 @@ Foam::multiphaseSystem::multiphaseSystem
         1e-8/pow(average(mesh.V()), 1.0/3.0)
     )
 {
-    forAllIter(phaseSystem::phaseModelTable, phases(), iter)
+    forAll(phases(), phasei)
     {
-        volScalarField& alphai = iter();
+        volScalarField& alphai = phases()[phasei];
         mesh.setFluxRequired(alphai.name());
     }
 }
@@ -547,9 +540,9 @@ Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
         )
     );
 
-    forAllConstIter(PtrDictionary<phaseModel>, phases(), iter)
+    forAll(phases(), phasej)
     {
-        const phaseModel& phase2 = iter();
+        const phaseModel& phase2 = phases()[phasej];
 
         if (&phase2 != &phase1)
         {
@@ -591,9 +584,13 @@ Foam::multiphaseSystem::nearInterface() const
         )
     );
 
-    forAllConstIter(PtrDictionary<phaseModel>, phases(), iter)
+    forAll(phases(), phasei)
     {
-        tnearInt() = max(tnearInt(), pos(iter() - 0.01)*pos(0.99 - iter()));
+        tnearInt() = max
+        (
+            tnearInt(),
+            pos(phases()[phasei] - 0.01)*pos(0.99 - phases()[phasei])
+        );
     }
 
     return tnearInt;
@@ -625,10 +622,9 @@ void Foam::multiphaseSystem::solve()
         PtrList<volScalarField> alpha0s(phases().size());
         PtrList<surfaceScalarField> phiSums(phases().size());
 
-        int phasei = 0;
-        forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+        forAll(phases(), phasei)
         {
-            phaseModel& phase = iter();
+            phaseModel& phase = phases()[phasei];
             volScalarField& alpha = phase;
 
             alpha0s.set
@@ -652,8 +648,6 @@ void Foam::multiphaseSystem::solve()
                     dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0)
                 )
             );
-
-            phasei++;
         }
 
         for
@@ -668,18 +662,15 @@ void Foam::multiphaseSystem::solve()
         {
             solveAlphas();
 
-            int phasei = 0;
-            forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+            forAll(phases(), phasei)
             {
-                phiSums[phasei] += iter().phi();
-                phasei++;
+                phiSums[phasei] += phases()[phasei].phi();
             }
         }
 
-        phasei = 0;
-        forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+        forAll(phases(), phasei)
         {
-            phaseModel& phase = iter();
+            phaseModel& phase = phases()[phasei];
             volScalarField& alpha = phase;
 
             phase.phi() = phiSums[phasei]/nAlphaSubCycles;
@@ -691,8 +682,6 @@ void Foam::multiphaseSystem::solve()
             // Reset the old-time field value
             alpha.oldTime() = alpha0s[phasei];
             alpha.oldTime().timeIndex() = runTime.timeIndex();
-
-            phasei++;
         }
     }
     else
@@ -700,9 +689,9 @@ void Foam::multiphaseSystem::solve()
         solveAlphas();
     }
 
-    forAllIter(PtrDictionary<phaseModel>, phases(), iter)
+    forAll(phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = phases()[phasei];
         phase.alphaRhoPhi() = fvc::interpolate(phase.rho())*phase.alphaPhi();
     }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
index 07a5c88194..3b6ee95513 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
@@ -9,10 +9,10 @@ PtrList<fvVectorMatrix> UEqns(fluid.phases().size());
     phaseSystem::momentumTransferTable&
         momentumTransfer(momentumTransferPtr());
 
-    int phasei = 0;
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = fluid.phases()[phasei];
+
         const volScalarField& alpha = phase;
         const volScalarField& rho = phase.rho();
         volVectorField& U = phase.U();
@@ -31,7 +31,5 @@ PtrList<fvVectorMatrix> UEqns(fluid.phases().size());
 
         UEqns[phasei].relax();
         fvOptions.constrain(UEqns[phasei]);
-
-        phasei++;
     }
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index 442676d1b9..ff759f42c6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -2,10 +2,9 @@ PtrList<surfaceScalarField> alphafs(fluid.phases().size());
 PtrList<volScalarField> rAUs(fluid.phases().size());
 PtrList<surfaceScalarField> alpharAUfs(fluid.phases().size());
 
-int phasei = 0;
-forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+forAll(fluid.phases(), phasei)
 {
-    phaseModel& phase = iter();
+    phaseModel& phase = fluid.phases()[phasei];
     const volScalarField& alpha = phase;
 
     alphafs.set(phasei, fvc::interpolate(alpha).ptr());
@@ -33,8 +32,6 @@ forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
             fvc::interpolate(max(alpha, phase.residualAlpha())*rAUs[phasei])
         ).ptr()
     );
-
-    phasei++;
 }
 
 // Turbulent diffusion, particle-pressure, lift and wall-lubrication fluxes
@@ -42,10 +39,9 @@ PtrList<surfaceScalarField> phiFs(fluid.phases().size());
 {
     autoPtr<PtrList<volVectorField> > Fs = fluid.Fs();
 
-    phasei = 0;
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = fluid.phases()[phasei];
 
         phiFs.set
         (
@@ -56,8 +52,6 @@ PtrList<surfaceScalarField> phiFs(fluid.phases().size());
                 (fvc::interpolate(rAUs[phasei]*Fs()[phasei]) & mesh.Sf())
             )
         );
-
-        phasei++;
     }
 }
 
@@ -69,10 +63,9 @@ while (pimple.correct())
 
     PtrList<volVectorField> HbyAs(fluid.phases().size());
 
-    phasei = 0;
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = fluid.phases()[phasei];
         const volScalarField& alpha = phase;
 
         // Correct fixed-flux BCs to be consistent with the velocity BCs
@@ -95,8 +88,6 @@ while (pimple.correct())
               + max(phase.residualAlpha() - alpha, scalar(0))
                *phase.rho()*phase.U().oldTime()/runTime.deltaT()
             );
-
-        phasei++;
     }
 
     // Mean density for buoyancy force and p_rgh -> p
@@ -109,10 +100,9 @@ while (pimple.correct())
     );
 
     PtrList<surfaceScalarField> phigs(fluid.phases().size());
-    phasei = 0;
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = fluid.phases()[phasei];
 
         phigs.set
         (
@@ -126,8 +116,6 @@ while (pimple.correct())
                 )
             ).ptr()
         );
-
-        phasei++;
     }
 
     PtrList<surfaceScalarField> phiHbyAs(fluid.phases().size());
@@ -146,10 +134,9 @@ while (pimple.correct())
         dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
     );
 
-    phasei = 0;
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = fluid.phases()[phasei];
         const volScalarField& alpha = phase;
 
         // ddtPhiCorr filter -- only apply in pure(ish) phases
@@ -223,8 +210,6 @@ while (pimple.correct())
         }
 
         phiHbyA += alphafs[phasei]*phiHbyAs[phasei];
-
-        phasei++;
     }
 
     MRF.makeRelative(phiHbyA);
@@ -242,11 +227,9 @@ while (pimple.correct())
         dimensionedScalar("rAUf", dimensionSet(-1, 3, 1, 0, 0), 0)
     );
 
-    phasei = 0;
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
         rAUf += alphafs[phasei]*alpharAUfs[phasei];
-        phasei++;
     }
     rAUf = mag(rAUf);
 
@@ -255,12 +238,10 @@ while (pimple.correct())
     {
         surfaceScalarField::GeometricBoundaryField phib(phi.boundaryField());
         phib = 0;
-        phasei = 0;
-        forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+        forAll(fluid.phases(), phasei)
         {
-            phaseModel& phase = iter();
+            phaseModel& phase = fluid.phases()[phasei];
             phib += alphafs[phasei].boundaryField()*phase.phi().boundaryField();
-            phasei++;
         }
 
         setSnGrad<fixedFluxPressureFvPatchScalarField>
@@ -273,10 +254,9 @@ while (pimple.correct())
     }
 
     PtrList<fvScalarMatrix> pEqnComps(fluid.phases().size());
-    phasei = 0;
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = fluid.phases()[phasei];
 
         if (phase.compressible())
         {
@@ -338,8 +318,6 @@ while (pimple.correct())
                 );
             }
         }
-
-        phasei++;
     }
 
     // Cache p prior to solve for density update
@@ -358,17 +336,14 @@ while (pimple.correct())
         {
             fvScalarMatrix pEqn(pEqnIncomp);
 
-            phasei = 0;
-            forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+            forAll(fluid.phases(), phasei)
             {
-                phaseModel& phase = iter();
+                phaseModel& phase = fluid.phases()[phasei];
 
                 if (phase.compressible())
                 {
                     pEqn += pEqnComps[phasei];
                 }
-
-                phasei++;
             }
 
             solve
@@ -385,10 +360,9 @@ while (pimple.correct())
 
             surfaceScalarField mSfGradp("mSfGradp", pEqnIncomp.flux()/rAUf);
 
-            phasei = 0;
-            forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+            forAll(fluid.phases(), phasei)
             {
-                phaseModel& phase = iter();
+                phaseModel& phase = fluid.phases()[phasei];
 
                 phase.phi() = phiHbyAs[phasei] + alpharAUfs[phasei]*mSfGradp;
 
@@ -397,8 +371,6 @@ while (pimple.correct())
                 {
                     phase.divU(-pEqnComps[phasei] & p_rgh);
                 }
-
-                phasei++;
             }
 
             // Optionally relax pressure for velocity correction
@@ -406,10 +378,9 @@ while (pimple.correct())
 
             mSfGradp = pEqnIncomp.flux()/rAUf;
 
-            phasei = 0;
-            forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+            forAll(fluid.phases(), phasei)
             {
-                phaseModel& phase = iter();
+                phaseModel& phase = fluid.phases()[phasei];
 
                 phase.U() =
                     HbyAs[phasei]
@@ -421,8 +392,6 @@ while (pimple.correct())
                     );
                 phase.U().correctBoundaryConditions();
                 fvOptions.correct(phase.U());
-
-                phasei++;
             }
         }
     }
@@ -434,9 +403,9 @@ while (pimple.correct())
     p_rgh = p - rho*gh;
 
     // Update densities from change in p_rgh
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
-        phaseModel& phase = iter();
+        phaseModel& phase = fluid.phases()[phasei];
         phase.rho()() += phase.thermo().psi()*(p_rgh - p_rgh_0);
     }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqnSave.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqnSave.H
deleted file mode 100644
index e94f68d8f2..0000000000
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqnSave.H
+++ /dev/null
@@ -1,285 +0,0 @@
-// --- Pressure corrector loop
-while (pimple.correct())
-{
-    // rho1 = rho10 + psi1*p_rgh;
-    // rho2 = rho20 + psi2*p_rgh;
-
-    // tmp<fvScalarMatrix> pEqnComp1;
-    // tmp<fvScalarMatrix> pEqnComp2;
-
-    // //if (transonic)
-    // //{
-    // //}
-    // //else
-    // {
-    //     surfaceScalarField phid1("phid1", fvc::interpolate(psi1)*phi1);
-    //     surfaceScalarField phid2("phid2", fvc::interpolate(psi2)*phi2);
-
-    //     pEqnComp1 =
-    //         fvc::ddt(rho1) + psi1*correction(fvm::ddt(p_rgh))
-    //       + fvc::div(phid1, p_rgh)
-    //       - fvc::Sp(fvc::div(phid1), p_rgh);
-
-    //     pEqnComp2 =
-    //         fvc::ddt(rho2) + psi2*correction(fvm::ddt(p_rgh))
-    //       + fvc::div(phid2, p_rgh)
-    //       - fvc::Sp(fvc::div(phid2), p_rgh);
-    // }
-
-    PtrList<surfaceScalarField> alphafs(fluid.phases().size());
-    PtrList<volVectorField> HbyAs(fluid.phases().size());
-    PtrList<surfaceScalarField> phiHbyAs(fluid.phases().size());
-    PtrList<volScalarField> rAUs(fluid.phases().size());
-    PtrList<surfaceScalarField> rAlphaAUfs(fluid.phases().size());
-
-    int phasei = 0;
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
-    {
-        phaseModel& phase = iter();
-
-        MRF.makeAbsolute(phase.phi().oldTime());
-        MRF.makeAbsolute(phase.phi());
-
-        HbyAs.set(phasei, new volVectorField(phase.U()));
-        phiHbyAs.set(phasei, new surfaceScalarField(1.0*phase.phi()));
-
-        phasei++;
-    }
-
-    surfaceScalarField phiHbyA
-    (
-        IOobject
-        (
-            "phiHbyA",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
-    );
-
-    volScalarField rho("rho", fluid.rho());
-    surfaceScalarField ghSnGradRho(ghf*fvc::snGrad(rho)*mesh.magSf());
-
-    phasei = 0;
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
-    {
-        phaseModel& phase = iter();
-        const volScalarField& alpha = phase;
-
-        alphafs.set(phasei, fvc::interpolate(alpha).ptr());
-        alphafs[phasei].rename("hmm" + alpha.name());
-
-        volScalarField dragCoeffi
-        (
-            IOobject
-            (
-                "dragCoeffi",
-                runTime.timeName(),
-                mesh
-            ),
-            fluid.Kd(phase),
-            zeroGradientFvPatchScalarField::typeName
-        );
-        dragCoeffi.correctBoundaryConditions();
-
-        rAUs.set(phasei, (1.0/(UEqns[phasei].A() + dragCoeffi)).ptr());
-        rAlphaAUfs.set
-        (
-            phasei,
-            (
-                alphafs[phasei]*fvc::interpolate(phase.rho())
-               /fvc::interpolate(UEqns[phasei].A() + dragCoeffi)
-            ).ptr()
-        );
-
-        HbyAs[phasei] = rAUs[phasei]*UEqns[phasei].H();
-
-        phiHbyAs[phasei] =
-        (
-            (fvc::interpolate(HbyAs[phasei]) & mesh.Sf())
-          + rAlphaAUfs[phasei]*fvc::ddtCorr(phase.U(), phase.phi())
-        );
-        MRF.makeRelative(phiHbyAs[phasei]);
-        MRF.makeRelative(phase.phi().oldTime());
-        MRF.makeRelative(phase.phi());
-
-        phiHbyAs[phasei] +=
-            rAlphaAUfs[phasei]
-           *(
-               fluid.surfaceTension(phase)*mesh.magSf()
-             + (fvc::interpolate(phase.rho() - rho))*(g & mesh.Sf())
-             - ghSnGradRho
-            )/fvc::interpolate(phase.rho());
-
-        forAllConstIter
-        (
-            phaseSystem::KdTable,
-            fluid.Kds(),
-            KdIter
-        )
-        {
-            const volScalarField& K(*KdIter());
-
-            const phasePair& pair(fluid.phasePairs()[KdIter.key()]);
-
-            const phaseModel* phase1 = &pair.phase1();
-            const phaseModel* phase2 = &pair.phase2();
-
-            forAllConstIter(phasePair, pair, iter)
-            {
-                if (phase1 == &phase)
-                {
-                    phiHbyAs[phasei] +=
-                        fvc::interpolate(K)
-                       /fvc::interpolate(UEqns[phasei].A() + dragCoeffi)
-                       *phase2->phi();
-
-                    HbyAs[phasei] += rAUs[phasei]*K*phase2->U();
-                }
-
-                Swap(phase1, phase2);
-            }
-        }
-
-        phiHbyA += alphafs[phasei]*phiHbyAs[phasei];
-
-        phasei++;
-    }
-
-    surfaceScalarField rAUf
-    (
-        IOobject
-        (
-            "rAUf",
-            runTime.timeName(),
-            mesh
-        ),
-        mesh,
-        dimensionedScalar("rAUf", dimensionSet(-1, 3, 1, 0, 0), 0)
-    );
-
-    phasei = 0;
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
-    {
-        phaseModel& phase = iter();
-        rAUf += mag(alphafs[phasei]*rAlphaAUfs[phasei])
-            /fvc::interpolate(phase.rho());
-
-        phasei++;
-    }
-
-    // Update the fixedFluxPressure BCs to ensure flux consistency
-    {
-        surfaceScalarField::GeometricBoundaryField phib(phi.boundaryField());
-        phib = 0;
-        phasei = 0;
-        forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
-        {
-            phaseModel& phase = iter();
-
-            phib +=
-                alphafs[phasei].boundaryField()
-               *(mesh.Sf().boundaryField() & phase.U().boundaryField());
-
-            phasei++;
-        }
-
-        setSnGrad<fixedFluxPressureFvPatchScalarField>
-        (
-            p_rgh.boundaryField(),
-            (
-                phiHbyA.boundaryField() - MRF.relative(phib)
-            )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
-        );
-    }
-
-    while (pimple.correctNonOrthogonal())
-    {
-        fvScalarMatrix pEqnIncomp
-        (
-            fvc::div(phiHbyA)
-          - fvm::laplacian(rAUf, p_rgh)
-        );
-
-        pEqnIncomp.setReference(pRefCell, pRefValue);
-
-        solve
-        (
-            // (
-            //     (alpha1/rho1)*pEqnComp1()
-            //   + (alpha2/rho2)*pEqnComp2()
-            // ) +
-            pEqnIncomp,
-            mesh.solver(p_rgh.select(pimple.finalInnerIter()))
-        );
-
-        if (pimple.finalNonOrthogonalIter())
-        {
-            surfaceScalarField mSfGradp("mSfGradp", pEqnIncomp.flux()/rAUf);
-
-            phasei = 0;
-            phi = dimensionedScalar("phi", phi.dimensions(), 0);
-            forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
-            {
-                phaseModel& phase = iter();
-
-                phase.phi() =
-                    phiHbyAs[phasei]
-                  + rAlphaAUfs[phasei]*mSfGradp/fvc::interpolate(phase.rho());
-                phi +=
-                    alphafs[phasei]*phiHbyAs[phasei]
-                  + mag(alphafs[phasei]*rAlphaAUfs[phasei])
-                   *mSfGradp/fvc::interpolate(phase.rho());
-
-                phasei++;
-            }
-
-            // dgdt =
-
-            // (
-            //     pos(alpha2)*(pEqnComp2 & p)/rho2
-            //   - pos(alpha1)*(pEqnComp1 & p)/rho1
-            // );
-
-            p_rgh.relax();
-
-            p = p_rgh + rho*gh;
-
-            mSfGradp = pEqnIncomp.flux()/rAUf;
-
-            phasei = 0;
-            forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
-            {
-                phaseModel& phase = iter();
-
-                phase.U() =
-                    HbyAs[phasei]
-                  + fvc::reconstruct
-                    (
-                        rAlphaAUfs[phasei]
-                       *(
-                            fvc::interpolate(phase.rho() - rho)
-                           *(g & mesh.Sf())
-                          - ghSnGradRho
-                          + mSfGradp
-                        )
-                    )/phase.rho();
-
-                phase.U().correctBoundaryConditions();
-
-                phasei++;
-            }
-        }
-    }
-
-    //p = max(p, pMin);
-
-    // rho1 = rho10 + psi1*p_rgh;
-    // rho2 = rho20 + psi2*p_rgh;
-
-    // Dp1Dt = fvc::DDt(phi1, p_rgh);
-    // Dp2Dt = fvc::DDt(phi2, p_rgh);
-}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
index 3a609e41a8..aae1d9072c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
@@ -12,9 +12,9 @@
 
     surfaceScalarField maxPhi("maxPhi", phi);
 
-    forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
+    forAll(fluid.phases(), phasei)
     {
-        maxPhi = max(maxPhi, mag(iter().phi()));
+        maxPhi = max(maxPhi, mag(fluid.phases()[phasei].phi()));
     }
 
     // Set the reciprocal time-step from the local Courant number
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index 13a98b885f..401c4f622c 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -57,8 +57,8 @@ Foam::twoPhaseSystem::twoPhaseSystem
 )
 :
     phaseSystem(mesh),
-    phase1_(phaseModels_.first()),
-    phase2_(phaseModels_.last())
+    phase1_(phaseModels_[0]),
+    phase2_(phaseModels_[1])
 {
     phase2_.volScalarField::operator=(scalar(1) - phase1_);
 

From 0859c15eb25a6c30dec65acf875a894856c7efab Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 16 Sep 2015 22:22:37 +0100
Subject: [PATCH 48/70] reactingMultiphaseEulerFoam: Removed debugging option

---
 .../reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options  | 2 +-
 .../reactingMultiphaseEulerFoam/multiphaseSystem/Make/options   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
index 27e4869309..9acc2a5f82 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -ggdb3 \
+EXE_INC = \
     -ImultiphaseSystem/lnInclude \
     -I../phaseSystems/lnInclude \
     -I../interfacialModels/lnInclude \
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
index f4de6a6d84..222f3b3ba4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -ggdb3 \
+EXE_INC = \
     -I../../interfacialModels/lnInclude \
     -I../../interfacialCompositionModels/lnInclude \
     -I../../phaseSystems/lnInclude \

From 6672e643275200d4befa51b15aa40e095339cf58 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Sep 2015 09:19:03 +0100
Subject: [PATCH 49/70] reactingEulerFoam: Updated phase loops

---
 .../HeatAndMassTransferPhaseSystem.C          |  9 +---
 .../HeatTransferPhaseSystem.C                 |  9 +---
 ...terfaceCompositionPhaseChangePhaseSystem.C |  9 +---
 .../MomentumTransferPhaseSystem.C             |  9 +---
 .../ThermalPhaseChangePhaseSystem.C           |  9 +---
 .../phaseSystems/phaseSystem/phaseSystem.C    | 53 ++++++++-----------
 .../phaseSystem/phaseSystemTemplates.H        |  6 +--
 7 files changed, 35 insertions(+), 69 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
index bfad310038..9eddbe4efd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
@@ -268,14 +268,9 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
 
     phaseSystem::heatTransferTable& eqns = eqnsPtr();
 
-    forAllConstIter
-    (
-        phaseSystem::phaseModelList,
-        this->phaseModels_,
-        phaseModelIter
-    )
+    forAll(this->phaseModels_, phasei)
     {
-        const phaseModel& phase(phaseModelIter());
+        const phaseModel& phase = this->phaseModels_[phasei];
 
         eqns.insert
         (
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
index a0881ee33a..f4a1284db8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
@@ -120,14 +120,9 @@ Foam::HeatTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
 
     phaseSystem::heatTransferTable& eqns = eqnsPtr();
 
-    forAllConstIter
-    (
-        phaseSystem::phaseModelList,
-        this->phaseModels_,
-        phaseModelIter
-    )
+    forAll(this->phaseModels_, phasei)
     {
-        const phaseModel& phase(phaseModelIter());
+        const phaseModel& phase = this->phaseModels_[phasei];
 
         eqns.insert
         (
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
index 801ceb8caa..fe0343b2ac 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
@@ -69,14 +69,9 @@ massTransfer() const
 
     phaseSystem::massTransferTable& eqns = eqnsPtr();
 
-    forAllConstIter
-    (
-        phaseSystem::phaseModelList,
-        this->phaseModels_,
-        phaseModelIter
-    )
+    forAll(this->phaseModels_, phasei)
     {
-        const phaseModel& phase(phaseModelIter());
+        const phaseModel& phase = this->phaseModels_[phasei];
 
         const PtrList<volScalarField>& Yi = phase.Y();
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index 0f5470d26e..dc9335f7ea 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -413,14 +413,9 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
 
     phaseSystem::momentumTransferTable& eqns = eqnsPtr();
 
-    forAllConstIter
-    (
-        phaseSystem::phaseModelList,
-        this->phaseModels_,
-        phaseModelIter
-    )
+    forAll(this->phaseModels_, phasei)
     {
-        const phaseModel& phase(phaseModelIter());
+        const phaseModel& phase = this->phaseModels_[phasei];
 
         eqns.insert
         (
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index 1eb96b3b26..f0453940c7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -64,14 +64,9 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::massTransfer() const
 
     phaseSystem::massTransferTable& eqns = eqnsPtr();
 
-    forAllConstIter
-    (
-        phaseSystem::phaseModelList,
-        this->phaseModels_,
-        phaseModelIter
-    )
+    forAll(this->phaseModels_, phasei)
     {
-        const phaseModel& phase(phaseModelIter());
+        const phaseModel& phase = this->phaseModels_[phasei];
 
         const PtrList<volScalarField>& Yi = phase.Y();
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
index ae23455d88..aa9380758d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
@@ -46,24 +46,19 @@ Foam::tmp<Foam::surfaceScalarField> Foam::phaseSystem::calcPhi
     const phaseModelList& phaseModels
 ) const
 {
-    phaseModelList::const_iterator phaseModelIter = phaseModels.begin();
-
     tmp<surfaceScalarField> tmpPhi
     (
         new surfaceScalarField
         (
             "phi",
-            fvc::interpolate(phaseModelIter())*phaseModelIter().phi()
+            fvc::interpolate(phaseModels[0])*phaseModels[0].phi()
         )
     );
 
-    ++phaseModelIter;
-
-    for (; phaseModelIter != phaseModels.end(); ++ phaseModelIter)
+    for (label phasei=1; phasei<phaseModels.size(); phasei++)
     {
         tmpPhi() +=
-            fvc::interpolate(phaseModelIter())
-           *phaseModelIter().phi();
+            fvc::interpolate(phaseModels[phasei])*phaseModels[phasei].phi();
     }
 
     return tmpPhi;
@@ -196,16 +191,14 @@ Foam::phaseSystem::~phaseSystem()
 
 Foam::tmp<Foam::volScalarField> Foam::phaseSystem::rho() const
 {
-    phaseModelList::const_iterator phaseModelIter = phaseModels_.begin();
-
     tmp<volScalarField> tmpRho
     (
-        phaseModelIter()*phaseModelIter().rho()
+        phaseModels_[0]*phaseModels_[0].rho()
     );
 
-    for (; phaseModelIter != phaseModels_.end(); ++ phaseModelIter)
+    for (label phasei=1; phasei<phaseModels_.size(); phasei++)
     {
-        tmpRho() += phaseModelIter()*phaseModelIter().rho();
+        tmpRho() += phaseModels_[phasei]*phaseModels_[phasei].rho();
     }
 
     return tmpRho;
@@ -214,16 +207,14 @@ Foam::tmp<Foam::volScalarField> Foam::phaseSystem::rho() const
 
 Foam::tmp<Foam::volVectorField> Foam::phaseSystem::U() const
 {
-    phaseModelList::const_iterator phaseModelIter = phaseModels_.begin();
-
     tmp<volVectorField> tmpU
     (
-        phaseModelIter()*phaseModelIter().U()
+        phaseModels_[0]*phaseModels_[0].U()
     );
 
-    for (; phaseModelIter != phaseModels_.end(); ++ phaseModelIter)
+    for (label phasei=1; phasei<phaseModels_.size(); phasei++)
     {
-        tmpU() += phaseModelIter()*phaseModelIter().U();
+        tmpU() += phaseModels_[phasei]*phaseModels_[phasei].U();
     }
 
     return tmpU;
@@ -266,9 +257,9 @@ void Foam::phaseSystem::solve()
 
 void Foam::phaseSystem::correct()
 {
-    forAllIter(phaseModelList, phaseModels_, phaseModelIter)
+    forAll(phaseModels_, phasei)
     {
-        phaseModelIter().correct();
+        phaseModels_[phasei].correct();
     }
 }
 
@@ -277,11 +268,11 @@ void Foam::phaseSystem::correctKinematics()
 {
     bool updateDpdt = false;
 
-    forAllIter(phaseModelList, phaseModels_, phaseModelIter)
+    forAll(phaseModels_, phasei)
     {
-        phaseModelIter().correctKinematics();
+        phaseModels_[phasei].correctKinematics();
 
-        updateDpdt = updateDpdt || phaseModelIter().thermo().dpdt();
+        updateDpdt = updateDpdt || phaseModels_[phasei].thermo().dpdt();
     }
 
     // Update the pressure time-derivative if required
@@ -294,27 +285,27 @@ void Foam::phaseSystem::correctKinematics()
 
 void Foam::phaseSystem::correctThermo()
 {
-    forAllIter(phaseModelList, phaseModels_, phaseModelIter)
+    forAll(phaseModels_, phasei)
     {
-        phaseModelIter().correctThermo();
+        phaseModels_[phasei].correctThermo();
     }
 }
 
 
 void Foam::phaseSystem::correctTurbulence()
 {
-    forAllIter(phaseModelList, phaseModels_, phaseModelIter)
+    forAll(phaseModels_, phasei)
     {
-        phaseModelIter().correctTurbulence();
+        phaseModels_[phasei].correctTurbulence();
     }
 }
 
 
 void Foam::phaseSystem::correctEnergyTransport()
 {
-    forAllIter(phaseModelList, phaseModels_, phaseModelIter)
+    forAll(phaseModels_, phasei)
     {
-        phaseModelIter().correctEnergyTransport();
+        phaseModels_[phasei].correctEnergyTransport();
     }
 }
 
@@ -325,9 +316,9 @@ bool Foam::phaseSystem::read()
     {
         bool readOK = true;
 
-        forAllIter(phaseModelList, phaseModels_, phaseModelIter)
+        forAll(phaseModels_, phasei)
         {
-            readOK &= phaseModelIter().read();
+            readOK &= phaseModels_[phasei].read();
         }
 
         // models ...
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
index 37a3627e1c..eee3fcd3b3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
@@ -151,12 +151,12 @@ void Foam::phaseSystem::generatePairsAndSubModels
         HashTable<autoPtr<modelType>, phasePairKey, phasePairKey::hash>
         modelTypeTable;
 
-    forAllConstIter(phaseModelList, phaseModels_, phaseModelIter)
+    forAll(phaseModels_, phasei)
     {
         modelTypeTable tempModels;
         generatePairsAndSubModels
         (
-            IOobject::groupName(modelName, phaseModelIter().name()),
+            IOobject::groupName(modelName, phaseModels_[phasei].name()),
             tempModels
         );
 
@@ -175,7 +175,7 @@ void Foam::phaseSystem::generatePairsAndSubModels
 
             models[tempModelIter.key()].insert
             (
-                phaseModelIter().name(),
+                phaseModels_[phasei].name(),
                 *tempModelIter
             );
         }

From 1c203d4116c3d52e565393de2f42bdd701f28d9b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Sep 2015 09:47:27 +0100
Subject: [PATCH 50/70] Renamed reactingEulerFoam phaseSystemTemplates.H ->
 phaseSystemTemplates.C This file contains definitions rather than
 declarations

---
 .../reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H    | 2 +-
 .../{phaseSystemTemplates.H => phaseSystemTemplates.C}          | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/{phaseSystemTemplates.H => phaseSystemTemplates.C} (100%)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
index 95eb7f6a3f..001f1acdd3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H
@@ -365,7 +365,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "phaseSystemTemplates.H"
+#   include "phaseSystemTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C
similarity index 100%
rename from applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.H
rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C

From 3c71648ed594f0305be3b1af5eb7cb17e45e7457 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Sep 2015 09:48:30 +0100
Subject: [PATCH 51/70] reactingMultiphaseEulerFoam: Created local reference to
 the list of phases to avoid clutter

---
 .../reactingMultiphaseEulerFoam/CourantNo.H   |  4 +-
 .../reactingMultiphaseEulerFoam/EEqns.H       |  8 +--
 .../reactingMultiphaseEulerFoam/YEqns.H       |  4 +-
 .../createFields.H                            |  3 +-
 .../reactingMultiphaseEulerFoam/pU/UEqns.H    |  6 +-
 .../reactingMultiphaseEulerFoam/pU/pEqn.H     | 62 +++++++++----------
 .../reactingMultiphaseEulerFoam/setRDeltaT.H  |  4 +-
 7 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H
index 93c97ac4b0..d7d1cc66d8 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H
@@ -39,12 +39,12 @@ if (mesh.nInternalFaces())
         fvc::surfaceSum(mag(phi))().internalField()
     );
 
-    forAll(fluid.phases(), phasei)
+    forAll(phases, phasei)
     {
         sumPhi = max
         (
             sumPhi,
-            fvc::surfaceSum(mag(fluid.phases()[phasei].phi()))().internalField()
+            fvc::surfaceSum(mag(phases[phasei].phi()))().internalField()
         );
     }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
index 15a8f6216b..386331e0ee 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H
@@ -6,9 +6,9 @@
 
     phaseSystem::heatTransferTable& heatTransfer = heatTransferPtr();
 
-    forAll(fluid.phases(), phasei)
+    forAll(phases, phasei)
     {
-        phaseModel& phase = fluid.phases()[phasei];
+        phaseModel& phase = phases[phasei];
 
         const volScalarField& alpha = phase;
         const volScalarField& rho = phase.rho();
@@ -36,9 +36,9 @@
 
 fluid.correctThermo();
 
-forAll(fluid.phases(), phasei)
+forAll(phases, phasei)
 {
-    phaseModel& phase = fluid.phases()[phasei];
+    phaseModel& phase = phases[phasei];
 
     Info<< phase.name() << " min/max T "
         << min(phase.thermo().T()).value()
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H
index 5a44011fc9..4094e185af 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H
@@ -5,9 +5,9 @@
     phaseSystem::massTransferTable&
         massTransfer(massTransferPtr());
 
-    forAll(fluid.phases(), phasei)
+    forAll(phases, phasei)
     {
-        phaseModel& phase = fluid.phases()[phasei];
+        phaseModel& phase = phases[phasei];
 
         PtrList<volScalarField>& Y = phase.Y();
         const volScalarField& alpha = phase;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
index 7f89ea5f45..1375db8c40 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
@@ -8,6 +8,7 @@ autoPtr<multiphaseSystem> fluidPtr
     multiphaseSystem::New(mesh)
 );
 multiphaseSystem& fluid = fluidPtr();
+multiphaseSystem::phaseModelList& phases = fluid.phases();
 
 surfaceScalarField& phi = fluid.phi();
 
@@ -20,7 +21,7 @@ dimensionedScalar pMin
 
 #include "gh.H"
 
-volScalarField& p = fluid.phases().first().thermo().p();
+volScalarField& p = phases[0].thermo().p();
 
 Info<< "Reading field p_rgh\n" << endl;
 volScalarField p_rgh
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
index 3b6ee95513..32cedb0fe0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
@@ -1,6 +1,6 @@
 Info<< "Constructing momentum equations" << endl;
 
-PtrList<fvVectorMatrix> UEqns(fluid.phases().size());
+PtrList<fvVectorMatrix> UEqns(phases.size());
 
 {
     autoPtr<phaseSystem::momentumTransferTable>
@@ -9,9 +9,9 @@ PtrList<fvVectorMatrix> UEqns(fluid.phases().size());
     phaseSystem::momentumTransferTable&
         momentumTransfer(momentumTransferPtr());
 
-    forAll(fluid.phases(), phasei)
+    forAll(phases, phasei)
     {
-        phaseModel& phase = fluid.phases()[phasei];
+        phaseModel& phase = phases[phasei];
 
         const volScalarField& alpha = phase;
         const volScalarField& rho = phase.rho();
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index ff759f42c6..9fd728ec68 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -1,10 +1,10 @@
-PtrList<surfaceScalarField> alphafs(fluid.phases().size());
-PtrList<volScalarField> rAUs(fluid.phases().size());
-PtrList<surfaceScalarField> alpharAUfs(fluid.phases().size());
+PtrList<surfaceScalarField> alphafs(phases.size());
+PtrList<volScalarField> rAUs(phases.size());
+PtrList<surfaceScalarField> alpharAUfs(phases.size());
 
-forAll(fluid.phases(), phasei)
+forAll(phases, phasei)
 {
-    phaseModel& phase = fluid.phases()[phasei];
+    phaseModel& phase = phases[phasei];
     const volScalarField& alpha = phase;
 
     alphafs.set(phasei, fvc::interpolate(alpha).ptr());
@@ -35,13 +35,13 @@ forAll(fluid.phases(), phasei)
 }
 
 // Turbulent diffusion, particle-pressure, lift and wall-lubrication fluxes
-PtrList<surfaceScalarField> phiFs(fluid.phases().size());
+PtrList<surfaceScalarField> phiFs(phases.size());
 {
     autoPtr<PtrList<volVectorField> > Fs = fluid.Fs();
 
-    forAll(fluid.phases(), phasei)
+    forAll(phases, phasei)
     {
-        phaseModel& phase = fluid.phases()[phasei];
+        phaseModel& phase = phases[phasei];
 
         phiFs.set
         (
@@ -61,11 +61,11 @@ while (pimple.correct())
     // Update continuity errors due to temperature changes
     fluid.correct();
 
-    PtrList<volVectorField> HbyAs(fluid.phases().size());
+    PtrList<volVectorField> HbyAs(phases.size());
 
-    forAll(fluid.phases(), phasei)
+    forAll(phases, phasei)
     {
-        phaseModel& phase = fluid.phases()[phasei];
+        phaseModel& phase = phases[phasei];
         const volScalarField& alpha = phase;
 
         // Correct fixed-flux BCs to be consistent with the velocity BCs
@@ -99,10 +99,10 @@ while (pimple.correct())
         ghf*fvc::snGrad(rho)*mesh.magSf()
     );
 
-    PtrList<surfaceScalarField> phigs(fluid.phases().size());
-    forAll(fluid.phases(), phasei)
+    PtrList<surfaceScalarField> phigs(phases.size());
+    forAll(phases, phasei)
     {
-        phaseModel& phase = fluid.phases()[phasei];
+        phaseModel& phase = phases[phasei];
 
         phigs.set
         (
@@ -118,7 +118,7 @@ while (pimple.correct())
         );
     }
 
-    PtrList<surfaceScalarField> phiHbyAs(fluid.phases().size());
+    PtrList<surfaceScalarField> phiHbyAs(phases.size());
 
     surfaceScalarField phiHbyA
     (
@@ -134,9 +134,9 @@ while (pimple.correct())
         dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
     );
 
-    forAll(fluid.phases(), phasei)
+    forAll(phases, phasei)
     {
-        phaseModel& phase = fluid.phases()[phasei];
+        phaseModel& phase = phases[phasei];
         const volScalarField& alpha = phase;
 
         // ddtPhiCorr filter -- only apply in pure(ish) phases
@@ -227,7 +227,7 @@ while (pimple.correct())
         dimensionedScalar("rAUf", dimensionSet(-1, 3, 1, 0, 0), 0)
     );
 
-    forAll(fluid.phases(), phasei)
+    forAll(phases, phasei)
     {
         rAUf += alphafs[phasei]*alpharAUfs[phasei];
     }
@@ -238,9 +238,9 @@ while (pimple.correct())
     {
         surfaceScalarField::GeometricBoundaryField phib(phi.boundaryField());
         phib = 0;
-        forAll(fluid.phases(), phasei)
+        forAll(phases, phasei)
         {
-            phaseModel& phase = fluid.phases()[phasei];
+            phaseModel& phase = phases[phasei];
             phib += alphafs[phasei].boundaryField()*phase.phi().boundaryField();
         }
 
@@ -253,10 +253,10 @@ while (pimple.correct())
         );
     }
 
-    PtrList<fvScalarMatrix> pEqnComps(fluid.phases().size());
-    forAll(fluid.phases(), phasei)
+    PtrList<fvScalarMatrix> pEqnComps(phases.size());
+    forAll(phases, phasei)
     {
-        phaseModel& phase = fluid.phases()[phasei];
+        phaseModel& phase = phases[phasei];
 
         if (phase.compressible())
         {
@@ -336,9 +336,9 @@ while (pimple.correct())
         {
             fvScalarMatrix pEqn(pEqnIncomp);
 
-            forAll(fluid.phases(), phasei)
+            forAll(phases, phasei)
             {
-                phaseModel& phase = fluid.phases()[phasei];
+                phaseModel& phase = phases[phasei];
 
                 if (phase.compressible())
                 {
@@ -360,9 +360,9 @@ while (pimple.correct())
 
             surfaceScalarField mSfGradp("mSfGradp", pEqnIncomp.flux()/rAUf);
 
-            forAll(fluid.phases(), phasei)
+            forAll(phases, phasei)
             {
-                phaseModel& phase = fluid.phases()[phasei];
+                phaseModel& phase = phases[phasei];
 
                 phase.phi() = phiHbyAs[phasei] + alpharAUfs[phasei]*mSfGradp;
 
@@ -378,9 +378,9 @@ while (pimple.correct())
 
             mSfGradp = pEqnIncomp.flux()/rAUf;
 
-            forAll(fluid.phases(), phasei)
+            forAll(phases, phasei)
             {
-                phaseModel& phase = fluid.phases()[phasei];
+                phaseModel& phase = phases[phasei];
 
                 phase.U() =
                     HbyAs[phasei]
@@ -403,9 +403,9 @@ while (pimple.correct())
     p_rgh = p - rho*gh;
 
     // Update densities from change in p_rgh
-    forAll(fluid.phases(), phasei)
+    forAll(phases, phasei)
     {
-        phaseModel& phase = fluid.phases()[phasei];
+        phaseModel& phase = phases[phasei];
         phase.rho()() += phase.thermo().psi()*(p_rgh - p_rgh_0);
     }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
index aae1d9072c..9e9ca54230 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H
@@ -12,9 +12,9 @@
 
     surfaceScalarField maxPhi("maxPhi", phi);
 
-    forAll(fluid.phases(), phasei)
+    forAll(phases, phasei)
     {
-        maxPhi = max(maxPhi, mag(fluid.phases()[phasei].phi()));
+        maxPhi = max(maxPhi, mag(phases[phasei].phi()));
     }
 
     // Set the reciprocal time-step from the local Courant number

From 3ca5ecb15a15f1e7b2f918a8701b90f384491984 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Sep 2015 17:05:12 +0100
Subject: [PATCH 52/70] pairPatchAgglomeration: Added call to compactLevels at
 the end of agglomerate Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1853

---
 .../pairPatchAgglomeration/pairPatchAgglomeration.C             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
index f3c986bac4..46fc5f1853 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
@@ -440,6 +440,8 @@ void Foam::pairPatchAgglomeration::agglomerate()
 
         nCoarseFacesOld = nCoarseFaces;
     }
+
+    compactLevels(nCreatedLevels);
 }
 
 

From 1979194f3638ec53b71a20b7a52bc8e97040e9fa Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 17 Sep 2015 22:55:08 +0100
Subject: [PATCH 53/70] reactingMultiphaseEulerFoam: Added support for
 turbulent dispersion

---
 .../turbulentDispersionModel.C                |  9 ++
 .../turbulentDispersionModel.H                |  3 +
 .../MomentumTransferPhaseSystem.C             | 86 +++++++++++++++----
 .../MomentumTransferPhaseSystem.H             |  6 ++
 .../multiphaseSystem/multiphaseSystem.H       |  6 ++
 .../reactingMultiphaseEulerFoam/pU/pEqn.H     |  4 +-
 6 files changed, 96 insertions(+), 18 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
index d5d805c085..0bb29c1bea 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
@@ -26,6 +26,8 @@ License
 #include "turbulentDispersionModel.H"
 #include "phasePair.H"
 #include "fvcGrad.H"
+#include "surfaceInterpolate.H"
+#include "fvcSnGrad.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -66,4 +68,11 @@ Foam::turbulentDispersionModel::F() const
 }
 
 
+Foam::tmp<Foam::surfaceScalarField>
+Foam::turbulentDispersionModel::Ff() const
+{
+    return fvc::interpolate(D())*fvc::snGrad(pair_.dispersed());
+}
+
+
 // ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
index 932fdb3801..56e72ebcac 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
@@ -120,6 +120,9 @@ public:
 
         //- Turbulent dispersion force
         virtual tmp<volVectorField> F() const;
+
+        //- Turbulent dispersion force on faces
+        virtual tmp<surfaceScalarField> Ff() const;
 };
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index dc9335f7ea..f43a3a0354 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -38,6 +38,7 @@ License
 #include "fvmDiv.H"
 #include "fvmSup.H"
 #include "fvcDiv.H"
+#include "fvcSnGrad.H"
 #include "fvMatrix.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -575,27 +576,78 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
         Fs[pair.phase2().index()] -= F;
     }
 
-    // Add the turbulent dispersion force
-    // forAllConstIter
-    // (
-    //     turbulentDispersionModelTable,
-    //     turbulentDispersionModels_,
-    //     turbulentDispersionModelIter
-    // )
-    // {
-    //     const volVectorField F(turbulentDispersionModelIter()->F<vector>());
-
-    //     const phasePair&
-    //         pair(this->phasePairs_[turbulentDispersionModelIter.key()]);
-
-    //     *eqns[pair.phase1().name()] += F;
-    //     *eqns[pair.phase2().name()] -= F;
-    // }
-
     return tFs;
 }
 
 
+template<class BasePhaseSystem>
+Foam::autoPtr<Foam::PtrList<Foam::surfaceScalarField> >
+Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::phiDs
+(
+    const PtrList<volScalarField>& rAUs
+) const
+{
+    autoPtr<PtrList<surfaceScalarField> > tphiDs
+    (
+        new PtrList<surfaceScalarField>(this->phases().size())
+    );
+
+    PtrList<surfaceScalarField>& phiDs = tphiDs();
+
+    forAll(phiDs, phasei)
+    {
+        phiDs.set
+        (
+            phasei,
+            new surfaceScalarField
+            (
+                IOobject
+                (
+                    liftModel::typeName + ":F",
+                    this->mesh_.time().timeName(),
+                    this->mesh_,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                this->mesh_,
+                dimensionedScalar
+                (
+                    "zero",
+                    dimTime*dimArea*turbulentDispersionModel::dimF/dimDensity,
+                    0
+                )
+            )
+        );
+    }
+
+    // Add the turbulent dispersion force
+    forAllConstIter
+    (
+        turbulentDispersionModelTable,
+        turbulentDispersionModels_,
+        turbulentDispersionModelIter
+    )
+    {
+        const phasePair&
+            pair(this->phasePairs_[turbulentDispersionModelIter.key()]);
+
+        const volScalarField D(turbulentDispersionModelIter()->D());
+        const surfaceScalarField snGradAlpha1
+        (
+            fvc::snGrad(pair.phase1())*this->mesh_.magSf()
+        );
+
+        phiDs[pair.phase1().index()] +=
+            fvc::interpolate(rAUs[pair.phase1().index()]*D)*snGradAlpha1;
+        phiDs[pair.phase2().index()] -=
+            fvc::interpolate(rAUs[pair.phase2().index()]*D)*snGradAlpha1;
+    }
+
+    return tphiDs;
+}
+
+
 template<class BasePhaseSystem>
 bool Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::read()
 {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
index 194602dfc9..980f854a9e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
@@ -175,6 +175,12 @@ public:
         //- Return the combined force (lift + wall-lubrication)
         virtual autoPtr<PtrList<volVectorField> > Fs() const;
 
+        //- Return the turbulent dispersion force on faces for phase pair
+        virtual autoPtr<PtrList<surfaceScalarField> > phiDs
+        (
+            const PtrList<volScalarField>& rAUs
+        ) const;
+
         //- Return the combined face-force (lift + wall-lubrication)
         virtual tmp<surfaceScalarField> Ff(const phasePairKey& key) const;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
index 9b7e3da3c1..f4c185d9b7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
@@ -169,6 +169,12 @@ public:
         //- Return the combined force (lift + wall-lubrication) for phase pair
         virtual autoPtr<PtrList<Foam::volVectorField> > Fs() const = 0;
 
+        //- Return the turbulent dispersion force on faces for phase pair
+        virtual autoPtr<PtrList<Foam::surfaceScalarField> > phiDs
+        (
+            const PtrList<volScalarField>& rAUs
+        ) const = 0;
+
         //- Return the total interfacial mass transfer rate for phase
         virtual tmp<volScalarField> dmdt(const phaseModel& phase) const = 0;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index 9fd728ec68..136d595418 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -34,10 +34,11 @@ forAll(phases, phasei)
     );
 }
 
-// Turbulent diffusion, particle-pressure, lift and wall-lubrication fluxes
+// Lift, wall-lubrication and turbulent diffusion fluxes
 PtrList<surfaceScalarField> phiFs(phases.size());
 {
     autoPtr<PtrList<volVectorField> > Fs = fluid.Fs();
+    autoPtr<PtrList<surfaceScalarField> > phiDs = fluid.phiDs(rAUs);
 
     forAll(phases, phasei)
     {
@@ -50,6 +51,7 @@ PtrList<surfaceScalarField> phiFs(phases.size());
             (
                 IOobject::groupName("phiF", phase.name()),
                 (fvc::interpolate(rAUs[phasei]*Fs()[phasei]) & mesh.Sf())
+              + phiDs()[phasei]
             )
         );
     }

From 29cea780e14eab2c49fe6d53ba2e358284b15c1f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 18 Sep 2015 18:55:21 +0100
Subject: [PATCH 54/70] reactingMultiphaseEulerFoam: Optimize the handling of
 optional forces

---
 .../MomentumTransferPhaseSystem.C             | 75 ++++++++++++-------
 .../MomentumTransferPhaseSystem.H             | 14 ++++
 .../reactingMultiphaseEulerFoam/pU/pEqn.H     | 64 ++++++++++++----
 .../bubbleColumn/constant/phaseProperties     |  9 +--
 4 files changed, 112 insertions(+), 50 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
index f43a3a0354..f50bd61f9e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
@@ -511,17 +511,12 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
 
 
 template<class BasePhaseSystem>
-Foam::autoPtr<Foam::PtrList<Foam::volVectorField> >
-Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
+Foam::volVectorField& Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setF
+(
+    PtrList<volVectorField>& Fs, const label phasei
+) const
 {
-    autoPtr<PtrList<volVectorField> > tFs
-    (
-        new PtrList<volVectorField>(this->phases().size())
-    );
-
-    PtrList<volVectorField>& Fs = tFs();
-
-    forAll(Fs, phasei)
+    if (!Fs.set(phasei))
     {
         Fs.set
         (
@@ -543,6 +538,20 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
         );
     }
 
+    return Fs[phasei];
+}
+
+
+template<class BasePhaseSystem>
+Foam::autoPtr<Foam::PtrList<Foam::volVectorField> >
+Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
+{
+    autoPtr<PtrList<volVectorField> > tFs
+    (
+        new PtrList<volVectorField>(this->phases().size())
+    );
+    PtrList<volVectorField>& Fs = tFs();
+
     // Add the lift force
     forAllConstIter
     (
@@ -555,8 +564,8 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
 
         const phasePair& pair(this->phasePairs_[liftModelIter.key()]);
 
-        Fs[pair.phase1().index()] += F;
-        Fs[pair.phase2().index()] -= F;
+        setF(Fs, pair.phase1().index()) += F;
+        setF(Fs, pair.phase2().index()) -= F;
     }
 
     // Add the wall lubrication force
@@ -572,8 +581,8 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
         const phasePair&
             pair(this->phasePairs_[wallLubricationModelIter.key()]);
 
-        Fs[pair.phase1().index()] += F;
-        Fs[pair.phase2().index()] -= F;
+        setF(Fs, pair.phase1().index()) += F;
+        setF(Fs, pair.phase2().index()) -= F;
     }
 
     return tFs;
@@ -581,20 +590,13 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Fs() const
 
 
 template<class BasePhaseSystem>
-Foam::autoPtr<Foam::PtrList<Foam::surfaceScalarField> >
-Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::phiDs
+Foam::surfaceScalarField&
+Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setPhiD
 (
-    const PtrList<volScalarField>& rAUs
+    PtrList<surfaceScalarField>& phiDs, const label phasei
 ) const
 {
-    autoPtr<PtrList<surfaceScalarField> > tphiDs
-    (
-        new PtrList<surfaceScalarField>(this->phases().size())
-    );
-
-    PtrList<surfaceScalarField>& phiDs = tphiDs();
-
-    forAll(phiDs, phasei)
+    if (!phiDs.set(phasei))
     {
         phiDs.set
         (
@@ -603,7 +605,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::phiDs
             (
                 IOobject
                 (
-                    liftModel::typeName + ":F",
+                    turbulentDispersionModel::typeName + ":phiD",
                     this->mesh_.time().timeName(),
                     this->mesh_,
                     IOobject::NO_READ,
@@ -621,6 +623,23 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::phiDs
         );
     }
 
+    return phiDs[phasei];
+}
+
+
+template<class BasePhaseSystem>
+Foam::autoPtr<Foam::PtrList<Foam::surfaceScalarField> >
+Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::phiDs
+(
+    const PtrList<volScalarField>& rAUs
+) const
+{
+    autoPtr<PtrList<surfaceScalarField> > tphiDs
+    (
+        new PtrList<surfaceScalarField>(this->phases().size())
+    );
+    PtrList<surfaceScalarField>& phiDs = tphiDs();
+
     // Add the turbulent dispersion force
     forAllConstIter
     (
@@ -638,9 +657,9 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::phiDs
             fvc::snGrad(pair.phase1())*this->mesh_.magSf()
         );
 
-        phiDs[pair.phase1().index()] +=
+        setPhiD(phiDs, pair.phase1().index()) +=
             fvc::interpolate(rAUs[pair.phase1().index()]*D)*snGradAlpha1;
-        phiDs[pair.phase2().index()] -=
+        setPhiD(phiDs, pair.phase2().index()) -=
             fvc::interpolate(rAUs[pair.phase2().index()]*D)*snGradAlpha1;
     }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
index 980f854a9e..2f787ed004 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H
@@ -133,6 +133,20 @@ private:
             //- Turbulent dispersion models
             turbulentDispersionModelTable turbulentDispersionModels_;
 
+            //- Construct element phasei of Fs if not set and return
+            //  Used by Fs()
+            volVectorField& setF
+            (
+                PtrList<volVectorField>& Fs, const label phasei
+            ) const;
+
+            //- Construct element phasei of phiDs if not set and return
+            //  Used by phiDs()
+            surfaceScalarField& setPhiD
+            (
+                PtrList<surfaceScalarField>& phiDs, const label phasei
+            ) const;
+
 
 public:
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index 136d595418..e23746a3ad 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -38,22 +38,51 @@ forAll(phases, phasei)
 PtrList<surfaceScalarField> phiFs(phases.size());
 {
     autoPtr<PtrList<volVectorField> > Fs = fluid.Fs();
+
+    forAll(phases, phasei)
+    {
+        phaseModel& phase = phases[phasei];
+
+        if (Fs().set(phasei))
+        {
+            phiFs.set
+            (
+                phasei,
+                new surfaceScalarField
+                (
+                    IOobject::groupName("phiF", phase.name()),
+                    (fvc::interpolate(rAUs[phasei]*Fs()[phasei]) & mesh.Sf())
+                )
+            );
+        }
+    }
+}
+{
     autoPtr<PtrList<surfaceScalarField> > phiDs = fluid.phiDs(rAUs);
 
     forAll(phases, phasei)
     {
         phaseModel& phase = phases[phasei];
 
-        phiFs.set
-        (
-            phasei,
-            new surfaceScalarField
-            (
-                IOobject::groupName("phiF", phase.name()),
-                (fvc::interpolate(rAUs[phasei]*Fs()[phasei]) & mesh.Sf())
-              + phiDs()[phasei]
-            )
-        );
+        if (phiDs().set(phasei))
+        {
+            if (phiFs.set(phasei))
+            {
+                phiFs[phasei] += phiDs()[phasei];
+            }
+            else
+            {
+                phiFs.set
+                (
+                    phasei,
+                    new surfaceScalarField
+                    (
+                        IOobject::groupName("phiF", phase.name()),
+                        phiDs()[phasei]
+                    )
+                );
+            }
+        }
     }
 }
 
@@ -101,12 +130,12 @@ while (pimple.correct())
         ghf*fvc::snGrad(rho)*mesh.magSf()
     );
 
-    PtrList<surfaceScalarField> phigs(phases.size());
+    PtrList<surfaceScalarField> phigFs(phases.size());
     forAll(phases, phasei)
     {
         phaseModel& phase = phases[phasei];
 
-        phigs.set
+        phigFs.set
         (
             phasei,
             (
@@ -118,6 +147,11 @@ while (pimple.correct())
                 )
             ).ptr()
         );
+
+        if (phiFs.set(phasei))
+        {
+            phigFs[phasei] += phiFs[phasei];
+        }
     }
 
     PtrList<surfaceScalarField> phiHbyAs(phases.size());
@@ -177,8 +211,7 @@ while (pimple.correct())
                    MRF.absolute(phase.phi().oldTime())
                  - (fvc::interpolate(phase.U().oldTime()) & mesh.Sf())
                 )/runTime.deltaT()
-              - phiFs[phasei]
-              - phigs[phasei]
+              - phigFs[phasei]
             )
         );
 
@@ -389,8 +422,7 @@ while (pimple.correct())
                   + fvc::reconstruct
                     (
                         alpharAUfs[phasei]*mSfGradp
-                      - phiFs[phasei]
-                      - phigs[phasei]
+                      - phigFs[phasei]
                     );
                 phase.U().correctBoundaryConditions();
                 fvOptions.correct(phase.U());
diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index f7590f98f3..98192e477f 100644
--- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -151,16 +151,13 @@ heatTransfer
 );
 
 lift
-(
-);
+();
 
 wallLubrication
-(
-);
+();
 
 turbulentDispersion
-(
-);
+();
 
 // Minimum allowable pressure
 pMin            10000;

From d0b23bec38d125c3faa56858feaa430708221b53 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 23 Sep 2015 15:55:54 +0100
Subject: [PATCH 55/70] solidBodyMotionFvMesh: Fixed typo Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1854

---
 .../solidBodyMotionFvMesh/solidBodyMotionFvMesh.C          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
index 030fdea85d..d7118782a5 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,9 +123,8 @@ Foam::solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject& io)
             FatalErrorIn
             (
                 "solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject&)"
-            )
-                << "Unable to find cellZone " << cellZoneName
-                << ".  Valid celLZones are:"
+            )   << "Unable to find cellZone " << cellZoneName
+                << ".  Valid cellZones are:"
                 << cellZones().names()
                 << exit(FatalError);
         }

From 6a3d9e9d8235d9d5505b805508b9bd268c42396e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 25 Sep 2015 17:52:51 +0100
Subject: [PATCH 56/70] reactingTwoPhaseEulerFoam:
 alphatFixedDmdtWallBoilingWallFunction: new BC to test wall boiling

---
 ...allBoilingWallFunctionFvPatchScalarField.C | 373 ++++++++++++++++++
 ...allBoilingWallFunctionFvPatchScalarField.H | 210 ++++++++++
 src/TurbulenceModels/compressible/Make/files  |   3 +-
 ...haseChangeWallFunctionFvPatchScalarField.C |   5 +
 ...haseChangeWallFunctionFvPatchScalarField.H |   4 +-
 5 files changed, 591 insertions(+), 4 deletions(-)
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
 create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
new file mode 100644
index 0000000000..a37553e338
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
@@ -0,0 +1,373 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H"
+#include "compressibleTurbulenceModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "twoPhaseSystem.H"
+#include "phaseSystem.H"
+#include "ThermalPhaseChangePhaseSystem.H"
+#include "MomentumTransferPhaseSystem.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+scalar alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::maxExp_
+    = 50.0;
+scalar alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::tolerance_
+    = 0.01;
+label alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::maxIters_
+    = 10;
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn
+        (
+            "alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField"
+            "::checkType()"
+        )
+            << "Patch type for patch " << patch().name() << " must be wall\n"
+            << "Current patch type is " << patch().type() << nl
+            << exit(FatalError);
+    }
+}
+
+
+tmp<scalarField>
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::Psmooth
+(
+    const scalarField& Prat
+) const
+{
+    return 9.24*(pow(Prat, 0.75) - 1.0)*(1.0 + 0.28*exp(-0.007*Prat));
+}
+
+
+tmp<scalarField>
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::yPlusTherm
+(
+    const scalarField& P,
+    const scalarField& Prat
+) const
+{
+
+    tmp<scalarField> typtf(new scalarField(this->size()));
+    scalarField& yptf = typtf();
+
+    forAll(yptf, faceI)
+    {
+        scalar ypt = 11.0;
+
+        for (int i=0; i<maxIters_; i++)
+        {
+            scalar f = ypt - (log(E_*ypt)/kappa_ + P[faceI])/Prat[faceI];
+            scalar df = 1.0 - 1.0/(ypt*kappa_*Prat[faceI]);
+            scalar yptNew = ypt - f/df;
+
+            if (yptNew < VSMALL)
+            {
+                yptf[faceI] =  0;
+            }
+            else if (mag(yptNew - ypt) < tolerance_)
+            {
+                yptf[faceI] = yptNew;
+            }
+            else
+            {
+                ypt = yptNew;
+            }
+        }
+
+        yptf[faceI] = ypt;
+    }
+
+    return typtf;
+}
+
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    alphatPhaseChangeWallFunctionFvPatchScalarField(p, iF),
+    Prt_(0.85),
+    Cmu_(0.09),
+    kappa_(0.41),
+    E_(9.8),
+    fixedDmdt_(0.0)
+{
+    checkType();
+}
+
+
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    alphatPhaseChangeWallFunctionFvPatchScalarField(p, iF, dict),
+    Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85)),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    fixedDmdt_(dict.lookupOrDefault<scalar>("fixedDmdt", 0.0))
+{}
+
+
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+(
+    const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    alphatPhaseChangeWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
+    Prt_(ptf.Prt_),
+    Cmu_(ptf.Cmu_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_),
+    fixedDmdt_(ptf.fixedDmdt_)
+{}
+
+
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+(
+    const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField& awfpsf
+)
+:
+    alphatPhaseChangeWallFunctionFvPatchScalarField(awfpsf),
+    Prt_(awfpsf.Prt_),
+    Cmu_(awfpsf.Cmu_),
+    kappa_(awfpsf.kappa_),
+    E_(awfpsf.E_),
+    fixedDmdt_(awfpsf.fixedDmdt_)
+{}
+
+
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::
+alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+(
+    const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField& awfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    alphatPhaseChangeWallFunctionFvPatchScalarField(awfpsf, iF),
+    Prt_(awfpsf.Prt_),
+    Cmu_(awfpsf.Cmu_),
+    kappa_(awfpsf.kappa_),
+    E_(awfpsf.E_),
+    fixedDmdt_(awfpsf.fixedDmdt_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Lookup the fluid model
+    const ThermalPhaseChangePhaseSystem
+    <
+        MomentumTransferPhaseSystem<twoPhaseSystem>
+    >& fluid =
+        refCast
+        <
+            const ThermalPhaseChangePhaseSystem
+            <
+                MomentumTransferPhaseSystem<twoPhaseSystem>
+            >
+        >
+        (
+            db().lookupObject<phaseSystem>("phaseProperties")
+        );
+
+    const phaseModel& liquid
+    (
+        fluid.phase1().name() == dimensionedInternalField().group()
+      ? fluid.phase1()
+      : fluid.phase2()
+    );
+
+    const label patchi = patch().index();
+
+    // Retrieve turbulence properties from model
+    const compressibleTurbulenceModel& turbModel =
+        db().lookupObject<compressibleTurbulenceModel>
+        (
+            IOobject::groupName
+            (
+                compressibleTurbulenceModel::propertiesName,
+                dimensionedInternalField().group()
+            )
+        );
+
+    const scalar Cmu25 = pow025(Cmu_);
+
+    const scalarField& y = turbModel.y()[patchi];
+
+    const tmp<scalarField> tmuw = turbModel.mu(patchi);
+    const scalarField& muw = tmuw();
+
+    const tmp<scalarField> talphaw = liquid.thermo().alpha(patchi);
+    const scalarField& alphaw = talphaw();
+
+    scalarField& alphatw = *this;
+
+    const tmp<volScalarField> tk = turbModel.k();
+    const volScalarField& k = tk();
+    const fvPatchScalarField& kw = k.boundaryField()[patchi];
+
+    const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi];
+    const scalarField magUp(mag(Uw.patchInternalField() - Uw));
+    const scalarField magGradUw(mag(Uw.snGrad()));
+
+    const fvPatchScalarField& rhow = turbModel.rho().boundaryField()[patchi];
+    const fvPatchScalarField& hew =
+        liquid.thermo().he().boundaryField()[patchi];
+
+    const fvPatchScalarField& Tw =
+        liquid.thermo().T().boundaryField()[patchi];
+
+    scalarField Tp(Tw.patchInternalField());
+
+    // Heat flux [W/m2] - lagging alphatw
+    const scalarField qDot
+    (
+        (alphatw + alphaw)*hew.snGrad()
+    );
+
+    scalarField uTau(Cmu25*sqrt(kw));
+
+    scalarField yPlus(uTau*y/(muw/rhow));
+
+    scalarField Pr(muw/alphaw);
+
+    // Molecular-to-turbulent Prandtl number ratio
+    scalarField Prat(Pr/Prt_);
+
+    // Thermal sublayer thickness
+    scalarField P(this->Psmooth(Prat));
+
+    scalarField yPlusTherm(this->yPlusTherm(P, Prat));
+
+    scalarField alphatConv(this->size(), 0.0);
+
+    // Populate boundary values
+    forAll(alphatw, faceI)
+    {
+        // Evaluate new effective thermal diffusivity
+        scalar alphaEff = 0.0;
+        if (yPlus[faceI] < yPlusTherm[faceI])
+        {
+            scalar A = qDot[faceI]*rhow[faceI]*uTau[faceI]*y[faceI];
+            scalar B = qDot[faceI]*Pr[faceI]*yPlus[faceI];
+            scalar C = Pr[faceI]*0.5*rhow[faceI]*uTau[faceI]*sqr(magUp[faceI]);
+            alphaEff = A/(B + C + VSMALL);
+        }
+        else
+        {
+            scalar A = qDot[faceI]*rhow[faceI]*uTau[faceI]*y[faceI];
+            scalar B =
+                qDot[faceI]*Prt_*(1.0/kappa_*log(E_*yPlus[faceI]) + P[faceI]);
+            scalar magUc =
+                uTau[faceI]/kappa_*log(E_*yPlusTherm[faceI]) - mag(Uw[faceI]);
+            scalar C =
+                0.5*rhow[faceI]*uTau[faceI]
+               *(Prt_*sqr(magUp[faceI]) + (Pr[faceI] - Prt_)*sqr(magUc));
+            alphaEff = A/(B + C + VSMALL);
+        }
+
+        // Update convective heat transfer turbulent thermal diffusivity
+        alphatConv[faceI] = max(0.0, alphaEff - alphaw[faceI]);
+    }
+
+    dmdt_ = fixedDmdt_;
+
+    operator==(alphatConv);
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchField<scalar>::write(os);
+    os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    os.writeKeyword("fixedDmdt") << fixedDmdt_ << token::END_STATEMENT << nl;
+    dmdt_.writeEntry("dmdt", os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H
new file mode 100644
index 0000000000..bd9426fdb6
--- /dev/null
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H
@@ -0,0 +1,210 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::compressible::alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+
+Group
+    grpCmpWallFunctions
+
+Description
+    A simple alphatPhaseChangeWallFunctionFvPatchScalarField with a fixed
+    volumetric phase-change mass flux.
+
+SeeAlso
+    Foam::compressible::alphatPhaseChangeWallFunctionFvPatchScalarField
+
+SourceFiles
+    alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleAlphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField_H
+#define compressibleAlphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField_H
+
+#include "alphatPhaseChangeWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+/*---------------------------------------------------------------------------*\
+   Class alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+:
+    public alphatPhaseChangeWallFunctionFvPatchScalarField
+{
+    // Private data
+
+        //- Turbulent Prandtl number
+        scalar Prt_;
+
+        //- Cmu coefficient
+        scalar Cmu_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
+        //- E coefficient
+        scalar fixedDmdt_;
+
+
+        // Solution parameters
+
+            static scalar maxExp_;
+            static scalar tolerance_;
+            static label maxIters_;
+
+
+    // Private Member Functions
+
+        //- Check the type of the patch
+        void checkType();
+
+        //- 'P' function
+        tmp<scalarField> Psmooth(const scalarField& Prat) const;
+
+        //- Calculate y+ at the edge of the thermal laminar sublayer
+        tmp<scalarField> yPlusTherm
+        (
+            const scalarField& P,
+            const scalarField& Prat
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("compressible::alphatFixedDmdtWallBoilingWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+        //  onto a new patch
+        alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+        (
+            const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+        (
+            const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+        (
+            const alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        //- Return the rate of phase-change
+        virtual const scalarField& dmdt() const
+        {
+            return dmdt_;
+        }
+
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/Make/files b/src/TurbulenceModels/compressible/Make/files
index 1f7f2fa12d..c4aab94251 100644
--- a/src/TurbulenceModels/compressible/Make/files
+++ b/src/TurbulenceModels/compressible/Make/files
@@ -15,7 +15,6 @@ $(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
 
 turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
 turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
-
-/*turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C*/
+turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
 
 LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
index 1df17993a7..0eb70aabbc 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
@@ -35,6 +35,11 @@ namespace Foam
 namespace compressible
 {
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(alphatPhaseChangeWallFunctionFvPatchScalarField,0);
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 alphatPhaseChangeWallFunctionFvPatchScalarField::
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H
index fb424995a8..4d1dd4f15b 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H
@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleAlphatWallFunctionPhaseChangeFvPatchScalarField_H
-#define compressibleAlphatWallFunctionPhaseChangeFvPatchScalarField_H
+#ifndef compressibleAlphatPhaseChangeWallFunctionFvPatchScalarField_H
+#define compressibleAlphatPhaseChangeWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 

From c5955e4af4240056013fbbdf55298112d9fb113c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 25 Sep 2015 17:54:55 +0100
Subject: [PATCH 57/70] reactingEulerFoam: Support compressibility and
 mass-transfer independently Now combinations of incompressible, compressible
 phases with or without mass-transfer are supported efficiently.

---
 .../HeatAndMassTransferPhaseSystem.C          |  10 ++
 .../HeatAndMassTransferPhaseSystem.H          |   3 +
 .../HeatTransferPhaseSystem.C                 |  15 +-
 .../ThermalPhaseChangePhaseSystem.C           | 162 ++++++++++++++++--
 .../ThermalPhaseChangePhaseSystem.H           |  11 ++
 .../AnisothermalPhaseModel.C                  |  42 ++---
 .../AnisothermalPhaseModel.H                  |   6 +-
 .../phaseModel/phaseModel/phaseModel.C        |   9 +-
 .../phaseModel/phaseModel/phaseModel.H        |   4 +-
 .../reactionThermo/hRefConstThermos.C         |  25 +++
 .../multiphaseSystem/multiphaseSystem.C       |  16 +-
 .../multiphaseSystem/multiphaseSystem.H       |   3 +
 .../reactingMultiphaseEulerFoam/pU/pEqn.H     |  20 ++-
 .../reactingTwoPhaseEulerFoam/pU/pEqn.H       |   4 +-
 .../reactingTwoPhaseEulerFoam/pUf/pEqn.H      |  62 +++++--
 .../Make/files                                |   2 +
 .../Make/options                              |   1 +
 .../twoPhaseSystem/twoPhaseSystem.C           |  14 +-
 18 files changed, 317 insertions(+), 92 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
index 9eddbe4efd..3db07ef804 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
@@ -151,6 +151,16 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+template<class BasePhaseSystem>
+bool Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::transfersMass
+(
+    const phaseModel& phase
+) const
+{
+    return true;
+}
+
+
 template<class BasePhaseSystem>
 Foam::tmp<Foam::volScalarField>
 Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::dmdt
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
index d8aa29676a..3a0cbd4ba2 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H
@@ -120,6 +120,9 @@ public:
 
     // Member Functions
 
+        //- Return true if there is mass transfer for phase
+        virtual bool transfersMass(const phaseModel& phase) const;
+
         //- Return the interfacial mass flow rate
         virtual tmp<volScalarField> dmdt(const phasePairKey& key) const;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
index f4a1284db8..95636c3749 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
@@ -92,20 +92,7 @@ Foam::HeatTransferPhaseSystem<BasePhaseSystem>::dmdt
     const Foam::phaseModel& phase
 ) const
 {
-    return tmp<volScalarField>
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                IOobject::groupName("dmdt", phase.name()),
-                this->mesh().time().timeName(),
-                this->mesh().time()
-            ),
-            this->mesh(),
-            dimensionedScalar("zero", dimDensity/dimTime, 0)
-        )
-    );
+    return tmp<volScalarField>(NULL);
 }
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index f0453940c7..175a993e30 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -25,6 +25,7 @@ License
 
 #include "ThermalPhaseChangePhaseSystem.H"
 #include "fvCFD.H"
+#include "alphatPhaseChangeWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -39,7 +40,61 @@ ThermalPhaseChangePhaseSystem
     volatile_(this->lookup("volatile")),
     saturationModel_(saturationModel::New(this->subDict("saturationModel"))),
     massTransfer_(this->lookup("massTransfer"))
-{}
+{
+
+    forAllConstIter
+    (
+        phaseSystem::phasePairTable,
+        this->phasePairs_,
+        phasePairIter
+    )
+    {
+        const phasePair& pair(phasePairIter());
+
+        if (pair.ordered())
+        {
+            continue;
+        }
+
+        // Initially assume no mass transfer
+        iDmdt_.insert
+        (
+            pair,
+            new volScalarField
+            (
+                IOobject
+                (
+                    IOobject::groupName("iDmdt", pair.name()),
+                    this->mesh().time().timeName(),
+                    this->mesh(),
+                    IOobject::NO_READ,
+                    IOobject::AUTO_WRITE
+                ),
+                this->mesh(),
+                dimensionedScalar("zero", dimDensity/dimTime, 0)
+            )
+        );
+
+        // Initially assume no mass transfer
+        wDmdt_.insert
+        (
+            pair,
+            new volScalarField
+            (
+                IOobject
+                (
+                    IOobject::groupName("wDmdt", pair.name()),
+                    this->mesh().time().timeName(),
+                    this->mesh(),
+                    IOobject::NO_READ,
+                    IOobject::AUTO_WRITE
+                ),
+                this->mesh(),
+                dimensionedScalar("zero", dimDensity/dimTime, 0)
+            )
+        );
+    }
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -52,6 +107,14 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+template<class BasePhaseSystem>
+const Foam::saturationModel&
+Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::saturation() const
+{
+    return saturationModel_();
+}
+
+
 template<class BasePhaseSystem>
 Foam::autoPtr<Foam::phaseSystem::massTransferTable>
 Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::massTransfer() const
@@ -121,6 +184,9 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::massTransfer() const
 template<class BasePhaseSystem>
 void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
 {
+    typedef compressible::alphatPhaseChangeWallFunctionFvPatchScalarField
+        alphatPhaseChangeWallFunction;
+
     BasePhaseSystem::correctThermo();
 
     forAllConstIter
@@ -147,6 +213,8 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
         const volScalarField& he2(phase2.thermo().he());
 
         volScalarField& dmdt(*this->dmdt_[pair]);
+        volScalarField& iDmdt(*this->iDmdt_[pair]);
+        volScalarField& wDmdt(*this->wDmdt_[pair]);
 
         volScalarField& Tf = *this->Tf_[pair];
 
@@ -167,25 +235,28 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
 
             Tf = saturationModel_->Tsat(phase1.thermo().p());
 
-            dmdt =
-                (H1*(Tf - T1) + H2*(Tf - T2))
+            scalar iDmdtRelax(this->mesh().fieldRelaxationFactor("iDmdt"));
+
+            iDmdt =
+                (1 - iDmdtRelax)*iDmdt
+              + iDmdtRelax*(H1*(Tf - T1) + H2*(Tf - T2))
                /min
                 (
-                    (pos(dmdt)*he2 + neg(dmdt)*hef2)
-                  - (neg(dmdt)*he1 + pos(dmdt)*hef1),
+                    (pos(iDmdt)*he2 + neg(iDmdt)*hef2)
+                  - (neg(iDmdt)*he1 + pos(iDmdt)*hef1),
                     0.3*mag(hef2 - hef1)
                 );
 
-            Info<< "dmdt." << pair.name()
-                << ": min = " << min(dmdt.internalField())
-                << ", mean = " << average(dmdt.internalField())
-                << ", max = " << max(dmdt.internalField())
-                << ", integral = " << fvc::domainIntegrate(dmdt).value()
+            Info<< "iDmdt." << pair.name()
+                << ": min = " << min(iDmdt.internalField())
+                << ", mean = " << average(iDmdt.internalField())
+                << ", max = " << max(iDmdt.internalField())
+                << ", integral = " << fvc::domainIntegrate(iDmdt).value()
                 << endl;
         }
         else
         {
-            dmdt == dimensionedScalar("0", dmdt.dimensions(), 0);
+            iDmdt == dimensionedScalar("0", dmdt.dimensions(), 0);
         }
 
         volScalarField H1(this->heatTransferModels_[pair][pair.first()]->K());
@@ -200,12 +271,13 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
 
         volScalarField mDotL
         (
-            dmdt*
+            iDmdt*
             (
-                (pos(dmdt)*he2 + neg(dmdt)*hef2)
-              - (neg(dmdt)*he1 + pos(dmdt)*hef1)
+                (pos(iDmdt)*he2 + neg(iDmdt)*hef2)
+              - (neg(iDmdt)*he1 + pos(iDmdt)*hef1)
             )
         );
+
         Tf = (H1*T1 + H2*T2 + mDotL)/(H1 + H2);
 
         Info<< "Tf." << pair.name()
@@ -213,6 +285,68 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
             << ", mean = " << average(Tf.internalField())
             << ", max = " << max(Tf.internalField())
             << endl;
+
+        // Accumulate dmdt contributions from boundaries
+        if
+        (
+            phase2.mesh().foundObject<volScalarField>
+            (
+                "alphat." +  phase2.name()
+            )
+        )
+        {
+            scalar wDmdtRelax(this->mesh().fieldRelaxationFactor("wDmdt"));
+            wDmdt *= (1 - wDmdtRelax);
+
+            const volScalarField& alphat =
+                phase2.mesh().lookupObject<volScalarField>
+                (
+                    "alphat." +  phase2.name()
+                );
+
+            const fvPatchList& patches = this->mesh().boundary();
+            forAll(patches, patchi)
+            {
+                const fvPatch& currPatch = patches[patchi];
+
+                if
+                (
+                    isA<alphatPhaseChangeWallFunction>
+                    (
+                        alphat.boundaryField()[patchi]
+                    )
+                )
+                {
+                    const scalarField& patchDmdt =
+                        refCast<const alphatPhaseChangeWallFunction>
+                        (
+                            alphat.boundaryField()[patchi]
+                        ).dmdt();
+
+                    forAll(patchDmdt,facei)
+                    {
+                        label faceCelli = currPatch.faceCells()[facei];
+                        wDmdt[faceCelli] += wDmdtRelax*patchDmdt[facei];
+                    }
+                }
+            }
+
+            Info<< "wDmdt." << pair.name()
+                << ": min = " << min(wDmdt.internalField())
+                << ", mean = " << average(wDmdt.internalField())
+                << ", max = " << max(wDmdt.internalField())
+                << ", integral = " << fvc::domainIntegrate(wDmdt).value()
+                << endl;
+        }
+
+        dmdt = wDmdt + iDmdt;
+
+        Info<< "dmdt." << pair.name()
+            << ": min = " << min(dmdt.internalField())
+            << ", mean = " << average(dmdt.internalField())
+            << ", max = " << max(dmdt.internalField())
+            << ", integral = " << fvc::domainIntegrate(dmdt).value()
+            << endl;
     }
 }
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
index edae5a6ff6..e67b8209fe 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H
@@ -73,6 +73,14 @@ protected:
         // Mass transfer enabled
         Switch massTransfer_;
 
+        //- Interfacial Mass transfer rate
+        HashPtrTable<volScalarField, phasePairKey, phasePairKey::hash>
+            iDmdt_;
+
+        //- Wall Mass transfer rate
+        HashPtrTable<volScalarField, phasePairKey, phasePairKey::hash>
+            wDmdt_;
+
 
 public:
 
@@ -88,6 +96,9 @@ public:
 
     // Member Functions
 
+        //- Return the saturationModel
+        const saturationModel& saturation() const;
+
         //- Return the mass transfer matrices
         virtual autoPtr<phaseSystem::massTransferTable> massTransfer() const;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
index 78e015ff3a..8d705049f7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
@@ -37,17 +37,7 @@ Foam::AnisothermalPhaseModel<BasePhaseModel>::AnisothermalPhaseModel
 )
 :
     BasePhaseModel(fluid, phaseName, index),
-    divU_
-    (
-        IOobject
-        (
-            IOobject::groupName("divU", this->name()),
-            fluid.mesh().time().timeName(),
-            fluid.mesh()
-        ),
-        fluid.mesh(),
-        dimensionedScalar("divU", dimless/dimTime, 0)
-    ),
+    divU_(NULL),
     K_
     (
         IOobject
@@ -105,7 +95,7 @@ Foam::AnisothermalPhaseModel<BasePhaseModel>::heEqn()
 
     volScalarField& he = this->thermo_->he();
 
-    return
+    tmp<fvScalarMatrix> tEEqn
     (
         fvm::ddt(alpha, this->rho(), he) + fvm::div(alphaRhoPhi, he)
       - fvm::Sp(contErr, he)
@@ -119,16 +109,23 @@ Foam::AnisothermalPhaseModel<BasePhaseModel>::heEqn()
            *fvc::interpolate(alphaEff),
             he
         )
-
-      + (
-            he.name() == this->thermo_->phasePropertyName("e")
-          ? fvc::ddt(alpha)*this->thermo().p()
-          + fvc::div(alphaPhi, this->thermo().p())
-          : -alpha*this->fluid().dpdt()
-        )
      ==
         this->Sh()
     );
+
+    // Add the appropriate pressure-work term
+    if (he.name() == this->thermo_->phasePropertyName("e"))
+    {
+        tEEqn() +=
+            fvc::ddt(alpha)*this->thermo().p()
+          + fvc::div(alphaPhi, this->thermo().p());
+    }
+    else if (this->thermo_->dpdt())
+    {
+        tEEqn() -= alpha*this->fluid().dpdt();
+    }
+
+    return tEEqn;
 }
 
 
@@ -140,7 +137,7 @@ bool Foam::AnisothermalPhaseModel<BasePhaseModel>::compressible() const
 
 
 template<class BasePhaseModel>
-const Foam::volScalarField&
+const Foam::tmp<Foam::volScalarField>&
 Foam::AnisothermalPhaseModel<BasePhaseModel>::divU() const
 {
     return divU_;
@@ -149,7 +146,10 @@ Foam::AnisothermalPhaseModel<BasePhaseModel>::divU() const
 
 template<class BasePhaseModel>
 void
-Foam::AnisothermalPhaseModel<BasePhaseModel>::divU(const volScalarField& divU)
+Foam::AnisothermalPhaseModel<BasePhaseModel>::divU
+(
+    const tmp<volScalarField>& divU
+)
 {
     divU_ = divU;
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
index 9d7a92b499..a8c4be694a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H
@@ -55,7 +55,7 @@ class AnisothermalPhaseModel
     // Private data
 
         //- Dilatation rate
-        volScalarField divU_;
+        tmp<volScalarField> divU_;
 
         //- Kinetic energy
         volScalarField K_;
@@ -95,10 +95,10 @@ public:
             virtual bool compressible() const;
 
             //- Return the phase dilatation rate (d(alpha)/dt + div(alpha*phi))
-            virtual const volScalarField& divU() const;
+            virtual const tmp<volScalarField>& divU() const;
 
             //- Set the phase dilatation rate (d(alpha)/dt + div(alpha*phi))
-            virtual void divU(const volScalarField& divU);
+            virtual void divU(const tmp<volScalarField>& divU);
 
             //- Return the phase kinetic energy
             virtual const volScalarField& K() const;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
index 0849867944..eb2e871530 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
@@ -165,16 +165,17 @@ bool Foam::phaseModel::compressible() const
 }
 
 
-const Foam::volScalarField& Foam::phaseModel::divU() const
+const Foam::tmp<Foam::volScalarField>& Foam::phaseModel::divU() const
 {
     notImplemented("Foam::phaseModel::divU()");
-    return volScalarField::null();
+    static tmp<Foam::volScalarField> divU_(NULL);
+    return divU_;
 }
 
 
-void Foam::phaseModel::divU(const volScalarField& divU)
+void Foam::phaseModel::divU(const tmp<volScalarField>& divU)
 {
-    WarningIn("phaseModel::divU(const volScalarField& divU)")
+    WarningIn("phaseModel::divU(const tmp<volScalarField>& divU)")
         << "Attempt to set the dilatation rate of an incompressible phase"
         << endl;
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
index ae94353aeb..27d78390ca 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H
@@ -216,10 +216,10 @@ public:
             virtual bool compressible() const;
 
             //- Return the phase dilatation rate (d(alpha)/dt + div(alpha*phi))
-            virtual const volScalarField& divU() const;
+            virtual const tmp<volScalarField>& divU() const;
 
             //- Set the phase dilatation rate (d(alpha)/dt + div(alpha*phi))
-            virtual void divU(const volScalarField& divU);
+            virtual void divU(const tmp<volScalarField>& divU);
 
             //- Return the phase kinetic energy
             virtual const volScalarField& K() const;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
index 47ae733b14..76c2351109 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
@@ -120,6 +120,19 @@ constTransport
     >
 > constRefRhoConstEThermoPhysics;
 
+typedef
+constTransport
+<
+    species::thermo
+    <
+        hRefConstThermo
+        <
+            rhoConst<specie>
+        >,
+        sensibleEnthalpy
+    >
+> constRefRhoConstHThermoPhysics;
+
 
 // pureMixture, sensibleEnthalpy:
 
@@ -229,6 +242,18 @@ makeReactionMixtureThermo
 );
 
 
+// multiComponentMixture, sensibleEnthalpy:
+
+makeReactionMixtureThermo
+(
+    rhoThermo,
+    rhoReactionThermo,
+    heRhoThermo,
+    multiComponentMixture,
+    constRefRhoConstHThermoPhysics
+);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index cf765d4c07..a79e9393b5 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -204,7 +204,7 @@ void Foam::multiphaseSystem::solveAlphas()
                 mesh_
             ),
             mesh_,
-            dimensionedScalar("Sp", phase.divU().dimensions(), 0.0)
+            dimensionedScalar("Sp", divU.dimensions(), 0.0)
         );
 
         volScalarField::DimensionedInternalField Su
@@ -220,9 +220,9 @@ void Foam::multiphaseSystem::solveAlphas()
             divU*min(alpha, scalar(1))
         );
 
-        if (phase.compressible())
+        if (phase.divU().valid())
         {
-            const scalarField& dgdt = phase.divU();
+            const scalarField& dgdt = phase.divU()();
 
             forAll(dgdt, celli)
             {
@@ -247,9 +247,9 @@ void Foam::multiphaseSystem::solveAlphas()
 
             if (&phase2 == &phase) continue;
 
-            if (phase2.compressible())
+            if (phase2.divU().valid())
             {
-                const scalarField& dgdt2 = phase2.divU();
+                const scalarField& dgdt2 = phase2.divU()();
 
                 forAll(dgdt2, celli)
                 {
@@ -515,6 +515,12 @@ Foam::multiphaseSystem::~multiphaseSystem()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+bool Foam::multiphaseSystem::transfersMass(const phaseModel& phase) const
+{
+    return false;
+}
+
+
 Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
 (
     const phaseModel& phase1
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
index f4c185d9b7..a9390f2589 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
@@ -175,6 +175,9 @@ public:
             const PtrList<volScalarField>& rAUs
         ) const = 0;
 
+        //- Return true if there is mass transfer for phase
+        virtual bool transfersMass(const phaseModel& phase) const;
+
         //- Return the total interfacial mass transfer rate for phase
         virtual tmp<volScalarField> dmdt(const phaseModel& phase) const = 0;
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index e23746a3ad..230b650106 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -311,7 +311,7 @@ while (pimple.correct())
                     phasei,
                     (
                         (
-                            phase.continuityError() - fluid.dmdt(phase)
+                            phase.continuityError()
                           - fvc::Sp
                             (
                                 fvc::ddt(alpha) + fvc::div(phase.alphaPhi()),
@@ -340,7 +340,7 @@ while (pimple.correct())
                     phasei,
                     (
                         (
-                            phase.continuityError() - fluid.dmdt(phase)
+                            phase.continuityError()
                           - fvc::Sp
                             (
                                 (fvc::ddt(alpha) + fvc::div(phase.alphaPhi())),
@@ -352,6 +352,18 @@ while (pimple.correct())
                     ).ptr()
                 );
             }
+
+            if (fluid.transfersMass(phase))
+            {
+                if (pEqnComps.set(phasei))
+                {
+                    pEqnComps[phasei] -= fluid.dmdt(phase);
+                }
+                else
+                {
+                    pEqnComps.set(phasei, fvm::Su(-fluid.dmdt(phase), rho));
+                }
+            }
         }
     }
 
@@ -373,9 +385,7 @@ while (pimple.correct())
 
             forAll(phases, phasei)
             {
-                phaseModel& phase = phases[phasei];
-
-                if (phase.compressible())
+                if (pEqnComps.set(phasei))
                 {
                     pEqn += pEqnComps[phasei];
                 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
index 5ffc70ec84..c8a9e28288 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
@@ -321,12 +321,12 @@ while (pimple.correct())
         {
             fvScalarMatrix pEqn(pEqnIncomp);
 
-            if (phase1.compressible())
+            if (pEqnComp1.valid())
             {
                 pEqn += pEqnComp1();
             }
 
-            if (phase2.compressible())
+            if (pEqnComp2.valid())
             {
                 pEqn += pEqnComp2();
             }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
index 161a08b06d..c3f7d472fa 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
@@ -227,7 +227,9 @@ while (pimple.correct())
             fvc::interpolate(psi2)*phi2
         );
 
-        pEqnComp1 =
+        if (phase1.compressible())
+        {
+            pEqnComp1 =
             (
                 phase1.continuityError() - fluid.dmdt()
               - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
@@ -237,10 +239,13 @@ while (pimple.correct())
                 psi1*fvm::ddt(p_rgh)
               + fvm::div(phid1, p_rgh) - fvm::Sp(fvc::div(phid1), p_rgh)
             );
-        deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
-        pEqnComp1().relax();
+            deleteDemandDrivenData(pEqnComp1().faceFluxCorrectionPtr());
+            pEqnComp1().relax();
+        }
 
-        pEqnComp2 =
+        if (phase2.compressible())
+        {
+            pEqnComp2 =
             (
                 phase2.continuityError() + fluid.dmdt()
               - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
@@ -250,24 +255,31 @@ while (pimple.correct())
                 psi2*fvm::ddt(p_rgh)
               + fvm::div(phid2, p_rgh) - fvm::Sp(fvc::div(phid2), p_rgh)
             );
-        deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
-        pEqnComp2().relax();
+            deleteDemandDrivenData(pEqnComp2().faceFluxCorrectionPtr());
+            pEqnComp2().relax();
+        }
     }
     else
     {
-        pEqnComp1 =
+        if (phase1.compressible())
+        {
+            pEqnComp1 =
             (
                 phase1.continuityError() - fluid.dmdt()
               - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
             )/rho1
           + (alpha1*psi1/rho1)*correction(fvm::ddt(p_rgh));
+        }
 
-        pEqnComp2 =
+        if (phase2.compressible())
+        {
+            pEqnComp2 =
             (
                 phase2.continuityError() + fluid.dmdt()
               - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
             )/rho2
           + (alpha2*psi2/rho2)*correction(fvm::ddt(p_rgh));
+        }
     }
 
     // Cache p prior to solve for density update
@@ -281,11 +293,25 @@ while (pimple.correct())
           - fvm::laplacian(rAUf, p_rgh)
         );
 
-        solve
-        (
-            pEqnComp1() + pEqnComp2() + pEqnIncomp,
-            mesh.solver(p_rgh.select(pimple.finalInnerIter()))
-        );
+        {
+            fvScalarMatrix pEqn(pEqnIncomp);
+
+            if (pEqnComp1.valid())
+            {
+                pEqn += pEqnComp1();
+            }
+
+            if (pEqnComp2.valid())
+            {
+                pEqn += pEqnComp2();
+            }
+
+            solve
+            (
+                pEqn,
+                mesh.solver(p_rgh.select(pimple.finalInnerIter()))
+            );
+        }
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -325,17 +351,23 @@ while (pimple.correct())
             fvOptions.correct(U2);
 
             // Set the phase dilatation rates
-            if (phase1.compressible())
+            if (pEqnComp1.valid())
             {
                 phase1.divU(-pEqnComp1 & p_rgh);
             }
-            if (phase2.compressible())
+            if (pEqnComp2.valid())
             {
                 phase2.divU(-pEqnComp2 & p_rgh);
             }
         }
     }
 
+    Info<< "min(p) = " << min(p_rgh + rho*gh).value() << endl;
+    if (min(p_rgh + rho*gh) < pMin)
+    {
+        Info<< "Clipping p" << endl;
+    }
+
     // Update and limit the static pressure
     p = max(p_rgh + rho*gh, pMin);
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files
index d1cbb6eaeb..10a0e8679a 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files
@@ -35,4 +35,6 @@ kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
 kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
 kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
 
+derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
+
 LIB = $(FOAM_LIBBIN)/libtwoPhaseReactingTurbulenceModels
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
index cd3f851fc8..f003ce2281 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
     -I../twoPhaseSystem/lnInclude \
     -I../../phaseSystems/lnInclude \
     -I../../interfacialModels/lnInclude\
+    -I../../interfacialCompositionModels/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/transportModel \
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index 401c4f622c..187ca4c238 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -203,30 +203,30 @@ void Foam::twoPhaseSystem::solve()
     // Construct the dilatation rate source term
     tmp<volScalarField::DimensionedInternalField> tdgdt;
 
-    if (phase1_.compressible() && phase2_.compressible())
+    if (phase1_.divU().valid() && phase2_.divU().valid())
     {
         tdgdt =
         (
             alpha2.dimensionedInternalField()
-           *phase1_.divU().dimensionedInternalField()
+           *phase1_.divU()().dimensionedInternalField()
           - alpha1.dimensionedInternalField()
-           *phase2_.divU().dimensionedInternalField()
+           *phase2_.divU()().dimensionedInternalField()
         );
     }
-    else if (phase1_.compressible())
+    else if (phase1_.divU().valid())
     {
         tdgdt =
         (
             alpha2.dimensionedInternalField()
-           *phase1_.divU().dimensionedInternalField()
+           *phase1_.divU()().dimensionedInternalField()
         );
     }
-    else if (phase2_.compressible())
+    else if (phase2_.divU().valid())
     {
         tdgdt =
         (
           - alpha1.dimensionedInternalField()
-           *phase2_.divU().dimensionedInternalField()
+           *phase2_.divU()().dimensionedInternalField()
         );
     }
 

From c8135cee57b2d5fd534d85dcc78714b91ec6ed38 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 25 Sep 2015 19:00:07 +0100
Subject: [PATCH 58/70] reactingEulerFoam: Further improvements to the handling
 of mass-transfer between incompressible and compressible phases

---
 .../HeatTransferPhaseSystem.C                 | 10 +++++++
 .../HeatTransferPhaseSystem.H                 |  3 ++
 .../reactionThermo/hRefConstThermos.C         | 10 +++++++
 .../multiphaseSystem/multiphaseSystem.C       |  6 ----
 .../multiphaseSystem/multiphaseSystem.H       |  2 +-
 .../reactingMultiphaseEulerFoam/pU/pEqn.H     |  8 +++--
 .../reactingTwoPhaseEulerFoam/pU/pEqn.H       | 29 ++++++++++++++++---
 .../reactingTwoPhaseEulerFoam/pUf/pEqn.H      | 29 ++++++++++++++++---
 .../twoPhaseSystem/twoPhaseSystem.C           |  6 ++++
 .../twoPhaseSystem/twoPhaseSystem.H           |  6 ++++
 10 files changed, 92 insertions(+), 17 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
index 95636c3749..07b41eb771 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
@@ -57,6 +57,16 @@ Foam::HeatTransferPhaseSystem<BasePhaseSystem>::~HeatTransferPhaseSystem()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
+template<class BasePhaseSystem>
+bool Foam::HeatTransferPhaseSystem<BasePhaseSystem>::transfersMass
+(
+    const phaseModel& phase
+) const
+{
+    return false;
+}
+
+
 template<class BasePhaseSystem>
 Foam::tmp<Foam::volScalarField>
 Foam::HeatTransferPhaseSystem<BasePhaseSystem>::dmdt
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
index cef3b696bd..0c908239fd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H
@@ -89,6 +89,9 @@ public:
 
     // Member Functions
 
+        //- Return true if there is mass transfer for phase
+        virtual bool transfersMass(const phaseModel& phase) const;
+
         //- Return the interfacial mass flow rate
         virtual tmp<volScalarField> dmdt
         (
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
index 76c2351109..f43303a2b7 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
@@ -254,6 +254,16 @@ makeReactionMixtureThermo
 );
 
 
+makeReactionMixtureThermo
+(
+    rhoThermo,
+    rhoReactionThermo,
+    heRhoThermo,
+    multiComponentMixture,
+    constRefGasHThermoPhysics
+);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index a79e9393b5..5512fd6559 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -515,12 +515,6 @@ Foam::multiphaseSystem::~multiphaseSystem()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-bool Foam::multiphaseSystem::transfersMass(const phaseModel& phase) const
-{
-    return false;
-}
-
-
 Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
 (
     const phaseModel& phase1
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
index a9390f2589..e33bf8c487 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H
@@ -176,7 +176,7 @@ public:
         ) const = 0;
 
         //- Return true if there is mass transfer for phase
-        virtual bool transfersMass(const phaseModel& phase) const;
+        virtual bool transfersMass(const phaseModel& phase) const = 0;
 
         //- Return the total interfacial mass transfer rate for phase
         virtual tmp<volScalarField> dmdt(const phaseModel& phase) const = 0;
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
index 230b650106..2703d75ef1 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
@@ -357,11 +357,15 @@ while (pimple.correct())
             {
                 if (pEqnComps.set(phasei))
                 {
-                    pEqnComps[phasei] -= fluid.dmdt(phase);
+                    pEqnComps[phasei] -= fluid.dmdt(phase)/rho;
                 }
                 else
                 {
-                    pEqnComps.set(phasei, fvm::Su(-fluid.dmdt(phase), rho));
+                    pEqnComps.set
+                    (
+                        phasei,
+                        fvm::Su(-fluid.dmdt(phase)/rho, p_rgh)
+                    );
                 }
             }
         }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
index c8a9e28288..1af167cc40 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
@@ -247,7 +247,7 @@ while (pimple.correct())
 
             pEqnComp1 =
                 (
-                    phase1.continuityError() - fluid.dmdt()
+                    phase1.continuityError()
                   - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
                 )/rho1
               + (alpha1/rho1)*correction
@@ -270,7 +270,7 @@ while (pimple.correct())
 
             pEqnComp2 =
                 (
-                    phase2.continuityError() + fluid.dmdt()
+                    phase2.continuityError()
                   - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
                 )/rho2
                + (alpha2/rho2)*correction
@@ -288,7 +288,7 @@ while (pimple.correct())
         {
             pEqnComp1 =
                 (
-                    phase1.continuityError() - fluid.dmdt()
+                    phase1.continuityError()
                   - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
                 )/rho1
               + (alpha1*psi1/rho1)*correction(fvm::ddt(p_rgh));
@@ -298,13 +298,34 @@ while (pimple.correct())
         {
             pEqnComp2 =
                 (
-                    phase2.continuityError() + fluid.dmdt()
+                    phase2.continuityError()
                   - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
                 )/rho2
               + (alpha2*psi2/rho2)*correction(fvm::ddt(p_rgh));
         }
     }
 
+    if (fluid.transfersMass())
+    {
+        if (pEqnComp1.valid())
+        {
+            pEqnComp1() -= fluid.dmdt()/rho1;
+        }
+        else
+        {
+            pEqnComp1 = fvm::Su(-fluid.dmdt()/rho1, p_rgh);
+        }
+
+        if (pEqnComp2.valid())
+        {
+            pEqnComp2() += fluid.dmdt()/rho2;
+        }
+        else
+        {
+            pEqnComp2 = fvm::Su(fluid.dmdt()/rho2, p_rgh);
+        }
+    }
+
     // Cache p prior to solve for density update
     volScalarField p_rgh_0(p_rgh);
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
index c3f7d472fa..e2edf14bed 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H
@@ -231,7 +231,7 @@ while (pimple.correct())
         {
             pEqnComp1 =
             (
-                phase1.continuityError() - fluid.dmdt()
+                phase1.continuityError()
               - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
             )/rho1
           + (alpha1/rho1)*correction
@@ -247,7 +247,7 @@ while (pimple.correct())
         {
             pEqnComp2 =
             (
-                phase2.continuityError() + fluid.dmdt()
+                phase2.continuityError()
               - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
             )/rho2
           + (alpha2/rho2)*correction
@@ -265,7 +265,7 @@ while (pimple.correct())
         {
             pEqnComp1 =
             (
-                phase1.continuityError() - fluid.dmdt()
+                phase1.continuityError()
               - fvc::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), rho1)
             )/rho1
           + (alpha1*psi1/rho1)*correction(fvm::ddt(p_rgh));
@@ -275,13 +275,34 @@ while (pimple.correct())
         {
             pEqnComp2 =
             (
-                phase2.continuityError() + fluid.dmdt()
+                phase2.continuityError()
               - fvc::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), rho2)
             )/rho2
           + (alpha2*psi2/rho2)*correction(fvm::ddt(p_rgh));
         }
     }
 
+    if (fluid.transfersMass())
+    {
+        if (pEqnComp1.valid())
+        {
+            pEqnComp1() -= fluid.dmdt()/rho1;
+        }
+        else
+        {
+            pEqnComp1 = fvm::Su(-fluid.dmdt()/rho1, p_rgh);
+        }
+
+        if (pEqnComp2.valid())
+        {
+            pEqnComp2() += fluid.dmdt()/rho2;
+        }
+        else
+        {
+            pEqnComp2 = fvm::Su(fluid.dmdt()/rho2, p_rgh);
+        }
+    }
+
     // Cache p prior to solve for density update
     volScalarField p_rgh_0("p_rgh_0", p_rgh);
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index 187ca4c238..7b7ddee6f4 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -168,6 +168,12 @@ Foam::twoPhaseSystem::D() const
 }
 
 
+bool Foam::twoPhaseSystem::transfersMass() const
+{
+    return transfersMass(phase1());
+}
+
+
 Foam::tmp<Foam::volScalarField>
 Foam::twoPhaseSystem::dmdt() const
 {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
index deca55fa6e..3c4c98f589 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H
@@ -78,6 +78,9 @@ class twoPhaseSystem
         //  Multiplies the phase-fraction gradient
         virtual tmp<volScalarField> D(const phasePairKey& key) const = 0;
 
+        //- Return true if there is mass transfer for phase
+        virtual bool transfersMass(const phaseModel& phase) const = 0;
+
         //- Return the interfacial mass flow rate for phase pair
         virtual tmp<volScalarField> dmdt(const phasePairKey& key) const = 0;
 
@@ -192,6 +195,9 @@ public:
         //  Multiplies the phase-fraction gradient
         tmp<volScalarField> D() const;
 
+        //- Return true if there is mass transfer
+        bool transfersMass() const;
+
         //- Return the interfacial mass flow rate
         tmp<volScalarField> dmdt() const;
 

From e846c991ad371028ff17b032ed835c9ba00dd78f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 28 Sep 2015 14:30:48 +0100
Subject: [PATCH 59/70] KinematicLookupTableInjection: Use 64bit integers to
 avoid overflow for large numbers of injectors.

---
 .../KinematicLookupTableInjection.C                         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
index 293fd7d740..d53b781cdb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -187,7 +187,7 @@ void Foam::KinematicLookupTableInjection<CloudType>::setPositionAndCell
     }
     else
     {
-        injectorI = parcelI*injectorCells_.size()/nParcels;
+        injectorI = int64_t(parcelI)*int64_t(injectors_.size())/nParcels;
     }
 
     position = injectors_[injectorI].x();
@@ -206,7 +206,7 @@ void Foam::KinematicLookupTableInjection<CloudType>::setProperties
     typename CloudType::parcelType& parcel
 )
 {
-    label injectorI = parcelI*injectorCells_.size()/nParcels;
+    label injectorI = int64_t(parcelI)*int64_t(injectors_.size())/nParcels;
 
     // set particle velocity
     parcel.U() = injectors_[injectorI].U();

From 4c9eb4c2e954f3e821ba6b56a6e93d396a4e9c67 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 28 Sep 2015 15:34:37 +0100
Subject: [PATCH 60/70] ptot: Add support for -region Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1227 Patch provided by Bruno
 Santos

---
 .../utilities/postProcessing/miscellaneous/ptot/ptot.C         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
index 1977bb7476..41ca210179 100644
--- a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
+++ b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
@@ -36,13 +36,14 @@ Description
 int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
+    #include "addRegionOption.H"
 
     #include "setRootCase.H"
     #include "createTime.H"
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     forAll(timeDirs, timeI)
     {

From 45b875b65d2b1358722f730f3212ed3d8cd65ff8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 28 Sep 2015 22:18:39 +0100
Subject: [PATCH 61/70] Removed unnecessary "else if" conditions Resolves
 bug-report http://www.openfoam.org/mantisbt/view.php?id=1858

---
 .../schemes/linearUpwind/linearUpwindV.C      | 25 ++-----------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
index 6368d2accd..22a04bff7b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,17 +125,6 @@ Foam::linearUpwindV<Type>::correction
                 sfCorr[facei] *= maxCorrs/(sfCorrs + VSMALL);
             }
         }
-        else if (sfCorrs < 0)
-        {
-            if (maxCorrs > 0)
-            {
-                sfCorr[facei] = vector::zero;
-            }
-            else if (sfCorrs < maxCorrs)
-            {
-                sfCorr[facei] *= maxCorrs/(sfCorrs - VSMALL);
-            }
-        }
     }
 
 
@@ -203,17 +192,6 @@ Foam::linearUpwindV<Type>::correction
                         pSfCorr[facei] *= maxCorrs/(pSfCorrs + VSMALL);
                     }
                 }
-                else if (pSfCorrs < 0)
-                {
-                    if (maxCorrs > 0)
-                    {
-                        pSfCorr[facei] = vector::zero;
-                    }
-                    else if (pSfCorrs < maxCorrs)
-                    {
-                        pSfCorr[facei] *= maxCorrs/(pSfCorrs - VSMALL);
-                    }
-                }
             }
         }
     }
@@ -227,4 +205,5 @@ namespace Foam
     makelimitedSurfaceInterpolationTypeScheme(linearUpwindV, vector)
 }
 
+
 // ************************************************************************* //

From cceebf0601b60abc871e780a4117c135a58a0049 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 30 Sep 2015 18:16:12 +0100
Subject: [PATCH 62/70] dimensionedType: Corrected order of dimensions and
 value in lookupOrDefault and lookupOrAddToDict Deprecated old versions.

---
 .../dimensionedType/dimensionedType.C         | 34 +++++++++++++++++++
 .../dimensionedType/dimensionedType.H         | 23 ++++++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index b9ed09ae80..6a0cbb7861 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -173,6 +173,26 @@ Foam::dimensioned<Type>::dimensioned
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
+template<class Type>
+Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrDefault
+(
+    const word& name,
+    const dictionary& dict,
+    const dimensionSet& dims,
+    const Type& defaultValue
+)
+{
+    if (dict.found(name))
+    {
+        return dimensioned<Type>(name, dims, dict.lookup(name));
+    }
+    else
+    {
+        return dimensioned<Type>(name, dims, defaultValue);
+    }
+}
+
+
 template<class Type>
 Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrDefault
 (
@@ -193,6 +213,20 @@ Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrDefault
 }
 
 
+template<class Type>
+Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrAddToDict
+(
+    const word& name,
+    dictionary& dict,
+    const dimensionSet& dims,
+    const Type& defaultValue
+)
+{
+    Type value = dict.lookupOrAddDefault<Type>(name, defaultValue);
+    return dimensioned<Type>(name, dims, value);
+}
+
+
 template<class Type>
 Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrAddToDict
 (
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index bb7f632918..2fcf61c2db 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -123,7 +123,17 @@ public:
 
     // Static member functions
 
-        //- Construct from dictionary, with default value.
+        //- Construct from dictionary, with default dimensions and value.
+        static dimensioned<Type> lookupOrDefault
+        (
+            const word&,
+            const dictionary&,
+            const dimensionSet& dims = dimless,
+            const Type& defaultValue = pTraits<Type>::zero
+        );
+
+        //- Construct from dictionary, with default value and dimensions.
+        //  Deprecated, use form with dimensions before value.
         static dimensioned<Type> lookupOrDefault
         (
             const word&,
@@ -135,6 +145,17 @@ public:
         //- Construct from dictionary, with default value.
         //  If the value is not found, it is added into the dictionary.
         static dimensioned<Type> lookupOrAddToDict
+        (
+            const word&,
+            dictionary&,
+            const dimensionSet& dims = dimless,
+            const Type& defaultValue = pTraits<Type>::zero
+        );
+
+        //- Construct from dictionary, with default value.
+        //  If the value is not found, it is added into the dictionary.
+        //  Deprecated, use form with dimensions before value.
+        static dimensioned<Type> lookupOrAddToDict
         (
             const word&,
             dictionary&,

From 12a1e428c885da4ac23e5fcf0e36b8fb8872198c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 30 Sep 2015 18:17:32 +0100
Subject: [PATCH 63/70] patchInjection: Check for 0-patches

---
 .../injectionModel/patchInjection/patchInjection.C | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
index 218c727a86..8ad13750c9 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C
@@ -82,6 +82,13 @@ patchInjection::patchInjection
 
         patchInjectedMasses_.setSize(pbm.size(), 0);
     }
+
+    if (!patchIDs_.size())
+    {
+        FatalErrorIn("patchInjection::patchInjection")
+            << "No patches selected"
+            << exit(FatalError);
+    }
 }
 
 
@@ -100,6 +107,9 @@ void patchInjection::correct
     scalarField& diameterToInject
 )
 {
+    // Do not correct if no patches selected
+    if (!patchIDs_.size()) return;
+
     const scalarField& delta = owner().delta();
     const scalarField& rho = owner().rho();
     const scalarField& magSf = owner().magSf();
@@ -160,6 +170,9 @@ void patchInjection::correct
 
 void patchInjection::patchInjectedMassTotals(scalarField& patchMasses) const
 {
+    // Do not correct if no patches selected
+    if (!patchIDs_.size()) return;
+
     scalarField patchInjectedMasses
     (
         getModelProperty<scalarField>
@@ -170,7 +183,6 @@ void patchInjection::patchInjectedMassTotals(scalarField& patchMasses) const
     );
 
     scalarField patchInjectedMassTotals(patchInjectedMasses_);
-    //combineReduce(patchInjectedMassTotals, plusEqOp<scalarField>());
     Pstream::listCombineGather(patchInjectedMassTotals, plusEqOp<scalar>());
 
     forAll(patchIDs_, pidi)

From fdc56d961959223e419a007096454b9869906629 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 30 Sep 2015 18:18:20 +0100
Subject: [PATCH 64/70] 
 surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification: Corrected
 and improved solidification rate controls

    Solidification phase change model where all film mass is converted when the
    local temperature > activation temperature.  The latent heat is
    assumed to be removed by heat-transfer to the wall.
---
 .../solidification/solidification.C           | 43 +++++++++++++++----
 .../solidification/solidification.H           | 19 ++++----
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
index f7cfae7562..f5b5b36f59 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,8 +57,20 @@ solidification::solidification
 :
     phaseChangeModel(typeName, owner, dict),
     T0_(readScalar(coeffDict_.lookup("T0"))),
-    L_(readScalar(coeffDict_.lookup("L"))),
-    alpha_(readScalar(coeffDict_.lookup("alpha"))),
+    maxSolidificationFrac_
+    (
+        coeffDict_.lookupOrDefault("maxSolidificationFrac", 0.2)
+    ),
+    maxSolidificationRate_
+    (
+        dimensioned<scalar>::lookupOrDefault
+        (
+            "maxSolidificationRate",
+            coeffDict_,
+            dimless/dimTime,
+            GREAT
+        )
+    ),
     mass_
     (
         IOobject
@@ -111,15 +123,28 @@ void solidification::correctModel
     const scalarField& T = film.T();
     const scalarField& alpha = film.alpha();
 
-    forAll(alpha, cellI)
+    const scalar rateLimiter = min
+    (
+        maxSolidificationFrac_,
+        (
+            maxSolidificationRate_
+           *owner_.regionMesh().time().deltaTValue()
+        ).value()
+    );
+
+    forAll(alpha, celli)
     {
-        if (alpha[cellI] > 0.5)
+        if (alpha[celli] > 0.5)
         {
-            if (T[cellI] > T0_)
+            if (T[celli] < T0_)
             {
-                mass_[cellI] += alpha_*availableMass[cellI];
-                dMass[cellI] += alpha_*availableMass[cellI];
-                dEnergy[cellI] += alpha_*availableMass[cellI]*L_;
+                const scalar dm = rateLimiter*availableMass[celli];
+
+                mass_[celli] += dm;
+                dMass[celli] += dm;
+
+                // Heat is assumed to be removed by heat-transfer to the wall
+                // so the energy remains unchanged by the phase-change.
             }
         }
     }
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
index 87f0c1206e..1854feac28 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,8 +25,9 @@ Class
     Foam::solidification
 
 Description
-    Solidification phase change model where all film mass is converted when
-    the local temperature > activation temperature.
+    Solidification phase change model where all film mass is converted when the
+    local temperature > activation temperature.  The latent heat is
+    assumed to be removed by heat-transfer to the wall.
 
 SourceFiles
     solidification.C
@@ -55,8 +56,6 @@ class solidification
 :
     public phaseChangeModel
 {
-private:
-
     // Private member functions
 
         //- Disallow default bitwise copy construct
@@ -73,11 +72,13 @@ protected:
         //- Temperature at which solidification starts
         scalar T0_;
 
-        //- Latent heat of solidification [J/kg]
-        scalar L_;
+        //- Solidification limiter
+        //  Maximum fraction of film which can solidify in a time-step
+        scalar maxSolidificationFrac_;
 
-        //- Under-relaxation parameter for solidification process (0-1)
-        scalar alpha_;
+        //- Solidification limiter
+        //  Maximum rate at which the film can solidify
+        dimensionedScalar maxSolidificationRate_;
 
         //- Accumulated solid mass [kg]
         volScalarField mass_;

From 81e083fc597bdaad1097b7cc8020b5c44ae3f083 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 1 Oct 2015 14:07:29 +0100
Subject: [PATCH 65/70] wingMotion tutorials: added missing ';'

---
 .../0.org/include/frontBackTopBottomPatches                     | 2 +-
 .../0.org/include/frontBackTopBottomPatches                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches
index 462f4ee594..01475bef75 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches
@@ -13,7 +13,7 @@ topAndBottom
 
 front
 {
-    type empty
+    type empty;
 }
 
 back
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/frontBackTopBottomPatches
index 462f4ee594..01475bef75 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/frontBackTopBottomPatches
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0.org/include/frontBackTopBottomPatches
@@ -13,7 +13,7 @@ topAndBottom
 
 front
 {
-    type empty
+    type empty;
 }
 
 back

From 027909c73752fd6840423b918d7764e9ab25cafd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 1 Oct 2015 17:29:29 +0100
Subject: [PATCH 66/70] dimensionedType: rationalize lookupOrDefault and
 lookupOrAddToDict Now consistent with constructors.

---
 .../compressible/rhoPimpleFoam/createFields.H  |  8 ++++----
 .../compressible/rhoSimpleFoam/createFields.H  |  8 ++++----
 .../rhoPorousSimpleFoam/createFields.H         |  8 ++++----
 .../fluid/createFluidFields.H                  |  8 ++++----
 .../reactingParcelFoam/createFields.H          |  8 ++++----
 .../simpleReactingParcelFoam/createFields.H    |  8 ++++----
 .../lagrangian/sprayFoam/createFields.H        |  8 ++++----
 .../dimensionedType/dimensionedType.C          | 18 ++++--------------
 .../dimensionedType/dimensionedType.H          | 12 ++++--------
 .../turbulenceModels/LES/LESModel/LESModel.C   |  4 ++--
 .../turbulenceModels/RAS/RASModel/RASModel.C   | 12 ++++++------
 11 files changed, 44 insertions(+), 58 deletions(-)

diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 0e214011de..96a8ea8421 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -45,8 +45,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         pimple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -56,8 +56,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         pimple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 2d89e2b566..fdf8a2a769 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -52,8 +52,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         simple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -63,8 +63,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         simple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
index 3ce8270b5e..149049e63e 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
@@ -51,8 +51,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         simple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -62,8 +62,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         simple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
index bd7452ae9e..1811878bd7 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
@@ -187,8 +187,8 @@ forAll(fluidRegions, i)
             (
                 "rhoMax",
                 simpleDict,
-                GREAT,
-                dimDensity
+                dimDensity,
+                GREAT
             )
         )
     );
@@ -202,8 +202,8 @@ forAll(fluidRegions, i)
             (
                 "rhoMin",
                 simpleDict,
-                0,
-                dimDensity
+                dimDensity,
+                0
             )
         )
     );
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
index 43c3d45e32..9d05da0425 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         pimple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         pimple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
index 7e79f9fb7d..cfabbfb5b0 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         simple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         simple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H
index 721c3f8319..7cc45050ce 100644
--- a/applications/solvers/lagrangian/sprayFoam/createFields.H
+++ b/applications/solvers/lagrangian/sprayFoam/createFields.H
@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
     (
         "rhoMax",
         pimple.dict(),
-        GREAT,
-        dimDensity
+        dimDensity,
+        GREAT
     )
 );
 
@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
     (
         "rhoMin",
         pimple.dict(),
-        0,
-        dimDensity
+        dimDensity,
+        0
     )
 );
 
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 6a0cbb7861..fdb38737a5 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -198,18 +198,10 @@ Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrDefault
 (
     const word& name,
     const dictionary& dict,
-    const Type& defaultValue,
-    const dimensionSet& dims
+    const Type& defaultValue
 )
 {
-    if (dict.found(name))
-    {
-        return dimensioned<Type>(name, dims, dict.lookup(name));
-    }
-    else
-    {
-        return dimensioned<Type>(name, dims, defaultValue);
-    }
+    return lookupOrDefault(name, dict, dimless, defaultValue);
 }
 
 
@@ -232,12 +224,10 @@ Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrAddToDict
 (
     const word& name,
     dictionary& dict,
-    const Type& defaultValue,
-    const dimensionSet& dims
+    const Type& defaultValue
 )
 {
-    Type value = dict.lookupOrAddDefault<Type>(name, defaultValue);
-    return dimensioned<Type>(name, dims, value);
+    return lookupOrAddToDict(name, dict, dimless, defaultValue);
 }
 
 
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 2fcf61c2db..40baca77f6 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -132,14 +132,12 @@ public:
             const Type& defaultValue = pTraits<Type>::zero
         );
 
-        //- Construct from dictionary, with default value and dimensions.
-        //  Deprecated, use form with dimensions before value.
+        //- Construct from dictionary dimensionless with value.
         static dimensioned<Type> lookupOrDefault
         (
             const word&,
             const dictionary&,
-            const Type& defaultValue = pTraits<Type>::zero,
-            const dimensionSet& dims = dimless
+            const Type& defaultValue = pTraits<Type>::zero
         );
 
         //- Construct from dictionary, with default value.
@@ -152,15 +150,13 @@ public:
             const Type& defaultValue = pTraits<Type>::zero
         );
 
-        //- Construct from dictionary, with default value.
+        //- Construct from dictionary, dimensionless with default value.
         //  If the value is not found, it is added into the dictionary.
-        //  Deprecated, use form with dimensions before value.
         static dimensioned<Type> lookupOrAddToDict
         (
             const word&,
             dictionary&,
-            const Type& defaultValue = pTraits<Type>::zero,
-            const dimensionSet& dims = dimless
+            const Type& defaultValue = pTraits<Type>::zero
         );
 
 
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
index 48c4cc0bd9..9955478f41 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@@ -75,8 +75,8 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
         (
             "kMin",
             LESDict_,
-            SMALL,
-            sqr(dimVelocity)
+            sqr(dimVelocity),
+            SMALL
         )
     ),
 
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
index 3e53f4f414..240c0870df 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
@@ -75,8 +75,8 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
         (
             "kMin",
             RASDict_,
-            SMALL,
-            sqr(dimVelocity)
+            sqr(dimVelocity),
+            SMALL
         )
     ),
 
@@ -86,8 +86,8 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
         (
             "epsilonMin",
             RASDict_,
-            SMALL,
-            kMin_.dimensions()/dimTime
+            kMin_.dimensions()/dimTime,
+            SMALL
         )
     ),
 
@@ -97,8 +97,8 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
         (
             "omegaMin",
             RASDict_,
-            SMALL,
-            dimless/dimTime
+            dimless/dimTime,
+            SMALL
         )
     )
 {

From 557c8adba8a989b41d10b420332c556841f29e7b Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 5 Oct 2015 11:33:13 +0100
Subject: [PATCH 67/70] Added "-region" option to wallGradU,
 temporalInterpolate and pPrime2 Patches provided by Bruno Santos Resolves
 feature-request http://www.openfoam.org/mantisbt/view.php?id=1861

---
 .../temporalInterpolate/temporalInterpolate.C             | 5 +++--
 .../postProcessing/scalarField/pPrime2/pPrime2.C          | 3 ++-
 .../utilities/postProcessing/wall/wallGradU/wallGradU.C   | 8 ++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
index 9460c33d48..ea8fc4975d 100644
--- a/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
+++ b/applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,6 +185,7 @@ void fieldInterpolator::interpolate()
 int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
+    #include "addRegionOption.H"
     argList::addOption
     (
         "fields",
@@ -259,7 +260,7 @@ int main(int argc, char *argv[])
     );
 
 
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     Info<< "Interpolating fields for times:" << endl;
 
diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
index e217bfd6a5..7848679a25 100644
--- a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
+++ b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
@@ -38,13 +38,14 @@ Description
 int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
+    #include "addRegionOption.H"
 
     #include "setRootCase.H"
     #include "createTime.H"
 
     instantList timeDirs = timeSelector::select0(runTime, args);
 
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     runTime.setTime(timeDirs.last(), timeDirs.size()-1);
 
diff --git a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
index 6491f2b1f9..7d58220a59 100644
--- a/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
+++ b/applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,10 +37,14 @@ Description
 int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
+    #include "addRegionOption.H"
+
     #include "setRootCase.H"
     #include "createTime.H"
+
     instantList timeDirs = timeSelector::select0(runTime, args);
-    #include "createMesh.H"
+
+    #include "createNamedMesh.H"
 
     forAll(timeDirs, timeI)
     {

From 25040ad08a5015bf4c150d3e6e81f93e2668ba17 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 5 Oct 2015 16:22:04 +0100
Subject: [PATCH 68/70] reactingTwoPhaseEulerFoam: Update cell-based UEqn to
 use the transport matrix construction in MovingPhaseModel

---
 .../reactingMultiphaseEulerFoam/pU/UEqns.H    |  1 +
 .../reactingTwoPhaseEulerFoam/pU/UEqns.H      | 41 ++++---------------
 .../reactingTwoPhaseEulerFoam/pU/pEqn.H       |  2 +
 3 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
index 32cedb0fe0..cf70a99e18 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H
@@ -31,5 +31,6 @@ PtrList<fvVectorMatrix> UEqns(phases.size());
 
         UEqns[phasei].relax();
         fvOptions.constrain(UEqns[phasei]);
+        fvOptions.correct(U);
     }
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H
index 9252630429..99bc95cfd6 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H
@@ -3,61 +3,36 @@ Info<< "Constructing momentum equations" << endl;
 fvVectorMatrix U1Eqn(U1, rho1.dimensions()*U1.dimensions()*dimVol/dimTime);
 fvVectorMatrix U2Eqn(U2, rho2.dimensions()*U2.dimensions()*dimVol/dimTime);
 
-volScalarField Kd(fluid.Kd());
-
 {
-    volScalarField Vm(fluid.Vm());
+    autoPtr<phaseSystem::momentumTransferTable>
+        momentumTransferPtr(fluid.momentumTransfer());
 
-    const volScalarField dmdt12(posPart(fluid.dmdt()));
-    const volScalarField dmdt21(negPart(fluid.dmdt()));
+    phaseSystem::momentumTransferTable&
+        momentumTransfer(momentumTransferPtr());
 
     {
         U1Eqn =
         (
-            fvm::ddt(alpha1, rho1, U1) + fvm::div(alphaRhoPhi1, U1)
-          - fvm::Sp(phase1.continuityError() + dmdt21, U1) + dmdt21*U2
-          + MRF.DDt(alpha1*rho1, U1)
-          + phase1.turbulence().divDevRhoReff(U1)
+            phase1.UEqn()
          ==
-          - Vm
-           *(
-                fvm::ddt(U1)
-              + fvm::div(phi1, U1)
-              - fvm::Sp(fvc::div(phi1), U1)
-              - phase2.DUDt()
-            )
-          - MRF.DDt(Vm, U1 - U2)
+           *momentumTransfer[phase1.name()]
           + fvOptions(alpha1, rho1, U1)
         );
         U1Eqn.relax();
-        U1Eqn += fvm::Sp(Kd, U1);
         fvOptions.constrain(U1Eqn);
-        U1.correctBoundaryConditions();
         fvOptions.correct(U1);
     }
 
     {
         U2Eqn =
         (
-            fvm::ddt(alpha2, rho2, U2) + fvm::div(alphaRhoPhi2, U2)
-          - fvm::Sp(phase2.continuityError() - dmdt12, U2) - dmdt12*U1
-          + MRF.DDt(alpha2*rho2, U2)
-          + phase2.turbulence().divDevRhoReff(U2)
+            phase2.UEqn()
          ==
-          - Vm
-           *(
-                fvm::ddt(U2)
-              + fvm::div(phi2, U2)
-              - fvm::Sp(fvc::div(phi2), U2)
-              - phase1.DUDt()
-            )
-          - MRF.DDt(Vm, U2 - U1)
+           *momentumTransfer[phase2.name()]
           + fvOptions(alpha2, rho2, U2)
         );
         U2Eqn.relax();
-        U2Eqn += fvm::Sp(Kd, U2);
         fvOptions.constrain(U2Eqn);
-        U2.correctBoundaryConditions();
         fvOptions.correct(U2);
     }
 }
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
index 1af167cc40..f269a79760 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H
@@ -31,6 +31,8 @@ surfaceScalarField alpharAUf2
     fvc::interpolate(max(alpha2, phase2.residualAlpha())*rAU2)
 );
 
+volScalarField Kd(fluid.Kd());
+
 // Turbulent diffusion, particle-pressure, lift and wall-lubrication fluxes
 tmp<surfaceScalarField> phiF1;
 tmp<surfaceScalarField> phiF2;

From 9577ad2d236fa177072e85b7911d47f6353f850e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 5 Oct 2015 17:43:33 +0100
Subject: [PATCH 69/70] reactingMultiphaseEulerFoam, multiphaseEulerFoam:
 Correct flux averaging for sub-cycling

---
 .../multiphaseSystem/multiphaseSystem.C                |  8 ++++----
 .../multiphaseSystem/multiphaseSystem.C                | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 2203d6e144..767600e394 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -888,7 +888,7 @@ void Foam::multiphaseSystem::solve()
         dimensionedScalar totalDeltaT = runTime.deltaT();
 
         PtrList<volScalarField> alpha0s(phases_.size());
-        PtrList<surfaceScalarField> phiSums(phases_.size());
+        PtrList<surfaceScalarField> alphaPhiSums(phases_.size());
 
         int phasei = 0;
         forAllIter(PtrDictionary<phaseModel>, phases_, iter)
@@ -902,7 +902,7 @@ void Foam::multiphaseSystem::solve()
                 new volScalarField(alpha.oldTime())
             );
 
-            phiSums.set
+            alphaPhiSums.set
             (
                 phasei,
                 new surfaceScalarField
@@ -936,7 +936,7 @@ void Foam::multiphaseSystem::solve()
             int phasei = 0;
             forAllIter(PtrDictionary<phaseModel>, phases_, iter)
             {
-                phiSums[phasei] += (runTime.deltaT()/totalDeltaT)*iter().phi();
+                alphaPhiSums[phasei] += iter().alphaPhi()/nAlphaSubCycles;
                 phasei++;
             }
         }
@@ -947,7 +947,7 @@ void Foam::multiphaseSystem::solve()
             phaseModel& phase = iter();
             volScalarField& alpha = phase;
 
-            phase.phi() = phiSums[phasei];
+            phase.alphaPhi() = alphaPhiSums[phasei];
 
             // Correct the time index of the field
             // to correspond to the global time
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 5512fd6559..d92368a886 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -157,7 +157,7 @@ void Foam::multiphaseSystem::solveAlphas()
 
         MULES::limit
         (
-            1.0/mesh_.time().deltaT().value(),
+            1.0/mesh_.time().deltaT().value(), // ***HGW add support for LTS
             geometricOneField(),
             phase,
             phi_,
@@ -620,7 +620,7 @@ void Foam::multiphaseSystem::solve()
         dimensionedScalar totalDeltaT = runTime.deltaT();
 
         PtrList<volScalarField> alpha0s(phases().size());
-        PtrList<surfaceScalarField> phiSums(phases().size());
+        PtrList<surfaceScalarField> alphaPhiSums(phases().size());
 
         forAll(phases(), phasei)
         {
@@ -633,7 +633,7 @@ void Foam::multiphaseSystem::solve()
                 new volScalarField(alpha.oldTime())
             );
 
-            phiSums.set
+            alphaPhiSums.set
             (
                 phasei,
                 new surfaceScalarField
@@ -664,7 +664,7 @@ void Foam::multiphaseSystem::solve()
 
             forAll(phases(), phasei)
             {
-                phiSums[phasei] += phases()[phasei].phi();
+                alphaPhiSums[phasei] += phases()[phasei].alphaPhi();
             }
         }
 
@@ -673,7 +673,7 @@ void Foam::multiphaseSystem::solve()
             phaseModel& phase = phases()[phasei];
             volScalarField& alpha = phase;
 
-            phase.phi() = phiSums[phasei]/nAlphaSubCycles;
+            phase.alphaPhi() = alphaPhiSums[phasei]/nAlphaSubCycles;
 
             // Correct the time index of the field
             // to correspond to the global time

From 94f952ab04126c6ad2eb1e204b388fc4d3df5a7f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 5 Oct 2015 22:42:12 +0100
Subject: [PATCH 70/70] reactingMultiphaseEulerFoam: Completed LTS support in
 multuphaseSystem

---
 .../multiphaseSystem/multiphaseSystem.C       | 63 +++++++++++++------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index d92368a886..fe1e4d4a8d 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -155,19 +155,43 @@ void Foam::multiphaseSystem::solveAlphas()
             }
         }
 
-        MULES::limit
-        (
-            1.0/mesh_.time().deltaT().value(), // ***HGW add support for LTS
-            geometricOneField(),
-            phase,
-            phi_,
-            alphaPhiCorr,
-            zeroField(),
-            zeroField(),
-            phase.alphaMax(),
-            0,
-            true
-        );
+        if (fv::localEulerDdt::enabled(mesh_))
+        {
+            const volScalarField& rDeltaT =
+                fv::localEulerDdt::localRDeltaT(mesh_);
+
+            MULES::limit
+            (
+                rDeltaT,
+                geometricOneField(),
+                phase,
+                phi_,
+                alphaPhiCorr,
+                zeroField(),
+                zeroField(),
+                phase.alphaMax(),
+                0,
+                true
+            );
+        }
+        else
+        {
+            const scalar rDeltaT = 1.0/mesh_.time().deltaTValue();
+
+            MULES::limit
+            (
+                rDeltaT,
+                geometricOneField(),
+                phase,
+                phi_,
+                alphaPhiCorr,
+                zeroField(),
+                zeroField(),
+                phase.alphaMax(),
+                0,
+                true
+            );
+        }
     }
 
     MULES::limitSum(alphaPhiCorrs);
@@ -481,7 +505,7 @@ Foam::multiphaseSystem::multiphaseSystem
         IOobject
         (
             "alphas",
-            mesh.time().timeName(),
+            mesh_.time().timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
@@ -496,13 +520,13 @@ Foam::multiphaseSystem::multiphaseSystem
     deltaN_
     (
         "deltaN",
-        1e-8/pow(average(mesh.V()), 1.0/3.0)
+        1e-8/pow(average(mesh_.V()), 1.0/3.0)
     )
 {
     forAll(phases(), phasei)
     {
         volScalarField& alphai = phases()[phasei];
-        mesh.setFluxRequired(alphai.name());
+        mesh_.setFluxRequired(alphai.name());
     }
 }
 
@@ -599,13 +623,12 @@ Foam::multiphaseSystem::nearInterface() const
 
 void Foam::multiphaseSystem::solve()
 {
-    const fvMesh& mesh = this->mesh();
-    const Time& runTime = mesh.time();
+    const Time& runTime = mesh_.time();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
     label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
 
-    bool LTS = fv::localEulerDdt::enabled(mesh);
+    bool LTS = fv::localEulerDdt::enabled(mesh_);
 
     if (nAlphaSubCycles > 1)
     {
@@ -614,7 +637,7 @@ void Foam::multiphaseSystem::solve()
         if (LTS)
         {
             trSubDeltaT =
-                fv::localEulerDdt::localRSubDeltaT(mesh, nAlphaSubCycles);
+                fv::localEulerDdt::localRSubDeltaT(mesh_, nAlphaSubCycles);
         }
 
         dimensionedScalar totalDeltaT = runTime.deltaT();