ENH: parcel injection - updated validation check

This commit is contained in:
andy
2012-09-24 12:54:25 +01:00
parent 66eac7a20b
commit 013515dfdd

View File

@ -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;
}
}
}
}