From a6b84927e4e4c2794ad32eee60de5ef485c93fb3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 25 Jul 2018 10:29:20 +0200
Subject: [PATCH] STYLE: use sortedToc() instead of toc() followed by sort()

---
 .../decomposePar/faMeshDecomposition.C        |  3 +-
 .../PrimitivePatch/PrimitivePatchBdryPoints.C |  3 +-
 .../distribution/distribution.C               | 28 +++++--------------
 .../polyMeshZipUpCells/polyMeshZipUpCells.C   |  5 +---
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
index 752c61bf49..a1296bd86e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
@@ -1049,8 +1049,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
         }
 
         // Grab the result from the hash list
-        globallySharedPoints_ = gSharedPoints.toc();
-        sort(globallySharedPoints_);
+        globallySharedPoints_ = gSharedPoints.sortedToc();
     }
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
index fc3cdce902..96516bfa09 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchBdryPoints.C
@@ -65,8 +65,7 @@ calcBdryPoints() const
         bp.insert(curEdge.end());
     }
 
-    boundaryPointsPtr_ = new labelList(bp.toc());
-    sort(*boundaryPointsPtr_);
+    boundaryPointsPtr_ = new labelList(bp.sortedToc());
 
     if (debug)
     {
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
index 2091a519ad..02fe7a5175 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
@@ -247,22 +247,14 @@ void Foam::distribution::add(const label valueToAdd)
 
 void Foam::distribution::insertMissingKeys()
 {
-    iterator iter(this->begin());
+    List<label> keys = sortedToc();
 
-    List<label> keys = toc();
-
-    sort(keys);
-
-    if (keys.size())
+    if (keys.size() > 2)
     {
-        for (label k = keys[0]; k < keys.last(); k++)
+        for (label k = keys[1]; k < keys.last(); k++)
         {
-            iter = find(k);
-
-            if (iter == this->end())
-            {
-                this->insert(k,0);
-            }
+            // Insert 0, if the entry does not already exist
+            this->insert(k,0);
         }
     }
 }
@@ -274,10 +266,7 @@ Foam::List<Foam::Pair<Foam::scalar>> Foam::distribution::normalised()
 
     insertMissingKeys();
 
-    List<label> keys = toc();
-
-    sort(keys);
-
+    List<label> keys = sortedToc();
     List<Pair<scalar>> normDist(size());
 
     forAll(keys,k)
@@ -420,10 +409,7 @@ Foam::List<Foam::Pair<Foam::scalar>> Foam::distribution::raw()
 {
     insertMissingKeys();
 
-    List<label> keys = toc();
-
-    sort(keys);
-
+    List<label> keys = sortedToc();
     List<Pair<scalar>> rawDist(size());
 
     forAll(keys,k)
diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
index 838835f30f..63a2ef7b22 100644
--- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
+++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
@@ -720,12 +720,9 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
         if (problemCells.size())
         {
             // This cycle has failed.  Print out the problem cells
-            labelList toc(problemCells.toc());
-            sort(toc);
-
             FatalErrorInFunction
                 << "Found " << problemCells.size() << " problem cells." << nl
-                << "Cells: " << toc
+                << "Cells: " << problemCells.sortedToc()
                 << abort(FatalError);
         }