From faacebb1f296f0f67245d4e0cb8d354a8da2dfd0 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 20 Feb 2012 13:07:21 +0000
Subject: [PATCH] ENH: renumberMesh: changed api of renumber library.

Changed API. Made bandCompression proper CutHillMcKey. Better stats.
---
 .../manipulation/renumberMesh/renumberMesh.C  | 134 ++++++++++++++----
 .../renumberMesh/renumberMeshDict             |   2 +-
 .../meshes/bandCompression/bandCompression.C  | 121 +++++++++++-----
 .../meshes/bandCompression/bandCompression.H  |   5 +-
 .../polyTopoChange/polyTopoChange.C           | 120 +++++++++++-----
 .../decompositionMethod/decompositionMethod.C |   4 +-
 .../CuthillMcKeeRenumber.C                    |   6 +-
 .../CuthillMcKeeRenumber.H                    |  15 +-
 .../boundaryFirstRenumber.C                   |   4 +-
 .../boundaryFirstRenumber.H                   |  15 +-
 .../manualRenumber/manualRenumber.C           |  28 ++--
 .../manualRenumber/manualRenumber.H           |  17 ++-
 .../randomRenumber/randomRenumber.C           |  12 +-
 .../randomRenumber/randomRenumber.H           |  15 +-
 .../renumberMethod/renumberMethod.H           |  18 ++-
 .../springRenumber/springRenumber.C           |   4 +-
 .../springRenumber/springRenumber.H           |  14 +-
 17 files changed, 364 insertions(+), 170 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 02e5a06567..487fde704a 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anispulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,6 +105,44 @@ label getBand(const labelList& owner, const labelList& neighbour)
 }
 
 
+// Calculate band of matrix
+void getBand
+(
+    const label nCells,
+    const labelList& owner,
+    const labelList& neighbour,
+    label& bandwidth,
+    scalar& profile,            // scalar to avoid overflow
+    scalar& sumSqrIntersect     // scalar to avoid overflow
+)
+{
+    labelList cellBandwidth(nCells, 0);
+    scalarField nIntersect(nCells, 0.0);
+
+    forAll(neighbour, faceI)
+    {
+        label own = owner[faceI];
+        label nei = neighbour[faceI];
+
+        // Note: mag not necessary for correct (upper-triangular) ordering.
+        label diff = nei-own;
+        cellBandwidth[nei] = max(cellBandwidth[nei], diff);
+    }
+
+    forAll(nIntersect, cellI)
+    {
+        for (label rowI = cellI-cellBandwidth[cellI]; rowI < cellI; rowI++)
+        {
+            nIntersect[rowI]++;
+        }
+    }
+
+    bandwidth = max(cellBandwidth);
+    profile = sum(cellBandwidth);
+    sumSqrIntersect = sum(Foam::sqr(nIntersect));
+}
+
+
 // Determine upper-triangular face order
 labelList getFaceOrder
 (
@@ -488,21 +526,12 @@ labelList regionRenumber
 
         const fvMesh& subMesh = subsetter.subMesh();
 
-        labelList subReverseCellOrder = method.renumber
+        labelList subCellOrder = method.renumber
         (
             subMesh,
             subMesh.cellCentres()
         );
 
-        labelList subCellOrder
-        (
-            invert
-            (
-                subMesh.nCells(),
-                subReverseCellOrder
-            )
-        );
-
         // Restore state
         UPstream::parRun() = oldParRun;
 
@@ -556,13 +585,46 @@ int main(int argc, char *argv[])
 
     const bool overwrite = args.optionFound("overwrite");
 
-    label band = getBand(mesh.faceOwner(), mesh.faceNeighbour());
+    label band;
+    scalar profile;
+    scalar sumSqrIntersect;
+    getBand
+    (
+        mesh.nCells(),
+        mesh.faceOwner(),
+        mesh.faceNeighbour(),
+        band,
+        profile,
+        sumSqrIntersect
+    );
 
-    Info<< "Mesh size: " << returnReduce(mesh.nCells(), sumOp<label>()) << nl
-        << "Band before renumbering: "
-        << returnReduce(band, maxOp<label>()) << nl << endl;
+    if (band != getBand(mesh.faceOwner(), mesh.faceNeighbour()))
+    {
+        FatalErrorIn(args.executable())
+            << "band:" << band
+            << abort(FatalError);
+    }
 
 
+    reduce(band, maxOp<label>());
+    reduce(profile, sumOp<scalar>());
+    scalar rmsFrontwidth = Foam::sqrt
+    (
+        returnReduce
+        (
+            sumSqrIntersect,
+            sumOp<scalar>()
+        )
+      / mesh.globalData().nTotalCells()
+    );
+
+    Info<< "Mesh size: " << mesh.globalData().nTotalCells() << nl
+        << "Before renumbering :" << nl
+        << "    band           : " << band << nl
+        << "    profile        : " << profile << nl
+        << "    rms frontwidth : " << rmsFrontwidth << nl
+        << endl;
+
     bool sortCoupledFaceCells = false;
     bool writeMaps = false;
     bool orderPoints = false;
@@ -803,14 +865,13 @@ int main(int argc, char *argv[])
     }
     else
     {
-        // Detemines old to new cell ordering
-        labelList reverseCellOrder = renumberPtr().renumber
+        // Detemines sorted back to original cell ordering
+        cellOrder = renumberPtr().renumber
         (
             mesh,
             mesh.cellCentres()
         );
-
-        cellOrder = invert(mesh.nCells(), reverseCellOrder);
+        labelList reverseCellOrder = invert(mesh.nCells(), cellOrder);
 
 
         if (sortCoupledFaceCells)
@@ -969,11 +1030,36 @@ int main(int argc, char *argv[])
     }
 
 
