From 8b52b700d0e1b367d44fa481026c349cfdeb81fe Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 3 May 2013 12:55:44 +0100
Subject: [PATCH] ENH: Updated suppression collision model

---
 .../Templates/KinematicCloud/KinematicCloudI.H      |  2 +-
 .../SuppressionCollision/SuppressionCollision.C     | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index f99bb8c57c..bef2f78a60 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -622,7 +622,7 @@ Foam::KinematicCloud<CloudType>::vDotSweep() const
     vDotSweep.internalField() /= mesh_.V();
     vDotSweep.correctBoundaryConditions();
 
-    return vDotSweep;
+    return tvDotSweep;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C
index c25cc8b646..b486fa02b7 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C
@@ -36,7 +36,9 @@ void Foam::SuppressionCollision<CloudType>::collide(const scalar dt)
         lookupObject<kinematicCloud>(suppressionCloud_);
 
     volScalarField vDotSweep(sc.vDotSweep());
-    volScalarField P(type() + ":p", 1.0 - exp(-vDotSweep*dt));
+
+    dimensionedScalar Dt("dt", dimTime, dt);
+    volScalarField P(type() + ":p", 1.0 - exp(-vDotSweep*Dt));
 
     forAllIter(typename CloudType, this->owner(), iter)
     {
@@ -63,9 +65,12 @@ Foam::SuppressionCollision<CloudType>::SuppressionCollision
     CloudType& owner
 )
 :
-    StochasticCollisionModel<CloudType>(owner),
-    suppressionCloud_(dict.lookup("suppressionCloud")),
-    suppressedParcelType_(dict.lookupOrDefault("suppressedParcelType", -1))
+    StochasticCollisionModel<CloudType>(dict, owner, typeName),
+    suppressionCloud_(this->coeffDict().lookup("suppressionCloud")),
+    suppressedParcelType_
+    (
+        this->coeffDict().lookupOrDefault("suppressedParcelType", -1)
+    )
 {}