From 1d86fc4f6bd38808f52b06b003b7336c74f70bd9 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 Jul 2019 11:08:40 +0200
Subject: [PATCH] ENH: add single-parameter sortedOrder() function

---
 applications/test/sort/Test-sortList.C        |  6 ++--
 .../DelaunayMesh/DelaunayMeshIO.C             |  6 ++--
 .../conformalVoronoiMeshCalcDualMesh.C        | 15 +++-----
 .../manipulation/renumberMesh/renumberMesh.C  | 12 +++----
 .../containers/Lists/ListOps/ListOps.H        | 12 +++++++
 .../Lists/ListOps/ListOpsTemplates.C          | 36 +++++++++++++++++++
 .../PtrLists/PtrListOps/PtrListOps.H          |  4 +++
 .../PtrLists/PtrListOps/PtrListOpsTemplates.C | 18 ++++++++--
 .../procFacesGAMGProcAgglomeration.C          |  3 +-
 .../meshes/lduMesh/lduPrimitiveMesh.C         |  9 ++---
 src/OpenFOAM/meshes/meshTools/mergePoints.C   |  5 ++-
 src/conversion/starcd/STARCDMeshReader.C      |  8 +++--
 src/dynamicMesh/polyMeshAdder/polyMeshAdder.C |  4 +--
 .../polyTopoChange/edgeCollapser.C            |  6 ++--
 .../polyTopoChange/polyTopoChange.C           | 19 ++--------
 .../isoAdvection/isoCutCell/isoCutCell.C      |  8 ++---
 .../isoAdvection/isoCutFace/isoCutFace.C      |  5 ++-
 .../field/externalCoupled/externalCoupled.C   |  3 +-
 .../PatchPostProcessing/PatchPostProcessing.C |  5 ++-
 .../PairCollision/PairCollision.C             | 11 +++---
 .../InjectedParticleInjection.C               |  4 +--
 .../meshRefinement/meshRefinement.C           |  3 +-
 .../meshRefinement/meshRefinementTemplates.C  |  6 ++--
 .../snappyHexMeshDriver/snappyRefineDriver.C  |  3 +-
 .../snappySnapDriverFeature.C                 |  5 ++-
 src/meshTools/sets/topoSets/cellZoneSet.C     |  3 +-
 src/meshTools/sets/topoSets/faceZoneSet.C     |  5 ++-
 src/meshTools/sets/topoSets/pointZoneSet.C    |  5 ++-
 .../springRenumber/springRenumber.C           |  5 ++-
 .../MeshedSurface/MeshedSurfaceZones.C        |  5 ++-
 .../surfaceFormats/stl/STLsurfaceFormat.C     |  5 ++-
 .../surfaceFormats/tri/TRIsurfaceFormat.C     |  5 ++-
 src/surfMesh/triSurface/triSurface.C          |  2 +-
 33 files changed, 134 insertions(+), 117 deletions(-)

diff --git a/applications/test/sort/Test-sortList.C b/applications/test/sort/Test-sortList.C
index 4cadeeb65c..0c65daccc4 100644
--- a/applications/test/sort/Test-sortList.C
+++ b/applications/test/sort/Test-sortList.C
@@ -58,10 +58,12 @@ int main(int argc, char *argv[])
     SortableList<label> list1r(list1.size());
     list1r = list1;
 
-    Info<< "unsorted: " << orig << endl;
+    Info<< "unsorted: " << orig << nl
+        << "order:    " << sortedOrder(list1) << endl;
     sort(list1);
     Info<< "sorted:   " << list1 << nl
-        << "indices:  " << order << endl;
+        << "indices:  " << order << nl
+        << "order:    " << sortedOrder(list1) << endl;
 
     list1r.reverseSort();
     Info<< "reverse ..." << nl;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index f1c184e500..602eaedcbf 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           |
