From 1de2f305450bcfd33a0b5020c0f65606ba08f57a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 5 Jun 2019 09:13:08 +0200
Subject: [PATCH] COMP: fixes for label=64, scalar=32
---
src/fileFormats/colours/colourTools.C | 2 +-
src/mesh/blockMesh/PDRblockMesh/PDRblock.C | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/fileFormats/colours/colourTools.C b/src/fileFormats/colours/colourTools.C
index db27ecaa963..a2aae558d34 100644
--- a/src/fileFormats/colours/colourTools.C
+++ b/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;
diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblock.C b/src/mesh/blockMesh/PDRblockMesh/PDRblock.C
index a667d89bcf3..f62980b7c6e 100644
--- a/src/mesh/blockMesh/PDRblockMesh/PDRblock.C
+++ b/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)
{
--
GitLab