-    band = getBand(mesh.faceOwner(), mesh.faceNeighbour());
-
-    Info<< "Band after renumbering: "
-        << returnReduce(band, maxOp<label>()) << nl << endl;
-
+    {
+        label band;
+        scalar profile;
+        scalar sumSqrIntersect;
+        getBand
+        (
+            mesh.nCells(),
+            mesh.faceOwner(),
+            mesh.faceNeighbour(),
+            band,
+            profile,
+            sumSqrIntersect
+        );
+        reduce(band, maxOp<label>());
+        reduce(profile, sumOp<scalar>());
+        scalar rmsFrontwidth = Foam::sqrt
+        (
+            returnReduce
+            (
+                sumSqrIntersect,
+                sumOp<scalar>()
+            )
+          / mesh.globalData().nTotalCells()
+        );
+        Info<< "After renumbering :" << nl
+            << "    band           : " << band << nl
+            << "    profile        : " << profile << nl
+            << "    rms frontwidth : " << rmsFrontwidth << nl
+            << endl;
+    }
 
     if (orderPoints)
     {
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
index 988379720b..bc7084616d 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
@@ -50,7 +50,7 @@ method          CuthillMcKee;
 
 manualCoeffs
 {
-    // In system directory: old to new labelIOList
+    // In system directory: new-to-original (i.e. order) labelIOList
     dataFile "cellMap";
 }
 
diff --git a/src/OpenFOAM/meshes/bandCompression/bandCompression.C b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
index cec9dc9c6c..ad589fc1d7 100644
--- a/src/OpenFOAM/meshes/bandCompression/bandCompression.C
+++ b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,10 @@ Description
 
 #include "bandCompression.H"
 #include "SLList.H"
+#include "IOstreams.H"
+#include "DynamicList.H"
+#include "ListOps.H"
+#include "PackedBoolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,58 +47,97 @@ Foam::labelList Foam::bandCompression(const labelListList& cellCellAddressing)
     // the business bit of the renumbering
     SLList<label> nextCell;
 
-    labelList visited(cellCellAddressing.size());
+    PackedBoolList visited(cellCellAddressing.size());
 
-    label currentCell;
     label cellInOrder = 0;
 
-    // reset the visited cells list
-    forAll(visited, cellI)
-    {
-        visited[cellI] = 0;
-    }
 
-    // loop over the cells
-    forAll(visited, cellI)
+    // Work arrays. Kept outside of loop to minimise allocations.
+    // - neighbour cells
+    DynamicList<label> nbrs;
+    // - corresponding weights
+    DynamicList<label> weights;
+
+    // - ordering
+    labelList order;
+
+
+    while (true)
     {
-        // find the first cell that has not been visited yet
-        if (visited[cellI] == 0)
+        // For a disconnected region find the lowest connected cell.
+
+        label currentCell = -1;
+        label minWeight = labelMax;
+
+        forAll(visited, cellI)
         {
-            currentCell = cellI;
-
-            // use this cell as a start
-            nextCell.append(currentCell);
-
-            // loop through the nextCell list. Add the first cell into the
-            // cell order if it has not already been visited and ask for its
-            // neighbours. If the neighbour in question has not been visited,
-            // add it to the end of the nextCell list
-
-            while (nextCell.size())
+            // find the lowest connected cell that has not been visited yet
+            if (!visited[cellI])
             {
-                currentCell = nextCell.removeHead();
-
-                if (visited[currentCell] == 0)
+                if (cellCellAddressing[cellI].size() < minWeight)
                 {
-                    visited[currentCell] = 1;
+                    minWeight = cellCellAddressing[cellI].size();
+                    currentCell = cellI;
+                }
+            }
+        }
 
-                    // add into cellOrder
-                    newOrder[cellInOrder] = currentCell;
-                    cellInOrder++;
 
-                    // find if the neighbours have been visited
-                    const labelList& neighbours =
-                        cellCellAddressing[currentCell];
+        if (currentCell == -1)
+        {
+            break;
+        }
 
-                    forAll(neighbours, nI)
+
+        // Starting from currentCell walk breadth-first
+
+
+        // use this cell as a start
+        nextCell.append(currentCell);
+
+        // loop through the nextCell list. Add the first cell into the
+        // cell order if it has not already been visited and ask for its
+        // neighbours. If the neighbour in question has not been visited,
+        // add it to the end of the nextCell list
+
+        while (nextCell.size())
+        {
+            currentCell = nextCell.removeHead();
+
+            if (!visited[currentCell])
+            {
+                visited[currentCell] = 1;
+
+                // add into cellOrder
+                newOrder[cellInOrder] = currentCell;
+                cellInOrder++;
+
+                // find if the neighbours have been visited
+                const labelList& neighbours = cellCellAddressing[currentCell];
+
+                // Add in increasing order of connectivity
+
+                // 1. Count neighbours of unvisited neighbours
+                nbrs.clear();
+                weights.clear();
+
+                forAll(neighbours, nI)
+                {
+                    label nbr = neighbours[nI];
+                    if (!visited[nbr])
                     {
-                        if (visited[neighbours[nI]] == 0)
-                        {
-                            // not visited, add to the list
-                            nextCell.append(neighbours[nI]);
-                        }
+                        // not visited, add to the list
+                        nbrs.append(nbr);
+                        weights.append(cellCellAddressing[nbr].size());
                     }
                 }
+                // 2. Sort
+                sortedOrder(weights, order);
+                // 3. Add in sorted order
+                forAll(order, i)
+                {
+                    nextCell.append(nbrs[i]);
+                }
             }
         }
     }
diff --git a/src/OpenFOAM/meshes/bandCompression/bandCompression.H b/src/OpenFOAM/meshes/bandCompression/bandCompression.H
index 8cbad9fbde..f1506e5dbc 100644
--- a/src/OpenFOAM/meshes/bandCompression/bandCompression.H
+++ b/src/OpenFOAM/meshes/bandCompression/bandCompression.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,8 @@ InNamespace
 Description
     The bandCompression function renumbers the addressing such that the
     band of the matrix is reduced. The algorithm uses a simple search
-    through the neighbour list
+    through the neighbour list in order of connectivity.
+    (CutHill-McKee algorithm)
 
 SourceFiles
     bandCompression.C
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 58a897666b..9000380aa1 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -604,52 +604,96 @@ Foam::label Foam::polyTopoChange::getCellOrder
     label cellInOrder = 0;
 
 
-    // loop over the cells
-    forAll(visited, cellI)
+    // Work arrays. Kept outside of loop to minimise allocations.
+    // - neighbour cells
+    DynamicList<label> nbrs;
+    // - corresponding weights
+    DynamicList<label> weights;
+
+    // - ordering
+    labelList order;
+
+
+    while (true)
     {
-        // find the first non-removed cell that has not been visited yet
-        if (!cellRemoved(cellI) && visited[cellI] == 0)
+        // For a disconnected region find the lowest connected cell.
+
+        label currentCell = -1;
+        label minWeight = labelMax;
+
+        forAll(visited, cellI)
         {
-            // use this cell as a start
-            nextCell.append(cellI);
-
-            // loop through the nextCell list. Add the first cell into the
-            // cell order if it has not already been visited and ask for its
-            // neighbours. If the neighbour in question has not been visited,
-            // add it to the end of the nextCell list
-
-            do
+            // find the lowest connected cell that has not been visited yet
+            if (!cellRemoved(cellI) && !visited[cellI])
             {
-                label currentCell = nextCell.removeHead();
-
-                if (visited[currentCell] == 0)
+                if (cellCellAddressing[cellI].size() < minWeight)
                 {
-                    visited[currentCell] = 1;
-
-                    // add into cellOrder
-                    newOrder[cellInOrder] = currentCell;
-                    cellInOrder++;
-
-                    // find if the neighbours have been visited
-                    const UList<label> cCells = cellCellAddressing[currentCell];
-
-                    forAll(cCells, i)
-                    {
-                        label nbr = cCells[i];
-
-                        if (!cellRemoved(nbr) && visited[nbr] == 0)
-                        {
-                            // not visited, add to the list
-                            nextCell.append(nbr);
-                        }
-                    }
+                    minWeight = cellCellAddressing[cellI].size();
+                    currentCell = cellI;
+                }
+            }
+        }
+
+
+        if (currentCell == -1)
+        {
+            break;
+        }
+
+
+        // Starting from currentCell walk breadth-first
+
+
+        // use this cell as a start
+        nextCell.append(currentCell);
+
+        // loop through the nextCell list. Add the first cell into the
+        // cell order if it has not already been visited and ask for its
+        // neighbours. If the neighbour in question has not been visited,
+        // add it to the end of the nextCell list
+
+        while (nextCell.size())
+        {
+            currentCell = nextCell.removeHead();
+
+            if (!visited[currentCell])
+            {
+                visited[currentCell] = 1;
+
+                // add into cellOrder
+                newOrder[cellInOrder] = currentCell;
+                cellInOrder++;
+
+                // find if the neighbours have been visited
+                const labelList& neighbours = cellCellAddressing[currentCell];
+
+                // Add in increasing order of connectivity
+
+                // 1. Count neighbours of unvisited neighbours
+                nbrs.clear();
+                weights.clear();
+
+                forAll(neighbours, nI)
+                {
+                    label nbr = neighbours[nI];
+                    if (!cellRemoved(nbr) && !visited[nbr])
+                    {
+                        // not visited, add to the list
+                        nbrs.append(nbr);
+                        weights.append(cellCellAddressing[nbr].size());
+                    }
+                }
+                // 2. Sort
+                sortedOrder(weights, order);
+                // 3. Add in sorted order
+                forAll(order, i)
+                {
+                    nextCell.append(nbrs[i]);
                 }
             }
-            while (nextCell.size());
         }
     }
 
-
     // Now we have new-to-old in newOrder.
     newOrder.setSize(cellInOrder);
 
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index e0e96412d3..573b6e5206 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -275,7 +275,7 @@ void Foam::decompositionMethod::calcCellCells
     {
         const polyPatch& pp = patches[patchI];
 
-        if (pp.coupled())
+        if (pp.coupled() && (parallel || !isA<processorPolyPatch>(pp)))
         {
             label faceI = pp.start();
             label bFaceI = pp.start()-mesh.nInternalFaces();
diff --git a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.C b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.C
index 2732484b36..a756b2c514 100644
--- a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.C
+++ b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ Foam::labelList Foam::CuthillMcKeeRenumber::renumber
         reverse(orderedToOld);
     }
 
-    return invert(orderedToOld.size(), orderedToOld);
+    return orderedToOld;
 }
 
 
@@ -99,7 +99,7 @@ Foam::labelList Foam::CuthillMcKeeRenumber::renumber
         reverse(orderedToOld);
     }
 
