zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Henry Weller
2017-08-03 10:44:49 +01:00
parent ec58513737 a0fcab2f31
commit 540796ea3a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -81,6 +81,7 @@ bool Foam::CollidingParcel<ParcelType>::move
p.angularMomentum() += 0.5*trackTime*p.torque();
td.keepParticle = true;
td.switchProcessor = false;
break;
}

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,6 +77,7 @@ bool Foam::MPPICParcel<ParcelType>::move
td.cloud().dampingModel().velocityCorrection(p, trackTime);
td.keepParticle = true;
td.switchProcessor = false;
break;
}
@ -86,6 +87,7 @@ bool Foam::MPPICParcel<ParcelType>::move
td.cloud().packingModel().velocityCorrection(p, trackTime);
td.keepParticle = true;
td.switchProcessor = false;
break;
}