COMP: fixes for label=64, scalar=32

src/fileFormats/colours/colourTools.C

@@ -426,7 +426,7 @@ void Foam::colourTools::interpolateDiverging
         // adjusting the scalar value.
 
         scalar Mmid = std::max(msh1[0], msh2[0]);
-        Mmid = std::max(88.0, Mmid);
+        Mmid = std::max(scalar(88.0), Mmid);
         if (s < 0.5)
         {
             msh2[0] = Mmid; msh2[1] = 0; msh2[2] = 0;

src/mesh/blockMesh/PDRblockMesh/PDRblock.C

@@ -289,7 +289,7 @@ void Foam::PDRblock::readGridControl
 
         const scalar dist = (subPoint.last() - subPoint.first());
 
-        if (equal(expRatio, 1.0))
+        if (equal(expRatio, 1))
         {
             for (label i=1; i < nDiv; ++i)
             {