zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs
2013-12-19 16:55:40 +00:00
parent 19486b6f5c bdd50222b4
commit 01d4c05328
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.C
View File

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

4
src/lagrangian/intermediate/parcels/Templates/MPPICParcel/MPPICParcel.C
View File

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