+    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2012-2017 OpenFOAM Foundation
@@ -67,9 +67,7 @@ void Foam::DelaunayMesh<Triangulation>::sortFaces
         << "Sorting faces, owner and neighbour into upper triangular order"
         << endl;
 
-    labelList oldToNew;
-
-    sortedOrder(ownerNeighbourPair, oldToNew);
+    labelList oldToNew(sortedOrder(ownerNeighbourPair));
 
     oldToNew = invert(oldToNew.size(), oldToNew);
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 92b5fe28fa..98ec82ab8e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2018-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2012-2016 OpenFOAM Foundation
@@ -1322,8 +1322,7 @@ void Foam::conformalVoronoiMesh::indexDualVertices
 
                 // Sort the vertices so that they will be in the same order on
                 // each processor
-                labelList oldToNew;
-                sortedOrder(cellVerticesPair, oldToNew);
+                labelList oldToNew(sortedOrder(cellVerticesPair));
                 oldToNew = invert(oldToNew.size(), oldToNew);
                 inplaceReorder(oldToNew, cellVertices);
 
@@ -2406,10 +2405,7 @@ void Foam::conformalVoronoiMesh::sortFaces
         << "Sorting faces, owner and neighbour into upper triangular order"
         << endl;
 
-    labelList oldToNew;
-
-    sortedOrder(ownerNeighbourPair, oldToNew);
-
+    labelList oldToNew(sortedOrder(ownerNeighbourPair));
     oldToNew = invert(oldToNew.size(), oldToNew);
 
     inplaceReorder(oldToNew, faces);
@@ -2459,10 +2455,7 @@ void Foam::conformalVoronoiMesh::sortProcPatches
                     << exit(FatalError) << endl;
             }
 
-            labelList oldToNew;
-
-            sortedOrder(sortingIndices, oldToNew);
-
+            labelList oldToNew(sortedOrder(sortingIndices));
             oldToNew = invert(oldToNew.size(), oldToNew);
 
             inplaceReorder(oldToNew, sortingIndices);
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 9f66e9c619..0c354c88d1 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -226,12 +226,10 @@ labelList getFaceOrder
             }
         }
 
-        order.setSize(nbr.size());
         sortedOrder(nbr, order);
 
-        forAll(order, i)
+        for (const label index : order)
         {
-            label index = order[i];
             if (nbr[index] != -1)
             {
                 oldToNewFace[cFaces[index]] = newFacei++;
@@ -495,8 +493,7 @@ autoPtr<mapPolyMesh> reorderMesh
                     newFlipMap[i] = fZone.flipMap()[i];
                 }
             }
-            labelList newToOld;
-            sortedOrder(newAddressing, newToOld);
+            labelList newToOld(sortedOrder(newAddressing));
             fZone.resetAddressing
             (
                 labelUIndList(newAddressing, newToOld)(),
@@ -1010,8 +1007,7 @@ int main(int argc, char *argv[])
             bndCellMap.setSize(nBndCells);
 
             // Sort
-            labelList order;
-            sortedOrder(bndCellMap, order);
+            labelList order(sortedOrder(bndCellMap));
 
             // Redo newReverseCellOrder
             labelList newReverseCellOrder(mesh.nCells(), -1);
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index 4e257aee0b..b9ae69505a 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -177,6 +177,10 @@ template<class Container>
 label inplaceMapValue(const Map<label>& mapper, Container& input);
 
 
+//- Return the (stable) sort order for the list
+template<class T>
+labelList sortedOrder(const UList<T>& input);
+
 //- Generate the (stable) sort order for the list
 template<class T>
 void sortedOrder(const UList<T>& input, labelList& order);
@@ -191,6 +195,10 @@ void sortedOrder
 );
 
 
+//- Return (sorted) indices corresponding to duplicate list values
+template<class T>
+labelList duplicateOrder(const UList<T>& input);
+
 //- Generate (sorted) indices corresponding to duplicate list values
 template<class T>
 void duplicateOrder(const UList<T>& input, labelList& order);