-    return invert(orderedToOld.size(), orderedToOld);
+    return orderedToOld;
 }
 
 
diff --git a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H
index a4ec011b40..237b828e25 100644
--- a/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H
+++ b/src/renumber/renumberMethods/CuthillMcKeeRenumber/CuthillMcKeeRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,23 +80,26 @@ public:
 
     // Member Functions
 
-        //- Return for every coordinate the wanted processor number.
-        //  We need a polyMesh (to be able to load the file)
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
             notImplemented("CuthillMcKeeRenumber::renumber(const pointField&)");
             return labelList(0);
         }
 
-        //- Return for every coordinate the wanted processor number. Use the
-        //  mesh connectivity (if needed)
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  Use the mesh connectivity (if needed)
         virtual labelList renumber
         (
             const polyMesh& mesh,
             const pointField& cc
         ) const;
 
-        //- Return for every cell the new cell label.
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
         //  The connectivity is equal to mesh.cellCells() except
         //  - the connections are across coupled patches
         virtual labelList renumber
diff --git a/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.C b/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.C
index 293e5ba19b..a26ca1e207 100644
--- a/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.C
+++ b/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,7 +194,7 @@ Foam::labelList Foam::boundaryFirstRenumber::renumber
     //        << endl;
     //}
 
-    return invert(newOrder.size(), newOrder);
+    return newOrder;
 }
 
 
