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

This commit is contained in:
Henry Weller 2017-08-01 09:48:51 +01:00
commit 89ccd9169c
2 changed files with 2 additions and 2 deletions

View file

@ -123,7 +123,7 @@ inline Foam::CollidingParcel<ParcelType>::CollidingParcel
nParticle0,
d0,
dTarget0,
torque0,
U0,
constProps
),
f_(f0),

View file

@ -352,7 +352,7 @@ public:
const scalar nParticle0,
const scalar d0,
const scalar dTarget0,
const vector& torque0,
const vector& U0,
const constantProperties& constProps
);