Merge remote branch 'OpenCFD/master' into olesenm

Conflicts:
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allrun
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/thermophysicalProperties
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/fuels/propane.dat
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/controlDict
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes
	tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C

@@ -130,13 +130,13 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::Gulder::XiEq() const
         U/(mag(U) + dimensionedScalar("Usmall", U.dimensions(), 1e-4))
     );
 
-    const volScalarField nr(sqrt(max(N - (Uhat & ns & Uhat), 1e-4)));
+    const volScalarField nr(sqrt(max(N - (Uhat & ns & Uhat), scalar(1e-4))));
 
     const scalarField cellWidth(pow(mesh.V(), 1.0/3.0));
 
     const scalarField upLocal(uPrimeCoef_*sqrt((U & CT & U)*cellWidth));
 
-    const scalarField deltaUp(upLocal*(max(1.0, pow(nr, 0.5)) - 1.0));
+    const scalarField deltaUp(upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0));
 
     up.internalField() += deltaUp;
 

tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README

@@ -8,4 +8,4 @@ Step to introduce the PDR fields:
 1) Create zero-size patches for wall or/and coupled baffles in
 the boundary file.
 2) Specify the boundary contitions for these patches in the fields.
-3) Create the new PDR mesh using the PDRMesh utility
+3) Create the new PDR mesh using the PDRMesh utility.

tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes

@@ -83,5 +83,4 @@ fluxRequired
     p;
 }
 
-
 // ************************************************************************* //

tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution

@@ -15,7 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 solvers
 {
     rho