diff --git a/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.H b/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.H
index 690af21455..1b5ac139e2 100644
--- a/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.H
+++ b/src/renumber/renumberMethods/boundaryFirstRenumber/boundaryFirstRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,8 +80,9 @@ public:
 
     // Member Functions
 
-        //- Return for every coordinate the wanted processor number.
-        //  We need a polyMesh (to be able to load the file)
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
             notImplemented
@@ -91,15 +92,17 @@ public:
             return labelList(0);
         }
 
-        //- Return for every coordinate the wanted processor number. Use the
-        //  mesh connectivity (if needed)
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  Use the mesh connectivity (if needed)
         virtual labelList renumber
         (
             const polyMesh& mesh,
             const pointField& cc
         ) const;
 
-        //- Return for every cell the new cell label.
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
         //  The connectivity is equal to mesh.cellCells() except
         //  - the connections are across coupled patches
         virtual labelList renumber
diff --git a/src/renumber/renumberMethods/manualRenumber/manualRenumber.C b/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
index 92b5c8e00c..99ac60b666 100644
--- a/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
+++ b/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ Foam::labelList Foam::manualRenumber::renumber
     const pointField& points
 ) const
 {
-    labelIOList oldToNew
+    labelIOList newToOld
     (
         IOobject
         (
@@ -78,14 +78,14 @@ Foam::labelList Foam::manualRenumber::renumber
 
     // check if the final renumbering is OK
 
-    if (oldToNew.size() != points.size())
+    if (newToOld.size() != points.size())
     {
         FatalErrorIn
         (
             "manualRenumber::renumber(const pointField&, const scalarField&)"
         )   << "Size of renumber list does not correspond "
             << "to the number of points.  Size: "
-            << oldToNew.size() << " Number of points: "
+            << newToOld.size() << " Number of points: "
             << points.size()
             << ".\n" << "Manual renumbering data read from file "
             << dataFile_ << "." << endl
@@ -93,27 +93,27 @@ Foam::labelList Foam::manualRenumber::renumber
     }
 
     // Invert to see if one to one
-    labelList newToOld(points.size(), -1);
-    forAll(oldToNew, i)
+    labelList oldToNew(points.size(), -1);
+    forAll(newToOld, i)
     {
-        label newI = oldToNew[i];
+        label origCellI = newToOld[i];
 
-        if (newI < 0 || newI >= oldToNew.size())
+        if (origCellI < 0 || origCellI >= points.size())
         {
             FatalErrorIn
             (
                 "manualRenumber::renumber(const pointField&"
                 ", const scalarField&)"
             )   << "Renumbering is not one-to-one. Index "
-                << i << " maps onto " << newI
+                << i << " maps onto original cell " << origCellI
                 << ".\n" << "Manual renumbering data read from file "
                 << dataFile_ << "." << endl
                 << exit(FatalError);
         }
 
-        if (newToOld[newI] == -1)
+        if (oldToNew[origCellI] == -1)
         {
-            newToOld[newI] = i;
+            oldToNew[origCellI] = i;
         }
         else
         {
@@ -122,15 +122,15 @@ Foam::labelList Foam::manualRenumber::renumber
                 "manualRenumber::renumber(const pointField&"
                 ", const scalarField&)"
             )   << "Renumbering is not one-to-one. Both index "
-                << newToOld[newI]
-                << " and " << i << " map onto " << newI
+                << oldToNew[origCellI]
+                << " and " << i << " map onto " << origCellI
                 << ".\n" << "Manual renumbering data read from file "
                 << dataFile_ << "." << endl
                 << exit(FatalError);
         }
     }
 
-    return oldToNew;
+    return newToOld;
 }
 
 
diff --git a/src/renumber/renumberMethods/manualRenumber/manualRenumber.H b/src/renumber/renumberMethods/manualRenumber/manualRenumber.H
index a4d4b2f46f..7419754369 100644
--- a/src/renumber/renumberMethods/manualRenumber/manualRenumber.H
+++ b/src/renumber/renumberMethods/manualRenumber/manualRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     Foam::manualRenumber
 
 Description
-    Renumber given a cell-to-new cell association in a file
+    Renumber given a ordered-to-original cell association in a file
 
 SourceFiles
     manualRenumber.C
@@ -79,23 +79,26 @@ public:
 
     // Member Functions
 
-        //- Return for every coordinate the wanted processor number.
-        //  We need a polyMesh (to be able to load the file)
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
             notImplemented("manualRenumber::renumber(const pointField&)");
             return labelList(0);
         }
 
