From 1d78434bee8ff9bef3f78e0fd6dd40cd71a4d35d Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Wed, 31 May 2023 11:35:29 +0100
Subject: [PATCH] functionObjects::interfaceHeight: Corrected parallel
 operation

---
 .../field/interfaceHeight/interfaceHeight.C    | 12 ++++++------
 src/sampling/sampledSet/lineCell/lineCell.C    |  4 ++--
 .../sampledSet/lineCellFace/lineCellFace.C     | 12 +++++++-----
 .../sampledSet/lineCellFace/lineCellFace.H     |  5 +++--
 src/sampling/sampledSet/lineFace/lineFace.C    |  6 +++---
 src/sampling/sampledSet/lineFace/lineFace.H    |  4 ++--
 .../sampledSet/sampledSet/sampledSetParticle.C | 18 +++++++++++++++---
 .../sampledSet/sampledSet/sampledSetParticle.H | 14 +++++++++-----
 8 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/functionObjects/field/interfaceHeight/interfaceHeight.C b/src/functionObjects/field/interfaceHeight/interfaceHeight.C
index e6672aaa5b..c1b2fa2899 100644
--- a/src/functionObjects/field/interfaceHeight/interfaceHeight.C
+++ b/src/functionObjects/field/interfaceHeight/interfaceHeight.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,16 +93,16 @@ void Foam::functionObjects::interfaceHeight::writePositions()
         // line. The latter is equal to the equivalent length with alpha equal
         // to one.
         scalar sumLength = 0, sumLengthAlpha = 0;
