From 1d3a93554b25d8af7014c7654307585286b74a7c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 21 Feb 2011 22:50:17 +0000
Subject: [PATCH] Add conversion to scalar for SP

---
 .../solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H   | 4 +++-
 .../Kinematic/InjectionModel/PatchInjection/PatchInjection.C | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H b/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H
index e84eef1023..7dc0779969 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H
+++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H
@@ -116,7 +116,9 @@
      && runTime.timeIndex() > runTime.startTimeIndex() + 1
     )
     {
-        rDeltaT = rDeltaT0*max(rDeltaT/rDeltaT0, 1.0 - rDeltaTDampingCoeff);
+        rDeltaT =
+             rDeltaT0
+            *max(rDeltaT/rDeltaT0, scalar(1.0) - rDeltaTDampingCoeff);
 
         Info<< "Damped flow time scale min/max = "
             << gMin(1/rDeltaT.internalField())
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 1f6a275027..38517d00a7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -49,7 +49,10 @@ Foam::label Foam::PatchInjection<CloudType>::parcelsToInject
         if
         (
             nParcelsToInject > 0
-         && (nParcels - scalar(nParcelsToInject) > rnd.position(0.0, 1.0))
+         && (
+               nParcels - scalar(nParcelsToInject)
+             > rnd.position(scalar(0), scalar(1))
+            )
         )
         {
             ++nParcelsToInject;