From 013515dfddde6845f7d931017c2f4d1ad77b4bef Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 24 Sep 2012 12:54:25 +0100
Subject: [PATCH] ENH: parcel injection - updated validation check

---
 .../InjectionModel/InjectionModel.C           | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index ff2f3a6e84..32473b8acf 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -585,16 +585,23 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                             pPtr->rho()
                         );
 
-                    if ((pPtr->nParticle() >= 1.0) && (pPtr->move(td, dt)))
+                    if (!pPtr->move(td, dt))
                     {
-                        td.cloud().addParticle(pPtr);
-                        massAdded += pPtr->nParticle()*pPtr->mass();
-                        parcelsAdded++;
+                        delete pPtr;
                     }
                     else
                     {
-                        delayedVolume += pPtr->nParticle()*pPtr->volume();
-                        delete pPtr;
+                        if (pPtr->nParticle() >= 1.0)
+                        {
+                            td.cloud().addParticle(pPtr);
+                            massAdded += pPtr->nParticle()*pPtr->mass();
+                            parcelsAdded++;
+                        }
+                        else
+                        {
+                            delayedVolume += pPtr->nParticle()*pPtr->volume();
+                            delete pPtr;
+                        }
                     }
                 }
             }