From e8985cbd2954382f123f7bcd5a4e1af1004f7e49 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 30 Aug 2013 16:31:22 +0100 Subject: [PATCH] BUG: Corrected commit 6a1b567 --- .../Templates/KinematicParcel/KinematicParcel.C | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C index 10bd38d62e..b833962825 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C @@ -287,16 +287,13 @@ bool Foam::KinematicParcel::move const label cellI = p.cell(); const scalar magU = mag(U_); - if (p.active()) + if (p.active() && moving && (magU > ROOTVSMALL)) { const scalar d = dt*magU; const scalar dCorr = min(d, maxCo*cbrt(V[cellI])); - dt *= dCorr/d; - - if (moving && (magU > ROOTVSMALL)) - { - dt *= p.trackToFace(p.position() + dCorr*U_/magU, td); - } + dt *= + dCorr/d + *p.trackToFace(p.position() + dCorr*U_/magU, td); } tEnd -= dt;