-        //- Return for every coordinate the wanted processor number. Use the
-        //  mesh connectivity (if needed)
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  Use the mesh connectivity (if needed)
         virtual labelList renumber
         (
             const polyMesh& mesh,
             const pointField& cc
         ) const;
 
-        //- Return for every cell the new cell label.
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
         //  The connectivity is equal to mesh.cellCells() except
         //  - the connections are across coupled patches
         virtual labelList renumber
diff --git a/src/renumber/renumberMethods/randomRenumber/randomRenumber.C b/src/renumber/renumberMethods/randomRenumber/randomRenumber.C
index 2dae28e438..e5268f7ed7 100644
--- a/src/renumber/renumberMethods/randomRenumber/randomRenumber.C
+++ b/src/renumber/renumberMethods/randomRenumber/randomRenumber.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,17 +59,17 @@ Foam::labelList Foam::randomRenumber::renumber
 {
     Random rndGen(0);
 
-    labelList oldToNew(identity(points.size()));
+    labelList newToOld(identity(points.size()));
 
     for (label iter = 0; iter < 10; iter++)
     {
-        forAll(oldToNew, i)
+        forAll(newToOld, i)
         {
-            label j = rndGen.integer(0, oldToNew.size()-1);
-            Swap(oldToNew[i], oldToNew[j]);
+            label j = rndGen.integer(0, newToOld.size()-1);
+            Swap(newToOld[i], newToOld[j]);
         }
     }
-    return oldToNew;
+    return newToOld;
 }
 
 