-        for(label si = 0; si < set.size() - 1; ++ si)
+        for (label si = 0; si < set.size() - 1; ++ si)
         {
-            if (set.segments()[si] != set.segments()[si+1])
-            {
-                continue;
-            }
+            if (set.segments()[si] != set.segments()[si+1]) continue;
 
             const vector& p0 = set.pointCoord(si), p1 = set.pointCoord(si+1);
             const label c0 = set.cells()[si], c1 = set.cells()[si+1];
             const label f0 = set.faces()[si], f1 = set.faces()[si+1];
+
+            if (f0 != -1 && f1 != -1) continue;
+
             const scalar a0 = interpolator->interpolate(p0, c0, f0);
             const scalar a1 = interpolator->interpolate(p1, c1, f1);
 
diff --git a/src/sampling/sampledSet/lineCell/lineCell.C b/src/sampling/sampledSet/lineCell/lineCell.C
index a512a37d3c..b7485ef373 100644
--- a/src/sampling/sampledSet/lineCell/lineCell.C
+++ b/src/sampling/sampledSet/lineCell/lineCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ void Foam::sampledSets::lineCell::calcSamples
         searchEngine(),
         start_,
         end_,
-        false,
+        0,
         true,
         samplingPositions,
         samplingDistances,
diff --git a/src/sampling/sampledSet/lineCellFace/lineCellFace.C b/src/sampling/sampledSet/lineCellFace/lineCellFace.C
index acf9199117..b6b85c1a82 100644
--- a/src/sampling/sampledSet/lineCellFace/lineCellFace.C
+++ b/src/sampling/sampledSet/lineCellFace/lineCellFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,6 +45,7 @@ namespace sampledSets
 
 void Foam::sampledSets::lineCellFace::calcSamples
 (
+    const label storeFaces,
     DynamicList<point>& samplingPositions,
     DynamicList<scalar>& samplingDistances,
     DynamicList<label>& samplingSegments,
@@ -58,7 +59,7 @@ void Foam::sampledSets::lineCellFace::calcSamples
         searchEngine(),
         start_,
         end_,
-        true,
+        storeFaces,
         true,
         samplingPositions,
         samplingDistances,
@@ -69,7 +70,7 @@ void Foam::sampledSets::lineCellFace::calcSamples
 }
 
 
-void Foam::sampledSets::lineCellFace::genSamples()
+void Foam::sampledSets::lineCellFace::genSamples(const label storeFaces)
 {
     DynamicList<point> samplingPositions;
     DynamicList<scalar> samplingDistances;
@@ -79,6 +80,7 @@ void Foam::sampledSets::lineCellFace::genSamples()
 
     calcSamples
     (
+        storeFaces,
         samplingPositions,
         samplingDistances,
         samplingSegments,
@@ -117,7 +119,7 @@ Foam::sampledSets::lineCellFace::lineCellFace
     start_(dict.lookup("start")),
     end_(dict.lookup("end"))
 {
-    genSamples();
+    genSamples(1);
 }
 
 
@@ -135,7 +137,7 @@ Foam::sampledSets::lineCellFace::lineCellFace
     start_(start),
     end_(end)
 {
-    genSamples();
+    genSamples(2);
 }
 
 
diff --git a/src/sampling/sampledSet/lineCellFace/lineCellFace.H b/src/sampling/sampledSet/lineCellFace/lineCellFace.H
index e3f451b123..2f04e86c1c 100644
--- a/src/sampling/sampledSet/lineCellFace/lineCellFace.H
+++ b/src/sampling/sampledSet/lineCellFace/lineCellFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,6 +85,7 @@ class lineCellFace
         //- Calculate all the sampling points
         virtual void calcSamples
         (
+            const label storeFaces,
             DynamicList<point>& samplingPositions,
             DynamicList<scalar>& samplingDistances,
             DynamicList<label>& samplingSegments,
@@ -93,7 +94,7 @@ class lineCellFace
         ) const;
 
         //- Uses calcSamples to obtain samples and copies them into *this
-        void genSamples();
+        void genSamples(const label storeFaces);
 
 
 public:
diff --git a/src/sampling/sampledSet/lineFace/lineFace.C b/src/sampling/sampledSet/lineFace/lineFace.C
index 5ba6e1881b..34142c9270 100644
--- a/src/sampling/sampledSet/lineFace/lineFace.C
+++ b/src/sampling/sampledSet/lineFace/lineFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ void Foam::sampledSets::lineFace::calcSamples
     const meshSearch& searchEngine,
     const vector& start,
     const vector& end,
-    const bool storeFaces,
+    const label storeFaces,
     const bool storeCells,
     DynamicList<point>& samplingPositions,
     DynamicList<scalar>& samplingDistances,
@@ -280,7 +280,7 @@ void Foam::sampledSets::lineFace::calcSamples
         searchEngine(),
         start_,
         end_,
-        true,
+        1,
         false,
         samplingPositions,
         samplingDistances,
diff --git a/src/sampling/sampledSet/lineFace/lineFace.H b/src/sampling/sampledSet/lineFace/lineFace.H
index 00cb81ec5e..290c5ca3f0 100644
--- a/src/sampling/sampledSet/lineFace/lineFace.H
+++ b/src/sampling/sampledSet/lineFace/lineFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ public:
             const meshSearch& searchEngine,
             const vector& start,
             const vector& end,
-            const bool storeFaces,
+            const label storeFaces,
             const bool storeCells,
             DynamicList<point>& samplingPositions,
             DynamicList<scalar>& samplingDistances,
diff --git a/src/sampling/sampledSet/sampledSet/sampledSetParticle.C b/src/sampling/sampledSet/sampledSet/sampledSetParticle.C
index b9e359bbc3..ffe2935c0d 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSetParticle.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSetParticle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,7 +139,7 @@ bool Foam::sampledSetParticle::move
         while (onInternalFace(td.mesh))
         {
             if (td.storeCells_) storeCell(cloud, td);
-            if (td.storeFaces_) storeFace(cloud, td);
+            if (td.storeFaces_ > 0) storeFace(cloud, td);
 
             hitFace(setF_*s, 0, cloud, td);
 
@@ -151,7 +151,7 @@ bool Foam::sampledSetParticle::move
         if (onFace())
         {
             if (td.storeCells_) storeCell(cloud, td);
-            if (td.storeFaces_) storeFace(cloud, td);
+            if (td.storeFaces_ > 0) storeFace(cloud, td);
 
             hitFace(setF_*s, 0, cloud, td);
         }
@@ -247,6 +247,18 @@ void Foam::sampledSetParticle::hitWallPatch
 }
 
 
+void Foam::sampledSetParticle::correctAfterParallelTransfer
+(
+    sampledSetCloud& cloud,
+    trackingData& td
+)
+{
+    particle::correctAfterParallelTransfer(cloud, td);
+
+    if (td.storeFaces_ > 1) storeFace(cloud, td);
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const sampledSetParticle& p)
diff --git a/src/sampling/sampledSet/sampledSet/sampledSetParticle.H b/src/sampling/sampledSet/sampledSet/sampledSetParticle.H
index 966e1e2d53..1394b5c14a 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSetParticle.H
+++ b/src/sampling/sampledSet/sampledSet/sampledSetParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2021-2022 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021-2023 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ public:
         const bool storeSet_;
 
         //- Are we storing the faces we track through?
-        const bool storeFaces_;
+        const label storeFaces_;
 
         //- Are we storing the cells we track through?
         const bool storeCells_;
@@ -97,9 +97,9 @@ public:
         (
             sampledSetCloud& cloud,
             const List<point>& set,
-            bool storeSet,
-            bool storeFaces,
-            bool storeCells,
+            const bool storeSet,
+            const label storeFaces,
+            const bool storeCells,
             DynamicList<point>& positions,
             DynamicList<scalar>& distances,
             DynamicList<label>& cells,
@@ -211,6 +211,10 @@ public:
             //- Hit a wall patch. Ends the track.
             void hitWallPatch(sampledSetCloud&, trackingData&);
 
+            //- Do corrections to the particle and tracking data following a
+            //  transfer between processors
+            void correctAfterParallelTransfer(sampledSetCloud&, trackingData&);
+
 
     // IOstream Operators