From f285247d1ac9c28e41d5896ee125fe2e7064007f Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 10 Oct 2013 11:02:35 +0100 Subject: [PATCH] BUG: lagrangian injection model - add to addedMass if particle is immediately absorbed - mantis #1036 --- .../InjectionModel/InjectionModel/InjectionModel.C | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C index f49e790867..7d3ccf083c 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C @@ -550,7 +550,7 @@ void Foam::InjectionModel::inject(TrackData& td) if (cellI > -1) { // Lagrangian timestep - scalar dt = time - timeInj; + const scalar dt = time - timeInj; // Apply corrections to position for 2-D cases meshTools::constrainToMeshCentre(mesh, pos); @@ -586,8 +586,11 @@ void Foam::InjectionModel::inject(TrackData& td) pPtr->rho() ); + const scalar mParcel0 = pPtr->nParticle()*pPtr->mass(); + if (!pPtr->move(td, dt)) { + massAdded += mParcel0; delete pPtr; } else @@ -595,7 +598,7 @@ void Foam::InjectionModel::inject(TrackData& td) if (pPtr->nParticle() >= 1.0) { td.cloud().addParticle(pPtr); - massAdded += pPtr->nParticle()*pPtr->mass(); + massAdded += mParcel0; parcelsAdded++; } else