@@ -206,6 +214,10 @@ void duplicateOrder
 );
 
 
+//- Return (sorted) indices corresponding to unique list values
+template<class T>
+labelList uniqueOrder(const UList<T>& input);
+
 //- Generate (sorted) indices corresponding to unique list values
 template<class T>
 void uniqueOrder(const UList<T>& input, labelList& order);
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 1d5c095dd6..d905505f5b 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -320,6 +320,18 @@ Foam::label Foam::inplaceMapValue
 }
 
 
+template<class T>
+Foam::labelList Foam::sortedOrder
+(
+    const UList<T>& input
+)
+{
+    labelList order(input.size());
+    sortedOrder(input, order, typename UList<T>::less(input));
+    return order;
+}
+
+
 template<class T>
 void Foam::sortedOrder
 (
@@ -355,6 +367,18 @@ void Foam::sortedOrder
 }
 
 
+template<class T>
+Foam::labelList Foam::duplicateOrder
+(
+    const UList<T>& input
+)
+{
+    labelList order(input.size());
+    duplicateOrder(input, order, typename UList<T>::less(input));
+    return order;
+}
+
+
 template<class T>
 void Foam::duplicateOrder
 (
@@ -396,6 +420,18 @@ void Foam::duplicateOrder
 }
 
 
+template<class T>
+Foam::labelList Foam::uniqueOrder
+(
+    const UList<T>& input
+)
+{
+    labelList order(input.size());
+    uniqueOrder(input, order, typename UList<T>::less(input));
+    return order;
+}
+
+
 template<class T>
 void Foam::uniqueOrder
 (
diff --git a/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOps.H b/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOps.H
index a7324a9a94..c8f00d8098 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOps.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOps.H
@@ -49,6 +49,10 @@ SourceFiles
 namespace Foam
 {
 
+//- Return (stable) sort order for the list
+template<class T>
+labelList sortedOrder(const UPtrList<T>& input);
+
 //- Generate (stable) sort order for the list
 template<class T>
 void sortedOrder(const UPtrList<T>& input, labelList& order);
diff --git a/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOpsTemplates.C b/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOpsTemplates.C
index 86a129e87b..8703fed7ab 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOpsTemplates.C
+++ b/src/OpenFOAM/containers/PtrLists/PtrListOps/PtrListOpsTemplates.C
@@ -27,6 +27,18 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
+template<class T>
+Foam::labelList Foam::sortedOrder
+(
+    const UPtrList<T>& input
+)
+{
+    labelList order(input.size());
+    sortedOrder(input, order, typename PtrListOps::less<T>(input));
+    return order;
+}
+
+
 template<class T>
 void Foam::sortedOrder
 (
@@ -65,7 +77,7 @@ void Foam::sortedOrder
 template<class T>
 void Foam::sort(UPtrList<T>& list)
 {
-    labelList order;
+    labelList order(input.size());
     sortedOrder(list, order);
     list.sortOrder(order, false);  // false = allow nullptr
 }
@@ -74,7 +86,7 @@ void Foam::sort(UPtrList<T>& list)
 template<class T, class Compare>
 void Foam::sort(UPtrList<T>& list, const Compare& comp)
 {
-    labelList order;
+    labelList order(input.size());
     sortedOrder(list, order, comp);
     list.sortOrder(order, false);  // false = allow nullptr
 }
@@ -83,7 +95,7 @@ void Foam::sort(UPtrList<T>& list, const Compare& comp)
 template<class T>
 void Foam::shuffle(UPtrList<T>& list)
 {
-    labelList order = identity(list.size());
+    labelList order(identity(list.size()));
     Foam::shuffle(order);
     list.sortOrder(order, false);  // false = allow nullptr
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
index 28365b6a00..2540a1b88f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -190,8 +190,7 @@ Foam::procFacesGAMGProcAgglomeration::processorAgglomeration
         }
 
         // Sort according to master and redo restriction
-        labelList newToOld;
-        sortedOrder(coarseToMaster, newToOld);
+        labelList newToOld(sortedOrder(coarseToMaster));
         labelList oldToNew(invert(newToOld.size(), newToOld));
 
         fineToCoarse = labelUIndList(oldToNew, fineToCoarse)();
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
index ae8f658979..0676dcf6a4 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
@@ -182,16 +182,14 @@ Foam::labelList Foam::lduPrimitiveMesh::upperTriOrder
         label nNbr = offsets[celli+1] - startOfCell;
 
         nbr.setSize(nNbr);
-        order.setSize(nNbr);
-        forAll(order, i)
+        forAll(nbr, i)
         {
             nbr[i] = upper[cellToFaces[offsets[celli]+i]];
         }
         sortedOrder(nbr, order);
 
-        forAll(order, i)
+        for (const label index : order)
         {
-            label index = order[i];
             oldToNew[cellToFaces[startOfCell + index]] = newFacei++;
         }
     }
@@ -807,8 +805,7 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
             );
         }
 