diff --git a/src/renumber/renumberMethods/randomRenumber/randomRenumber.H b/src/renumber/renumberMethods/randomRenumber/randomRenumber.H
index 0665d5159b..f2860eac2a 100644
--- a/src/renumber/renumberMethods/randomRenumber/randomRenumber.H
+++ b/src/renumber/renumberMethods/randomRenumber/randomRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,19 +74,22 @@ public:
 
     // Member Functions
 
-        //- Return for every coordinate the wanted processor number.
-        //  We need a polyMesh (to be able to load the file)
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  Use the mesh connectivity (if needed)
         virtual labelList renumber(const pointField&) const;
 
-        //- Return for every coordinate the wanted processor number. Use the
-        //  mesh connectivity (if needed)
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  Use the mesh connectivity (if needed)
         virtual labelList renumber
         (
             const polyMesh& mesh,
             const pointField& cc
         ) const;
 
-        //- Return for every cell the new cell label.
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
         //  The connectivity is equal to mesh.cellCells() except
         //  - the connections are across coupled patches
         virtual labelList renumber
diff --git a/src/renumber/renumberMethods/renumberMethod/renumberMethod.H b/src/renumber/renumberMethods/renumberMethod/renumberMethod.H
index ead92b1e41..b7b02f2dbd 100644
--- a/src/renumber/renumberMethods/renumberMethod/renumberMethod.H
+++ b/src/renumber/renumberMethods/renumberMethod/renumberMethod.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -109,7 +109,8 @@ public:
 
     // Member Functions
 
