From 325b003b6e7c11ee60a53757f4805858f7ef6ebf Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 31 Dec 2014 19:02:52 +0000
Subject: [PATCH] Added and verified support for 64bit labels

To compile with 64bit labels set

WM_LABEL_SIZE=64

in ~/OpenFOAM/dev/prefs.sh

source ~/.bashrc

then Allwmake in OpenFOAM-dev.

This will build into for example OpenFOAM-dev/platforms/linux64ClangDPInt64Opt

If WM_LABEL_SIZE is unset or set to 32:

WM_LABEL_SIZE=32

the build would be placed into OpenFOAM-dev/platforms/linux64ClangDPInt32Opt

Thus both 32bit and 64bit label builds can coexist without problem.
---
 .../DelaunayMesh/DelaunayMesh.H               |   2 +-
 .../DelaunayMesh/DelaunayMeshIO.C             |   4 +-
 .../DelaunayMesh/DistributedDelaunayMesh.C    |   4 +-
 .../searchableSurfaceControl.C                |   2 +-
 .../conformalVoronoiMesh.H                    |   1 -
 .../conformalVoronoiMeshCalcDualMesh.C        |  14 +-
 .../conformalVoronoiMeshFeaturePoints.C       |   2 +-
 .../conformalVoronoiMeshI.H                   |   6 +-
 .../conformalVoronoiMeshIO.C                  |  10 +-
 .../conformalVoronoiMeshTemplates.C           |   2 +-
 .../conformalVoronoiMeshZones.C               |   4 +-
 .../featurePointConformerSpecialisations.C    |   4 +-
 .../indexedCell/indexedCell.H                 |   6 +-
 .../indexedCell/indexedCellI.H                |   4 +-
 .../indexedVertex/indexedVertex.H             |  10 +-
 .../indexedVertex/indexedVertexI.H            |   8 +-
 .../autoDensity/autoDensity.C                 |   2 +-
 .../searchableBoxFeatures.C                   |   4 +-
 .../searchablePlateFeatures.C                 |   2 +-
 .../mesh/generation/foamyQuadMesh/CV2D.C      |   1 -
 .../mesh/manipulation/setSet/writeFuns.C      |  32 +-
 .../mesh/manipulation/setSet/writeFuns.H      |  49 ++-
 .../PV3FoamReader/CMakeLists.txt              |   1 +
 .../vtkPV3Foam/vtkPV3FoamMeshVolume.C         |   1 -
 .../PV3blockMeshReader/CMakeLists.txt         |   1 +
 .../PV4FoamReader/CMakeLists.txt              |   1 +
 .../vtkPV4Foam/vtkPV4FoamMeshVolume.C         |   1 -
 .../PV4blockMeshReader/CMakeLists.txt         |   1 +
 etc/bashrc                                    |   4 +
 etc/config/CGAL.csh                           |   2 +-
 etc/config/CGAL.sh                            |   2 +-
 etc/config/scotch.sh                          |   2 +-
 etc/config/settings.csh                       |   3 +-
 etc/config/settings.sh                        |   3 +-
 etc/cshrc                                     |   4 +
 src/OSspecific/POSIX/fileMonitor.C            |   2 +-
 src/OpenFOAM/Make/files                       |  13 +-
 .../linkTypes/DLListBase/DLListBase.C         |   1 -
 src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H |   7 +-
 .../db/IOstreams/Pstreams/UOPstream.C         |  10 +-
 .../db/IOstreams/Pstreams/UOPstream.H         |   7 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C |   7 +-
 src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H |   2 +-
 src/OpenFOAM/db/IOstreams/Pstreams/exchange.C |  16 +-
 src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C |  19 +-
 src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C |  10 +-
 src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H |   7 +-
 .../db/IOstreams/Sstreams/prefixOSstream.C    |   9 +-
 .../db/IOstreams/Sstreams/prefixOSstream.H    |   7 +-
 .../dlLibraryTable/dlLibraryTable.C           |  12 +-
 .../fields/Fields/Field/FieldFunctions.C      |   8 +-
 .../fields/Fields/Field/FieldFunctions.H      |   8 +-
 src/OpenFOAM/include/OSspecific.H             |   1 -
 .../lduInterface/processorLduInterface.H      |   2 +-
 .../processorLduInterfaceField.H              |   2 +-
 .../GAMGAgglomerateLduAddressing.C            |   2 +-
 .../GAMGAgglomeration/GAMGAgglomeration.H     |   2 +-
 .../GAMGAgglomerationTemplates.C              |   5 +-
 .../GAMGProcAgglomeration.C                   |   2 +-
 .../GAMGProcAgglomeration.H                   |   2 +-
 .../eagerGAMGProcAgglomeration.C              |   2 +-
 .../masterCoarsestGAMGProcAgglomeration.C     |   2 +-
 .../procFacesGAMGProcAgglomeration.C          |   4 +-
 .../lduMatrix/solvers/GAMG/GAMGSolver.C       |   2 +-
 .../lduMatrix/solvers/GAMG/GAMGSolver.H       |   6 +-
 .../GAMG/GAMGSolverAgglomerateMatrix.C        |  12 +-
 .../processorGAMGInterfaceField.H             |   2 +-
 .../processorGAMGInterface.H                  |   2 +-
 src/OpenFOAM/meshes/lduMesh/lduMesh.H         |   2 +-
 .../primitives/contiguous/contiguous.H        |  59 ++--
 src/OpenFOAM/primitives/ints/int/int.H        |  34 +-
 src/OpenFOAM/primitives/ints/int/intIO.C      |  70 +---
 src/OpenFOAM/primitives/ints/int32/int32.C    |  50 +++
 src/OpenFOAM/primitives/ints/int32/int32.H    | 137 ++++++++
 .../ints/{ulong/ulongIO.C => int32/int32IO.C} |  39 ++-
 src/OpenFOAM/primitives/ints/int64/int64.C    |  50 +++
 src/OpenFOAM/primitives/ints/int64/int64.H    | 137 ++++++++
 .../ints/{long/longIO.C => int64/int64IO.C}   |  38 ++-
 src/OpenFOAM/primitives/ints/label/label.C    |  76 +----
 src/OpenFOAM/primitives/ints/label/label.H    | 300 ++----------------
 .../{long/long.H => label/labelSpecific.H}    |  51 ++-
 .../primitives/ints/longLong/longLongIO.C     | 131 --------
 src/OpenFOAM/primitives/ints/uLabel/uLabel.C  |  70 ++--
 src/OpenFOAM/primitives/ints/uLabel/uLabel.H  | 163 ++--------
 .../primitives/ints/uLabel/uLabelSpecific.H   |   0
 src/OpenFOAM/primitives/ints/uint/uint.H      |  36 ++-
 src/OpenFOAM/primitives/ints/uint/uintIO.C    |  64 +---
 .../ints/{ulong/ulong.H => uint32/uint32.C}   |  55 ++--
 src/OpenFOAM/primitives/ints/uint32/uint32.H  | 137 ++++++++
 .../primitives/ints/uint32/uint32IO.C         | 102 ++++++
 .../{longLong/longLong.H => uint64/uint64.C}  |  56 ++--
 src/OpenFOAM/primitives/ints/uint64/uint64.H  | 137 ++++++++
 .../primitives/ints/uint64/uint64IO.C         | 102 ++++++
 src/Pstream/gamma/IPread.C                    |   5 +-
 src/Pstream/gamma/OPwrite.C                   |  10 +-
 src/Pstream/mpi/UPstream.C                    |   8 +-
 src/Pstream/mpi/allReduce.H                   |   2 +-
 src/Pstream/mpi/allReduceTemplates.C          |   2 +-
 .../metisDecomp/dummyMetisDecomp.C            |  12 +-
 .../ptscotchDecomp/dummyPtscotchDecomp.C      |  26 +-
 .../scotchDecomp/dummyScotchDecomp.C          |  14 +-
 .../processor/processorFvPatchField.H         |   2 +-
 src/finiteVolume/fvMesh/fvMesh.H              |   2 +-
 .../constraint/processor/processorFvPatch.H   |   2 +-
 .../autoHexMeshDriver/autoSnapDriver.C        |  21 +-
 .../autoHexMeshDriver/autoSnapDriverFeature.C |   2 +-
 .../meshRefinement/meshRefinementBaffles.C    |   2 +-
 .../PatchEdgeFaceWave/PatchEdgeFaceWave.H     |   2 +-
 .../searchableSurface/searchableSurface.C     |   9 +-
 .../decompose/metisDecomp/metisDecomp.C       |  24 +-
 .../decompose/metisDecomp/metisDecomp.H       |   6 +-
 .../decompose/ptscotchDecomp/ptscotchDecomp.C |  50 +--
 .../decompose/ptscotchDecomp/ptscotchDecomp.H |  16 +-
 .../decompose/scotchDecomp/scotchDecomp.C     |  36 +--
 .../decompose/scotchDecomp/scotchDecomp.H     |  12 +-
 wmake/rules/General/general                   |   2 +-
 116 files changed, 1515 insertions(+), 1242 deletions(-)
 create mode 100644 src/OpenFOAM/primitives/ints/int32/int32.C
 create mode 100644 src/OpenFOAM/primitives/ints/int32/int32.H
 rename src/OpenFOAM/primitives/ints/{ulong/ulongIO.C => int32/int32IO.C} (69%)
 create mode 100644 src/OpenFOAM/primitives/ints/int64/int64.C
 create mode 100644 src/OpenFOAM/primitives/ints/int64/int64.H
 rename src/OpenFOAM/primitives/ints/{long/longIO.C => int64/int64IO.C} (68%)
 rename src/OpenFOAM/primitives/ints/{long/long.H => label/labelSpecific.H} (71%)
 delete mode 100644 src/OpenFOAM/primitives/ints/longLong/longLongIO.C
 create mode 100644 src/OpenFOAM/primitives/ints/uLabel/uLabelSpecific.H
 rename src/OpenFOAM/primitives/ints/{ulong/ulong.H => uint32/uint32.C} (60%)
 create mode 100644 src/OpenFOAM/primitives/ints/uint32/uint32.H
 create mode 100644 src/OpenFOAM/primitives/ints/uint32/uint32IO.C
 rename src/OpenFOAM/primitives/ints/{longLong/longLong.H => uint64/uint64.C} (58%)
 create mode 100644 src/OpenFOAM/primitives/ints/uint64/uint64.H
 create mode 100644 src/OpenFOAM/primitives/ints/uint64/uint64IO.C

diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
index 0bf843f1c9..211bd75d39 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
@@ -115,7 +115,7 @@ private:
         {
             typedef typename Triangulation::Geom_traits Gt;
 
-            typedef std::pair<const typename Triangulation::Point*, int>
+            typedef std::pair<const typename Triangulation::Point*, label>
                 Point_3;
 
             struct Less_x_3
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index d987a8ad4f..f429112ed5 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
@@ -450,7 +450,7 @@ Foam::DelaunayMesh<Triangulation>::createMesh
     }
 
     label faceI = 0;
-    labelList verticesOnTriFace(3, -1);
+    labelList verticesOnTriFace(3, label(-1));
     face newFace(verticesOnTriFace);
 
     for
