Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

This commit is contained in:
mattijs 2013-12-19 16:55:40 +00:00
commit 01d4c05328
2 changed files with 6 additions and 0 deletions

View File

@ -80,6 +80,8 @@ bool Foam::CollidingParcel<ParcelType>::move
p.angularMomentum() += 0.5*trackTime*p.torque();
td.keepParticle = true;
break;
}

View File

@ -76,6 +76,8 @@ bool Foam::MPPICParcel<ParcelType>::move
p.UCorrect() =
td.cloud().dampingModel().velocityCorrection(p, trackTime);
td.keepParticle = true;
break;
}
case TrackData::tpPackingNoTrack:
@ -83,6 +85,8 @@ bool Foam::MPPICParcel<ParcelType>::move
p.UCorrect() =
td.cloud().packingModel().velocityCorrection(p, trackTime);
td.keepParticle = true;
break;
}
case TrackData::tpCorrectTrack: