ENH: lagrangian - updated injection model

This commit is contained in:
andy
2013-11-12 15:16:26 +00:00
parent 5d0c0287ca
commit e949770310

View File

@ -586,20 +586,19 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
pPtr->rho() pPtr->rho()
); );
const scalar mParcel0 = pPtr->nParticle()*pPtr->mass(); if (pPtr->nParticle() >= 1.0)
if (!pPtr->move(td, dt))
{ {
massAdded += mParcel0; parcelsAdded++;
delete pPtr; massAdded += pPtr->nParticle()*pPtr->mass();
if (pPtr->move(td, dt))
{
td.cloud().addParticle(pPtr);
} }
else else
{ {
if (pPtr->nParticle() >= 1.0) delete pPtr;
{ }
td.cloud().addParticle(pPtr);
massAdded += mParcel0;
parcelsAdded++;
} }
else else
{ {
@ -609,7 +608,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
} }
} }
} }
}
delayedVolume_ = delayedVolume; delayedVolume_ = delayedVolume;
} }