lagrangian: Removed duplicate data from method arguments

A lot of methods were taking argument data which could be referenced or
generated from the parcel class at little or no additional cost. This
was confusing and generated the possibility of inconsistent data states.

src/functionObjects/field/nearWallFields/findCellParticle.C

@@ -130,10 +130,7 @@ bool Foam::findCellParticle::hitPatch
 (
     const polyPatch&,
     Cloud<findCellParticle>& cloud,
-    trackingData& td,
-    const label patchi,
-    const scalar trackFraction,
-    const tetIndices& tetIs
+    trackingData& td
 )
 {
     return false;
@@ -188,6 +185,32 @@ void Foam::findCellParticle::hitCyclicPatch
 }
 
 
+void Foam::findCellParticle::hitCyclicAMIPatch
+(
+    const cyclicAMIPolyPatch&,
+    Cloud<findCellParticle>& cloud,
+    trackingData& td,
+    const vector&
+)
+{
+    // Remove particle
+    td.keepParticle = false;
+}
+
+
+void Foam::findCellParticle::hitCyclicACMIPatch
+(
+    const cyclicACMIPolyPatch&,
+    Cloud<findCellParticle>& cloud,
+    trackingData& td,
+    const vector&
+)
+{
+    // Remove particle
+    td.keepParticle = false;
+}
+
+
 void Foam::findCellParticle::hitProcessorPatch
 (
     const processorPolyPatch&,
@@ -204,19 +227,6 @@ void Foam::findCellParticle::hitWallPatch
 (
     const wallPolyPatch& wpp,
     Cloud<findCellParticle>& cloud,
-    trackingData& td,
-    const tetIndices&
-)
-{
-    // Remove particle
-    td.keepParticle = false;
-}
-
-
-void Foam::findCellParticle::hitPatch
-(
-    const polyPatch& wpp,
-    Cloud<findCellParticle>& cloud,
     trackingData& td
 )
 {

src/functionObjects/field/nearWallFields/findCellParticle.H

@@ -229,10 +229,7 @@ public:
             (
                 const polyPatch&,
                 Cloud<findCellParticle>&,
-                trackingData& td,
-                const label patchi,
-                const scalar trackFraction,
-                const tetIndices& tetIs
+                trackingData& td
             );
 
             //- Overridable function to handle the particle hitting a wedge
@@ -269,6 +266,24 @@ public:
                 trackingData& td
             );
 
+            //- Overridable function to handle the particle hitting a cyclicAMI
+            void hitCyclicAMIPatch
+            (
+                const cyclicAMIPolyPatch&,
+                Cloud<findCellParticle>& cloud,
+                trackingData& td,
+                const vector&
+            );
+
+            //- Overridable function to handle the particle hitting a cyclicACMI
+            void hitCyclicACMIPatch
+            (
+                const cyclicACMIPolyPatch&,
+                Cloud<findCellParticle>& cloud,
+                trackingData& td,
+                const vector&
+            );
+
             //- Overridable function to handle the particle hitting a
             //- processorPatch
             void hitProcessorPatch
@@ -283,15 +298,6 @@ public:
             (
                 const wallPolyPatch&,
                 Cloud<findCellParticle>&,
-                trackingData& td,
-                const tetIndices&
-            );
-
-            //- Overridable function to handle the particle hitting a polyPatch
-            void hitPatch
-            (
-                const polyPatch&,
-                Cloud<findCellParticle>&,
                 trackingData& td
             );
 

src/functionObjects/field/streamLine/streamLineParticle.C

@@ -274,10 +274,7 @@ bool Foam::streamLineParticle::hitPatch
 (
     const polyPatch&,
     streamLineParticleCloud& cloud,
-    trackingData& td,
-    const label patchi,
-    const scalar trackFraction,
-    const tetIndices& tetIs
+    trackingData& td
 )
 {
     // Disable generic patch interaction
@@ -333,6 +330,32 @@ void Foam::streamLineParticle::hitCyclicPatch
 }
 
 
+void Foam::streamLineParticle::hitCyclicAMIPatch
+(
+    const cyclicAMIPolyPatch&,
+    streamLineParticleCloud& cloud,
+    trackingData& td,
+    const vector&
+)
+{
+    // Remove particle
+    td.keepParticle = false;
+}
+
+
+void Foam::streamLineParticle::hitCyclicACMIPatch
+(
+    const cyclicACMIPolyPatch&,
+    streamLineParticleCloud& cloud,
+    trackingData& td,
+    const vector&
+)
+{
+    // Remove particle
+    td.keepParticle = false;
+}
+
+
 void Foam::streamLineParticle::hitProcessorPatch
 (
     const processorPolyPatch&,
@@ -349,19 +372,6 @@ void Foam::streamLineParticle::hitWallPatch
 (
     const wallPolyPatch& wpp,
     streamLineParticleCloud& cloud,
-    trackingData& td,
-    const tetIndices&
-)
-{
-    // Remove particle
-    td.keepParticle = false;
-}
-
-
-void Foam::streamLineParticle::hitPatch
-(
-    const polyPatch& wpp,
-    streamLineParticleCloud& cloud,
     trackingData& td
 )
 {

src/functionObjects/field/streamLine/streamLineParticle.H

@@ -220,10 +220,7 @@ public:
             (
                 const polyPatch&,
                 streamLineParticleCloud& cloud,
-                trackingData& td,
-                const label patchi,
-                const scalar trackFraction,
-                const tetIndices& tetIs
+                trackingData& td
             );
 
             //- Overridable function to handle the particle hitting a wedge
@@ -260,6 +257,26 @@ public:
                 trackingData& td
             );
 
+            //- Overridable function to handle the particle hitting a
+            //  cyclicAMIPatch
+            void hitCyclicAMIPatch
+            (
+                const cyclicAMIPolyPatch&,
+                streamLineParticleCloud& cloud,
+                trackingData& td,
+                const vector& direction
+            );
+
+            //- Overridable function to handle the particle hitting a
+            //  cyclicACMIPatch
+            void hitCyclicACMIPatch
+            (
+                const cyclicACMIPolyPatch&,
+                streamLineParticleCloud& cloud,
+                trackingData& td,
+                const vector& direction
+            );
+
             //- Overridable function to handle the particle hitting a
             //- processorPatch
             void hitProcessorPatch
@@ -274,15 +291,6 @@ public:
             (
                 const wallPolyPatch&,
                 streamLineParticleCloud& cloud,
-                trackingData& td,
-                const tetIndices&
-            );
-
-            //- Overridable function to handle the particle hitting a polyPatch
-            void hitPatch
-            (
-                const polyPatch&,
-                streamLineParticleCloud& cloud,
                 trackingData& td
             );