From a34357b1a639d32ceaee5d99c9551118f4a03524 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 4 May 2022 00:33:53 +0200
Subject: [PATCH] ENH: additional IndirectList static methods

- uniq() : creates an IndirectList with duplicated entries
  filtered out

- subset() : creates an IndirectList with positions that satisfy
  a condition predicate.

- subset_if() : creates an IndirectList with values that satisfy a
  given predicate.

  An indirect subset will be cheaper than creating a subset copy
  of the original data, and also allows modification.

STYLE: combine UIndirectList.H into UIndirectList.H (reduce file clutter)
---
 applications/test/ListOps/Test-ListOps.C      |   4 +
 .../test/UIndirectList/Test-UIndirectList.C   |   2 +-
 applications/test/minMax1/Test-minMax1.C      |   4 +-
 applications/test/sort/Test-sortList.C        |  16 ++-
 .../IndirectLists/IndirectList/IndirectList.H | 115 +++++++++++++++++-
 .../IndirectList/IndirectListI.H              | 109 ++++++++++++++++-
 .../IndirectList/UIndirectList.H              |  16 +++
 .../IndirectListBase/IndirectListAddressing.H |   8 +-
 .../UIndirectList/UIndirectList.H             | 108 ----------------
 .../containers/Lists/ListOps/ListOps.H        |   5 +
 .../meshes/meshShapes/cell/cellIndList.H      |   5 +-
 .../meshes/meshShapes/cellShape/cellShapeI.H  |   2 +-
 .../meshes/meshShapes/edge/edgeIndList.H      |   5 +-
 .../meshes/meshShapes/face/faceIndList.H      |   5 +-
 .../primitiveShapes/point/pointIndList.H      |   5 +-
 .../primitives/Scalar/lists/scalarIndList.H   |   5 +-
 .../primitives/Vector/lists/vectorIndList.H   |   5 +-
 .../primitives/ints/lists/labelIndList.H      |   3 +-
 .../primitives/strings/lists/stringListOps.H  |   4 +-
 src/finiteArea/faMatrices/faMatrix/faMatrix.C |   2 +-
 .../faMesh/faMeshBoundaryHaloTemplates.C      |   2 +-
 .../mappedFixedInternalValueFvPatchField.C    |   2 +-
 ...ppedFixedPushedInternalValueFvPatchField.C |   2 +-
 .../fvMatrices/fvMatrix/fvMatrix.C            |   2 +-
 .../utilities/areaWrite/areaWrite.C           |   2 +-
 .../sampledSet/sampledSets/sampledSets.C      |   2 +-
 .../sampledSurfaces/sampledSurfaces.C         |   2 +-
 27 files changed, 292 insertions(+), 150 deletions(-)
 create mode 100644 src/OpenFOAM/containers/IndirectLists/IndirectList/UIndirectList.H
 delete mode 100644 src/OpenFOAM/containers/IndirectLists/UIndirectList/UIndirectList.H

diff --git a/applications/test/ListOps/Test-ListOps.C b/applications/test/ListOps/Test-ListOps.C
index ea034e57b5..e3db28c7ff 100644
--- a/applications/test/ListOps/Test-ListOps.C
+++ b/applications/test/ListOps/Test-ListOps.C
@@ -151,6 +151,10 @@ int main(int argc, char *argv[])
         << subsetList(test6, evenNonZero) << nl
         << endl;
 
+    Info<< "Subset of non-zero, even values: "
+        << IndirectList<label>::subset_if(test6, evenNonZero) << nl
+        << endl;
+
     test6.append(identity(13, 12));
 
     Info<< "Randomized: " << flatOutput(test6) << endl;
diff --git a/applications/test/UIndirectList/Test-UIndirectList.C b/applications/test/UIndirectList/Test-UIndirectList.C
index a9d9cabd76..7d6714591a 100644
--- a/applications/test/UIndirectList/Test-UIndirectList.C
+++ b/applications/test/UIndirectList/Test-UIndirectList.C
@@ -27,7 +27,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "UIndirectList.H"
+#include "IndirectList.H"
 #include "DynamicList.H"
 #include "IOstreams.H"
 #include "ListOps.H"