-        labelList order;
-        sortedOrder(procPairs, order);
+        labelList order(sortedOrder(procPairs));
 
         // Count
         label n = 0;
diff --git a/src/OpenFOAM/meshes/meshTools/mergePoints.C b/src/OpenFOAM/meshes/meshTools/mergePoints.C
index 845e5f0df5..3f7ecf8711 100644
--- a/src/OpenFOAM/meshes/meshTools/mergePoints.C
+++ b/src/OpenFOAM/meshes/meshTools/mergePoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2017-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -84,8 +84,7 @@ Foam::label Foam::mergePoints
     {
         magSqrDist[pointi] = magSqr(points[pointi] - compareOrigin);
     }
-    labelList order;
-    Foam::sortedOrder(magSqrDist, order);
+    labelList order(Foam::sortedOrder(magSqrDist));
 
 
     Field<scalar> sortedTol(nPoints);
diff --git a/src/conversion/starcd/STARCDMeshReader.C b/src/conversion/starcd/STARCDMeshReader.C
index 05bb9ea186..8b5558f5ab 100644
--- a/src/conversion/starcd/STARCDMeshReader.C
+++ b/src/conversion/starcd/STARCDMeshReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -771,8 +771,10 @@ void Foam::fileFormats::STARCDMeshReader::readBoundary
     // Sort according to ascending region numbers, but leave
     // "Default_Boundary_Region" as the final patch
     {
-        labelList sortedIndices;
-        sortedOrder(SubList<label>(origRegion, nPatches-1), sortedIndices);
+        labelList sortedIndices
+        (
+            sortedOrder(SubList<label>(origRegion, nPatches-1))
+        );
 
         labelList oldToNew = identity(nPatches);
         forAll(sortedIndices, i)
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index 0696ad7355..44e8b0b8f3 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -1183,8 +1183,8 @@ void Foam::polyMeshAdder::mergeFaceZones
         fzFaces[i].shrink();
         fzFlips[i].shrink();
 
-        labelList order;
-        sortedOrder(fzFaces[i], order);
+        labelList order(sortedOrder(fzFaces[i]));
+
         fzFaces[i] = labelUIndList(fzFaces[i], order)();
         fzFlips[i] = boolUIndList(fzFlips[i], order)();
     }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index 4c0e36c3be..d08499b6b8 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           |
+    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -583,9 +583,7 @@ Foam::edgeCollapser::collapseType Foam::edgeCollapser::collapseFace
     // Sort the projected distances and the corresponding vertex
     // indices along the collapse axis
 
