Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

applications/solvers/Lagrangian/reactingParcelFoam/Make/files

@@ -1,3 +1,3 @@
 reactingParcelFoam.C
 
-EXE = $(FOAM_USER_APPBIN)/reactingParcelFoam
+EXE = $(FOAM_APPBIN)/reactingParcelFoam

applications/solvers/combustion/coalChemistryFoam/Make/files

@@ -1,3 +1,3 @@
 coalChemistryFoam.C
 
-EXE = $(FOAM_USER_APPBIN)/coalChemistryFoam
+EXE = $(FOAM_APPBIN)/coalChemistryFoam

applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H

@@ -3,7 +3,11 @@
     (
         fvm::ddt(alpha1)
       + fvm::div(phi, alpha1)
-      - fvm::laplacian(Dab, alpha1)
+      - fvm::laplacian
+        (
+            Dab + alphatab*turbulence->nut(), alpha1,
+            "laplacian(Dab,alpha1)"
+        )
     );
 
     alpha1Eqn.solve();

applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H

@@ -50,6 +50,9 @@
 
     dimensionedScalar Dab(twoPhaseProperties.lookup("Dab"));
 
+    // Read the reciprocal of the turbulent Schmidt number
+    dimensionedScalar alphatab(twoPhaseProperties.lookup("alphatab"));
+
     // Need to store rho for ddt(rho, U)
     volScalarField rho("rho", alpha1*rho1 + (scalar(1) - alpha1)*rho2);
     rho.oldTime();