@@ -461,7 +461,7 @@ Foam::DelaunayMesh<Triangulation>::createMesh
     )
     {
         const Cell_handle c1(fit->first);
-        const int oppositeVertex = fit->second;
+        const label oppositeVertex = fit->second;
         const Cell_handle c2(c1->neighbor(oppositeVertex));
 
         // Do not output if face has neither opposite vertex as an internal
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index b598a7f5de..322dc3f343 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -287,7 +287,7 @@ void Foam::DistributedDelaunayMesh<Triangulation>::findProcessorBoundaryCells
 //        Cell_handle cit = *vcit;
 //
 //        // Index of infinite vertex in this cell.
-//        int i = cit->index(Triangulation::infinite_vertex());
+//        label i = cit->index(Triangulation::infinite_vertex());
 //
 //        Cell_handle c = cit->neighbor(i);
 //
@@ -333,7 +333,7 @@ void Foam::DistributedDelaunayMesh<Triangulation>::findProcessorBoundaryCells
         if (Triangulation::is_infinite(cit))
         {
             // Index of infinite vertex in this cell.
-            int i = cit->index(Triangulation::infinite_vertex());
+            label i = cit->index(Triangulation::infinite_vertex());
 
             Cell_handle c = cit->neighbor(i);
 
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
index 49fc665e93..5866652b79 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C
@@ -497,7 +497,7 @@ void Foam::searchableSurfaceControl::cellSizeFunctionVertices
     List<pointIndexHit> infoList(1, pointIndexHit());
 
     vectorField normals(1);
-    labelList region(1, -1);
+    labelList region(1, label(-1));
 
     forAll(points, pI)
     {
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 2996493dbe..3fd302935a 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -43,7 +43,6 @@ SourceFiles
 
 #include "CGALTriangulation3Ddefs.H"
 #include "uint.H"
-#include "ulong.H"
 #include "searchableSurfaces.H"
 #include "conformationSurfaces.H"
 #include "cellShapeControl.H"
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index df2c8c2f65..17dac1c349 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -172,7 +172,7 @@ void Foam::conformalVoronoiMesh::calcTetMesh
 
     label faceI = 0;
 
-    labelList verticesOnTriFace(3, -1);
+    labelList verticesOnTriFace(3, label(-1));
 
     face newFace(verticesOnTriFace);
 
@@ -184,7 +184,7 @@ void Foam::conformalVoronoiMesh::calcTetMesh
     )
     {
         const Cell_handle c1(fit->first);
-        const int oppositeVertex = fit->second;
+        const label oppositeVertex = fit->second;
         const Cell_handle c2(c1->neighbor(oppositeVertex));
 
         if (c1->hasFarPoint() && c2->hasFarPoint())
@@ -347,7 +347,7 @@ Foam::label Foam::conformalVoronoiMesh::mergeIdenticalDualVertices
     )
     {
         const Cell_handle c1(fit->first);
-        const int oppositeVertex = fit->second;
+        const label oppositeVertex = fit->second;
         const Cell_handle c2(c1->neighbor(oppositeVertex));
 
         if (is_infinite(c1) || is_infinite(c2))
@@ -1070,7 +1070,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
 
         // Check for cells with one internal face only
 
-        labelList nInternalFaces(pMesh.nCells(), 0);
+        labelList nInternalFaces(pMesh.nCells(), label(0));
 
         for (label fI = 0; fI < pMesh.nInternalFaces(); fI++)
         {
@@ -1737,7 +1737,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
 
     const label nPatches = patchNames.size();
 
-    labelList procNeighbours(nPatches, -1);
+    labelList procNeighbours(nPatches, label(-1));
     forAll(procNeighbours, patchI)
     {
         if (patchDicts[patchI].found("neighbProcNo"))
@@ -2580,7 +2580,7 @@ void Foam::conformalVoronoiMesh::removeUnusedPoints
 
     label pointI = 0;
 
-    labelList oldToNew(pts.size(), -1);
+    labelList oldToNew(pts.size(), label(-1));
 
     // Move all of the used points to the start of the pointField and
     // truncate it
@@ -2637,7 +2637,7 @@ Foam::labelList Foam::conformalVoronoiMesh::removeUnusedCells
 
     label cellI = 0;
 
-    labelList oldToNew(cellUsed.size(), -1);
+    labelList oldToNew(cellUsed.size(), label(-1));
 
     // Move all of the used cellCentres to the start of the pointField and
     // truncate it
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
index f142470106..f9d2e68981 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C
@@ -922,7 +922,7 @@ void Foam::conformalVoronoiMesh::createMultipleEdgePointGroup
     const List<extendedFeatureEdgeMesh::sideVolumeType>& normalVolumeTypes =
         feMesh.normalVolumeTypes();
 
-    labelList nNormalTypes(4, 0);
+    labelList nNormalTypes(4, label(0));
 
     forAll(edNormalIs, edgeNormalI)
     {
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index 7d35594258..e6896463d1 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -90,7 +90,7 @@ inline Foam::scalar Foam::conformalVoronoiMesh::averageAnyCellSize
     label nProducts = 0;
 
     const Cell_handle c(fit->first);
-    const int oppositeVertex = fit->second;
+    const label oppositeVertex = fit->second;
 
     for (label i = 0; i < 3; i++)
     {
@@ -456,7 +456,7 @@ inline Foam::List<Foam::label> Foam::conformalVoronoiMesh::processorsAttached
     DynamicList<label> procsAttached(8);
 
     const Cell_handle c1(fit->first);
-    const int oppositeVertex = fit->second;
+    const label oppositeVertex = fit->second;
     const Cell_handle c2(c1->neighbor(oppositeVertex));
 
     FixedList<label, 4> c1Procs(CGAL::indexedCellOps::processorsAttached(c1));
@@ -486,7 +486,7 @@ inline bool Foam::conformalVoronoiMesh::isParallelDualEdge
 ) const
 {
     const Cell_handle c1(fit->first);
-    const int oppositeVertex = fit->second;
+    const label oppositeVertex = fit->second;
 
     return
     (
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 5b7612748c..7fac1631ff 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -542,7 +542,7 @@ void Foam::conformalVoronoiMesh::reorderPoints
     Info<< incrIndent << indent << "Reordering points into internal/external"
         << endl;
 
-    labelList oldToNew(points.size(), 0);
+    labelList oldToNew(points.size(), label(0));
 
     // Find points that are internal
     for (label fI = nInternalFaces; fI < faces.size(); ++fI)
@@ -645,8 +645,8 @@ void Foam::conformalVoronoiMesh::reorderProcessorPatches
 //    }
 
     // Rotation on new faces.
-    labelList rotation(faces.size(), 0);
-    labelList faceMap(faces.size(), -1);
+    labelList rotation(faces.size(), label(0));
+    labelList faceMap(faces.size(), label(-1));
 
     PstreamBuffers pBufs(Pstream::nonBlocking);
 
@@ -692,8 +692,8 @@ void Foam::conformalVoronoiMesh::reorderProcessorPatches
             const label patchStartFace =
                 readLabel(patchDicts[patchI].lookup("startFace"));
 
-            labelList patchFaceMap(nPatchFaces, -1);
-            labelList patchFaceRotation(nPatchFaces, 0);
+            labelList patchFaceMap(nPatchFaces, label(-1));
+            labelList patchFaceRotation(nPatchFaces, label(0));
 
             bool changed = refCast<const processorPolyPatch>(pp).order
             (
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
index 54a54ed6e9..6d4e8ebcaa 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
@@ -83,7 +83,7 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh)
 
         meshSearch cellSearch(bMesh, polyMesh::FACEPLANES);
 
-        labelList cellVertices(bMesh.nCells(), 0);
+        labelList cellVertices(bMesh.nCells(), label(0));
 
         for
         (
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
index e0915e01fb..dcbb61eec2 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshZones.C
@@ -218,7 +218,7 @@ Foam::labelList Foam::conformalVoronoiMesh::calcCellZones
     const pointField& cellCentres
 ) const
 {
-    labelList cellToSurface(cellCentres.size(), -1);
+    labelList cellToSurface(cellCentres.size(), label(-1));
 
     const PtrList<surfaceZonesInfo>& surfZones =
         geometryToConformTo().surfZones();
@@ -327,7 +327,7 @@ void Foam::conformalVoronoiMesh::calcFaceZones
     const labelList& faceOwner = mesh.faceOwner();
     const labelList& faceNeighbour = mesh.faceNeighbour();
 
-    labelList neiFaceOwner(mesh.nFaces() - mesh.nInternalFaces(), -1);
+    labelList neiFaceOwner(mesh.nFaces() - mesh.nInternalFaces(), label(-1));
 
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
index b12f56b909..682c30febc 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C
@@ -83,7 +83,7 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
         const labelListList& edgeNormals = feMesh.edgeNormals();
 
         label concaveEdgeI = -1;
-        labelList convexEdgesI(2, -1);
+        labelList convexEdgesI(2, label(-1));
         label nConvex = 0;
 
         forAll(pEds, i)
@@ -521,7 +521,7 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
         const labelListList& edgeNormals = feMesh.edgeNormals();
 
         label convexEdgeI = -1;
-        labelList concaveEdgesI(2, -1);
+        labelList concaveEdgesI(2, label(-1));
         label nConcave = 0;
 
         forAll(pEds, i)
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
index cb805f7149..a43e6ef019 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H
@@ -97,7 +97,7 @@ class indexedCell
         //  < 0 && > ctFar : the (global) index of a dual point on a processor
         //                   face
 
-        int index_;
+        Foam::label index_;
 
         //- The number of times that this Delaunay cell has been limited
         //  during filtering
@@ -154,9 +154,9 @@ public:
 
     // Member Functions
 
-        inline int& cellIndex();
+        inline Foam::label& cellIndex();
 
-        inline int cellIndex() const;
+        inline Foam::label cellIndex() const;
 
 #ifdef CGAL_INEXACT
         inline const Foam::point& dual();
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
index d0ae6137a5..fed87e61f2 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
@@ -94,14 +94,14 @@ CGAL::indexedCell<Gt, Cb>::indexedCell
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Gt, class Cb>
-int& CGAL::indexedCell<Gt, Cb>::cellIndex()
+Foam::label& CGAL::indexedCell<Gt, Cb>::cellIndex()
 {
     return index_;
 }
 
 
 template<class Gt, class Cb>
-int CGAL::indexedCell<Gt, Cb>::cellIndex() const
+Foam::label CGAL::indexedCell<Gt, Cb>::cellIndex() const
 {
     return index_;
 }
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
index 4636062a83..2d9e7a7b6a 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H
@@ -112,7 +112,7 @@ class indexedVertex
         //- The index for this Delaunay vertex.  For referred vertices, the
         //  index is negative for vertices that are the outer (slave) of point
         //  pairs
-        int index_;
+        Foam::label index_;
 
         //- Number of the processor that owns this vertex
         int processor_;
@@ -154,7 +154,7 @@ public:
         inline indexedVertex
         (
             const Point& p,
-            int index,
+            Foam::label index,
             vertexType type,
             int processor
         );
@@ -162,7 +162,7 @@ public:
         inline indexedVertex
         (
             const Foam::point& p,
-            int index,
+            Foam::label index,
             vertexType type,
             int processor
         );
@@ -174,9 +174,9 @@ public:
 
     // Member Functions
 
-        inline int& index();
+        inline Foam::label& index();
 
-        inline int index() const;
+        inline Foam::label index() const;
 
         inline vertexType& type();
 
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H
index 688e9f28e1..b6ecbd9172 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H
@@ -91,7 +91,7 @@ template<class Gt, class Vb>
 inline CGAL::indexedVertex<Gt, Vb>::indexedVertex
 (
     const Point& p,
-    int index,
+    Foam::label index,
     vertexType type,
     int processor
 )
@@ -110,7 +110,7 @@ template<class Gt, class Vb>
 inline CGAL::indexedVertex<Gt, Vb>::indexedVertex
 (
     const Foam::point& p,
-    int index,
+    Foam::label index,
     vertexType type,
     int processor
 )
@@ -154,14 +154,14 @@ inline CGAL::indexedVertex<Gt, Vb>::indexedVertex(Cell_handle f)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Gt, class Vb>
-inline int& CGAL::indexedVertex<Gt, Vb>::index()
+inline Foam::label& CGAL::indexedVertex<Gt, Vb>::index()
 {
     return index_;
 }
 
 
 template<class Gt, class Vb>
-inline int CGAL::indexedVertex<Gt, Vb>::index() const
+inline Foam::label CGAL::indexedVertex<Gt, Vb>::index() const
 {
     return index_;
 }
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
index 3552323d68..56dd5d703f 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
@@ -299,7 +299,7 @@ bool Foam::autoDensity::fillBox
 {
     const conformationSurfaces& geometry = geometryToConformTo();
 
-    unsigned int initialSize = initialPoints.size();
+    label initialSize = initialPoints.size();
 
     scalar maxCellSize = -GREAT;
 
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C
index 76726ccc07..7e3d418fec 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ Foam::searchableBoxFeatures::features() const
             surfacePoints[treeBoundBox::edges[eI].end()]
           - surfacePoints[treeBoundBox::edges[eI].start()];
 
-        normalDirections[eI] = labelList(2, 0);
+        normalDirections[eI] = labelList(2, label(0));
         for (label j = 0; j < 2; ++j)
         {
             const vector cross =
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchablePlateFeatures.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchablePlateFeatures.C
index a61862c432..5a53eb9776 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchablePlateFeatures.C
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchablePlateFeatures.C
@@ -131,7 +131,7 @@ Foam::searchablePlateFeatures::features() const
             surface().points()()[edges[eI].end()]
           - surface().points()()[edges[eI].start()];
 
-        normalDirections[eI] = labelList(2, 0);
+        normalDirections[eI] = labelList(2, label(0));
         for (label j = 0; j < 2; ++j)
         {
             const vector cross =
diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/CV2D.C b/applications/utilities/mesh/generation/foamyQuadMesh/CV2D.C
index ccdbb2b31e..2b16697fda 100644
--- a/applications/utilities/mesh/generation/foamyQuadMesh/CV2D.C
+++ b/applications/utilities/mesh/generation/foamyQuadMesh/CV2D.C
@@ -28,7 +28,6 @@ License
 #include "transform.H"
 #include "IFstream.H"
 #include "uint.H"
-#include "ulong.H"
 
 namespace Foam
 {
diff --git a/applications/utilities/mesh/manipulation/setSet/writeFuns.C b/applications/utilities/mesh/manipulation/setSet/writeFuns.C
index eb974ab2a9..d11c81460d 100644
--- a/applications/utilities/mesh/manipulation/setSet/writeFuns.C
+++ b/applications/utilities/mesh/manipulation/setSet/writeFuns.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-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,9 +43,9 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-void Foam::writeFuns::swapWord(label& word32)
+void Foam::writeFuns::swapWord(int32_t& word32)
 {
-    char* mem =  reinterpret_cast<char*>(&word32);
+    char* mem = reinterpret_cast<char*>(&word32);
 
     char a = mem[0];
     mem[0] = mem[3];
@@ -57,9 +57,9 @@ void Foam::writeFuns::swapWord(label& word32)
 }
 
 
-void Foam::writeFuns::swapWords(const label nWords, label* words32)
+void Foam::writeFuns::swapWords(const label nWords, int32_t* words32)
 {
-    for (label i = 0; i < nWords; i++)
+    for (label i=0; i<nWords; i++)
     {
         swapWord(words32[i]);
     }
@@ -75,9 +75,9 @@ void Foam::writeFuns::write
 {
     if (binary)
     {
-#       ifdef LITTLEENDIAN
-        swapWords(fField.size(),  reinterpret_cast<label*>(fField.begin()));
-#       endif
+        #ifdef LITTLEENDIAN
+        swapWords(fField.size(), reinterpret_cast<int32_t*>(fField.begin()));
+        #endif
 
         os.write
         (
@@ -111,7 +111,6 @@ void Foam::writeFuns::write
 )
 {
     List<floatScalar>& fld = fField.shrink();
-
     write(os, binary, fld);
 }
 
@@ -125,9 +124,13 @@ void Foam::writeFuns::write
 {
     if (binary)
     {
-#       ifdef LITTLEENDIAN
-        swapWords(elems.size(),  reinterpret_cast<label*>(elems.begin()));
-#       endif
+        #ifdef LITTLEENDIAN
+        swapWords
+        (
+            (sizeof(label)/4)*elems.size(),
+            reinterpret_cast<int32_t*>(elems.begin())
+        );
+        #endif
         os.write
         (
             reinterpret_cast<char*>(elems.begin()),
@@ -160,12 +163,10 @@ void Foam::writeFuns::write
 )
 {
     labelList& fld = elems.shrink();
-
     write(os, binary, fld);
 }
 
 
-// Store vector in dest.
 void Foam::writeFuns::insert(const point& pt, DynamicList<floatScalar>& dest)
 {
     dest.append(float(pt.x()));
@@ -174,7 +175,6 @@ void Foam::writeFuns::insert(const point& pt, DynamicList<floatScalar>& dest)
 }
 
 
-// Store labelList in dest.
 void Foam::writeFuns::insert(const labelList& source, DynamicList<label>& dest)
 {
     forAll(source, i)
@@ -184,7 +184,6 @@ void Foam::writeFuns::insert(const labelList& source, DynamicList<label>& dest)
 }
 
 
-// Store scalarField in dest
 void Foam::writeFuns::insert
 (
     const List<scalar>& source,
@@ -198,7 +197,6 @@ void Foam::writeFuns::insert
 }
 
 
-// Store scalarField (indexed through map) in dest
 void Foam::writeFuns::insert
 (
     const labelList& map,
diff --git a/applications/utilities/mesh/manipulation/setSet/writeFuns.H b/applications/utilities/mesh/manipulation/setSet/writeFuns.H
index 73e77eef2d..51c1ed8509 100644
--- a/applications/utilities/mesh/manipulation/setSet/writeFuns.H
+++ b/applications/utilities/mesh/manipulation/setSet/writeFuns.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-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,12 @@ Class
 Description
     Various functions for collecting and writing binary data.
 
+    The LITTLE_ENDIAN is based on 32bit words.
+    It is not clear how 64bit labels should be handled, currently they are
+    split into two 32bit words and swapWord applied to these two.
+
+    writeFuns should be a namespace rather than a class.
+
 SourceFiles
     writeFuns.C
 
@@ -41,43 +47,54 @@ SourceFiles
 #include "DynamicList.H"
 #include "point.H"
 
-using namespace Foam;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-
 /*---------------------------------------------------------------------------*\
                            Class writeFuns Declaration
 \*---------------------------------------------------------------------------*/
 
 class writeFuns
 {
-    //- Swap halves of word.
-    static void swapWord(label& word32);
-    static void swapWords(const label nWords, label* words32);
+    // Private member functions
+
+        //- Swap halves of word
+        static void swapWord(int32_t& word32);
+
+        //- Swap halves of word
+        static void swapWords(const label nWords, int32_t* words32);
+
 
 public:
 
-    //- Write ascii or binary. If binary optionally in-place swaps argument
+    //- Write floats ascii or binary.
+    //  If binary optionally in-place swaps argument
     static void write(std::ostream&, const bool, DynamicList<floatScalar>&);
+
+    //- Write labels ascii or binary.
+    //  If binary optionally in-place swaps argument
     static void write(std::ostream&, const bool, DynamicList<label>&);
 
-    //- Write ascii or binary. If binary optionally in-place swaps argument
+    //- Write floats ascii or binary.
+    //  If binary optionally in-place swaps argument
     static void write(std::ostream&, const bool, List<floatScalar>&);
+
+    //- Write labels ascii or binary.
+    //  If binary optionally in-place swaps argument
     static void write(std::ostream&, const bool, labelList&);
 
-    //- Append point to DynamicList
+    //- Append point to given DynamicList
     static void insert(const point&, DynamicList<floatScalar>& dest);
 
-    //- Append elements of labelList to DynamicList
+    //- Append elements of labelList to given DynamicList
     static void insert(const labelList&, DynamicList<label>&);
-    //- Append elements of scalarList to DynamicList
+
+    //- Append elements of scalarList to given DynamicList
     static void insert(const List<scalar>&, DynamicList<floatScalar>&);
 
-    //- Append elements of scalarList to DynamicList using map
+    //- Append elements of scalarList to given DynamicList using map
     static void insert
     (
         const labelList& map,
@@ -85,16 +102,16 @@ public:
         DynamicList<floatScalar>&
     );
 
-    //- Append points to DynamicList of floats
+    //- Append points to given DynamicList of floats
     static void insert(const List<point>& source, DynamicList<floatScalar>&);
-    //- As above but using map
+
+    //- Append points to given DynamicList of floats using map
     static void insert
     (
         const labelList& map,
         const List<point>& source,
         DynamicList<floatScalar>&
     );
-
 };
 
 
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
index 94d1763a20..4b37871f58 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt
@@ -26,6 +26,7 @@ INCLUDE_DIRECTORIES(
 
 ADD_DEFINITIONS(
     -DWM_$ENV{WM_PRECISION_OPTION}
+    -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
 )
 
 # Set output library destination to plugin directory
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
index e8fdd0b886..f786753491 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
@@ -31,7 +31,6 @@ License
 #include "cellModeller.H"
 #include "vtkOpenFOAMPoints.H"
 #include "Swap.H"
-#include "longLong.H"
 
 // VTK includes
 #include "vtkCellArray.h"
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt
index 8166a78a8d..60aaad3f62 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt
@@ -26,6 +26,7 @@ INCLUDE_DIRECTORIES(
 
 ADD_DEFINITIONS(
     -DWM_$ENV{WM_PRECISION_OPTION}
+    -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
 )
 
 # Set output library destination to plugin directory
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
index 4c2d5158b7..65c25ae507 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt
@@ -26,6 +26,7 @@ INCLUDE_DIRECTORIES(
 
 ADD_DEFINITIONS(
     -DWM_$ENV{WM_PRECISION_OPTION}
+    -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
 )
 
 # Set output library destination to plugin directory
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C
index 317b370082..54e91486cc 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamMeshVolume.C
@@ -31,7 +31,6 @@ License
 #include "cellModeller.H"
 #include "vtkOpenFOAMPoints.H"
 #include "Swap.H"
-#include "longLong.H"
 
 // VTK includes
 #include "vtkCellArray.h"
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
index 72003c8815..d081db2ff6 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt
@@ -26,6 +26,7 @@ INCLUDE_DIRECTORIES(
 
 ADD_DEFINITIONS(
     -DWM_$ENV{WM_PRECISION_OPTION}
+    -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
 )
 
 # Set output library destination to plugin directory
diff --git a/etc/bashrc b/etc/bashrc
index 3fec1e4351..5618894b5d 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -74,6 +74,10 @@ export WM_ARCH_OPTION=64
 #    WM_PRECISION_OPTION = DP | SP
 export WM_PRECISION_OPTION=DP
 
+#- Label size:
+#    WM_LABEL_SIZE = 32 | 64
+export WM_LABEL_SIZE=32
+
 #- Optimised, debug, profiling:
 #    WM_COMPILE_OPTION = Opt | Debug | Prof
 export WM_COMPILE_OPTION=Opt
diff --git a/etc/config/CGAL.csh b/etc/config/CGAL.csh
index 5f7dceecc2..9d6058d01c 100644
--- a/etc/config/CGAL.csh
+++ b/etc/config/CGAL.csh
@@ -30,7 +30,7 @@
 ##------------------------------------------------------------------------------
 
 set boost_version=boost-system
-set cgal_version=CGAL-4.3
+set cgal_version=CGAL-4.5.1
 
 setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
diff --git a/etc/config/CGAL.sh b/etc/config/CGAL.sh
index dc8772dd16..0760140f4b 100644
--- a/etc/config/CGAL.sh
+++ b/etc/config/CGAL.sh
@@ -30,7 +30,7 @@
 #------------------------------------------------------------------------------
 
 boost_version=boost-system
-cgal_version=CGAL-4.3
+cgal_version=CGAL-4.5.1
 
 export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
diff --git a/etc/config/scotch.sh b/etc/config/scotch.sh
index 1ee06e80b8..2ef01c8c48 100644
--- a/etc/config/scotch.sh
+++ b/etc/config/scotch.sh
@@ -34,6 +34,6 @@
 #------------------------------------------------------------------------------
 
 export SCOTCH_VERSION=scotch_6.0.0
-export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION
+export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_LABEL_OPTION/$SCOTCH_VERSION
 
 # -----------------------------------------------------------------------------
diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index 2138bb2369..6da932a435 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -142,7 +142,8 @@ setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
 # wmake configuration
 setenv WM_DIR $WM_PROJECT_DIR/wmake
 setenv WM_LINK_LANGUAGE c++
-setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
+setenv WM_LABEL_OPTION Int$WM_LABEL_SIZE
+setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION$WM_COMPILE_OPTION
 
 # base executables/libraries
 setenv FOAM_APPBIN $WM_PROJECT_DIR/platforms/$WM_OPTIONS/bin
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index aab770ef69..c4fa06d956 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -170,7 +170,8 @@ export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl
 # wmake configuration
 export WM_DIR=$WM_PROJECT_DIR/wmake
 export WM_LINK_LANGUAGE=c++
-export WM_OPTIONS=$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
+export WM_LABEL_OPTION=Int$WM_LABEL_SIZE
+export WM_OPTIONS=$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION$WM_COMPILE_OPTION
 
 # base executables/libraries
 export FOAM_APPBIN=$WM_PROJECT_DIR/platforms/$WM_OPTIONS/bin
diff --git a/etc/cshrc b/etc/cshrc
index 7919fe4112..07ca5cb34d 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -74,6 +74,10 @@ setenv WM_ARCH_OPTION 64
 #    WM_PRECISION_OPTION = DP | SP
 setenv WM_PRECISION_OPTION DP
 
+#- Label size:
+#    WM_LABEL_SIZE = 32 | 64
+setenv WM_LABEL_SIZE 32
+
 #- Optimised, debug, profiling:
 #    WM_COMPILE_OPTION = Opt | Debug | Prof
 setenv WM_COMPILE_OPTION Opt
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index 870e71d8e7..d704a1800c 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.C
@@ -327,7 +327,7 @@ void Foam::fileMonitor::checkFiles() const
             else if (FD_ISSET(watcher_->inotifyFd_, &fdSet))
             {
                 // Read events
-                ssize_t nBytes = read
+                ssize_t nBytes = ::read
                 (
                     watcher_->inotifyFd_,
                     buffer,
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 7f3f5f82c6..d7c517d1b1 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -16,11 +16,16 @@ $(chars)/char/charIO.C
 $(chars)/wchar/wcharIO.C
 
 ints = primitives/ints
-$(ints)/int/intIO.C
+$(ints)/uint32/uint32.C
+$(ints)/uint32/uint32IO.C
+$(ints)/uint64/uint64.C
+$(ints)/uint64/uint64IO.C
 $(ints)/uint/uintIO.C
-$(ints)/long/longIO.C
-$(ints)/longLong/longLongIO.C
-$(ints)/ulong/ulongIO.C
+$(ints)/int32/int32.C
+$(ints)/int32/int32IO.C
+$(ints)/int64/int64.C
+$(ints)/int64/int64IO.C
+$(ints)/int/intIO.C
 $(ints)/label/label.C
 $(ints)/uLabel/uLabel.C
 $(ints)/lists/labelIOList.C
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
index 4757dbb0f7..aee4db6a2c 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
@@ -27,7 +27,6 @@ License
 
 #include "DLListBase.H"
 #include "IOstreams.H"
-#include "long.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
index 48a6ad2fa2..0997c2b56f 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
@@ -122,8 +122,11 @@ public:
                 const bool quoted=true
             ) = 0;
 
-            //- Write label
-            virtual Ostream& write(const label) = 0;
+            //- Write int32_t
+            virtual Ostream& write(const int32_t) = 0;
+
+            //- Write int64_t
+            virtual Ostream& write(const int64_t) = 0;
 
             //- Write floatScalar
             virtual Ostream& write(const floatScalar) = 0;
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C
index 971229ee3a..cd3cba54ba 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C
@@ -254,7 +254,15 @@ Foam::Ostream& Foam::UOPstream::writeQuoted
 }
 
 
-Foam::Ostream& Foam::UOPstream::write(const label val)
+Foam::Ostream& Foam::UOPstream::write(const int32_t val)
+{
+    write(char(token::LABEL));
+    writeToBuffer(val);
+    return *this;
+}
+
+
+Foam::Ostream& Foam::UOPstream::write(const int64_t val)
 {
     write(char(token::LABEL));
     writeToBuffer(val);
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
index effcc4e312..94440a244f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
@@ -156,8 +156,11 @@ public:
                 const bool quoted=true
             );
 
-            //- Write label
-            Ostream& write(const label);
+            //- Write int32_t
+            virtual Ostream& write(const int32_t);
+
+            //- Write int64_t
+            Ostream& write(const int64_t);
 
             //- Write floatScalar
             Ostream& write(const floatScalar);
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index e975cd4b89..5f8a976c0f 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -409,7 +409,12 @@ Foam::UPstream::treeCommunication_(10);
 
 // Allocate a serial communicator. This gets overwritten in parallel mode
 // (by UPstream::setParRun())
-Foam::UPstream::communicator serialComm(-1, Foam::labelList(1, 0), false);
+Foam::UPstream::communicator serialComm
+(
+    -1,
+    Foam::labelList(1, Foam::label(0)),
+    false
+);
 
 
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 73a6388b97..e0a4f0040a 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -413,7 +413,7 @@ public:
         }
 
         //- Process ID of given process index
-        static List<int>& procID(int communicator)
+        static List<int>& procID(label communicator)
         {
             return procIDs_[communicator];
         }
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C b/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
index 62cce15f7d..ddc39244f6 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,16 +31,10 @@ Description
 #include "PstreamCombineReduceOps.H"
 #include "UPstream.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-//template<template<class> class ListType, class T>
 template<class Container, class T>
-void Pstream::exchange
+void Foam::Pstream::exchange
 (
     const List<Container>& sendBufs,
     List<Container>& recvBufs,
@@ -55,7 +49,7 @@ void Pstream::exchange
         FatalErrorIn
         (
             "Pstream::exchange(..)"
-        )   << "Continuous data only." << Foam::abort(FatalError);
+        )   << "Continuous data only." << sizeof(T) << Foam::abort(FatalError);
     }
 
     if (sendBufs.size() != UPstream::nProcs(comm))
@@ -153,8 +147,4 @@ void Pstream::exchange
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
index 3c7d266520..406567a947 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
@@ -350,8 +350,8 @@ Foam::Istream& Foam::ISstream::read(token& t)
                 {
                     if (asLabel)
                     {
-                        label labelVal;
-                        if (readLabel(buf, labelVal))
+                        label labelVal = 0;
+                        if (Foam::read(buf, labelVal))
                         {
                             t = labelVal;
                         }
@@ -367,21 +367,6 @@ Foam::Istream& Foam::ISstream::read(token& t)
                             {
                                 t.setBad();
                             }
-// ---------------------------------------
-// this would also be possible if desired:
-// ---------------------------------------
-//                        // return as a label when possible
-//                        // eg, 1E6 -> 1000000
-//                        if (scalarVal <= labelMax && scalarVal >= labelMin)
-//                        {
-//                            label labelVal(scalarVal);
-//
-//                            if (labelVal == scalarVal)
-//                            {
-//                                t = labelVal;
-//                            }
-//                        }
-
                         }
                     }
                     else
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
index 90f77a4802..bc06242993 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
@@ -183,7 +183,15 @@ Foam::Ostream& Foam::OSstream::writeQuoted
 }
 
 
-Foam::Ostream& Foam::OSstream::write(const label val)
+Foam::Ostream& Foam::OSstream::write(const int32_t val)
+{
+    os_ << val;
+    setState(os_.rdstate());
+    return *this;
+}
+
+
+Foam::Ostream& Foam::OSstream::write(const int64_t val)
 {
     os_ << val;
     setState(os_.rdstate());
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
index 8d2ef11dfc..ba840698f7 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
@@ -130,8 +130,11 @@ public:
                 const bool quoted=true
             );
 
-            //- Write label
-            virtual Ostream& write(const label);
+            //- Write int32_t
+            virtual Ostream& write(const int32_t);
+
+            //- Write int64_t
+            virtual Ostream& write(const int64_t);
 
             //- Write floatScalar
             virtual Ostream& write(const floatScalar);
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C
index a1b80fe57b..f290d94ce7 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C
@@ -137,7 +137,14 @@ Foam::Ostream& Foam::prefixOSstream::writeQuoted
 }
 
 
-Foam::Ostream& Foam::prefixOSstream::write(const label val)
+Foam::Ostream& Foam::prefixOSstream::write(const int32_t val)
+{
+    checkWritePrefix();
+    return OSstream::write(val);
+}
+
+
+Foam::Ostream& Foam::prefixOSstream::write(const int64_t val)
 {
     checkWritePrefix();
     return OSstream::write(val);
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
index b6d824da46..89a7b62771 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
@@ -121,8 +121,11 @@ public:
                 const bool quoted=true
             );
 
-            //- Write label
-            virtual Ostream& write(const label);
+            //- Write int32_t
+            virtual Ostream& write(const int32_t);
+
+            //- Write int64_t
+            virtual Ostream& write(const int64_t);
 
             //- Write floatScalar
             virtual Ostream& write(const floatScalar);
diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
index 43229b18fd..d1f2f209d3 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,13 +25,13 @@ License
 
 #include "dlLibraryTable.H"
 #include "OSspecific.H"
-#include "long.H"
+#include "int.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-defineTypeNameAndDebug(dlLibraryTable, 0);
+    defineTypeNameAndDebug(dlLibraryTable, 0);
 }
 
 
@@ -63,7 +63,7 @@ Foam::dlLibraryTable::~dlLibraryTable()
             {
                 Info<< "dlLibraryTable::~dlLibraryTable() : closing "
                     << libNames_[i]
-                    << " with handle " << long(libPtrs_[i]) << endl;
+                    << " with handle " << uintptr_t(libPtrs_[i]) << endl;
             }
             dlClose(libPtrs_[i]);
         }
@@ -86,7 +86,7 @@ bool Foam::dlLibraryTable::open
         if (debug)
         {
             Info<< "dlLibraryTable::open : opened " << functionLibName
-                << " resulting in handle " << long(functionLibPtr) << endl;
+                << " resulting in handle " << uintptr_t(functionLibPtr) << endl;
         }
 
         if (!functionLibPtr)
@@ -137,7 +137,7 @@ bool Foam::dlLibraryTable::close
         if (debug)
         {
             Info<< "dlLibraryTable::close : closing " << functionLibName
-                << " with handle " << long(libPtrs_[index]) << endl;
+                << " with handle " << uintptr_t(libPtrs_[index]) << endl;
         }
 
         bool ok = dlClose(libPtrs_[index]);
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index b5a49f6881..d38814f622 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -530,7 +530,7 @@ TMP_UNARY_FUNCTION(Type, average)
 #define G_UNARY_FUNCTION(ReturnType, gFunc, Func, rFunc)                      \
                                                                               \
 template<class Type>                                                          \
-ReturnType gFunc(const UList<Type>& f, const int comm)                        \
+ReturnType gFunc(const UList<Type>& f, const label comm)                      \
 {                                                                             \
     ReturnType res = Func(f);                                                 \
     reduce(res, rFunc##Op<Type>(), Pstream::msgType(), comm);                 \
@@ -554,7 +554,7 @@ scalar gSumProd
 (
     const UList<Type>& f1,
     const UList<Type>& f2,
-    const int comm
+    const label comm
 )
 {
     scalar SumProd = sumProd(f1, f2);
@@ -567,7 +567,7 @@ Type gSumCmptProd
 (
     const UList<Type>& f1,
     const UList<Type>& f2,
-    const int comm
+    const label comm
 )
 {
     Type SumProd = sumCmptProd(f1, f2);
@@ -579,7 +579,7 @@ template<class Type>
 Type gAverage
 (
     const UList<Type>& f,
-    const int comm
+    const label comm
 )
 {
     label n = f.size();
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
index 4c51262f9e..a5ecff56cf 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.H
@@ -212,7 +212,7 @@ TMP_UNARY_FUNCTION(Type, average)
 #define G_UNARY_FUNCTION(ReturnType, gFunc, Func, rFunc)                      \
                                                                               \
 template<class Type>                                                          \
-ReturnType gFunc(const UList<Type>& f, const int comm = UPstream::worldComm); \
+ReturnType gFunc(const UList<Type>& f, const label comm = UPstream::worldComm);\
 TMP_UNARY_FUNCTION(ReturnType, gFunc)
 
 G_UNARY_FUNCTION(Type, gMax, max, max)
@@ -231,7 +231,7 @@ scalar gSumProd
 (
     const UList<Type>& f1,
     const UList<Type>& f2,
-    const int comm = UPstream::worldComm
+    const label comm = UPstream::worldComm
 );
 
 template<class Type>
@@ -239,14 +239,14 @@ Type gSumCmptProd
 (
     const UList<Type>& f1,
     const UList<Type>& f2,
-    const int comm = UPstream::worldComm
+    const label comm = UPstream::worldComm
 );
 
 template<class Type>
 Type gAverage
 (
     const UList<Type>& f,
-    const int comm = UPstream::worldComm
+    const label comm = UPstream::worldComm
 );
 
 TMP_UNARY_FUNCTION(Type, gAverage)
diff --git a/src/OpenFOAM/include/OSspecific.H b/src/OpenFOAM/include/OSspecific.H
index 14052f8a87..384467b032 100644
--- a/src/OpenFOAM/include/OSspecific.H
+++ b/src/OpenFOAM/include/OSspecific.H
@@ -37,7 +37,6 @@ SourceFiles
 #define OSspecific_H
 
 #include "fileNameList.H"
-#include "long.H"
 
 #include <sys/types.h>
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
index 65d10613ee..3b784d3bb2 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
@@ -85,7 +85,7 @@ public:
         // Access
 
             //- Return communicator used for parallel communication
-            virtual int comm() const = 0;
+            virtual label comm() const = 0;
 
             //- Return processor number (rank in communicator)
             virtual int myProcNo() const = 0;
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
index 82ff49fb6f..9ebbe16e2a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
@@ -72,7 +72,7 @@ public:
         // Access
 
             //- Return communicator used for comms
-            virtual int comm() const = 0;
+            virtual label comm() const = 0;
 
             //- Return processor number
             virtual int myProcNo() const = 0;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index 066aa39d3b..9d933ee3b7 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -677,7 +677,7 @@ void Foam::GAMGAgglomeration::calculateRegionMaster
     const label comm,
     const labelList& procAgglomMap,
     labelList& masterProcs,
-    List<int>& agglomProcIDs
+    List<label>& agglomProcIDs
 )
 {
     // Determine the master processors
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
index 37cf4a9197..8f0ff18d41 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
@@ -435,7 +435,7 @@ public:
                 const label comm,
                 const labelList& procAgglomMap,
                 labelList& masterProcs,
-                List<int>& agglomProcIDs
+                List<label>& agglomProcIDs
             );
 
             //- Whether to agglomerate across processors
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
index 39d69458e2..b8b142d84a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerationTemplates.C
@@ -34,7 +34,6 @@ void Foam::GAMGAgglomeration::gatherList
 (
     const label comm,
     const labelList& procIDs,
-
     const Type& myVal,
     List<Type>& allVals,
     const int tag
@@ -123,7 +122,7 @@ void Foam::GAMGAgglomeration::restrictField
     {
         label fineComm = UPstream::parent(procCommunicator_[coarseLevelIndex]);
 
-        const List<int>& procIDs = agglomProcIDs(coarseLevelIndex);
+        const List<label>& procIDs = agglomProcIDs(coarseLevelIndex);
         const labelList& offsets = cellOffsets(coarseLevelIndex);
 
         globalIndex::gather
@@ -196,7 +195,7 @@ void Foam::GAMGAgglomeration::prolongField
             procCommunicator_[coarseLevelIndex]
         );
 
-        const List<int>& procIDs = agglomProcIDs(coarseLevelIndex);
+        const List<label>& procIDs = agglomProcIDs(coarseLevelIndex);
         const labelList& offsets = cellOffsets(coarseLevelIndex);
 
         label localSize = nCells_[levelIndex];
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
index d3a83dac79..2c2e052bed 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.C
@@ -266,7 +266,7 @@ bool Foam::GAMGProcAgglomeration::agglomerate
     const label fineLevelIndex,
     const labelList& procAgglomMap,
     const labelList& masterProcs,
-    const List<int>& agglomProcIDs,
+    const List<label>& agglomProcIDs,
     const label procAgglomComm
 )
 {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
index c3acc01521..b602779b30 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/GAMGProcAgglomeration/GAMGProcAgglomeration.H
@@ -71,7 +71,7 @@ protected:
             const label fineLevelIndex,
             const labelList& procAgglomMap,
             const labelList& masterProcs,
-            const List<int>& agglomProcIDs,
+            const List<label>& agglomProcIDs,
             const label procAgglomComm
         );
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C
index c1f166d1ec..ba4da8081f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/eagerGAMGProcAgglomeration/eagerGAMGProcAgglomeration.C
@@ -116,7 +116,7 @@ bool Foam::eagerGAMGProcAgglomeration::agglomerate()
                     labelList masterProcs;
                     // Local processors that agglomerate. agglomProcIDs[0]
                     // is in masterProc.
-                    List<int> agglomProcIDs;
+                    List<label> agglomProcIDs;
                     GAMGAgglomeration::calculateRegionMaster
                     (
                         levelComm,
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
index 480795fb55..6f097c19c9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/masterCoarsestGAMGProcAgglomeration/masterCoarsestGAMGProcAgglomeration.C
@@ -104,7 +104,7 @@ bool Foam::masterCoarsestGAMGProcAgglomeration::agglomerate()
                 labelList masterProcs;
                 // Local processors that agglomerate. agglomProcIDs[0] is in
                 // masterProc.
-                List<int> agglomProcIDs;
+                List<label> agglomProcIDs;
                 GAMGAgglomeration::calculateRegionMaster
                 (
                     levelComm,
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 6e13d52c99..3002169e64 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -151,7 +151,7 @@ Foam::procFacesGAMGProcAgglomeration::processorAgglomeration
     label singleCellMeshComm = UPstream::allocateCommunicator
     (
         mesh.comm(),
-        labelList(1, 0)            // only processor 0
+        labelList(1, label(0))            // only processor 0
     );
 
     scalarField faceWeights;
@@ -283,7 +283,7 @@ bool Foam::procFacesGAMGProcAgglomeration::agglomerate()
                     labelList masterProcs;
                     // Local processors that agglomerate. agglomProcIDs[0] is in
                     // masterProc.
-                    List<int> agglomProcIDs;
+                    List<label> agglomProcIDs;
                     GAMGAgglomeration::calculateRegionMaster
                     (
                         levelComm,
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
index c47c0aeee6..a68475bfab 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
@@ -164,7 +164,7 @@ Foam::GAMGSolver::GAMGSolver
 
                     const labelList& procAgglomMap =
                         agglomeration_.procAgglomMap(fineLevelIndex+1);
-                    const List<int>& procIDs =
+                    const List<label>& procIDs =
                         agglomeration_.agglomProcIDs(fineLevelIndex+1);
 
                     procAgglomerateMatrix
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
index 7dcd045ee4..40c67d2bb3 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
@@ -194,7 +194,7 @@ class GAMGSolver
             PtrList<FieldField<Field, scalar> >& otherBouCoeffs,
             PtrList<FieldField<Field, scalar> >& otherIntCoeffs,
             List<boolList>& otherTransforms,
-            List<List<int> >& otherRanks
+            List<List<label> >& otherRanks
         ) const;
 
         //- Agglomerate processor matrices
@@ -202,7 +202,7 @@ class GAMGSolver
         (
             // Agglomeration information
             const labelList& procAgglomMap,
-            const List<int>& agglomProcIDs,
+            const List<label>& agglomProcIDs,
 
             const label levelI,
 
@@ -218,7 +218,7 @@ class GAMGSolver
         void procAgglomerateMatrix
         (
             const labelList& procAgglomMap,
-            const List<int>& agglomProcIDs,
+            const List<label>& agglomProcIDs,
             const label levelI
         );
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index dc3cad1051..6860e55f2f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -296,7 +296,7 @@ void Foam::GAMGSolver::gatherMatrices
     PtrList<FieldField<Field, scalar> >& otherBouCoeffs,
     PtrList<FieldField<Field, scalar> >& otherIntCoeffs,
     List<boolList>& otherTransforms,
-    List<List<int> >& otherRanks
+    List<List<label> >& otherRanks
 ) const
 {
     if (debug)
@@ -332,7 +332,7 @@ void Foam::GAMGSolver::gatherMatrices
 
             // Receive number of/valid interfaces
             boolList& procTransforms = otherTransforms[otherI];
-            List<int>& procRanks = otherRanks[otherI];
+            List<label>& procRanks = otherRanks[otherI];
 
             fromSlave >> procTransforms;
             fromSlave >> procRanks;
@@ -372,7 +372,7 @@ void Foam::GAMGSolver::gatherMatrices
 
         // Count valid interfaces
         boolList procTransforms(interfaceBouCoeffs.size(), false);
-        List<int> procRanks(interfaceBouCoeffs.size(), -1);
+        List<label> procRanks(interfaceBouCoeffs.size(), -1);
         forAll(interfaces, intI)
         {
             if (interfaces.set(intI))
@@ -415,7 +415,7 @@ void Foam::GAMGSolver::procAgglomerateMatrix
 (
     // Agglomeration information
     const labelList& procAgglomMap,
-    const List<int>& agglomProcIDs,
+    const List<label>& agglomProcIDs,
 
     const label levelI,
 
@@ -451,7 +451,7 @@ void Foam::GAMGSolver::procAgglomerateMatrix
     PtrList<FieldField<Field, scalar> > otherBouCoeffs;
     PtrList<FieldField<Field, scalar> > otherIntCoeffs;
     List<boolList> otherTransforms;
-    List<List<int> > otherRanks;
+    List<List<label> > otherRanks;
     gatherMatrices
     (
         agglomProcIDs,
@@ -745,7 +745,7 @@ void Foam::GAMGSolver::procAgglomerateMatrix
 void Foam::GAMGSolver::procAgglomerateMatrix
 (
     const labelList& procAgglomMap,
-    const List<int>& agglomProcIDs,
+    const List<label>& agglomProcIDs,
 
     const label levelI
 )
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
index c86ee5c05f..1cadfe44fd 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
@@ -155,7 +155,7 @@ public:
         //- Processor interface functions
 
             //- Return communicator used for comms
-            virtual int comm() const
+            virtual label comm() const
             {
                 return procInterface_.comm();
             }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
index 3d0c9d28c3..0a157d416f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
@@ -148,7 +148,7 @@ public:
         //- Processor interface functions
 
             //- Return communicator used for sending
-            virtual int comm() const
+            virtual label comm() const
             {
                 return comm_;
             }
diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.H b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
index 7a092a676d..4564c2249d 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
@@ -80,7 +80,7 @@ public:
             virtual lduInterfacePtrsList interfaces() const = 0;
 
             //- Return communicator used for parallel communication
-            virtual int comm() const = 0;
+            virtual label comm() const = 0;
 
             //- Helper: reduce with current communicator
             template<class T, class BinaryOp>
diff --git a/src/OpenFOAM/primitives/contiguous/contiguous.H b/src/OpenFOAM/primitives/contiguous/contiguous.H
index 7a237d031c..1555b5979d 100644
--- a/src/OpenFOAM/primitives/contiguous/contiguous.H
+++ b/src/OpenFOAM/primitives/contiguous/contiguous.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-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,8 @@ Description
 #ifndef contiguous_H
 #define contiguous_H
 
+#include <stdint.h>
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -70,67 +72,60 @@ template<>
 inline bool contiguous<Pair<char> >()                       {return true;}
 
 template<>
-inline bool contiguous<unsigned char>()                     {return true;}
+inline bool contiguous<int8_t>()                            {return true;}
 template<>
-inline bool contiguous<FixedList<unsigned char, 2> >()      {return true;}
+inline bool contiguous<FixedList<int8_t, 2> >()             {return true;}
 template<>
-inline bool contiguous<Pair<unsigned char> >()              {return true;}
+inline bool contiguous<Pair<int8_t> >()                     {return true;}
 
 template<>
-inline bool contiguous<short>()                             {return true;}
+inline bool contiguous<uint8_t>()                           {return true;}
 template<>
-inline bool contiguous<FixedList<short, 2> >()              {return true;}
+inline bool contiguous<FixedList<uint8_t, 2> >()            {return true;}
 template<>
-inline bool contiguous<Pair<short> >()                      {return true;}
+inline bool contiguous<Pair<uint8_t> >()                    {return true;}
 
 template<>
-inline bool contiguous<unsigned short>()                    {return true;}
+inline bool contiguous<int16_t>()                           {return true;}
 template<>
-inline bool contiguous<FixedList<unsigned short, 2> >()     {return true;}
+inline bool contiguous<FixedList<int16_t, 2> >()            {return true;}
 template<>
-inline bool contiguous<Pair<unsigned short> >()             {return true;}
+inline bool contiguous<Pair<int16_t> >()                    {return true;}
 
 template<>
-inline bool contiguous<int>()                               {return true;}
+inline bool contiguous<uint16_t>()                          {return true;}
 template<>
-inline bool contiguous<FixedList<int, 2> >()                {return true;}
+inline bool contiguous<FixedList<uint16_t, 2> >()           {return true;}
 template<>
-inline bool contiguous<Pair<int> >()                        {return true;}
+inline bool contiguous<Pair<uint16_t> >()                   {return true;}
 
 template<>
-inline bool contiguous<unsigned int>()                      {return true;}
+inline bool contiguous<int32_t>()                           {return true;}
 template<>
-inline bool contiguous<FixedList<unsigned int, 2> >()       {return true;}
+inline bool contiguous<FixedList<int32_t, 2> >()            {return true;}
 template<>
-inline bool contiguous<Pair<unsigned int> >()               {return true;}
+inline bool contiguous<Pair<int32_t> >()                    {return true;}
 
 template<>
-inline bool contiguous<long>()                              {return true;}
+inline bool contiguous<uint32_t>()                          {return true;}
 template<>
-inline bool contiguous<FixedList<long, 2> >()               {return true;}
+inline bool contiguous<FixedList<uint32_t, 2> >()           {return true;}
 template<>
-inline bool contiguous<Pair<long> >()                       {return true;}
+inline bool contiguous<Pair<uint32_t> >()                   {return true;}
 
 template<>
-inline bool contiguous<unsigned long>()                     {return true;}
+inline bool contiguous<int64_t>()                           {return true;}
 template<>
-inline bool contiguous<FixedList<unsigned long, 2> >()      {return true;}
+inline bool contiguous<FixedList<int64_t, 2> >()            {return true;}
 template<>
-inline bool contiguous<Pair<unsigned long> >()              {return true;}
+inline bool contiguous<Pair<int64_t> >()                    {return true;}
 
 template<>
-inline bool contiguous<long long>()                         {return true;}
+inline bool contiguous<uint64_t>()                          {return true;}
 template<>
-inline bool contiguous<FixedList<long long, 2> >()          {return true;}
+inline bool contiguous<FixedList<uint64_t, 2> >()           {return true;}
 template<>
-inline bool contiguous<Pair<long long> >()                  {return true;}
-
-template<>
-inline bool contiguous<unsigned long long>()                {return true;}
-template<>
-inline bool contiguous<FixedList<unsigned long long, 2> >() {return true;}
-template<>
-inline bool contiguous<Pair<unsigned long long> >()         {return true;}
+inline bool contiguous<Pair<uint64_t> >()                   {return true;}
 
 template<>
 inline bool contiguous<float>()                             {return true;}
diff --git a/src/OpenFOAM/primitives/ints/int/int.H b/src/OpenFOAM/primitives/ints/int/int.H
index 9f3a34c978..a3ab4b5ac1 100644
--- a/src/OpenFOAM/primitives/ints/int/int.H
+++ b/src/OpenFOAM/primitives/ints/int/int.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,6 @@ Description
     System integer
 
 SourceFiles
-    int.C
     intIO.C
 
 \*---------------------------------------------------------------------------*/
@@ -36,27 +35,40 @@ SourceFiles
 #ifndef int_H
 #define int_H
 
-#include "word.H"
+#include "int32.H"
+#include "int64.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-class Istream;
-class Ostream;
+#define MAXMIN(retType, type1, type2)              \
+                                                   \
+inline retType max(const type1 s1, const type2 s2) \
+{                                                  \
+    return (s1 > s2)? s1: s2;                      \
+}                                                  \
+                                                   \
+inline retType min(const type1 s1, const type2 s2) \
+{                                                  \
+    return (s1 < s2)? s1: s2;                      \
+}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Return a word representation of an int
-word name(const int);
+MAXMIN(int8_t, int8_t, int8_t)
+MAXMIN(int16_t, int16_t, int16_t)
+
+MAXMIN(int32_t, int32_t, int32_t)
+MAXMIN(int64_t, int64_t, int32_t)
+MAXMIN(int64_t, int32_t, int64_t)
+MAXMIN(int64_t, int64_t, int64_t)
+
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 int readInt(Istream&);
-bool readInt(const char*, int&);
-Istream& operator>>(Istream&, int&);
-Ostream& operator<<(Ostream&, const int);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/ints/int/intIO.C b/src/OpenFOAM/primitives/ints/int/intIO.C
index bd02519897..9250e37313 100644
--- a/src/OpenFOAM/primitives/ints/int/intIO.C
+++ b/src/OpenFOAM/primitives/ints/int/intIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,64 +21,13 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Reads an int from an input stream, for a given version
-    number and File format. If an ascii File is being read,
-    then the line numbers are counted and an erroneous read
-    ised.
-
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
 #include "int.H"
 #include "IOstreams.H"
 
-#include <sstream>
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::word Foam::name(const int val)
-{
-    std::ostringstream buf;
-    buf << val;
-    return buf.str();
-}
-
-
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, int& i)
-{
-    token t(is);
-
-    if (!t.good())
-    {
-        is.setBad();
-        return is;
-    }
-
-    if (t.isLabel())
-    {
-        i = int(t.labelToken());
-    }
-    else
-    {
-        is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, int&)", is)
-            << "wrong token type - expected int, found " << t.info()
-            << exit(FatalIOError);
-
-        return is;
-    }
-
-    // Check state of Istream
-    is.check("Istream& operator>>(Istream&, int&)");
-
-    return is;
-}
-
-
 int Foam::readInt(Istream& is)
 {
     int val;
@@ -88,21 +37,4 @@ int Foam::readInt(Istream& is)
 }
 
 
-bool Foam::readInt(const char* buf, int& s)
-{
-    char *endptr = NULL;
-    long l = strtol(buf, &endptr, 10);
-    s = int(l);
-    return (*endptr == 0);
-}
-
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const int i)
-{
-    os.write(label(i));
-    os.check("Ostream& operator<<(Ostream&, const int)");
-    return os;
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/int32/int32.C b/src/OpenFOAM/primitives/ints/int32/int32.C
new file mode 100644
index 0000000000..c3674a58f7
--- /dev/null
+++ b/src/OpenFOAM/primitives/ints/int32/int32.C
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "int32.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+const int32_t Foam::pTraits<int32_t>::zero = 0;
+const int32_t Foam::pTraits<int32_t>::one = 1;
+const int32_t Foam::pTraits<int32_t>::min = INT32_MIN;
+const int32_t Foam::pTraits<int32_t>::max = INT32_MAX;
+const int32_t Foam::pTraits<int32_t>::rootMin = pTraits<int32_t>::min;
+const int32_t Foam::pTraits<int32_t>::rootMax = pTraits<int32_t>::max;
+
+const char* Foam::pTraits<int32_t>::componentNames[] = { "x" };
+
+Foam::pTraits<int32_t>::pTraits(const int32_t& p)
+:
+    p_(p)
+{}
+
+Foam::pTraits<int32_t>::pTraits(Istream& is)
+{
+    is >> p_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/int32/int32.H b/src/OpenFOAM/primitives/ints/int32/int32.H
new file mode 100644
index 0000000000..4a36238ba2
--- /dev/null
+++ b/src/OpenFOAM/primitives/ints/int32/int32.H
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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/>.
+
+Primitive
+    int32
+
+Description
+    32bit integer
+
+SourceFiles
+    int32.C
+    int32IO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef int32_H
+#define int32_H
+
+#include <stdint.h>
+#include <climits>
+#include <cstdlib>
+
+#include "word.H"
+#include "pTraits.H"
+#include "direction.H"
+
+#ifndef UINT32_MIN
+#define UINT32_MIN 0
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Istream;
+class Ostream;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Return a word representation of an int32
+word name(const int32_t);
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+int32_t readInt32(Istream&);
+bool read(const char*, int32_t&);
+Istream& operator>>(Istream&, int32_t&);
+Ostream& operator<<(Ostream&, const int32_t);
+
+//- template specialization for pTraits<int32_t>
+template<>
+class pTraits<int32_t>
+{
+    int32_t p_;
+
+public:
+
+    //- Component type
+    typedef int32_t cmptType;
+
+    // Member constants
+
+        enum
+        {
+            dim = 3,         //!< Dimensionality of space
+            rank = 0,        //!< Rank of int32_t is 0
+            nComponents = 1  //!< Number of components in int32_t is 1
+        };
+
+
+    // Static data members
+
+        static const char* const typeName;
+        static const char* componentNames[];
+        static const int32_t zero;
+        static const int32_t one;
+        static const int32_t min;
+        static const int32_t max;
+        static const int32_t rootMax;
+        static const int32_t rootMin;
+
+
+    // Constructors
+
+        //- Construct from primitive
+        explicit pTraits(const int32_t&);
+
+        //- Construct from Istream
+        pTraits(Istream&);
+
+
+    // Member Functions
+
+        //- Access to the int32_t value
+        operator int32_t() const
+        {
+            return p_;
+        }
+
+        //- Access to the int value
+        operator int32_t&()
+        {
+            return p_;
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/ulong/ulongIO.C b/src/OpenFOAM/primitives/ints/int32/int32IO.C
similarity index 69%
rename from src/OpenFOAM/primitives/ints/ulong/ulongIO.C
rename to src/OpenFOAM/primitives/ints/int32/int32IO.C
index a3e6097104..209e9ae0d1 100644
--- a/src/OpenFOAM/primitives/ints/ulong/ulongIO.C
+++ b/src/OpenFOAM/primitives/ints/int32/int32IO.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) 2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,30 +21,28 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Reads a ulong from an input stream.
-
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
 
-#include "ulong.H"
+#include "int32.H"
 #include "IOstreams.H"
 
 #include <sstream>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::word Foam::name(const unsigned long val)
+Foam::word Foam::name(const int32_t val)
 {
     std::ostringstream buf;
     buf << val;
     return buf.str();
 }
 
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, unsigned long& val)
+Foam::Istream& Foam::operator>>(Istream& is, int32_t& i)
 {
     token t(is);
 
@@ -56,38 +54,47 @@ Foam::Istream& Foam::operator>>(Istream& is, unsigned long& val)
 
     if (t.isLabel())
     {
-        val = static_cast<unsigned long>(t.labelToken());
+        i = int32_t(t.labelToken());
     }
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, unsigned long&)", is)
-            << "wrong token type - expected unsigned long, found " << t.info()
+        FatalIOErrorIn("operator>>(Istream&, int32_t&)", is)
+            << "wrong token type - expected int32_t, found " << t.info()
             << exit(FatalIOError);
 
         return is;
     }
 
     // Check state of Istream
-    is.check("Istream& operator>>(Istream&, unsigned long&)");
+    is.check("Istream& operator>>(Istream&, int32_t&)");
 
     return is;
 }
 
 
-unsigned long Foam::readUlong(Istream& is)
+int32_t Foam::readInt32(Istream& is)
 {
-    unsigned long val;
+    int32_t val;
     is >> val;
 
     return val;
 }
 
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const unsigned long val)
+bool Foam::read(const char* buf, int32_t& s)
 {
-    os.write(label(val));
-    os.check("Ostream& operator<<(Ostream&, const unsigned long)");
+    char *endptr = NULL;
+    long l = strtol(buf, &endptr, 10);
+    s = int32_t(l);
+    return (*endptr == 0);
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const int32_t i)
+{
+    os.write(label(i));
+    os.check("Ostream& operator<<(Ostream&, const int32_t)");
     return os;
 }
 
diff --git a/src/OpenFOAM/primitives/ints/int64/int64.C b/src/OpenFOAM/primitives/ints/int64/int64.C
new file mode 100644
index 0000000000..351eff9de2
--- /dev/null
+++ b/src/OpenFOAM/primitives/ints/int64/int64.C
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "int64.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+const int64_t Foam::pTraits<int64_t>::zero = 0;
+const int64_t Foam::pTraits<int64_t>::one = 1;
+const int64_t Foam::pTraits<int64_t>::min = INT64_MIN;
+const int64_t Foam::pTraits<int64_t>::max = INT64_MAX;
+const int64_t Foam::pTraits<int64_t>::rootMin = pTraits<int64_t>::min;
+const int64_t Foam::pTraits<int64_t>::rootMax = pTraits<int64_t>::max;
+
+const char* Foam::pTraits<int64_t>::componentNames[] = { "x" };
+
+Foam::pTraits<int64_t>::pTraits(const int64_t& p)
+:
+    p_(p)
+{}
+
+Foam::pTraits<int64_t>::pTraits(Istream& is)
+{
+    is >> p_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/int64/int64.H b/src/OpenFOAM/primitives/ints/int64/int64.H
new file mode 100644
index 0000000000..757a6d62fe
--- /dev/null
+++ b/src/OpenFOAM/primitives/ints/int64/int64.H
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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/>.
+
+Primitive
+    int64
+
+Description
+    64bit integer
+
+SourceFiles
+    int64.C
+    int64IO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef int64_H
+#define int64_H
+
+#include <stdint.h>
+#include <climits>
+#include <cstdlib>
+
+#include "word.H"
+#include "pTraits.H"
+#include "direction.H"
+
+#ifndef UINT64_MIN
+#define UINT64_MIN 0
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Istream;
+class Ostream;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Return a word representation of an int64
+word name(const int64_t);
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+int64_t readInt64(Istream&);
+bool read(const char*, int64_t&);
+Istream& operator>>(Istream&, int64_t&);
+Ostream& operator<<(Ostream&, const int64_t);
+
+//- template specialization for pTraits<int64_t>
+template<>
+class pTraits<int64_t>
+{
+    int64_t p_;
+
+public:
+
+    //- Component type
+    typedef int64_t cmptType;
+
+    // Member constants
+
+        enum
+        {
+            dim = 3,         //!< Dimensionality of space
+            rank = 0,        //!< Rank of int64_t is 0
+            nComponents = 1  //!< Number of components in int64_t is 1
+        };
+
+
+    // Static data members
+
+        static const char* const typeName;
+        static const char* componentNames[];
+        static const int64_t zero;
+        static const int64_t one;
+        static const int64_t min;
+        static const int64_t max;
+        static const int64_t rootMax;
+        static const int64_t rootMin;
+
+
+    // Constructors
+
+        //- Construct from primitive
+        explicit pTraits(const int64_t&);
+
+        //- Construct from Istream
+        pTraits(Istream&);
+
+
+    // Member Functions
+
+        //- Access to the int64_t value
+        operator int64_t() const
+        {
+            return p_;
+        }
+
+        //- Access to the int value
+        operator int64_t&()
+        {
+            return p_;
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/long/longIO.C b/src/OpenFOAM/primitives/ints/int64/int64IO.C
similarity index 68%
rename from src/OpenFOAM/primitives/ints/long/longIO.C
rename to src/OpenFOAM/primitives/ints/int64/int64IO.C
index 7e352bd9db..84bd2a045b 100644
--- a/src/OpenFOAM/primitives/ints/long/longIO.C
+++ b/src/OpenFOAM/primitives/ints/int64/int64IO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,32 +21,28 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Reads a long from an input stream, for a given version
-    number and File format. If an ascii File is being read, then the line
-    numbers are counted and an erroneous read ised.
-
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
 
-#include "long.H"
+#include "int64.H"
 #include "IOstreams.H"
 
 #include <sstream>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::word Foam::name(const long val)
+Foam::word Foam::name(const int64_t val)
 {
     std::ostringstream buf;
     buf << val;
     return buf.str();
 }
 
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, long& l)
+Foam::Istream& Foam::operator>>(Istream& is, int64_t& i)
 {
     token t(is);
 
@@ -58,45 +54,47 @@ Foam::Istream& Foam::operator>>(Istream& is, long& l)
 
     if (t.isLabel())
     {
-        l = long(t.labelToken());
+        i = int64_t(t.labelToken());
     }
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, long&)", is)
-            << "wrong token type - expected long, found " << t.info()
+        FatalIOErrorIn("operator>>(Istream&, int64_t&)", is)
+            << "wrong token type - expected int64_t, found " << t.info()
             << exit(FatalIOError);
 
         return is;
     }
 
     // Check state of Istream
-    is.check("Istream& operator>>(Istream&, long&)");
+    is.check("Istream& operator>>(Istream&, int64_t&)");
 
     return is;
 }
 
 
-long Foam::readLong(Istream& is)
+int64_t Foam::readInt64(Istream& is)
 {
-    long val;
+    int64_t val;
     is >> val;
 
     return val;
 }
 
-bool Foam::readLong(const char* buf, long& s)
+
+bool Foam::read(const char* buf, int64_t& s)
 {
     char *endptr = NULL;
-    s = strtol(buf, &endptr, 10);
+    long l = strtol(buf, &endptr, 10);
+    s = int64_t(l);
     return (*endptr == 0);
 }
 
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const long l)
+Foam::Ostream& Foam::operator<<(Ostream& os, const int64_t i)
 {
-    os.write(label(l));
-    os.check("Ostream& operator<<(Ostream&, const long)");
+    os.write(label(i));
+    os.check("Ostream& operator<<(Ostream&, const int64_t)");
     return os;
 }
 
diff --git a/src/OpenFOAM/primitives/ints/label/label.C b/src/OpenFOAM/primitives/ints/label/label.C
index d0129af7da..b09c3fa5e6 100644
--- a/src/OpenFOAM/primitives/ints/label/label.C
+++ b/src/OpenFOAM/primitives/ints/label/label.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,63 +28,18 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-const char* const pTraits<label>::typeName = "label";
-const label pTraits<label>::zero = 0;
-const label pTraits<label>::one = 1;
-const label pTraits<label>::min = labelMin;
-const label pTraits<label>::max = labelMax;
-const label pTraits<label>::rootMin = pTraits<label>::min;
-const label pTraits<label>::rootMax = pTraits<label>::max;
-
-const char* pTraits<label>::componentNames[] = { "x" };
-
-pTraits<label>::pTraits(const label& p)
-:
-    p_(p)
-{}
-
-
-pTraits<label>::pTraits(Istream& is)
-{
-    is >> p_;
-}
-
-
-#if (FOAM_LABEL_MAX != INT_MAX)
-const char* const pTraits<int>::typeName = "int";
-const int pTraits<int>::zero = 0;
-const int pTraits<int>::one = 1;
-const int pTraits<int>::min = INT_MIN;
-const int pTraits<int>::max = INT_MAX;
-const int pTraits<int>::min = INT_MIN;
-const int pTraits<int>::max = INT_MAX;
-const int pTraits<int>::rootMin = pTraits<int>::min;
-const int pTraits<int>::rootMax = pTraits<int>::max;
-
-const char* pTraits<int>::componentNames[] = { "x" };
-
-pTraits<int>::pTraits(const int& p)
-:
-    p_(p)
-{}
-
-
-pTraits<int>::pTraits(Istream& is)
-{
-    is >> p_;
-}
+#if WM_LABEL_SIZE == 32
+const char* const Foam::pTraits<int64_t>::typeName = "int64";
+const char* const Foam::pTraits<int32_t>::typeName = "label";
+#elif WM_LABEL_SIZE == 64
+const char* const Foam::pTraits<int64_t>::typeName = "label";
+const char* const Foam::pTraits<int32_t>::typeName = "int32";
 #endif
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Raise one label to the power of another (overloaded function call)
-label pow(label a, label b)
+Foam::label Foam::pow(label a, label b)
 {
     register label ans = 1;
     for (register label i=0; i<b; i++)
@@ -92,21 +47,20 @@ label pow(label a, label b)
         ans *= a;
     }
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (b < 0)
     {
         FatalErrorIn("pow(label a, label b)")
             << "negative value for b is not supported"
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     return ans;
 }
 
 
-//- Return factorial(n) : 0 <= n <= 12
-label factorial(label n)
+Foam::label Foam::factorial(label n)
 {
     static label factTable[13] =
     {
@@ -114,21 +68,17 @@ label factorial(label n)
         362880, 3628800, 39916800, 479001600
     };
 
-#   ifdef FULLDEBUG
+    #ifdef FULLDEBUG
     if (n > 12 && n < 0)
     {
         FatalErrorIn("factorial(label n)")
             << "n value out of range"
             << abort(FatalError);
     }
-#   endif
+    #endif
 
     return factTable[n];
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/label/label.H b/src/OpenFOAM/primitives/ints/label/label.H
index ed0160a108..846803d081 100644
--- a/src/OpenFOAM/primitives/ints/label/label.H
+++ b/src/OpenFOAM/primitives/ints/label/label.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,8 @@ Typedef
     Foam::label
 
 Description
-    A label is an int/long/long long depending on the range desired.
+    A label is an int32_t or int64_t as specified by the pre-processor macro
+    WM_LABEL_SIZE.
 
     A readLabel function is defined so that label can be constructed from
     Istream.
@@ -35,239 +36,35 @@ Description
 #ifndef label_H
 #define label_H
 
-#include <climits>
-#include <cstdlib>
+#include "int.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#define INT_ADD_SIZE(x,s,y) x ## s ## y
+#define INT_ADD_DEF_SIZE(x,s,y) INT_ADD_SIZE(x,s,y)
+#define INT_SIZE(x,y) INT_ADD_DEF_SIZE(x,WM_LABEL_SIZE,y)
 
-#if FOAM_LABEL64
-#    define FOAM_LABEL_MAX 9000000000000000000
-#else
-#    define FOAM_LABEL_MAX 2000000000
-#endif
-
-#include "pTraits.H"
-#include "direction.H"
-
-
-#if INT_MAX > FOAM_LABEL_MAX
-
-// Define label as an int
-
-# undef  FOAM_LABEL_MAX
-# define FOAM_LABEL_MAX INT_MAX
-
-# include "int.H"
-
-namespace Foam
-{
-    typedef int label;
-
-    static const label labelMin = INT_MIN;
-    static const label labelMax = INT_MAX;
-
-    inline label readLabel(Istream& is)
-    {
-        return readInt(is);
-    }
-
-    inline bool readLabel(const char* buf, label& s)
-    {
-        return readInt(buf, s);
-    }
-
-} // End namespace Foam
-
-
-#elif LONG_MAX > FOAM_LABEL_MAX
-// Define label as a long
-
-# undef  FOAM_LABEL_MAX
-# define FOAM_LABEL_MAX LONG_MAX
-
-# include "int.H"
-# include "long.H"
-
-namespace Foam
-{
-    typedef long label;
-
-    static const label labelMin = LONG_MIN;
-    static const label labelMax = LONG_MAX;
-
-    inline label readLabel(Istream& is)
-    {
-        return readLong(is);
-    }
-
-    inline bool readLabel(const char* buf, label& s)
-    {
-        return readLong(buf, s);
-    }
-
-} // End namespace Foam
-
-
-#elif LLONG_MAX > FOAM_LABEL_MAX
-
-// Define label as a long long
-
-# undef  FOAM_LABEL_MAX
-# define FOAM_LABEL_MAX LLONG_MAX
-
-# include "int.H"
-# include "long.H"
-# include "longLong.H"
-
-namespace Foam
-{
-    typedef long long label;
-
-    static const label labelMin = LLONG_MIN;
-    static const label labelMax = LLONG_MAX;
-
-    inline label readLabel(Istream& is)
-    {
-        return readLongLong(is);
-    }
-
-    inline bool readLabel(const char* buf, label& s)
-    {
-        return readLongLong(buf, s);
-    }
-
-} // End namespace Foam
-
+#if WM_LABEL_SIZE != 32 && WM_LABEL_SIZE != 64
+    #error "label.H: WM_LABEL_SIZE must be set to either 32 or 64"
 #endif
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//#include "pTraits.H"
-//#include "direction.H"
-
 namespace Foam
 {
 
-//- template specialization for pTraits<label>
-template<>
-class pTraits<label>
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef INT_SIZE(int, _t) label;
+
+static const label labelMin = INT_SIZE(INT, _MIN);
+static const label labelMax = INT_SIZE(INT, _MAX);
+
+inline label readLabel(Istream& is)
 {
-    label p_;
-
-public:
-
-    //- Component type
-    typedef label cmptType;
-
-    // Member constants
-
-        enum
-        {
-            dim = 3,         //!< Dimensionality of space
-            rank = 0,        //!< Rank of label is 0
-            nComponents = 1  //!< Number of components in label is 1
-        };
-
-
-    // Static data members
-
-        static const char* const typeName;
-        static const char* componentNames[];
-        static const label zero;
-        static const label one;
-        static const label min;
-        static const label max;
-        static const label rootMin;
-        static const label rootMax;
-
-
-    // Constructors
-
-        //- Construct from primitive
-        explicit pTraits(const label&);
-
-        //- Construct from Istream
-        pTraits(Istream&);
-
-
-    // Member Functions
-
-        //- Access to the label value
-        operator label() const
-        {
-            return p_;
-        }
-
-        //- Access to the label value
-        operator label&()
-        {
-            return p_;
-        }
-};
-
-
-// For convenience's sake always define pTraits<int> (so even if label != int)
-#if (FOAM_LABEL_MAX != INT_MAX)
-//- template specialization for pTraits<int>
-template<>
-class pTraits<int>
-{
-    int p_;
-
-public:
-
-    //- Component type
-    typedef int cmptType;
-
-    // Member constants
-
-        enum
-        {
-            dim = 3,         //!< Dimensionality of space
-            rank = 0,        //!< Rank of int is 0
-            nComponents = 1  //!< Number of components in int is 1
-        };
-
-
-    // Static data members
-
-        static const char* const typeName;
-        static const char* componentNames[];
-        static const int zero;
-        static const int one;
-        static const int min;
-        static const int max;
-        static const int rootMax;
-        static const int rootMin;
-
-
-    // Constructors
-
-        //- Construct from primitive
-        explicit pTraits(const int&);
-
-        //- Construct from Istream
-        pTraits(Istream&);
-
-
-    // Member Functions
-
-        //- Access to the int value
-        operator int() const
-        {
-            return p_;
-        }
-
-        //- Access to the int value
-        operator int&()
-        {
-            return p_;
-        }
-};
-#endif
-
+    return INT_SIZE(readInt,) (is);
+}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -275,40 +72,10 @@ public:
 //- Raise one label to the power of another
 label pow(label a, label b);
 
-//- Evaluate n! : n <= 12
+//- Evaluate n! : 0 < n <= 12
 label factorial(label n);
 
 
-#define MAXMIN(retType, type1, type2)              \
-                                                   \
-inline retType max(const type1 s1, const type2 s2) \
-{                                                  \
-    return (s1 > s2)? s1: s2;                      \
-}                                                  \
-                                                   \
-inline retType min(const type1 s1, const type2 s2) \
-{                                                  \
-    return (s1 < s2)? s1: s2;                      \
-}
-
-
-MAXMIN(char, char, char)
-MAXMIN(short, short, short)
-MAXMIN(int, int, int)
-MAXMIN(long, long, long)
-MAXMIN(long, long, int)
-MAXMIN(long long, long long, long long)
-
-MAXMIN(unsigned char, unsigned char, unsigned char)
-MAXMIN(unsigned short, unsigned short, unsigned short)
-MAXMIN(unsigned int, unsigned int, unsigned int)
-MAXMIN(unsigned long, unsigned long, unsigned long)
-MAXMIN(unsigned long long, unsigned long long, unsigned long long)
-
-MAXMIN(long, int, long)
-MAXMIN(long long, int, long long)
-MAXMIN(long long, long long, int)
-
 inline label& setComponent(label& l, const direction)
 {
     return l;
@@ -319,33 +86,18 @@ inline label component(const label l, const direction)
     return l;
 }
 
-inline label mag(const label l)
-{
-    return ::abs(l);
-}
-
-inline label sign(const label s)
-{
-    return (s >= 0)? 1: -1;
-}
-
-inline label pos(const label s)
-{
-    return (s >= 0)? 1: 0;
-}
-
-inline label neg(const label s)
-{
-    return (s < 0)? 1: 0;
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "labelSpecific.H"
+
+#undef INT_ADD_SIZE
+#undef INT_ADD_DEF_SIZE
+#undef INT_SIZE
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/long/long.H b/src/OpenFOAM/primitives/ints/label/labelSpecific.H
similarity index 71%
rename from src/OpenFOAM/primitives/ints/long/long.H
rename to src/OpenFOAM/primitives/ints/label/labelSpecific.H
index 6e09fc2046..f6b9fd5dd9 100644
--- a/src/OpenFOAM/primitives/ints/long/long.H
+++ b/src/OpenFOAM/primitives/ints/label/labelSpecific.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,48 +21,47 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Primitive
-    long
+Typedef
+    Foam::label
 
 Description
-    A long integer
-
-SourceFiles
-    longIO.C
+    label specific functions for which there is no uLabel equivalent
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef long_H
-#define long_H
-
-#include "word.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-class Istream;
-class Ostream;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Return a string representation of a long
-word name(const long);
+inline label mag(const label l)
+{
+    #if WM_LABEL_SIZE == 32
+        return ::abs(l);
+    #elif WM_LABEL_SIZE == 64
+        return ::labs(l);
+    #endif
+}
 
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+inline label sign(const label s)
+{
+    return (s >= 0)? 1: -1;
+}
 
-long readLong(Istream&);
-bool readLong(const char*, long&);
-Istream& operator>>(Istream&, long&);
-Ostream& operator<<(Ostream&, const long);
+inline label pos(const label s)
+{
+    return (s >= 0)? 1: 0;
+}
+
+inline label neg(const label s)
+{
+    return (s < 0)? 1: 0;
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/longLong/longLongIO.C b/src/OpenFOAM/primitives/ints/longLong/longLongIO.C
deleted file mode 100644
index 384fe1bf1f..0000000000
--- a/src/OpenFOAM/primitives/ints/longLong/longLongIO.C
+++ /dev/null
@@ -1,131 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-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/>.
-
-Description
-    Reads a long long from an input stream, for a given version
-    number and File format. If an ascii File is being read, then the line
-    numbers are counted and an erroneous read ised.
-
-\*---------------------------------------------------------------------------*/
-
-#include "error.H"
-
-#include "longLong.H"
-#include "IOstreams.H"
-
-#include <sstream>
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::word Foam::name(long long val)
-{
-    std::ostringstream buf;
-    buf << val;
-    return buf.str();
-}
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-Foam::Istream& Foam::operator>>(Istream& is, long long& l)
-{
-    l = readLongLong(is);
-
-    // Check state of Istream
-    is.check("Istream& operator>>(Istream&, long long&)");
-
-    return is;
-}
-
-
-long long Foam::readLongLong(Istream& is)
-{
-    register long long result = 0;
-
-    char c = 0;
-
-    static const label zeroOffset = int('0');
-
-    // Get next non-whitespace character
-    while (is.read(c) && isspace(c))
-    {}
-
-    do
-    {
-        if (isspace(c) || c == 0) break;
-
-        if (!isdigit(c))
-        {
-            FatalIOErrorIn("readLongLong(ISstream& is)", is)
-                << "Illegal digit: \"" << c << "\""
-                << exit(FatalIOError);
-        }
-
-        result *= 10 + int(c) - zeroOffset;
-    } while (is.read(c));
-
-    return result;
-}
-
-
-bool Foam::readLongLong(const char* buf, long long& s)
-{
-    char *endptr = NULL;
-    s = strtoll(buf, &endptr, 10);
-    return (*endptr == 0);
-}
-
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const long long l)
-{
-    long long val = l;
-
-    long long mask = 1000000000000000000LL;
-
-    bool printZeroes = false;
-
-    while (mask > 0)
-    {
-        int d = int(val/mask);
-
-        if (d == 0)
-        {
-            if (printZeroes)
-            {
-                os.write('0');
-            }
-        }
-        else
-        {
-            printZeroes = true;
-            os.write(char(d+'0'));
-        }
-
-        val = val % mask;
-        mask /= 10;
-    }
-    os.check("Ostream& operator<<(Ostream&, const long long)");
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabel.C b/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
index 2e8f488983..3fb842e7f1 100644
--- a/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
+++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,40 +23,62 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "uLabel.H"
 #include "error.H"
+#include "uLabel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
+#if WM_LABEL_SIZE == 32
+const char* const Foam::pTraits<uint64_t>::typeName = "uint64";
+const char* const Foam::pTraits<uint32_t>::typeName = "uLabel";
+#elif WM_LABEL_SIZE == 64
+const char* const Foam::pTraits<uint64_t>::typeName = "uLabel";
+const char* const Foam::pTraits<uint32_t>::typeName = "uint32";
+#endif
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-const char* const pTraits<uLabel>::typeName = "uLabel";
-const uLabel pTraits<uLabel>::zero = 0;
-const uLabel pTraits<uLabel>::one = 1;
-const uLabel pTraits<uLabel>::min = uLabelMin;
-const uLabel pTraits<uLabel>::max = uLabelMax;
-const uLabel pTraits<uLabel>::rootMin = pTraits<uLabel>::min;
-const uLabel pTraits<uLabel>::rootMax = pTraits<uLabel>::max;
-
-const char* pTraits<uLabel>::componentNames[] = { "x" };
-
-pTraits<uLabel>::pTraits(const uLabel& p)
-:
-    p_(p)
-{}
-
-
-pTraits<uLabel>::pTraits(Istream& is)
+Foam::uLabel Foam::pow(uLabel a, uLabel b)
 {
-    is >> p_;
+    register uLabel ans = 1;
+    for (register uLabel i=0; i<b; i++)
+    {
+        ans *= a;
+    }
+
+    #ifdef FULLDEBUG
+    if (b < 0)
+    {
+        FatalErrorIn("pow(uLabel a, uLabel b)")
+            << "negative value for b is not supported"
+            << abort(FatalError);
+    }
+    #endif
+
+    return ans;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+Foam::uLabel Foam::factorial(uLabel n)
+{
+    static uLabel factTable[13] =
+    {
+        1, 1, 2, 6, 24, 120, 720, 5040, 40320,
+        362880, 3628800, 39916800, 479001600
+    };
+
+    #ifdef FULLDEBUG
+    if (n > 12 && n < 0)
+    {
+        FatalErrorIn("factorial(uLabel n)")
+            << "n value out of range"
+            << abort(FatalError);
+    }
+    #endif
+
+    return factTable[n];
+}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
index d8a985f39e..27443560bf 100644
--- a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
+++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,157 +25,57 @@ Typedef
     Foam::uLabel
 
 Description
-    A uLabel is an unsigned label.
+    A uLabel is an uint32_t or uint64_t as specified by the pre-processor macro
+    WM_LABEL_SIZE.
 
-SeeAlso
-    label.H
+    A readLabel function is defined so that uLabel can be constructed from
+    Istream.
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef uLabel_H
 #define uLabel_H
 
-#include <climits>
-#include <cstdlib>
+#include "uint.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#define UINT_ADD_SIZE(x,s,y) x ## s ## y
+#define UINT_ADD_DEF_SIZE(x,s,y) UINT_ADD_SIZE(x,s,y)
+#define UINT_SIZE(x,y) UINT_ADD_DEF_SIZE(x,WM_LABEL_SIZE,y)
 
-#if FOAM_LABEL64
-#    define FOAM_ULABEL_MAX 18000000000000000000u
-#else
-#    define FOAM_ULABEL_MAX 4000000000u
-#endif
-
-
-#if UINT_MAX > FOAM_ULABEL_MAX
-
-// Define uLabel as an unsigned int
-
-# undef  FOAM_ULABEL_MAX
-# define FOAM_ULABEL_MAX UINT_MAX
-
-# include "uint.H"
-
-namespace Foam
-{
-    typedef unsigned int uLabel;
-
-    static const uLabel uLabelMin = 0;
-    static const uLabel uLabelMax = UINT_MAX;
-
-    inline uLabel readULabel(Istream& is)
-    {
-        return readUint(is);
-    }
-
-} // End namespace Foam
-
-
-#elif ULONG_MAX > FOAM_ULABEL_MAX
-
-// Define uLabel as an unsigned long
-
-# undef  FOAM_ULABEL_MAX
-# define FOAM_ULABEL_MAX ULONG_MAX
-
-# include "uint.H"
-# include "ulong.H"
-
-namespace Foam
-{
-    typedef unsigned long uLabel;
-
-    static const uLabel uLabelMin = 0;
-    static const uLabel uLabelMax = ULONG_MAX;
-
-    inline uLabel readULabel(Istream& is)
-    {
-        return readUlong(is);
-    }
-
-} // End namespace Foam
-
-
-#elif ULLONG_MAX > FOAM_ULABEL_MAX
-
-// Define uLabel as an unsigned long long
-
-# undef  FOAM_ULABEL_MAX
-
-# error "Not implemented yet"
-
+#if WM_LABEL_SIZE != 32 && WM_LABEL_SIZE != 64
+    #error "uLabel.H: WM_LABEL_SIZE must be set to either 32 or 64"
 #endif
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "pTraits.H"
-#include "direction.H"
-
 namespace Foam
 {
 
-//- template specialization for pTraits<uLabel>
-template<>
-class pTraits<uLabel>
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef UINT_SIZE(uint, _t) uLabel;
+
+static const uLabel uLabelMin = UINT_SIZE(UINT, _MIN);
+static const uLabel uLabelMax = UINT_SIZE(UINT, _MAX);
+
+inline uLabel readULabel(Istream& is)
 {
-    uLabel p_;
-
-public:
-
-    //- Component type
-    typedef uLabel cmptType;
-
-    // Member constants
-
-        enum
-        {
-            dim = 3,         //!< Dimensionality of space
-            rank = 0,        //!< Rank of uLabel is 0
-            nComponents = 1  //!< Number of components in uLabel is 1
-        };
-
-
-    // Static data members
-
-        static const char* const typeName;
-        static const char* componentNames[];
-        static const uLabel zero;
-        static const uLabel one;
-        static const uLabel max;
-        static const uLabel min;
-        static const uLabel rootMax;
-        static const uLabel rootMin;
-
-
-    // Constructors
-
-        //- Construct from primitive
-        explicit pTraits(const uLabel&);
-
-        //- Construct from Istream
-        pTraits(Istream&);
-
-
-    // Member Functions
-
-        //- Access to the uLabel value
-        operator uLabel() const
-        {
-            return p_;
-        }
-
-        //- Access to the uLabel value
-        operator uLabel&()
-        {
-            return p_;
-        }
-};
+    return UINT_SIZE(readUint,) (is);
+}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+//- Raise one uLabel to the power of another
+uLabel pow(uLabel a, uLabel b);
+
+//- Evaluate n! : 0 < n <= 12
+uLabel factorial(uLabel n);
+
+
 inline uLabel& setComponent(uLabel& l, const direction)
 {
     return l;
@@ -186,13 +86,18 @@ inline uLabel component(const uLabel l, const direction)
     return l;
 }
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "uLabelSpecific.H"
+
+#undef UINT_ADD_SIZE
+#undef UINT_ADD_DEF_SIZE
+#undef UINT_SIZE
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabelSpecific.H b/src/OpenFOAM/primitives/ints/uLabel/uLabelSpecific.H
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/OpenFOAM/primitives/ints/uint/uint.H b/src/OpenFOAM/primitives/ints/uint/uint.H
index bbac95c590..0aa847e7fb 100644
--- a/src/OpenFOAM/primitives/ints/uint/uint.H
+++ b/src/OpenFOAM/primitives/ints/uint/uint.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-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Primitive
     uint
 
 Description
-    System unsigned integer
+    System uinteger
 
 SourceFiles
     uintIO.C
@@ -35,26 +35,40 @@ SourceFiles
 #ifndef uint_H
 #define uint_H
 
-#include "word.H"
+#include "uint32.H"
+#include "uint64.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-class Istream;
-class Ostream;
+#define MAXMIN(retType, type1, type2)              \
+                                                   \
+inline retType max(const type1 s1, const type2 s2) \
+{                                                  \
+    return (s1 > s2)? s1: s2;                      \
+}                                                  \
+                                                   \
+inline retType min(const type1 s1, const type2 s2) \
+{                                                  \
+    return (s1 < s2)? s1: s2;                      \
+}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Return a string representation of an uint
-word name(const unsigned int);
+MAXMIN(uint8_t, uint8_t, uint8_t)
+MAXMIN(uint16_t, uint16_t, uint16_t)
+
+MAXMIN(uint32_t, uint32_t, uint32_t)
+MAXMIN(uint64_t, uint64_t, uint32_t)
+MAXMIN(uint64_t, uint32_t, uint64_t)
+MAXMIN(uint64_t, uint64_t, uint64_t)
+
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-unsigned int readUint(Istream&);
-Istream& operator>>(Istream&, unsigned int&);
-Ostream& operator<<(Ostream&, const unsigned int);
+uint readUint(Istream&);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/ints/uint/uintIO.C b/src/OpenFOAM/primitives/ints/uint/uintIO.C
index eaead2aa08..859eb1f8f6 100644
--- a/src/OpenFOAM/primitives/ints/uint/uintIO.C
+++ b/src/OpenFOAM/primitives/ints/uint/uintIO.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-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,78 +21,20 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Reads an uint from an input stream, for a given version
-    number and File format. If an ascii File is being read,
-    then the line numbers are counted and an erroneous read
-    ised.
-
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
 #include "uint.H"
 #include "IOstreams.H"
 
-#include <sstream>
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::word Foam::name(const unsigned int val)
-{
-    std::ostringstream buf;
-    buf << val;
-    return buf.str();
-}
-
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, unsigned int& i)
+uint Foam::readUint(Istream& is)
 {
-    token t(is);
-
-    if (!t.good())
-    {
-        is.setBad();
-        return is;
-    }
-
-    if (t.isLabel())
-    {
-        i = static_cast<unsigned int>(t.labelToken());
-    }
-    else
-    {
-        is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, unsigned int&)", is)
-            << "wrong token type - expected unsigned int, found " << t.info()
-            << exit(FatalIOError);
-
-        return is;
-    }
-
-    // Check state of Istream
-    is.check("Istream& operator>>(Istream&, unsigned int&)");
-
-    return is;
-}
-
-
-unsigned int Foam::readUint(Istream& is)
-{
-    unsigned int val;
+    uint val;
     is >> val;
 
     return val;
 }
 
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const unsigned int i)
-{
-    os.write(label(i));
-    os.check("Ostream& operator<<(Ostream&, const unsigned int)");
-    return os;
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/ulong/ulong.H b/src/OpenFOAM/primitives/ints/uint32/uint32.C
similarity index 60%
rename from src/OpenFOAM/primitives/ints/ulong/ulong.H
rename to src/OpenFOAM/primitives/ints/uint32/uint32.C
index ba83c54473..cdafc33441 100644
--- a/src/OpenFOAM/primitives/ints/ulong/ulong.H
+++ b/src/OpenFOAM/primitives/ints/uint32/uint32.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) 2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,47 +21,30 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Primitive
-    ulong
-
-Description
-    System unsigned long
-
-SourceFiles
-    ulongIO.C
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef ulong_H
-#define ulong_H
-
-#include "word.H"
+#include "uint32.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+const uint32_t Foam::pTraits<uint32_t>::zero = 0;
+const uint32_t Foam::pTraits<uint32_t>::one = 1;
+const uint32_t Foam::pTraits<uint32_t>::min = INT32_MIN;
+const uint32_t Foam::pTraits<uint32_t>::max = INT32_MAX;
+const uint32_t Foam::pTraits<uint32_t>::rootMin = pTraits<uint32_t>::min;
+const uint32_t Foam::pTraits<uint32_t>::rootMax = pTraits<uint32_t>::max;
+
+const char* Foam::pTraits<uint32_t>::componentNames[] = { "x" };
+
+Foam::pTraits<uint32_t>::pTraits(const uint32_t& p)
+:
+    p_(p)
+{}
+
+Foam::pTraits<uint32_t>::pTraits(Istream& is)
 {
+    is >> p_;
+}
 
-class Istream;
-class Ostream;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//- Return a string representation of a ulong
-word name(const unsigned long);
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-unsigned long readUlong(Istream&);
-Istream& operator>>(Istream&, unsigned long&);
-Ostream& operator<<(Ostream&, const unsigned long);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32.H b/src/OpenFOAM/primitives/ints/uint32/uint32.H
new file mode 100644
index 0000000000..71ad73897b
--- /dev/null
+++ b/src/OpenFOAM/primitives/ints/uint32/uint32.H
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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/>.
+
+Primitive
+    uint32
+
+Description
+    32bit uinteger
+
+SourceFiles
+    uint32.C
+    uint32IO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef uint32_H
+#define uint32_H
+
+#include <stdint.h>
+#include <climits>
+#include <cstdlib>
+
+#include "word.H"
+#include "pTraits.H"
+#include "direction.H"
+
+#ifndef UINT32_MIN
+#define UINT32_MIN 0
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Istream;
+class Ostream;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Return a word representation of an uint32
+word name(const uint32_t);
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+uint32_t readUint32(Istream&);
+bool read(const char*, uint32_t&);
+Istream& operator>>(Istream&, uint32_t&);
+Ostream& operator<<(Ostream&, const uint32_t);
+
+//- template specialization for pTraits<uint32_t>
+template<>
+class pTraits<uint32_t>
+{
+    uint32_t p_;
+
+public:
+
+    //- Component type
+    typedef uint32_t cmptType;
+
+    // Member constants
+
+        enum
+        {
+            dim = 3,         //!< Dimensionality of space
+            rank = 0,        //!< Rank of uint32_t is 0
+            nComponents = 1  //!< Number of components in uint32_t is 1
+        };
+
+
+    // Static data members
+
+        static const char* const typeName;
+        static const char* componentNames[];
+        static const uint32_t zero;
+        static const uint32_t one;
+        static const uint32_t min;
+        static const uint32_t max;
+        static const uint32_t rootMax;
+        static const uint32_t rootMin;
+
+
+    // Constructors
+
+        //- Construct from primitive
+        explicit pTraits(const uint32_t&);
+
+        //- Construct from Istream
+        pTraits(Istream&);
+
+
+    // Member Functions
+
+        //- Access to the uint32_t value
+        operator uint32_t() const
+        {
+            return p_;
+        }
+
+        //- Access to the uint value
+        operator uint32_t&()
+        {
+            return p_;
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/uint32/uint32IO.C b/src/OpenFOAM/primitives/ints/uint32/uint32IO.C
new file mode 100644
index 0000000000..688834e737
--- /dev/null
+++ b/src/OpenFOAM/primitives/ints/uint32/uint32IO.C
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "error.H"
+
+#include "uint32.H"
+#include "IOstreams.H"
+
+#include <sstream>
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::word Foam::name(const uint32_t val)
+{
+    std::ostringstream buf;
+    buf << val;
+    return buf.str();
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, uint32_t& i)
+{
+    token t(is);
+
+    if (!t.good())
+    {
+        is.setBad();
+        return is;
+    }
+
+    if (t.isLabel())
+    {
+        i = uint32_t(t.labelToken());
+    }
+    else
+    {
+        is.setBad();
+        FatalIOErrorIn("operator>>(Istream&, uint32_t&)", is)
+            << "wrong token type - expected uint32_t, found " << t.info()
+            << exit(FatalIOError);
+
+        return is;
+    }
+
+    // Check state of Istream
+    is.check("Istream& operator>>(Istream&, uint32_t&)");
+
+    return is;
+}
+
+
+uint32_t Foam::readUint32(Istream& is)
+{
+    uint32_t val;
+    is >> val;
+
+    return val;
+}
+
+
+bool Foam::read(const char* buf, uint32_t& s)
+{
+    char *endptr = NULL;
+    long l = strtol(buf, &endptr, 10);
+    s = uint32_t(l);
+    return (*endptr == 0);
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const uint32_t i)
+{
+    os.write(label(i));
+    os.check("Ostream& operator<<(Ostream&, const uint32_t)");
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/longLong/longLong.H b/src/OpenFOAM/primitives/ints/uint64/uint64.C
similarity index 58%
rename from src/OpenFOAM/primitives/ints/longLong/longLong.H
rename to src/OpenFOAM/primitives/ints/uint64/uint64.C
index e1595e8462..bbe35d20bb 100644
--- a/src/OpenFOAM/primitives/ints/longLong/longLong.H
+++ b/src/OpenFOAM/primitives/ints/uint64/uint64.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,48 +21,30 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Primitive
-    long long
-
-Description
-    A long long (64 bits on many systems)
-
-SourceFiles
-    longLongIO.C
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef longLong_H
-#define longLong_H
-
-#include "word.H"
+#include "uint64.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+const uint64_t Foam::pTraits<uint64_t>::zero = 0;
+const uint64_t Foam::pTraits<uint64_t>::one = 1;
+const uint64_t Foam::pTraits<uint64_t>::min = INT64_MIN;
+const uint64_t Foam::pTraits<uint64_t>::max = INT64_MAX;
+const uint64_t Foam::pTraits<uint64_t>::rootMin = pTraits<uint64_t>::min;
+const uint64_t Foam::pTraits<uint64_t>::rootMax = pTraits<uint64_t>::max;
+
+const char* Foam::pTraits<uint64_t>::componentNames[] = { "x" };
+
+Foam::pTraits<uint64_t>::pTraits(const uint64_t& p)
+:
+    p_(p)
+{}
+
+Foam::pTraits<uint64_t>::pTraits(Istream& is)
 {
+    is >> p_;
+}
 
-class Istream;
-class Ostream;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//- Return a string representation of a long long
-word name(long long);
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-long long readLongLong(Istream&);
-bool readLongLong(const char*, long long&);
-Istream& operator>>(Istream&, long long&);
-Ostream& operator<<(Ostream&, const long long);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64.H b/src/OpenFOAM/primitives/ints/uint64/uint64.H
new file mode 100644
index 0000000000..deee39fd4e
--- /dev/null
+++ b/src/OpenFOAM/primitives/ints/uint64/uint64.H
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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/>.
+
+Primitive
+    uint64
+
+Description
+    64bit uinteger
+
+SourceFiles
+    uint64.C
+    uint64IO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef uint64_H
+#define uint64_H
+
+#include <stdint.h>
+#include <climits>
+#include <cstdlib>
+
+#include "word.H"
+#include "pTraits.H"
+#include "direction.H"
+
+#ifndef UINT64_MIN
+#define UINT64_MIN 0
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Istream;
+class Ostream;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Return a word representation of an uint64
+word name(const uint64_t);
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+uint64_t readUint64(Istream&);
+bool read(const char*, uint64_t&);
+Istream& operator>>(Istream&, uint64_t&);
+Ostream& operator<<(Ostream&, const uint64_t);
+
+//- template specialization for pTraits<uint64_t>
+template<>
+class pTraits<uint64_t>
+{
+    uint64_t p_;
+
+public:
+
+    //- Component type
+    typedef uint64_t cmptType;
+
+    // Member constants
+
+        enum
+        {
+            dim = 3,         //!< Dimensionality of space
+            rank = 0,        //!< Rank of uint64_t is 0
+            nComponents = 1  //!< Number of components in uint64_t is 1
+        };
+
+
+    // Static data members
+
+        static const char* const typeName;
+        static const char* componentNames[];
+        static const uint64_t zero;
+        static const uint64_t one;
+        static const uint64_t min;
+        static const uint64_t max;
+        static const uint64_t rootMax;
+        static const uint64_t rootMin;
+
+
+    // Constructors
+
+        //- Construct from primitive
+        explicit pTraits(const uint64_t&);
+
+        //- Construct from Istream
+        pTraits(Istream&);
+
+
+    // Member Functions
+
+        //- Access to the uint64_t value
+        operator uint64_t() const
+        {
+            return p_;
+        }
+
+        //- Access to the uint value
+        operator uint64_t&()
+        {
+            return p_;
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ints/uint64/uint64IO.C b/src/OpenFOAM/primitives/ints/uint64/uint64IO.C
new file mode 100644
index 0000000000..39737bc934
--- /dev/null
+++ b/src/OpenFOAM/primitives/ints/uint64/uint64IO.C
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "error.H"
+
+#include "uint64.H"
+#include "IOstreams.H"
+
+#include <sstream>
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::word Foam::name(const uint64_t val)
+{
+    std::ostringstream buf;
+    buf << val;
+    return buf.str();
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, uint64_t& i)
+{
+    token t(is);
+
+    if (!t.good())
+    {
+        is.setBad();
+        return is;
+    }
+
+    if (t.isLabel())
+    {
+        i = uint64_t(t.labelToken());
+    }
+    else
+    {
+        is.setBad();
+        FatalIOErrorIn("operator>>(Istream&, uint64_t&)", is)
+            << "wrong token type - expected uint64_t, found " << t.info()
+            << exit(FatalIOError);
+
+        return is;
+    }
+
+    // Check state of Istream
+    is.check("Istream& operator>>(Istream&, uint64_t&)");
+
+    return is;
+}
+
+
+uint64_t Foam::readUint64(Istream& is)
+{
+    uint64_t val;
+    is >> val;
+
+    return val;
+}
+
+
+bool Foam::read(const char* buf, uint64_t& s)
+{
+    char *endptr = NULL;
+    long l = strtol(buf, &endptr, 10);
+    s = uint64_t(l);
+    return (*endptr == 0);
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const uint64_t i)
+{
+    os.write(label(i));
+    os.check("Ostream& operator<<(Ostream&, const uint64_t)");
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/Pstream/gamma/IPread.C b/src/Pstream/gamma/IPread.C
index cf0915ec0e..8dfc3c82fb 100644
--- a/src/Pstream/gamma/IPread.C
+++ b/src/Pstream/gamma/IPread.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-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,12 +27,11 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "IPstream.H"
-#include "long.H"
 #include "PstreamGlobals.H"
 
 extern "C"
 {
-#   include <linux/gamma/libgamma.h>
+    #include <linux/gamma/libgamma.h>
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/Pstream/gamma/OPwrite.C b/src/Pstream/gamma/OPwrite.C
index 7453ef5604..81af07f430 100644
--- a/src/Pstream/gamma/OPwrite.C
+++ b/src/Pstream/gamma/OPwrite.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-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,13 +27,11 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "OPstream.H"
-#include "long.H"
 #include "PstreamGlobals.H"
 
-extern "C" {
-
-#include <linux/gamma/libgamma.h>
-
+extern "C"
+{
+    #include <linux/gamma/libgamma.h>
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 610c6fa9fe..2020e30c0e 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -351,7 +351,13 @@ void Foam::UPstream::allocatePstreamCommunicator
         // Set the number of processes to the actual number
         int numProcs;
         MPI_Comm_size(PstreamGlobals::MPICommunicators_[index], &numProcs);
-        procIDs_[index] = identity(numProcs);
+
+        //procIDs_[index] = identity(numProcs);
+        procIDs_[index].setSize(numProcs);
+        forAll(procIDs_[index], i)
+        {
+            procIDs_[index][i] = i;
+        }
     }
     else
     {
diff --git a/src/Pstream/mpi/allReduce.H b/src/Pstream/mpi/allReduce.H
index b158518536..ad4f7677dc 100644
--- a/src/Pstream/mpi/allReduce.H
+++ b/src/Pstream/mpi/allReduce.H
@@ -53,7 +53,7 @@ void allReduce
     MPI_Op op,
     const BinaryOp& bop,
     const int tag,
-    const int communicator
+    const label communicator
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/Pstream/mpi/allReduceTemplates.C b/src/Pstream/mpi/allReduceTemplates.C
index 9a25da1628..7a07698a77 100644
--- a/src/Pstream/mpi/allReduceTemplates.C
+++ b/src/Pstream/mpi/allReduceTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
index ea6e6245aa..b1e6279777 100644
--- a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
+++ b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
@@ -57,20 +57,20 @@ namespace Foam
 
 Foam::label Foam::metisDecomp::decompose
 (
-    const List<int>& adjncy,
-    const List<int>& xadj,
+    const List<label>& adjncy,
+    const List<label>& xadj,
     const scalarField& cellWeights,
-    List<int>& finalDecomp
+    List<label>& finalDecomp
 )
 {
     FatalErrorIn
     (
         "labelList metisDecomp::decompose"
         "("
-            "const List<int>&, "
-            "const List<int>&, "
+            "const List<label>&, "
+            "const List<label>&, "
             "const scalarField&, "
-            "List<int>&"
+            "List<label>&"
         ")"
     )   << notImplementedMessage << exit(FatalError);
 
diff --git a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
index 36d405d597..adc13ad067 100644
--- a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
+++ b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
@@ -61,11 +61,11 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
 Foam::label Foam::ptscotchDecomp::decompose
 (
     const fileName& meshPath,
-    const List<int>& initxadj,
-    const List<int>& initadjncy,
+    const List<label>& initxadj,
+    const List<label>& initadjncy,
     const scalarField& initcWeights,
 
-    List<int>& finalDecomp
+    List<label>& finalDecomp
 ) const
 {
     FatalErrorIn
@@ -73,24 +73,26 @@ Foam::label Foam::ptscotchDecomp::decompose
         "label ptscotchDecomp::decompose"
         "("
             "onst fileName&,"
-            "const List<int>&, "
-            "const List<int>&, "
+            "const List<label>&, "
+            "const List<label>&, "
             "const scalarField&, "
-            "List<int>&"
+            "List<label>&"
         ")"
     )   << notImplementedMessage << exit(FatalError);
 
     return -1;
 }
+
+
 Foam::label Foam::ptscotchDecomp::decompose
 (
     const fileName& meshPath,
-    const int adjncySize,
-    const int adjncy[],
-    const int xadjSize,
-    const int xadj[],
+    const label adjncySize,
+    const label adjncy[],
+    const label xadjSize,
+    const label xadj[],
     const scalarField& cWeights,
-    List<int>& finalDecomp
+    List<label>& finalDecomp
 ) const
 {
     FatalErrorIn
@@ -103,7 +105,7 @@ Foam::label Foam::ptscotchDecomp::decompose
             "const int,"
             "const int,"
             "const scalarField&,"
-            "List<int>&"
+            "List<label>&"
         ")"
     )   << notImplementedMessage << exit(FatalError);
 
diff --git a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
index ebb935cebc..3929b7a0c1 100644
--- a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
+++ b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.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-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,11 +60,11 @@ void Foam::scotchDecomp::check(const int retVal, const char* str)
 Foam::label Foam::scotchDecomp::decompose
 (
     const fileName& meshPath,
-    const List<int>& adjncy,
-    const List<int>& xadj,
+    const List<label>& adjncy,
+    const List<label>& xadj,
     const scalarField& cWeights,
 
-    List<int>& finalDecomp
+    List<label>& finalDecomp
 )
 {
     FatalErrorIn
@@ -72,10 +72,10 @@ Foam::label Foam::scotchDecomp::decompose
         "label scotchDecomp::decompose\n"
         "(\n"
             "const fileName& meshPath,\n"
-            "const List<int>&,\n"
-            "const List<int>&,\n"
+            "const List<label>&,\n"
+            "const List<label>&,\n"
             "const scalarField&,\n"
-            "List<int>&\n"
+            "List<label>&\n"
         ")\n"
     )   << notImplementedMessage << exit(FatalError);
 
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index a35304b132..26437fc1a0 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -248,7 +248,7 @@ public:
         //- Processor coupled interface functions
 
             //- Return communicator used for comms
-            virtual int comm() const
+            virtual label comm() const
             {
                 return procPatch_.comm();
             }
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 47c03db115..7efd8defca 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -274,7 +274,7 @@ public:
             }
 
             //- Return communicator used for parallel communication
-            virtual int comm() const
+            virtual label comm() const
             {
                 return polyMesh::comm();
             }
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
index 4ccb029a73..960bd30776 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
@@ -85,7 +85,7 @@ public:
     // Member functions
 
         //- Return communicator used for comms
-        virtual int comm() const
+        virtual label comm() const
         {
             return procPolyPatch_.comm();
         }
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index 006ead54fb..41e6ca0dcc 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -2656,8 +2656,18 @@ void Foam::autoSnapDriver::doSnap
             (
                 regionSide
             );
-            meshRefinement::updateList(mapPtr().faceMap(), -1, filterFace);
-            meshRefinement::updateList(mapPtr().faceMap(), -1, duplicateFace);
+            meshRefinement::updateList
+            (
+                mapPtr().faceMap(),
+                label(-1),
+                filterFace
+            );
+            meshRefinement::updateList
+            (
+                mapPtr().faceMap(),
+                label(-1),
+                duplicateFace
+            );
 
             // Update baffles and baffle-to-baffle addressing
 
@@ -3187,7 +3197,12 @@ void Foam::autoSnapDriver::doSnap
             adaptPatchIDs,
             duplicateFace
         );
-        meshRefinement::updateList(mapPtr().faceMap(), -1, duplicateFace);
+        meshRefinement::updateList
+        (
+            mapPtr().faceMap(),
+            label(-1),
+            duplicateFace
+        );
     }
 
     // Repatching might have caused faces to be on same patch and hence
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
index b1cc58a051..5a0bf08e10 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
@@ -196,7 +196,7 @@ void Foam::autoSnapDriver::smoothAndConstrain
             pp.meshPoints(),
             dispCount,
             plusEqOp<label>(),
-            0,
+            label(0),
             mapDistribute::transform()
         );
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index e78b54f02d..8cf215729d 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -1914,7 +1914,7 @@ void Foam::meshRefinement::calcPatchNumMasterFaces
         patch.meshEdges(mesh_.edges(), mesh_.pointEdges()),
         nMasterFacesPerEdge,
         plusEqOp<label>(),
-        0
+        label(0)
     );
 }
 
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
index ff99788f7e..6527c42cb7 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/PatchEdgeFaceWave.H
@@ -65,7 +65,7 @@ template
 <
     class PrimitivePatchType,
     class Type,
-    class TrackingData = int
+    class TrackingData = label
 >
 class PatchEdgeFaceWave
 :
diff --git a/src/meshTools/searchableSurface/searchableSurface.C b/src/meshTools/searchableSurface/searchableSurface.C
index 838135df65..5915195384 100644
--- a/src/meshTools/searchableSurface/searchableSurface.C
+++ b/src/meshTools/searchableSurface/searchableSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,16 +24,13 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "searchableSurface.H"
-#include "long.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-defineTypeNameAndDebug(searchableSurface, 0);
-defineRunTimeSelectionTable(searchableSurface, dict);
-
+    defineTypeNameAndDebug(searchableSurface, 0);
+    defineRunTimeSelectionTable(searchableSurface, dict);
 }
 
 
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.C b/src/parallel/decompose/metisDecomp/metisDecomp.C
index 33d9e4db05..f14ef21e92 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.C
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.C
@@ -50,11 +50,11 @@ namespace Foam
 // Call Metis with options from dictionary.
 Foam::label Foam::metisDecomp::decompose
 (
-    const List<int>& adjncy,
-    const List<int>& xadj,
+    const List<label>& adjncy,
+    const List<label>& xadj,
     const scalarField& cWeights,
 
-    List<int>& finalDecomp
+    List<label>& finalDecomp
 )
 {
     // C style numbering
@@ -65,10 +65,10 @@ Foam::label Foam::metisDecomp::decompose
     // k-way: multi-level k-way
     word method("recursive");
 
-    int numCells = xadj.size()-1;
+    label numCells = xadj.size()-1;
 
     // decomposition options
-    List<int> options(METIS_NOPTIONS);
+    List<label> options(METIS_NOPTIONS);
     METIS_SetDefaultOptions(options.begin());
 
     // processor weights initialised with no size, only used if specified in
@@ -76,10 +76,10 @@ Foam::label Foam::metisDecomp::decompose
     Field<floatScalar> processorWeights;
 
     // cell weights (so on the vertices of the dual)
-    List<int> cellWeights;
+    List<label> cellWeights;
 
     // face weights (so on the edges of the dual)
-    List<int> faceWeights;
+    List<label> faceWeights;
 
 
     // Check for externally provided cellweights and if so initialise weights
@@ -170,7 +170,7 @@ Foam::label Foam::metisDecomp::decompose
         //{
         //    Info<< "metisDecomp : Using cell-based weights." << endl;
         //
-        //    IOList<int> cellIOWeights
+        //    IOList<label> cellIOWeights
         //    (
         //        IOobject
         //        (
@@ -209,8 +209,8 @@ Foam::label Foam::metisDecomp::decompose
         (
             &numCells,          // num vertices in graph
             &ncon,              // num balancing constraints
-            const_cast<List<int>&>(xadj).begin(),   // indexing into adjncy
-            const_cast<List<int>&>(adjncy).begin(), // neighbour info
+            const_cast<List<label>&>(xadj).begin(),   // indexing into adjncy
+            const_cast<List<label>&>(adjncy).begin(), // neighbour info
             cellWeights.begin(),// vertexweights
             NULL,               // vsize: total communication vol
             faceWeights.begin(),// edgeweights
@@ -228,8 +228,8 @@ Foam::label Foam::metisDecomp::decompose
         (
             &numCells,         // num vertices in graph
             &ncon,              // num balancing constraints
-            const_cast<List<int>&>(xadj).begin(),   // indexing into adjncy
-            const_cast<List<int>&>(adjncy).begin(), // neighbour info
+            const_cast<List<label>&>(xadj).begin(),   // indexing into adjncy
+            const_cast<List<label>&>(adjncy).begin(), // neighbour info
             cellWeights.begin(),// vertexweights
             NULL,               // vsize: total communication vol
             faceWeights.begin(),// edgeweights
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.H b/src/parallel/decompose/metisDecomp/metisDecomp.H
index 4bcd1b6eb7..c347753edb 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.H
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.H
@@ -53,10 +53,10 @@ class metisDecomp
 
         label decompose
         (
-            const List<int>& adjncy,
-            const List<int>& xadj,
+            const List<label>& adjncy,
+            const List<label>& xadj,
             const scalarField& cellWeights,
-            List<int>& finalDecomp
+            List<label>& finalDecomp
         );
 
         //- Disallow default bitwise copy construct and assignment
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
index 3791ad53de..049dc6b290 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
@@ -163,11 +163,11 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
 //Foam::label Foam::ptscotchDecomp::decomposeZeroDomains
 //(
 //    const fileName& meshPath,
-//    const List<int>& initadjncy,
-//    const List<int>& initxadj,
+//    const List<label>& initadjncy,
+//    const List<label>& initxadj,
 //    const scalarField& initcWeights,
 //
-//    List<int>& finalDecomp
+//    List<label>& finalDecomp
 //) const
 //{
 //    globalIndex globalCells(initxadj.size()-1);
@@ -210,7 +210,7 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
 //
 //    // Number of cells to send to the next processor
 //    // (is same as number of cells next processor has to receive)
-//    List<int> nSendCells(Pstream::nProcs(), 0);
+//    List<label> nSendCells(Pstream::nProcs(), 0);
 //
 //    for (label procI = nSendCells.size()-1; procI >=1; procI--)
 //    {
@@ -262,10 +262,10 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
 //        // Send cells to next processor
 //        OPstream toNextProc(Pstream::blocking, Pstream::myProcNo()+1);
 //
-//        int nCells = nSendCells[Pstream::myProcNo()];
-//        int startCell = xadj.size()-1 - nCells;
-//        int startFace = xadj[startCell];
-//        int nFaces = adjncy.size()-startFace;
+//        label nCells = nSendCells[Pstream::myProcNo()];
+//        label startCell = xadj.size()-1 - nCells;
+//        label startFace = xadj[startCell];
+//        label nFaces = adjncy.size()-startFace;
 //
 //        // Send for all cell data: last nCells elements
 //        // Send for all face data: last nFaces elements
@@ -311,7 +311,7 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
 //    {
 //        IPstream fromNextProc(Pstream::blocking, Pstream::myProcNo()+1);
 //
-//        List<int> nextFinalDecomp(fromNextProc);
+//        List<label> nextFinalDecomp(fromNextProc);
 //
 //        if (nextFinalDecomp.size() != nSendCells[Pstream::myProcNo()])
 //        {
@@ -330,10 +330,10 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
 //    {
 //        OPstream toPrevProc(Pstream::blocking, Pstream::myProcNo()-1);
 //
-//        int nToPrevious = nSendCells[Pstream::myProcNo()-1];
+//        label nToPrevious = nSendCells[Pstream::myProcNo()-1];
 //
 //        toPrevProc <<
-//            SubList<int>
+//            SubList<label>
 //            (
 //                finalDecomp,
 //                nToPrevious,
@@ -351,14 +351,14 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
 Foam::label Foam::ptscotchDecomp::decompose
 (
     const fileName& meshPath,
-    const List<int>& adjncy,
-    const List<int>& xadj,
+    const List<label>& adjncy,
+    const List<label>& xadj,
     const scalarField& cWeights,
-    List<int>& finalDecomp
+    List<label>& finalDecomp
 ) const
 {
-    List<int> dummyAdjncy(1);
-    List<int> dummyXadj(1);
+    List<label> dummyAdjncy(1);
+    List<label> dummyXadj(1);
     dummyXadj[0] = 0;
 
     return decompose
@@ -378,13 +378,13 @@ Foam::label Foam::ptscotchDecomp::decompose
 Foam::label Foam::ptscotchDecomp::decompose
 (
     const fileName& meshPath,
-    const int adjncySize,
-    const int adjncy[],
-    const int xadjSize,
-    const int xadj[],
+    const label adjncySize,
+    const label adjncy[],
+    const label xadjSize,
+    const label xadj[],
     const scalarField& cWeights,
 
-    List<int>& finalDecomp
+    List<label>& finalDecomp
 ) const
 {
     if (debug)
@@ -477,7 +477,7 @@ Foam::label Foam::ptscotchDecomp::decompose
     // Graph
     // ~~~~~
 
-    List<int> velotab;
+    List<label> velotab;
 
 
     // Check for externally provided cellweights and if so initialise weights
@@ -766,7 +766,7 @@ Foam::labelList Foam::ptscotchDecomp::decompose
     );
 
     // Decompose using default weights
-    List<int> finalDecomp;
+    List<label> finalDecomp;
     decompose
     (
         mesh.time().path()/mesh.name(),
@@ -819,7 +819,7 @@ Foam::labelList Foam::ptscotchDecomp::decompose
     );
 
     // Decompose using weights
-    List<int> finalDecomp;
+    List<label> finalDecomp;
     decompose
     (
         mesh.time().path()/mesh.name(),
@@ -866,7 +866,7 @@ Foam::labelList Foam::ptscotchDecomp::decompose
     CompactListList<label> cellCells(globalCellCells);
 
     // Decompose using weights
-    List<int> finalDecomp;
+    List<label> finalDecomp;
     decompose
     (
         "ptscotch",
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
index 7f59e53fb1..0930885525 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
@@ -64,22 +64,22 @@ class ptscotchDecomp
         label decompose
         (
             const fileName& meshPath,
-            const List<int>& adjncy,
-            const List<int>& xadj,
+            const List<label>& adjncy,
+            const List<label>& xadj,
             const scalarField& cWeights,
-            List<int>& finalDecomp
+            List<label>& finalDecomp
         ) const;
 
         //- Low level decompose
         label decompose
         (
             const fileName& meshPath,
-            const int adjncySize,
-            const int adjncy[],
-            const int xadjSize,
-            const int xadj[],
+            const label adjncySize,
+            const label adjncy[],
+            const label xadjSize,
+            const label xadj[],
             const scalarField& cWeights,
-            List<int>& finalDecomp
+            List<label>& finalDecomp
         ) const;
 
         //- Disallow default bitwise copy construct and assignment
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.C b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
index 1715f316f2..0095ad0513 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.C
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.C
@@ -173,11 +173,11 @@ void Foam::scotchDecomp::check(const int retVal, const char* str)
 Foam::label Foam::scotchDecomp::decompose
 (
     const fileName& meshPath,
-    const List<int>& adjncy,
-    const List<int>& xadj,
+    const List<label>& adjncy,
+    const List<label>& xadj,
     const scalarField& cWeights,
 
-    List<int>& finalDecomp
+    List<label>& finalDecomp
 )
 {
     if (!Pstream::parRun())
@@ -204,8 +204,8 @@ Foam::label Foam::scotchDecomp::decompose
         // Send all to master. Use scheduled to save some storage.
         if (Pstream::master())
         {
-            Field<int> allAdjncy(nTotalConnections);
-            Field<int> allXadj(globalCells.size()+1);
+            Field<label> allAdjncy(nTotalConnections);
+            Field<label> allXadj(globalCells.size()+1);
             scalarField allWeights(globalCells.size());
 
             // Insert my own
@@ -224,8 +224,8 @@ Foam::label Foam::scotchDecomp::decompose
             for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
                 IPstream fromSlave(Pstream::scheduled, slave);
-                Field<int> nbrAdjncy(fromSlave);
-                Field<int> nbrXadj(fromSlave);
+                Field<label> nbrAdjncy(fromSlave);
+                Field<label> nbrXadj(fromSlave);
                 scalarField nbrWeights(fromSlave);
 
                 // Append.
@@ -244,7 +244,7 @@ Foam::label Foam::scotchDecomp::decompose
             allXadj[nTotalCells] = nTotalConnections;
 
 
-            Field<int> allFinalDecomp;
+            Field<label> allFinalDecomp;
             decomposeOneProc
             (
                 meshPath,
@@ -259,7 +259,7 @@ Foam::label Foam::scotchDecomp::decompose
             for (int slave=1; slave<Pstream::nProcs(); slave++)
             {
                 OPstream toSlave(Pstream::scheduled, slave);
-                toSlave << SubField<int>
+                toSlave << SubField<label>
                 (
                     allFinalDecomp,
                     globalCells.localSize(slave),
@@ -267,7 +267,7 @@ Foam::label Foam::scotchDecomp::decompose
                 );
             }
             // Get my own part (always first)
-            finalDecomp = SubField<int>
+            finalDecomp = SubField<label>
             (
                 allFinalDecomp,
                 globalCells.localSize()
@@ -278,7 +278,7 @@ Foam::label Foam::scotchDecomp::decompose
             // Send my part of the graph (already in global numbering)
             {
                 OPstream toMaster(Pstream::scheduled, Pstream::masterNo());
-                toMaster<< adjncy << SubField<int>(xadj, xadj.size()-1)
+                toMaster<< adjncy << SubField<label>(xadj, xadj.size()-1)
                     << cWeights;
             }
 
@@ -295,11 +295,11 @@ Foam::label Foam::scotchDecomp::decompose
 Foam::label Foam::scotchDecomp::decomposeOneProc
 (
     const fileName& meshPath,
-    const List<int>& adjncy,
-    const List<int>& xadj,
+    const List<label>& adjncy,
+    const List<label>& xadj,
     const scalarField& cWeights,
 
-    List<int>& finalDecomp
+    List<label>& finalDecomp
 )
 {
     // Dump graph
@@ -372,7 +372,7 @@ Foam::label Foam::scotchDecomp::decomposeOneProc
     // Graph
     // ~~~~~
 
-    List<int> velotab;
+    List<label> velotab;
 
 
     // Check for externally provided cellweights and if so initialise weights
@@ -625,7 +625,7 @@ Foam::labelList Foam::scotchDecomp::decompose
     );
 
     // Decompose using default weights
-    List<int> finalDecomp;
+    List<label> finalDecomp;
     decompose
     (
         mesh.time().path()/mesh.name(),
@@ -677,7 +677,7 @@ Foam::labelList Foam::scotchDecomp::decompose
     );
 
     // Decompose using weights
-    List<int> finalDecomp;
+    List<label> finalDecomp;
     decompose
     (
         mesh.time().path()/mesh.name(),
@@ -725,7 +725,7 @@ Foam::labelList Foam::scotchDecomp::decompose
     CompactListList<label> cellCells(globalCellCells);
 
     // Decompose using weights
-    List<int> finalDecomp;
+    List<label> finalDecomp;
     decompose
     (
         "scotch",
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.H b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
index 98d509f87e..3c044941d0 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.H
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
@@ -59,20 +59,20 @@ class scotchDecomp
         label decompose
         (
             const fileName& meshPath,
-            const List<int>& adjncy,
-            const List<int>& xadj,
+            const List<label>& adjncy,
+            const List<label>& xadj,
             const scalarField& cWeights,
-            List<int>& finalDecomp
+            List<label>& finalDecomp
         );
 
         //- Decompose non-parallel
         label decomposeOneProc
         (
             const fileName& meshPath,
-            const List<int>& adjncy,
-            const List<int>& xadj,
+            const List<label>& adjncy,
+            const List<label>& xadj,
             const scalarField& cWeights,
-            List<int>& finalDecomp
+            List<label>& finalDecomp
         );
 
         //- Disallow default bitwise copy construct and assignment
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index f9f83f061b..ecbe83a14e 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -6,7 +6,7 @@ RANLIB     = ranlib
 CPP        = cpp
 LD         = ld
 
-GFLAGS     = -D$(WM_ARCH) -DWM_$(WM_PRECISION_OPTION)
+GFLAGS     = -D$(WM_ARCH) -DWM_$(WM_PRECISION_OPTION) -DWM_LABEL_SIZE=$(WM_LABEL_SIZE)
 GINC       =
 GLIBS      = -lm
 GLIB_LIBS  =