-        //- Return for every cell the new cell label.
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
         //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
@@ -120,12 +121,14 @@ public:
             return labelList(0);
         }
 
-        //- Return for every cell the new cell label. Use the
-        //  mesh connectivity (if needed)
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  Use the mesh connectivity (if needed)
         virtual labelList renumber(const polyMesh&, const pointField&) const;
 
-        //- Return for every cell the new cell label. Gets
-        //  passed agglomeration map (from fine to coarse cells) and coarse
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  Gets passed agglomeration map (from fine to coarse cells) and coarse
         //  cell
         //  location. Can be overridden by renumberMethods that provide this
         //  functionality natively. Coarse cells are local to the processor
@@ -138,7 +141,8 @@ public:
             const pointField& regionPoints
         ) const;
 
-        //- Return for every cell the new cell label.
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
         //  The connectivity is equal to mesh.cellCells() except
         //  - the connections are across coupled patches
         virtual labelList renumber
diff --git a/src/renumber/renumberMethods/springRenumber/springRenumber.C b/src/renumber/renumberMethods/springRenumber/springRenumber.C
index 64a15145ce..0bc9466494 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           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -165,7 +165,7 @@ Foam::labelList Foam::springRenumber::renumber
     // Reorder oldToNew
     inplaceReorder(shuffle, oldToNew);
 
-    return oldToNew;
+    return invert(oldToNew.size(), oldToNew);
 }
 
 
diff --git a/src/renumber/renumberMethods/springRenumber/springRenumber.H b/src/renumber/renumberMethods/springRenumber/springRenumber.H
index 30f7a3d838..c58bcf21d0 100644
--- a/src/renumber/renumberMethods/springRenumber/springRenumber.H
+++ b/src/renumber/renumberMethods/springRenumber/springRenumber.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,22 +95,26 @@ public:
 
     // Member Functions
 
-        //- Return for every coordinate the wanted processor number.
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  This is only defined for geometric renumberMethods.
         virtual labelList renumber(const pointField&) const
         {
             notImplemented("springRenumber::renumber(const pointField&)");
             return labelList(0);
         }
 
-        //- Return for every coordinate the wanted processor number. Use the
-        //  mesh connectivity (if needed)
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
+        //  Use the mesh connectivity (if needed)
         virtual labelList renumber
         (
             const polyMesh& mesh,
             const pointField& cc
         ) const;
 
-        //- Return for every cell the new cell label.
+        //- Return the order in which cells need to be visited, i.e.
+        //  from ordered back to original cell label.
         //  The connectivity is equal to mesh.cellCells() except
         //  - the connections are across coupled patches
         virtual labelList renumber