-    labelList oldToNew;
-
-    sortedOrder(d, oldToNew);
+    labelList oldToNew(sortedOrder(d));
 
     oldToNew = invert(oldToNew.size(), oldToNew);
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 3ff3d64757..007343334e 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015-2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2015-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -725,7 +725,6 @@ void Foam::polyTopoChange::getFaceOrder
         label nFaces = cellFaceOffsets[celli+1] - startOfCell;
 
         // Neighbouring cells
-        //SortableList<label> nbr(nFaces);
         nbr.setSize(nFaces);
 
         for (label i = 0; i < nFaces; i++)
@@ -765,21 +764,10 @@ void Foam::polyTopoChange::getFaceOrder
             }
         }
 
-        //nbr.sort();
-        order.setSize(nFaces);
         sortedOrder(nbr, order);
 
-        //forAll(nbr, i)
-        //{
-        //    if (nbr[i] != -1)
-        //    {
-        //        oldToNew[cellFaces[startOfCell + nbr.indices()[i]]] =
-        //            newFacei++;
-        //    }
-        //}
-        forAll(order, i)
+        for (const label index : order)
         {
-            label index = order[i];
             if (nbr[index] != -1)
             {
                 oldToNew[cellFaces[startOfCell + index]] = newFacei++;
@@ -1672,8 +1660,7 @@ void Foam::polyTopoChange::resetZones
         // Sort the addressing
         forAll(addressing, zonei)
         {
-            labelList newToOld;
-            sortedOrder(addressing[zonei], newToOld);
+            labelList newToOld(sortedOrder(addressing[zonei]));
             {
                 labelList newAddressing(addressing[zonei].size());
                 forAll(newAddressing, i)
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.C b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.C
index a17779efc0..afee5c62b6 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.C
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                 isoAdvector | Copyright (C) 2016-2017 DHI
@@ -299,8 +299,7 @@ void Foam::isoCutCell::calcIsoFacePointsFromEdges()
     DebugPout<< "Calculated isoFace point angles" << endl;
 
     // Sorting isoface points by angle and inserting into isoFacePoints_
-    labelList order(unsortedIsoFacePointAngles.size());
-    Foam::sortedOrder(unsortedIsoFacePointAngles, order);
+    labelList order(sortedOrder(unsortedIsoFacePointAngles));
     isoFacePoints_.append(unsortedIsoFacePoints[order[0]]);
     for (label pi = 1; pi < order.size(); pi++)
     {
@@ -508,8 +507,7 @@ Foam::label Foam::isoCutCell::vofCutCell
     {
         fvert[pi] = f_[pLabels[pi]];
     }
-    labelList order(fvert.size());
-    sortedOrder(fvert, order);
+    labelList order(sortedOrder(fvert));
     scalar f1 = fvert[order.first()];
     scalar f2 = fvert[order.last()];
 
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.C b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.C
index f685f4a200..bb84e18daa 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.C
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                 isoAdvector | Copyright (C) 2016-2017 DHI
@@ -496,8 +496,7 @@ Foam::scalar Foam::isoCutFace::timeIntegratedArea
     scalar tIntArea = 0.0;
 
     // Finding ordering of vertex points
-    labelList order(pTimes.size());
-    sortedOrder(pTimes, order);
+    labelList order(sortedOrder(pTimes));
     const scalar firstTime = pTimes[order.first()];
     const scalar lastTime = pTimes[order.last()];
 
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C
index 19f6956efb..4ebc1644a3 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@@ -388,8 +388,7 @@ void Foam::functionObjects::externalCoupled::checkOrder
     const wordList& regionNames
 )
 {
-    labelList order;
-    sortedOrder(regionNames, order);
+    labelList order(sortedOrder(regionNames));
     if (order != identity(regionNames.size()))
     {
         FatalErrorInFunction
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
index 2d6d49da72..74cfcf9e65 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           |
+    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -97,8 +97,7 @@ void Foam::PatchPostProcessing<CloudType>::write()
                 accessOp<List<scalar>>()
             );
 
-            labelList indices;
-            sortedOrder(globalTimes, indices);
+            labelList indices(sortedOrder(globalTimes));
 
             string header("# Time currentProc " + parcelType::propertyList_);
             patchOutFile<< header.c_str() << nl;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 0294677f62..1653dd0fbe 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -375,14 +375,13 @@ void Foam::PairCollision<CloudType>::wallInteraction()
             // ascending distance to their nearest point so that
             // grouping occurs around the closest in any group
 
-            labelList sortedOtherSiteIndices;
+            labelList sortedOtherSiteIndices
+            (
+                sortedOrder(otherSiteDistances)
+            );
 
-            sortedOrder(otherSiteDistances, sortedOtherSiteIndices);
-
-            forAll(sortedOtherSiteIndices, siteI)
+            for (const label orderedIndex : sortedOtherSiteIndices)
             {
-                label orderedIndex = sortedOtherSiteIndices[siteI];
-
                 const point& otherPt = otherSitePoints[orderedIndex];
 
                 if
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C
index 58a4a28b68..42fb49670d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C
@@ -110,8 +110,8 @@ void Foam::InjectedParticleInjection<CloudType>::initialise()
     }
 
     // Sort and renumber to ensure lists in ascending time
-    labelList sortedIndices;
-    Foam::sortedOrder(time, sortedIndices);
+    labelList sortedIndices(Foam::sortedOrder(time));
+
     time_ = UIndirectList<scalar>(time, sortedIndices);
     position_ = UIndirectList<point>(position, sortedIndices);
     diameter_ = UIndirectList<scalar>(diameter, sortedIndices);
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 1f1839bac4..53091dc186 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -2639,8 +2639,7 @@ Foam::label Foam::meshRefinement::findRegions
                     );
 
                     // Sort according to curveDist
-                    labelList indexSet;
-                    Foam::sortedOrder(allDist, indexSet);
+                    labelList indexSet(Foam::sortedOrder(allDist));
 
                     allLeakPaths.set
                     (
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
index 6d42f9191b..f0e7cd1da6 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -186,11 +186,9 @@ void Foam::meshRefinement::collectAndPrint
 
     scalarField magAllPoints(mag(allPoints-point(-0.317, 0.117, 0.501)));
 
-    labelList visitOrder;
-    sortedOrder(magAllPoints, visitOrder);
-    forAll(visitOrder, i)
+    labelList visitOrder(sortedOrder(magAllPoints));
+    for (const label allPointi : visitOrder)
     {
-        label allPointi = visitOrder[i];
         Info<< allPoints[allPointi] << " : " << allData[allPointi]
             << endl;
     }
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
index 27350487a3..6b632bd333 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@@ -2138,8 +2138,7 @@ Foam::label Foam::snappyRefineDriver::directionalSmooth
             }
 
             // Sort the normalized position
-            labelList order;
-            sortedOrder(normalizedPosition, order);
+            labelList order(sortedOrder(normalizedPosition));
 
             DynamicList<scalar> seedPointDist;
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index dda92341d8..25fd064cd2 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2015 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2015-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2015 OpenFOAM Foundation
@@ -724,8 +724,7 @@ void Foam::snappySnapDriver::correctAttraction
     // Tangential component along edge
     scalar tang = ((pt-edgePt)&edgeNormal);
 
-    labelList order;
-    Foam::sortedOrder(surfaceCounts, order);
+    labelList order(sortedOrder(surfaceCounts));
 
     if (order[0] < order[1])
     {
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.C b/src/meshTools/sets/topoSets/cellZoneSet.C
index 6ab0bf9311..14721840f5 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.C
+++ b/src/meshTools/sets/topoSets/cellZoneSet.C
@@ -45,8 +45,7 @@ namespace Foam
 
 void Foam::cellZoneSet::updateSet()
 {
-    labelList order;
-    sortedOrder(addressing_, order);
+    labelList order(sortedOrder(addressing_));
     inplaceReorder(order, addressing_);
 
     cellSet::clearStorage();
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.C b/src/meshTools/sets/topoSets/faceZoneSet.C
index 0106064b13..5a1204dea9 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.C
+++ b/src/meshTools/sets/topoSets/faceZoneSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2018-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -49,8 +49,7 @@ namespace Foam
 
 void Foam::faceZoneSet::updateSet()
 {
-    labelList order;
-    sortedOrder(addressing_, order);
+    labelList order(sortedOrder(addressing_));
     addressing_ = labelUIndList(addressing_, order)();
     flipMap_ = boolUIndList(flipMap_, order)();
 
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.C b/src/meshTools/sets/topoSets/pointZoneSet.C
index 7d0cc6a4d8..c29f627f31 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.C
+++ b/src/meshTools/sets/topoSets/pointZoneSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2018-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -46,8 +46,7 @@ namespace Foam
 
 void Foam::pointZoneSet::updateSet()
 {
-    labelList order;
-    sortedOrder(addressing_, order);
+    labelList order(sortedOrder(addressing_));
     inplaceReorder(order, addressing_);
 
     pointSet::clearStorage();
diff --git a/src/renumber/renumberMethods/springRenumber/springRenumber.C b/src/renumber/renumberMethods/springRenumber/springRenumber.C
index e2184e2d55..25ad16586b 100644
--- a/src/renumber/renumberMethods/springRenumber/springRenumber.C
+++ b/src/renumber/renumberMethods/springRenumber/springRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           |
+    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -161,8 +161,7 @@ Foam::labelList Foam::springRenumber::renumber
     //writeOBJ("endPosition.obj", cellCells, position);
 
     // Move cells to new position
-    labelList shuffle;
-    sortedOrder(position, shuffle);
+    labelList shuffle(sortedOrder(position));
 
     // Reorder oldToNew
     inplaceReorder(shuffle, oldToNew);
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
index 5cd8483abc..ad9a04b383 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -85,8 +85,7 @@ void Foam::MeshedSurface<Face>::sortFacesAndStore
 
     // Determine the sorted order:
     // use sortedOrder directly since we discard the intermediate list anyhow
-    List<label> faceMap;
-    sortedOrder(zones, faceMap);
+    labelList faceMap(sortedOrder(zones));
     zones.clear();
 
     // Sorted faces
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
index fc1217cbee..1e678a6870 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -164,8 +164,7 @@ bool Foam::fileFormats::STLsurfaceFormat<Face>::read
     {
         // Determine the sorted order:
         // use sortedOrder directly (the intermediate list is discarded anyhow)
-        labelList faceMap;
-        sortedOrder(zoneIds, faceMap);
+        labelList faceMap(sortedOrder(zoneIds));
 
         // Generate sorted faces
         forAll(faceMap, facei)
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
index 38c8b0b081..62a3b65656 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -124,8 +124,7 @@ bool Foam::fileFormats::TRIsurfaceFormat<Face>::read
     {
         // Determine the sorted order:
         // use sortedOrder directly (the intermediate list is discared anyhow)
-        labelList faceMap;
-        sortedOrder(zoneIds, faceMap);
+        labelList faceMap(sortedOrder(zoneIds));
 
         // Generate sorted faces
         forAll(faceMap, facei)
diff --git a/src/surfMesh/triSurface/triSurface.C b/src/surfMesh/triSurface/triSurface.C
index 79baa0f1fd..4bd2424f72 100644
--- a/src/surfMesh/triSurface/triSurface.C
+++ b/src/surfMesh/triSurface/triSurface.C
@@ -304,7 +304,7 @@ Foam::triSurface::calcPatches(labelList& faceMap) const
     // Determine the sorted order:
     // use sortedOrder directly (the intermediate list is discarded anyhow)
 
-    List<label> regions(size());
+    labelList regions(size());
     forAll(regions, facei)
     {
         regions[facei] = operator[](facei).region();