Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-6

This commit is contained in:
Henry Weller
2018-10-15 10:30:34 +01:00

View File

@ -349,14 +349,14 @@ bool Foam::KinematicParcel<ParcelType>::move
p.age() += dt; p.age() += dt;
if (p.onFace()) if (p.active() && p.onFace())
{ {
cloud.functions().postFace(p, ttd.keepParticle); cloud.functions().postFace(p, ttd.keepParticle);
} }
cloud.functions().postMove(p, dt, start, ttd.keepParticle); cloud.functions().postMove(p, dt, start, ttd.keepParticle);
if (p.onFace() && ttd.keepParticle) if (p.active() && p.onFace() && ttd.keepParticle)
{ {
p.hitFace(s, cloud, ttd); p.hitFace(s, cloud, ttd);
} }