From a6f2053518df7bbbec3ca9ed2c2dafb9177491be Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Fri, 20 Jul 2018 15:54:25 +0100
Subject: [PATCH] particle: Consistent return value from all track methods

---
 src/lagrangian/basic/particle/particle.H          | 2 +-
 src/lagrangian/basic/particle/particleTemplates.C | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H
index 5bc5a865cb..d324c27b37 100644
--- a/src/lagrangian/basic/particle/particle.H
+++ b/src/lagrangian/basic/particle/particle.H
@@ -566,7 +566,7 @@ public:
 
         //- Convenience function. Cobines trackToFace and hitFace
         template<class TrackCloudType>
-        void trackToAndHitFace
+        scalar trackToAndHitFace
         (
             const vector& direction,
             const scalar fraction,
diff --git a/src/lagrangian/basic/particle/particleTemplates.C b/src/lagrangian/basic/particle/particleTemplates.C
index 57da1b2d32..b4e7266a45 100644
--- a/src/lagrangian/basic/particle/particleTemplates.C
+++ b/src/lagrangian/basic/particle/particleTemplates.C
@@ -180,7 +180,7 @@ void Foam::particle::hitFace
 
 
 template<class TrackCloudType>
-void Foam::particle::trackToAndHitFace
+Foam::scalar Foam::particle::trackToAndHitFace
 (
     const vector& direction,
     const scalar fraction,
@@ -193,9 +193,11 @@ void Foam::particle::trackToAndHitFace
         Info << "Particle " << origId() << nl << FUNCTION_NAME << nl << endl;
     }
 
-    trackToFace(direction, fraction);
+    const scalar f = trackToFace(direction, fraction);
 
     hitFace(direction, cloud, td);
+
+    return f;
 }