diff --git a/applications/test/minMax1/Test-minMax1.C b/applications/test/minMax1/Test-minMax1.C
index 10f1a9e9e2..664a3a7f22 100644
--- a/applications/test/minMax1/Test-minMax1.C
+++ b/applications/test/minMax1/Test-minMax1.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -190,6 +190,8 @@ int main(int argc, char *argv[])
             << nl;
 
         Info<< "Subset = " << subsetList(values1, limiter) << nl;
+        Info<< "Subset = "
+            << IndirectList<scalar>::subset_if(values1, limiter) << nl;
 
         Info<< nl << "test clip() with limiter: " << limiter << nl;
         for (const scalar& val : values1)
diff --git a/applications/test/sort/Test-sortList.C b/applications/test/sort/Test-sortList.C
index 5e6f4f3813..04b17185fe 100644
--- a/applications/test/sort/Test-sortList.C
+++ b/applications/test/sort/Test-sortList.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,9 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
+#include "SortList.H"
 #include "SortableList.H"
+#include "IndirectList.H"
 #include "ListOps.H"
 #include "HashSet.H"
 #include "stringOps.H"
@@ -49,6 +51,18 @@ void printInfo(const SortableList<T>& list)
 
 int main(int argc, char *argv[])
 {
+    {
+        const labelList orig({7, 9, 7, 12, 9, 1, 12, 2, 4, 7, 4, 0});
+
+        Info<< "original list: " << flatOutput(orig) << endl;
+
+        auto unique = IndirectList<label>::uniq(orig);
+
+        Info<< "unique  list: " << flatOutput(unique) << endl;
+        Info<< "unique  idx : " << flatOutput(unique.addressing()) << endl;
+    }
+
+
     const labelList orig({7, 9, 1, 2, 4, 7, 4, 0});
 
     labelList order;
diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H
index 63c43d4792..5e802a6b57 100644
--- a/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,22 +33,82 @@ Description
 See also
     Foam::UIndirectList for a version without addressing allocation.
 
+Class
+    Foam::UIndirectList
+
+Description
+    A List with indirect addressing.
+    Like IndirectList but does not store addressing
+
+    Note the const_cast of the list values. This is so we can use it both
+    on const and non-const lists. Alternative would be to have a const_
+    variant etc.
+
 SourceFiles
     IndirectListI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IndirectList_H
-#define IndirectList_H
+#ifndef Foam_IndirectList_H
+#define Foam_IndirectList_H
 
+#include "List.H"
+#include "IndirectListBase.H"
 #include "IndirectListAddressing.H"
-#include "UIndirectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward Declarations
+template<class T> class IndirectList;
+template<class T> class UIndirectList;
+
+// Common list types
+typedef UIndirectList<bool> boolUIndList;       //!< UIndirectList of bools
+typedef UIndirectList<label> labelUIndList;     //!< UIndirectList of labels
+
+
+/*---------------------------------------------------------------------------*\
+                        Class UIndirectList Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class T>
+class UIndirectList
+:
+    public IndirectListBase<T, labelUList>
+{
+public:
+
+    // Constructors
+
+        //- Shallow copy values and addressing
+        UIndirectList(const UList<T>& values, const labelUList& addr)
+        :
+            IndirectListBase<T, labelUList>(values, addr)
+        {}
+
+        //- Copy construct (shallow copy values and addressing)
+        UIndirectList(const UIndirectList<T>& list)
+        :
+            UIndirectList<T>(list.values(), list.addressing())
+        {}
+
+
+    // Member Operators
+
+        //- Use standard assignment operations
+        using IndirectListBase<T, labelUList>::operator=;
+
+        //- Deep copy values, Fatal if list sizes are not identical
+        void operator=(const UIndirectList<T>& rhs)
+        {
+            this->copyList(rhs);
+        }
+};
+
+
 /*---------------------------------------------------------------------------*\
                         Class IndirectList Declaration
 \*---------------------------------------------------------------------------*/
@@ -82,6 +142,53 @@ public:
         inline explicit IndirectList(const UIndirectList<T>& list);
 
 
+    // Static Functions
+
+        //- Return an IndirectList comprising entries with \em positions
+        //- that satisfy the condition predicate.
+        //
+        //  The condition predicate can be considered a type of \em mask
+        //  for any given position.
+        //  A boolList, bitSet, labelRange or labelHashSet all satisfy
+        //  the requirements for use as position condition predicates.
+        //
+        //  \param values  The source list values
+        //  \param select  Accept/reject predicate based on \em position.
+        //  \param invert  Invert (negate) the selection logic
+        template<class UnaryCondition>
+        static IndirectList<T> subset
+        (
+            const UList<T>& values,
+            const UnaryCondition& select,
+            const bool invert = false
+        );
+
+        //- Return an IndirectList comprising entries with \em values
+        //- that satisfy the predicate.
+        //
+        //  \param values  The source list values
+        //  \param pred    Predicate used to test the \em value
+        //  \param invert  Invert (negate) the selection logic
+        template<class UnaryPredicate>
+        static IndirectList<T> subset_if
+        (
+            const UList<T>& values,
+            const UnaryPredicate& pred,
+            const bool invert = false
+        );
+
+        //- Return an IndirectList with duplicate entries filtered out.
+        //  Preserves the original input order, unless sorted = true
+        //
+        //  \param values  The source list values
+        //  \param sorted  Retain sorted order instead of original order
+        static IndirectList<T> uniq
+        (
+            const UList<T>& values,
+            const bool sorted = false
+        );
+
+
     // Member Functions
 
         //- The list addressing
diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectListI.H b/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectListI.H
index 76b3415844..eae0ddb4b0 100644
--- a/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectListI.H
+++ b/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectListI.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -115,4 +115,111 @@ inline Foam::IndirectList<T>::IndirectList(const UIndirectList<T>& list)
 {}
 
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+template<class T>
+template<class UnaryCondition>
+Foam::IndirectList<T> Foam::IndirectList<T>::subset
+(
+    const UList<T>& values,
+    const UnaryCondition& select,
+    const bool invert
+)
+{
+    const label len = values.size();
+
+    IndirectList<T> result(values, Foam::zero{});
+    labelList& addr = result.addressing();
+
+    addr.resize_nocopy(len);
+
+    label count = 0;
+    for (label i=0; i < len; ++i)
+    {
+        // Test on position
+        if (select(i) ? !invert : invert)
+        {
+            addr[count] = i;
+            ++count;
+        }
+    }
+    addr.resize(count);
+
+    return result;
+}
+
+
+template<class T>
+template<class UnaryPredicate>
+Foam::IndirectList<T> Foam::IndirectList<T>::subset_if
+(
+    const UList<T>& values,
+    const UnaryPredicate& pred,
+    const bool invert
+)
+{
+    const label len = values.size();
+
+    IndirectList<T> result(values, Foam::zero{});
+    labelList& addr = result.addressing();
+
+    addr.resize_nocopy(len);
+
+    label count = 0;
+    for (label i=0; i < len; ++i)
+    {
+        // Test on value
+        if (pred(values[i]) ? !invert : invert)
+        {
+            addr[count] = i;
+            ++count;
+        }
+    }
+    addr.resize(count);
+
+    return result;
+}
+
+
+template<class T>
+Foam::IndirectList<T> Foam::IndirectList<T>::uniq
+(
+    const UList<T>& values,
+    const bool sorted
+)
+{
+    const label len = values.size();
+
+    IndirectList<T> result(values, Foam::zero{});
+    labelList& order = result.addressing();
+
+    // Start from sorted order
+    Foam::sortedOrder(values, order);
+
+    if (len > 1)
+    {
+        label count = 0;
+        for (label i = 1; i < len; ++i)
+        {
+            // Eliminate duplicates
+            if (values[order[count]] != values[order[i]])
+            {
+                ++count;
+                order[count] = order[i];
+            }
+        }
+        ++count;
+        order.resize(count);
+
+        // Recover the original input order
+        if (!sorted)
+        {
+            Foam::sort(order);
+        }
+    }
+
+    return result;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectList/UIndirectList.H b/src/OpenFOAM/containers/IndirectLists/IndirectList/UIndirectList.H
new file mode 100644
index 0000000000..33e286f573
--- /dev/null
+++ b/src/OpenFOAM/containers/IndirectLists/IndirectList/UIndirectList.H
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------*\
+Description
+    Compatibility include
+
+    UIndirectList.H combined into IndirectList.H (MAY-2022)
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_UIndirectList_H
+#define Foam_UIndirectList_H
+
+#include "IndirectList.H"
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListAddressing.H b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListAddressing.H
index b760a3d6fc..e7c14bd8f6 100644
--- a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListAddressing.H
+++ b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListAddressing.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,8 +33,10 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IndirectListAddressing_H
-#define IndirectListAddressing_H
+#ifndef Foam_IndirectListAddressing_H
+#define Foam_IndirectListAddressing_H
+
+#include <utility>   // std::move
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/IndirectLists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/IndirectLists/UIndirectList/UIndirectList.H
deleted file mode 100644
index 8fc20ac6fe..0000000000
--- a/src/OpenFOAM/containers/IndirectLists/UIndirectList/UIndirectList.H
+++ /dev/null
@@ -1,108 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::UIndirectList
-
-Description
-    A List with indirect addressing.
-
-    Like IndirectList but does not store addressing.
-
-    Note the const_cast of the list values. This is so we can use it both
-    on const and non-const lists. Alternative would be to have a const_
-    variant etc.
-
-SourceFiles
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef UIndirectList_H
-#define UIndirectList_H
-
-#include "List.H"
-#include "IndirectListBase.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward Declarations
-template<class T> class UIndirectList;
-
-// Common list types
-typedef UIndirectList<bool> boolUIndList;       //!< UIndirectList of bools
-typedef UIndirectList<label> labelUIndList;     //!< UIndirectList of labels
-
-/*---------------------------------------------------------------------------*\
-                        Class UIndirectList Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class T>
-class UIndirectList
-:
-    public IndirectListBase<T, labelUList>
-{
-public:
-
-    // Constructors
-
-        //- Shallow copy values and addressing
-        UIndirectList(const UList<T>& values, const labelUList& addr)
-        :
-            IndirectListBase<T, labelUList>(values, addr)
-        {}
-
-        //- Copy construct (shallow copy values and addressing)
-        UIndirectList(const UIndirectList<T>& list)
-        :
-            UIndirectList<T>(list.values(), list.addressing())
-        {}
-
-
-    // Member Operators
-
-        //- Use standard assignment operations
-        using IndirectListBase<T, labelUList>::operator=;
-
-        //- Deep copy values, Fatal if list sizes are not identical
-        void operator=(const UIndirectList<T>& rhs)
-        {
-            this->copyList(rhs);
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index a59e0957ed..1ac082a857 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -246,6 +246,7 @@ void inplaceUniqueSort
 //  \endcode
 //
 //  \return The subsetted list
+//  \see IndirectList::subset
 template<class BoolListType, class T>
 List<T> subset
 (
@@ -261,6 +262,7 @@ List<T> subset
 //  \param[in] invert set as true to invert the selection logic
 //
 //  \return The subsetted list
+//  \see IndirectList::subset
 template<class T>
 List<T> subset
 (
@@ -306,6 +308,9 @@ void inplaceSubset
 //  \param[in] input the list input values.
 //  \param[in] pred the selection predicate
 //  \param[in] invert set as true to invert the selection logic
+//
+//  \return The subsetted list
+//  \see IndirectList::subset_if
 template<class T, class UnaryPredicate>
 List<T> subsetList
 (
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellIndList.H b/src/OpenFOAM/meshes/meshShapes/cell/cellIndList.H
index bc584fc14a..29b86927b2 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellIndList.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellIndList.H
@@ -37,13 +37,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cellIndList_H
-#define cellIndList_H
+#ifndef Foam_cellIndList_H
+#define Foam_cellIndList_H
 
 // Include all normal list typedefs as well
 #include "cellList.H"
 #include "IndirectList.H"
-#include "UIndirectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H
index 9795386b7c..c42938f703 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H
@@ -29,7 +29,7 @@ License
 #include "Istream.H"
 #include "cell.H"
 #include "cellModel.H"
-#include "UIndirectList.H"
+#include "IndirectList.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeIndList.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeIndList.H
index 2d444e9b88..0ad10c3252 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeIndList.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeIndList.H
@@ -37,13 +37,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef edgeIndList_H
-#define edgeIndList_H
+#ifndef Foam_edgeIndList_H
+#define Foam_edgeIndList_H
 
 // Include all normal list typedefs as well
 #include "edgeList.H"
 #include "IndirectList.H"
-#include "UIndirectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceIndList.H b/src/OpenFOAM/meshes/meshShapes/face/faceIndList.H
index 9ae6cf579c..f885a58631 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceIndList.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceIndList.H
@@ -37,13 +37,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef faceIndList_H
-#define faceIndList_H
+#ifndef Foam_faceIndList_H
+#define Foam_faceIndList_H
 
 // Include all normal list typedefs as well
 #include "faceList.H"
 #include "IndirectList.H"
-#include "UIndirectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/primitiveShapes/point/pointIndList.H b/src/OpenFOAM/meshes/primitiveShapes/point/pointIndList.H
index 5a865aeb82..aa564e7f82 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/point/pointIndList.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/point/pointIndList.H
@@ -37,13 +37,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef pointIndList_H
-#define pointIndList_H
+#ifndef Foam_pointIndList_H
+#define Foam_pointIndList_H
 
 // Include all normal list typedefs as well
 #include "pointList.H"
 #include "IndirectList.H"
-#include "UIndirectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/Scalar/lists/scalarIndList.H b/src/OpenFOAM/primitives/Scalar/lists/scalarIndList.H
index f2243ffc75..5fa0b3c80c 100644
--- a/src/OpenFOAM/primitives/Scalar/lists/scalarIndList.H
+++ b/src/OpenFOAM/primitives/Scalar/lists/scalarIndList.H
@@ -37,13 +37,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef scalarIndList_H
-#define scalarIndList_H
+#ifndef Foam_scalarIndList_H
+#define Foam_scalarIndList_H
 
 // Include all normal list typedefs as well
 #include "scalarList.H"
 #include "IndirectList.H"
-#include "UIndirectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/Vector/lists/vectorIndList.H b/src/OpenFOAM/primitives/Vector/lists/vectorIndList.H
index 0d2e9d485d..16e24a46b1 100644
--- a/src/OpenFOAM/primitives/Vector/lists/vectorIndList.H
+++ b/src/OpenFOAM/primitives/Vector/lists/vectorIndList.H
@@ -37,13 +37,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef vectorIndList_H
-#define vectorIndList_H
+#ifndef Foam_vectorIndList_H
+#define Foam_vectorIndList_H
 
 // Include all normal list typedefs as well
 #include "vectorList.H"
 #include "IndirectList.H"
-#include "UIndirectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/ints/lists/labelIndList.H b/src/OpenFOAM/primitives/ints/lists/labelIndList.H
index 56ad93c856..da2bfb50a6 100644
--- a/src/OpenFOAM/primitives/ints/lists/labelIndList.H
+++ b/src/OpenFOAM/primitives/ints/lists/labelIndList.H
@@ -43,14 +43,13 @@ Description
 // Include all normal list typedefs as well
 #include "labelList.H"
 #include "IndirectList.H"
-#include "UIndirectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    // NB: labelUIndList is defined in UIndirectList itself
     typedef IndirectList<label>  labelIndList;
+    // labelUIndList is defined in UIndirectList itself
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/strings/lists/stringListOps.H b/src/OpenFOAM/primitives/strings/lists/stringListOps.H
index 18a769da2b..43d855d102 100644
--- a/src/OpenFOAM/primitives/strings/lists/stringListOps.H
+++ b/src/OpenFOAM/primitives/strings/lists/stringListOps.H
@@ -70,6 +70,7 @@ namespace Foam
     //  \endcode
     //
     //  \return List indices for matching strings
+    //  \see IndirectList::subset_if
     template<class UnaryMatchPredicate, class StringType>
     labelList findMatchingStrings
     (
@@ -161,6 +162,7 @@ namespace Foam
     //  \code
     //    subsetMatchingStrings<regExp, stringList>(myRegExp, list);
     //  \endcode
+    //  \see IndirectList::subset_if
     template<class UnaryMatchPredicate, class StringListType>
     StringListType subsetMatchingStrings
     (
@@ -326,8 +328,6 @@ namespace Foam
     }
 
 
-
-
 /*---------------------------------------------------------------------------*\
                       Namespace stringListOps Declaration
 \*---------------------------------------------------------------------------*/
diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.C b/src/finiteArea/faMatrices/faMatrix/faMatrix.C
index 2d646e7851..58e7f8cef6 100644
--- a/src/finiteArea/faMatrices/faMatrix/faMatrix.C
+++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.C
@@ -30,7 +30,7 @@ License
 #include "edgeFields.H"
 #include "calculatedFaPatchFields.H"
 #include "zeroGradientFaPatchFields.H"
-#include "UIndirectList.H"
+#include "IndirectList.H"
 #include "UniformList.H"
 #include "demandDrivenData.H"
 
diff --git a/src/finiteArea/faMesh/faMeshBoundaryHaloTemplates.C b/src/finiteArea/faMesh/faMeshBoundaryHaloTemplates.C
index 69f2214b04..fd167f2b6c 100644
--- a/src/finiteArea/faMesh/faMeshBoundaryHaloTemplates.C
+++ b/src/finiteArea/faMesh/faMeshBoundaryHaloTemplates.C
@@ -26,7 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "faMeshBoundaryHalo.H"
-#include "UIndirectList.H"
+#include "IndirectList.H"
 #include "Pstream.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
index c5a44b05a8..89d6ec1ee4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C
@@ -26,7 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "mappedFixedInternalValueFvPatchField.H"
-#include "UIndirectList.H"
+#include "IndirectList.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C
index edb3b3ce84..5b6a841728 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C
@@ -26,7 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "mappedFixedPushedInternalValueFvPatchField.H"
-#include "UIndirectList.H"
+#include "IndirectList.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 01463b85ee..b59076769a 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -31,7 +31,7 @@ License
 #include "calculatedFvPatchFields.H"
 #include "extrapolatedCalculatedFvPatchFields.H"
 #include "coupledFvPatchFields.H"
-#include "UIndirectList.H"
+#include "IndirectList.H"
 #include "UniformList.H"
 #include "demandDrivenData.H"
 
diff --git a/src/functionObjects/utilities/areaWrite/areaWrite.C b/src/functionObjects/utilities/areaWrite/areaWrite.C
index d0bc87ca40..d352615f70 100644
--- a/src/functionObjects/utilities/areaWrite/areaWrite.C
+++ b/src/functionObjects/utilities/areaWrite/areaWrite.C
@@ -34,7 +34,7 @@ License
 #include "HashOps.H"
 #include "ListOps.H"
 #include "Time.H"
-#include "UIndirectList.H"
+#include "IndirectList.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index e62a5145bb..34900be083 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -34,7 +34,7 @@ License
 #include "mapPolyMesh.H"
 #include "IOmanip.H"
 #include "IOobjectList.H"
-#include "UIndirectList.H"
+#include "IndirectList.H"
 #include "ListOps.H"
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index 98f115ec28..aaa102c9bb 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -35,7 +35,7 @@ License
 #include "HashOps.H"
 #include "ListOps.H"
 #include "Time.H"
-#include "UIndirectList.H"
+#include "IndirectList.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //