From e9497703102cc49f0809acaede222ed8c77d6e67 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 12 Nov 2013 15:16:26 +0000
Subject: [PATCH] ENH: lagrangian - updated injection model
---
.../InjectionModel/InjectionModel.C | 22 +++++++++----------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 7d3ccf083ca..82080c41740 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -586,27 +586,25 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
pPtr->rho()
);
- const scalar mParcel0 = pPtr->nParticle()*pPtr->mass();
-
- if (!pPtr->move(td, dt))
- {
- massAdded += mParcel0;
- delete pPtr;
- }
- else
+ if (pPtr->nParticle() >= 1.0)
{
- if (pPtr->nParticle() >= 1.0)
+ parcelsAdded++;
+ massAdded += pPtr->nParticle()*pPtr->mass();
+
+ if (pPtr->move(td, dt))
{
td.cloud().addParticle(pPtr);
- massAdded += mParcel0;
- parcelsAdded++;
}
else
{
- delayedVolume += pPtr->nParticle()*pPtr->volume();
delete pPtr;
}
}
+ else
+ {
+ delayedVolume += pPtr->nParticle()*pPtr->volume();
+ delete pPtr;
+ }
}
}
}
--
GitLab