Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

applications/solvers/combustion/chemFoam/createSingleCellMesh.H

@@ -1,6 +1,6 @@
 Info<< "Constructing single cell mesh" << nl << endl;
 
-labelList owner(6, 0);
+labelList owner(6, label(0));
 labelList neighbour(0);
 
 pointField points(8);

applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H

@@ -0,0 +1,58 @@
+{
+    #include "continuityErrs.H"
+
+    wordList pcorrTypes
+    (
+        p_rgh.boundaryField().size(),
+        zeroGradientFvPatchScalarField::typeName
+    );
+
+    forAll (p_rgh.boundaryField(), i)
+    {
+        if (p_rgh.boundaryField()[i].fixesValue())
+        {
+            pcorrTypes[i] = fixedValueFvPatchScalarField::typeName;
+        }
+    }
+
+    volScalarField pcorr
+    (
+        IOobject
+        (
+            "pcorr",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("pcorr", p_rgh.dimensions(), 0.0),
+        pcorrTypes
+    );
+
+    dimensionedScalar rAUf("(1|A(U))", dimTime/rho.dimensions(), 1.0);
+
+    adjustPhi(phi, U, pcorr);
+
+    fvc::makeAbsolute(phi, U);
+
+    while (pimple.correctNonOrthogonal())
+    {
+        fvScalarMatrix pcorrEqn
+        (
+            fvm::laplacian(rAUf, pcorr) == fvc::div(phi)
+        );
+
+        pcorrEqn.setReference(pRefCell, pRefValue);
+        pcorrEqn.solve();
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            phi -= pcorrEqn.flux();
+            phiAbs = phi;
+            fvc::makeRelative(phi, U);
+        }
+    }
+
+    #include "continuityErrs.H"
+}

applications/utilities/mesh/conversion/sammToFoam/readBoundary.C

@@ -47,7 +47,7 @@ void sammMesh::readBoundary()
     labelList pointLabels(4);
     labelList pointLabelsTri(3);
 
-    labelList patchLabels(1000, -1);
+    labelList patchLabels(1000, label(-1));
 
     word patchType;
     patchTypes_.setSize(1000);

applications/utilities/mesh/conversion/sammToFoam/readCells.C

@@ -230,7 +230,7 @@ void sammMesh::readCells()
     {
         IFstream cellsFile(cellsFileName);
 
-        labelList labels(24, -1);
+        labelList labels(24, label(-1));
         label lineLabel, sammLabel, regionLabel, typeFlag;
 
         for (label cellI = 0; cellI < nCells; cellI++)

applications/utilities/mesh/conversion/star3ToFoam/readBoundary.C

@@ -47,7 +47,7 @@ void starMesh::readBoundary()
     labelList pointLabels(4);
     labelList pointLabelsTri(3);
 
-    labelList patchLabels(1000, -1);
+    labelList patchLabels(1000, label(-1));
 
     word patchType;
     patchTypes_.setSize(1000);

applications/utilities/mesh/conversion/star3ToFoam/readCells.C

@@ -275,7 +275,7 @@ void starMesh::readCells()
     {
         IFstream cellsFile(cellsFileName);
 
-        labelList labels(24, -1);
+        labelList labels(24, label(-1));
         label lineLabel, starLabel, regionLabel, typeFlag;
 
         for (label cellI = 0; cellI < nCells; cellI++)

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

@@ -1456,7 +1456,7 @@ void setCouplingInfo
 {
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
-    List<polyPatch*> newPatches(patches.size(), NULL);
+    List<polyPatch*> newPatches(patches.size(), static_cast<polyPatch*>(NULL));
 
     forAll(zoneToPatch, zoneI)
     {

applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C

@@ -244,8 +244,8 @@ void Foam::domainDecomposition::decomposeMesh()
     {
         label nInterfaces = interPatchFaces[procI].size();
 
-        subPatchIDs[procI].setSize(nInterfaces, labelList(1, -1));
+        subPatchIDs[procI].setSize(nInterfaces, labelList(1, label(-1)));
-        subPatchStarts[procI].setSize(nInterfaces, labelList(1, 0));
+        subPatchStarts[procI].setSize(nInterfaces, labelList(1, label(0)));
     }
 
     // Processor boundaries from split cyclics
@@ -319,7 +319,7 @@ void Foam::domainDecomposition::decomposeMesh()
             {
                 label nIntfcs = interPatchFaces[procI].size();
                 subPatchIDs[procI].setSize(nIntfcs, labelList(1, patchi));
-                subPatchStarts[procI].setSize(nIntfcs, labelList(1, 0));
+                subPatchStarts[procI].setSize(nIntfcs, labelList(1, label(0)));
             }
         }
     }

applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.C

@@ -114,7 +114,7 @@ Foam::fieldviewTopology::fieldviewTopology
     // Mark all faces that are to be seen as wall for particle
     // tracking and all cells that use one or more of these walls
 
-    labelList wallFace(mesh.nFaces(), NOT_A_WALL);
+    List<int> wallFace(mesh.nFaces(), NOT_A_WALL);
     boolList wallCell(mesh.nCells(), false);
 
     if (setWallInfo)
@@ -149,20 +149,20 @@ Foam::fieldviewTopology::fieldviewTopology
     const cellModel& hex = *(cellModeller::lookup("hex"));
 
     // Pre calculate headers for cells not on walls
-    labelList notWallFlags(6, NOT_A_WALL);
+    List<int> notWallFlags(6, NOT_A_WALL);
-    label tetNotWall = fv_encode_elem_header
+    unsigned int tetNotWall = fv_encode_elem_header
     (
         FV_TET_ELEM_ID, notWallFlags.begin()
     );
-    label pyrNotWall = fv_encode_elem_header
+    unsigned int pyrNotWall = fv_encode_elem_header
     (
         FV_PYRA_ELEM_ID, notWallFlags.begin()
     );
-    label prismNotWall = fv_encode_elem_header
+    unsigned int prismNotWall = fv_encode_elem_header
     (
         FV_PRISM_ELEM_ID, notWallFlags.begin()
     );
-    label hexNotWall = fv_encode_elem_header
+    unsigned int hexNotWall = fv_encode_elem_header
     (
         FV_HEX_ELEM_ID, notWallFlags.begin()
     );
@@ -179,7 +179,7 @@ Foam::fieldviewTopology::fieldviewTopology
 
     const faceList& allFaces = mesh.faces();
 
-    labelList wallFlags(6);
+    List<int> wallFlags(6);
     forAll(cellShapes, celli)
     {
         const cellShape& cellShape = cellShapes[celli];

applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.H

@@ -55,13 +55,13 @@ class fieldviewTopology
     // Private data
 
         //- Hexes in fieldview format
-        labelList hexLabels_;
+        List<int> hexLabels_;
 
-        labelList prismLabels_;
+        List<int> prismLabels_;
 
-        labelList pyrLabels_;
+        List<int> pyrLabels_;
 
-        labelList tetLabels_;
+        List<int> tetLabels_;
 
         //- Number of non-hex/prism/pyr/tet labels
         label nPoly_;
@@ -108,22 +108,22 @@ public:
 
         // Access
 
-            const labelList& hexLabels() const
+            const List<int>& hexLabels() const
             {
                 return hexLabels_;
             }
 
-            const labelList& prismLabels() const
+            const List<int>& prismLabels() const
             {
                 return prismLabels_;
             }
 
-            const labelList& pyrLabels() const
+            const List<int>& pyrLabels() const
             {
                 return pyrLabels_;
             }
 
-            const labelList& tetLabels() const
+            const List<int>& tetLabels() const
             {
                 return tetLabels_;
             }

applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C

@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
 
     vectorField normals(2*nFeatEds, vector::zero);
     vectorField edgeDirections(nFeatEds, vector::zero);
-    labelListList edgeNormals(nFeatEds, labelList(2, -1));
+    labelListList edgeNormals(nFeatEds, labelList(2, label(-1)));
 
     triSurfaceSearch querySurf1(surf1);
     triSurfaceSearch querySurf2(surf2);

src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.C

@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "HashTable.H"
+#include "uLabel.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -47,7 +48,7 @@ Foam::label Foam::HashTableCore::canonicalSize(const label size)
     }
 
     // enforce power of two
-    unsigned int goodSize = size;
+    uLabel goodSize = size;
 
     if (goodSize & (goodSize - 1))
     {

src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H

@@ -68,7 +68,7 @@ class UIPstream
 
         const bool clearAtEnd_;
 
-        label messageSize_;
+        int messageSize_;
 
 
     // Private Member Functions

src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C

@@ -222,7 +222,7 @@ int Foam::UPstream::myProcNo_(0);
 bool Foam::UPstream::parRun_(false);
 
 // List of process IDs
-Foam::List<int> Foam::UPstream::procIDs_(1, 0);
+Foam::List<int> Foam::UPstream::procIDs_(label(1), 0);
 
 // Standard transfer message type
 int Foam::UPstream::msgType_(1);

src/OpenFOAM/db/Time/Time.C

@@ -278,7 +278,7 @@ Foam::Time::Time
     writeControl_(wcTimeStep),
     writeInterval_(GREAT),
     secondaryWriteControl_(wcTimeStep),
-    secondaryWriteInterval_(labelMax),
+    secondaryWriteInterval_(labelMax/10.0), // bit less to allow calculations
     purgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),
@@ -370,7 +370,7 @@ Foam::Time::Time
     writeControl_(wcTimeStep),
     writeInterval_(GREAT),
     secondaryWriteControl_(wcTimeStep),
-    secondaryWriteInterval_(labelMax),
+    secondaryWriteInterval_(labelMax/10.0),
     purgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),
@@ -465,7 +465,7 @@ Foam::Time::Time
     writeControl_(wcTimeStep),
     writeInterval_(GREAT),
     secondaryWriteControl_(wcTimeStep),
-    secondaryWriteInterval_(labelMax),
+    secondaryWriteInterval_(labelMax/10.0),
     purgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),
@@ -562,7 +562,7 @@ Foam::Time::Time
     writeControl_(wcTimeStep),
     writeInterval_(GREAT),
     secondaryWriteControl_(wcTimeStep),
-    secondaryWriteInterval_(labelMax),
+    secondaryWriteInterval_(labelMax/10.0),
     purgeWrite_(0),
     writeOnce_(false),
     subCycling_(false),

src/OpenFOAM/fields/Fields/transformList/transformList.H

@@ -75,6 +75,28 @@ template<class T>
 void transformList(const tensorField&, EdgeMap<T>&);
 
 
+// Specialisations for bool
+template<>
+inline void transformList(const tensor&, UList<bool>&)
+{}
+template<>
+inline void transformList(const tensorField&, UList<bool>&)
+{}
+template<>
+inline void transformList(const tensor&, Map<bool>&)
+{}
+template<>
+inline void transformList(const tensorField&, Map<bool>&)
+{}
+template<>
+inline void transformList(const tensor&, EdgeMap<bool>&)
+{}
+template<>
+inline void transformList(const tensorField&, EdgeMap<bool>&)
+{}
+
+
+// Specialisations for label
 template<>
 inline void transformList(const tensor&, labelUList&)
 {}
@@ -95,6 +117,7 @@ inline void transformList(const tensorField&, EdgeMap<label>&)
 {}
 
 
+// Specialisations for scalar
 template<>
 inline void transformList(const tensor&, UList<scalar>&)
 {}

src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C

@@ -137,7 +137,7 @@ void Foam::pointMapper::calcAddressing() const
             if (addr[pointI].empty())
             {
                 // Mapped from a dummy point. Take point 0 with weight 1.
-                addr[pointI] = labelList(1, 0);
+                addr[pointI] = labelList(1, label(0));
                 w[pointI] = scalarList(1, 1.0);
 
                 insertedPoints[nInsertedPoints] = pointI;

src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C

@@ -88,7 +88,7 @@ void Foam::pointPatchMapper::calcAddressing() const
             else
             {
                 // Inserted point. Map from point0 (arbitrary choice)
-                addr[i] = labelList(1, 0);
+                addr[i] = labelList(1, label(0));
                 w[i] = scalarList(1, 1.0);
             }
         }

src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C

@@ -202,7 +202,7 @@ void Foam::cellMapper::calcAddressing() const
             if (addr[cellI].empty())
             {
                 // Mapped from a dummy cell
-                addr[cellI] = labelList(1, 0);
+                addr[cellI] = labelList(1, label(0));
                 w[cellI] = scalarList(1, 1.0);
 
                 insertedCells[nInsertedCells] = cellI;

src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C

@@ -180,7 +180,7 @@ void Foam::faceMapper::calcAddressing() const
             if (addr[faceI].empty())
             {
                 // Mapped from a dummy face
-                addr[faceI] = labelList(1, 0);
+                addr[faceI] = labelList(1, label(0));
                 w[faceI] = scalarList(1, 1.0);
 
                 insertedFaces[nInsertedFaces] = faceI;

src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C

@@ -147,7 +147,7 @@ bool Foam::pointZone::checkParallelSync(const bool report) const
         maxZone[pointI] = index();
         minZone[pointI] = index();
     }
-    syncTools::syncPointList(mesh, maxZone, maxEqOp<label>(), -1);
+    syncTools::syncPointList(mesh, maxZone, maxEqOp<label>(), label(-1));
     syncTools::syncPointList(mesh, minZone, minEqOp<label>(), labelMax);
 
     bool error = false;

src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransform.C

@@ -318,7 +318,7 @@ void Foam::globalIndexAndTransform::determineTransforms()
 
 void Foam::globalIndexAndTransform::determineTransformPermutations()
 {
-    label nTransformPermutations = pow(3, transforms_.size());
+    label nTransformPermutations = pow(label(3), transforms_.size());
 
     transformPermutations_.setSize(nTransformPermutations);
 

src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H

@@ -151,7 +151,7 @@ Foam::globalIndexAndTransform::decodeTransformIndex
     const label transformIndex
 ) const
 {
-    FixedList<label, 3> permutation(0);
+    FixedList<label, 3> permutation(label(0));
 
     label t = transformIndex;
     if (nIndependentTransforms() > 0)
@@ -520,7 +520,7 @@ Foam::labelList Foam::globalIndexAndTransform::transformIndicesForPatches
     }
 
     // Number of selected transformations
-    label nSelTrans = pow(2, nUsedTrans) - 1;
+    label nSelTrans = pow(label(2), nUsedTrans) - 1;
 
     // Pout<< nl << permutation << nl << endl;
 

src/OpenFOAM/primitives/hashes/Hash/Hash.H

@@ -42,6 +42,8 @@ Description
 
 namespace Foam
 {
+//template<class Type> class Hash;
+//template<> class Hash<label>;
 
 /*---------------------------------------------------------------------------*\
                             Class Hash Declaration
@@ -70,30 +72,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Hash specialization for hashing pointer addresses.
-//  Treat a pointer like a long.
-//  This should work for both 32-bit and 64-bit pointers.
-template<>
-class Hash<void*>
-{
-public:
-
-    Hash()
-    {}
-
-    unsigned operator()(const void* const& p, unsigned seed) const
-    {
-        return Hash<long>()(long(p), seed);
-    }
-
-    unsigned operator()(const void* const& p) const
-    {
-        return Hash<long>()(long(p));
-    }
-
-};
-
-
 //- Hash specialization for hashing labels
 template<>
 class Hash<Foam::label>
@@ -121,6 +99,30 @@ public:
 };
 
 
+//- Hash specialization for hashing pointer addresses.
+//  Treat a pointer like a long.
+//  This should work for both 32-bit and 64-bit pointers.
+template<>
+class Hash<void*>
+{
+public:
+
+    Hash()
+    {}
+
+    unsigned operator()(const void* const& p, unsigned seed) const
+    {
+        return Hash<long>()(long(p), seed);
+    }
+
+    unsigned operator()(const void* const& p) const
+    {
+        return Hash<long>()(long(p));
+    }
+
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/OpenFOAM/primitives/ints/label/label.C

@@ -53,6 +53,28 @@ pTraits<label>::pTraits(Istream& is)
 }
 
 
+#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 char* pTraits<int>::componentNames[] = { "x" };
+
+pTraits<int>::pTraits(const int& p)
+:
+    p_(p)
+{}
+
+
+pTraits<int>::pTraits(Istream& is)
+{
+    is >> p_;
+}
+#endif
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Raise one label to the power of another (overloaded function call)

src/OpenFOAM/primitives/ints/label/label.H

@@ -47,6 +47,9 @@ Description
 #    define FOAM_LABEL_MAX 2000000000
 #endif
 
+#include "pTraits.H"
+#include "direction.H"
+
 
 #if INT_MAX > FOAM_LABEL_MAX
 
@@ -126,8 +129,8 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "pTraits.H"
+//#include "pTraits.H"
-#include "direction.H"
+//#include "direction.H"
 
 namespace Foam
 {
@@ -188,6 +191,66 @@ public:
 };
 
 
+// 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;
+
+
+    // 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
+
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Raise one label to the power of another
@@ -214,6 +277,7 @@ 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)

src/OpenFOAM/primitives/ints/long/long.H

@@ -48,7 +48,7 @@ class Ostream;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Return a string representation of a long
-word name(long);
+word name(const long);
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 

src/OpenFOAM/primitives/ints/long/longIO.C

@@ -37,7 +37,7 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::word Foam::name(long val)
+Foam::word Foam::name(const long val)
 {
     std::ostringstream buf;
     buf << val;

src/OpenFOAM/primitives/ints/uLabel/uLabel.H

@@ -42,9 +42,9 @@ SeeAlso
 
 
 #if FOAM_LABEL64
-#    define FOAM_ULABEL_MAX 18000000000000000000
+#    define FOAM_ULABEL_MAX 18000000000000000000u
 #else
-#    define FOAM_ULABEL_MAX 4000000000
+#    define FOAM_ULABEL_MAX 4000000000u
 #endif
 
 

src/OpenFOAM/primitives/transform/transform.H

@@ -57,6 +57,12 @@ inline tensor rotationTensor
 }
 
 
+inline label transform(const tensor&, const bool i)
+{
+    return i;
+}
+
+
 inline label transform(const tensor&, const label i)
 {
     return i;

src/Pstream/mpi/UIPread.C

@@ -259,7 +259,7 @@ Foam::label Foam::UIPstream::read
 
         // Check size of message read
 
-        label messageSize;
+        int messageSize;
         MPI_Get_count(&status, MPI_BYTE, &messageSize);
 
         if (debug)

src/combustionModels/FSD/FSD.C

@@ -260,7 +260,7 @@ void FSD<CombThermoType, ThermoType>::calculateSourceNorm()
 //  Combustion progress variable (c).
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    List<label> productsIndex(2, -1);
+    List<label> productsIndex(2, label(-1));
     {
         label i = 0;
         forAll (this->singleMixture_.specieProd(), specieI)

src/conversion/meshReader/starcd/STARCDMeshReader.C

@@ -640,9 +640,9 @@ void Foam::meshReaders::STARCD::readBoundary(const fileName& inputName)
     label lineLabel, starCellId, cellFaceId, starRegion, configNumber;
     word patchType;
 
-    labelList mapToFoamPatchId(1000, -1);
+    labelList mapToFoamPatchId(1000, label(-1));
-    labelList nPatchFaces(1000, 0);
+    labelList nPatchFaces(1000, label(0));
-    labelList origRegion(1000, 0);
+    labelList origRegion(1000, label(0));
     patchTypes_.setSize(1000);
 
     // this is what we seem to need

src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C

@@ -862,7 +862,7 @@ void Foam::addPatchCellLayer::setRefinement
         {
             labelList n(mesh_.nPoints(), 0);
             UIndirectList<label>(n, meshPoints) = nPointLayers;
-            syncTools::syncPointList(mesh_, n, maxEqOp<label>(), 0);
+            syncTools::syncPointList(mesh_, n, maxEqOp<label>(), label(0));
 
             // Non-synced
             forAll(meshPoints, i)
@@ -906,7 +906,7 @@ void Foam::addPatchCellLayer::setRefinement
                 mesh_,
                 nFromFace,
                 maxEqOp<label>(),
-                0
+                label(0)
             );
 
             forAll(nPointLayers, i)
@@ -1418,7 +1418,7 @@ void Foam::addPatchCellLayer::setRefinement
             mesh_,
             meshEdgeLayers,
             maxEqOp<label>(),
-            0                   // initial value
+            label(0)            // initial value
         );
 
         forAll(meshEdges, edgeI)

src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C

@@ -714,7 +714,7 @@ void Foam::combineFaces::setRefinement
         mesh_,
         nPointFaces,
         plusEqOp<label>(),
-        0                   // null value
+        label(0)            // null value
     );
 
     // Remove all unused points. Store position if undoable.

src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C

@@ -94,7 +94,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
         {
             if (max(addr[faceI]) >= oldNInternal)
             {
-                addr[faceI] = labelList(1, 0);
+                addr[faceI] = labelList(1, label(0));
                 w[faceI] = scalarList(1, 1.0);
             }
         }

src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C

@@ -239,8 +239,14 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
             break;
         }
 
-        label cI =
+        label cI = generationCells_
-            generationCells_[rnd.position(0, generationCells_.size() - 1)];
+        [
+            rnd.position
+            (
+                label(0),
+                generationCells_.size() - 1
+            )
+        ];
 
         // Pick a particle at random from the cell - if there are
         // none, insert one at the cell centre.  Otherwise, split an
@@ -268,7 +274,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
         }
         else
         {
-            label cPI = rnd.position(0, cellOccupancy[cI].size() - 1);
+            label cPI = rnd.position(label(0), cellOccupancy[cI].size() - 1);
 
             // This has to be a reference to the pointer so that it
             // can be set to NULL when the particle is deleted.

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C

@@ -1255,7 +1255,7 @@ void Foam::autoLayerDriver::getPatchDisplacement
             meshPoints,
             nPointFaces,
             plusEqOp<label>(),
-            0                   // null value
+            label(0)            // null value
         );
 
         forAll(pointNormals, i)
@@ -1954,7 +1954,7 @@ void Foam::autoLayerDriver::setupLayerInfoTruncation
             pp.meshPoints(),
             nPatchPointLayers,
             maxEqOp<label>(),
-            0                   // null value
+            label(0)        // null value
         );
     }
 }

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C

@@ -587,7 +587,7 @@ void Foam::autoLayerDriver::findIsolatedRegions
         pp.meshPoints(),
         isolatedPoint,
         plusEqOp<label>(),
-        0        // null value
+        label(0)        // null value
     );
 
     // stop layer growth on isolated faces
@@ -730,7 +730,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
             meshPoints,
             nPointFaces,
             plusEqOp<label>(),
-            0                   // null value
+            label(0)            // null value
         );
 
         forAll(pointNormals, i)

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C

@@ -220,7 +220,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
         pp.meshPoints(),
         nBoundary,
         plusEqOp<label>(),  // combine op
-        0                   // null value
+        label(0)            // null value
     );
 
     forAll(avgBoundary, i)
@@ -295,7 +295,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
             mesh,
             globalNum,
             plusEqOp<label>(),  // combine op
-            0                   // null value
+            label(0)            // null value
         );
 
         avgInternal.setSize(meshPoints.size());

src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C

@@ -2002,7 +2002,7 @@ void Foam::meshRefinement::updateMesh
     );
 
     // Update surfaceIndex
-    updateList(map.faceMap(), -1, surfaceIndex_);
+    updateList(map.faceMap(), label(-1), surfaceIndex_);
 
     // Update cached intersection information
     updateIntersections(changedFaces);
@@ -2015,7 +2015,7 @@ void Foam::meshRefinement::updateMesh
         if (userFaceData_[i].first() == KEEPALL)
         {
             // extend list with face-from-face data
-            updateList(map.faceMap(), -1, data);
+            updateList(map.faceMap(), label(-1), data);
         }
         else if (userFaceData_[i].first() == MASTERONLY)
         {

src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C

@@ -815,7 +815,7 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::filterDuplicateFaces
         mesh_,
         nBafflesPerEdge,
         plusEqOp<label>(),  // in-place add
-        0                   // initial value
+        label(0)            // initial value
     );
 
 
@@ -2062,7 +2062,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
             mesh_,
             pointBaffle,
             maxEqOp<label>(),
-            -1                  // null value
+            label(-1)           // null value
         );
 
 

src/meshTools/algorithms/MeshWave/FaceCellWave.C

@@ -45,7 +45,7 @@ template <class Type, class TrackingData>
 Foam::scalar Foam::FaceCellWave<Type, TrackingData>::propagationTol_ = 0.01;
 
 template <class Type, class TrackingData>
-Foam::label Foam::FaceCellWave<Type, TrackingData>::dummyTrackData_ = 12345;
+int Foam::FaceCellWave<Type, TrackingData>::dummyTrackData_ = 12345;
 
 namespace Foam
 {

src/meshTools/algorithms/MeshWave/FaceCellWave.H

@@ -240,7 +240,7 @@ class FaceCellWave
 
             //- Used as default trackdata value to satisfy default template
             //  argument.
-            static label dummyTrackData_;
+            static int dummyTrackData_;
 
 
 public:

src/meshTools/algorithms/MeshWave/MeshWave.C

@@ -30,7 +30,7 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template <class Type, class TrackingData>
-Foam::label Foam::MeshWave<Type, TrackingData>::dummyTrackData_ = 12345;
+int Foam::MeshWave<Type, TrackingData>::dummyTrackData_ = 12345;
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

src/meshTools/algorithms/MeshWave/MeshWave.H

@@ -81,7 +81,7 @@ class MeshWave
 
             //- Used as default trackdata value to satisfy default template
             //  argument.
-            static label dummyTrackData_;
+            static int dummyTrackData_;
 
 public:
 

src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C

@@ -41,7 +41,7 @@ template <class Type, class TrackingData>
 Foam::scalar Foam::PointEdgeWave<Type, TrackingData>::propagationTol_ = 0.01;
 
 template <class Type, class TrackingData>
-Foam::label Foam::PointEdgeWave<Type, TrackingData>::dummyTrackData_ = 12345;
+int Foam::PointEdgeWave<Type, TrackingData>::dummyTrackData_ = 12345;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //

src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H

@@ -96,7 +96,7 @@ class PointEdgeWave
 
         //- Used as default trackdata value to satisfy default template
         //  argument.
-        static label dummyTrackData_;
+        static int dummyTrackData_;
 
 
     // Private data

src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C

@@ -58,7 +58,7 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
     absorptionEmissionModel(dict, mesh),
     coeffsDict_((dict.subDict(typeName + "Coeffs"))),
     speciesNames_(0),
-    specieIndex_(0),
+    specieIndex_(label(0)),
     lookUpTablePtr_(),
     thermo_(mesh.lookupObject<basicThermo>("thermophysicalProperties")),
     EhrrCoeff_(readScalar(coeffsDict_.lookup("EhrrCoeff"))),

src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C

@@ -55,7 +55,7 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission
     absorptionEmissionModel(dict, mesh),
     coeffsDict_((dict.subDict(typeName + "Coeffs"))),
     speciesNames_(0),
-    specieIndex_(0),
+    specieIndex_(label(0)),
     lookUpTable_
     (
         fileName(coeffsDict_.lookup("lookUpTableFileName")),

src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C

@@ -100,7 +100,7 @@ tmp<volScalarField> kkLOmega::fTaul
                     lambdaEff*omega_
                   + dimensionedScalar
                     (
-                        "ROTVSMALL",
+                        "ROOTVSMALL",
                         dimLength*inv(dimTime),
                         ROOTVSMALL
                     )
@@ -194,6 +194,7 @@ tmp<volScalarField> kkLOmega::gammaNAT
     );
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 kkLOmega::kkLOmega
@@ -670,7 +671,7 @@ void kkLOmega::correct()
         alphaT(lambdaEff, fv(sqr(fw)*kt_/nu()/(omega_ + omegaMin_)), ktS)
     );
 
-    // By pass s0urce term divided by kl_
+    // By pass source term divided by kl_
 
     const dimensionedScalar fwMin("SMALL", dimless, ROOTVSMALL);
 

src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H

@@ -136,6 +136,7 @@ class kkLOmega
             const volScalarField& fNatCrit
         ) const;
 
+
 protected:
 
     // Protected data

tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre

@@ -4,6 +4,10 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+# copy propeller surface from resources folder
+cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
+
+
 # - meshing
 
 runApplication blockMesh

tutorials/incompressible/pimpleFoam/TJunction/0/p

@@ -22,14 +22,13 @@ boundaryField
 {
     inlet
     {
-        //type            totalPressure;
+        type            uniformTotalPressure;
-        //p0              uniform 40;
+        pressure        table
-
+        (
-        type            timeVaryingTotalPressure;
+            (0 10)
+            (1 40)
+        );
         p0              40; // only used for restarts
-        outOfBounds     clamp;
-        fileName        "$FOAM_CASE/constant/p0vsTime";
-
         U               U;
         phi             phi;
         rho             none;

tutorials/incompressible/pimpleFoam/TJunction/constant/p0vsTime

@@ -1,4 +0,0 @@
-(
-    (0 10)
-    (1 40)
-)

tutorials/incompressible/pimpleFoam/TJunctionFan/0/p

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -23,50 +22,37 @@ boundaryField
 {
     inlet
     {
-        type            timeVaryingTotalPressure;
+        type            uniformTotalPressure;
+        pressure        table
+        (
+            (0 10)
+            (1 40)
+        );
+        p0              40; // only used for restarts
+        U               U;
+        phi             phi;
         rho             none;
         psi             none;
         gamma           1;
-        p0              40;
-        fileName        "$FOAM_CASE/constant/p0vsTime";
-        outOfBounds     clamp;
         value           uniform 40;
     }
+
     outlet1
     {
         type            fixedValue;
         value           uniform 10;
     }
+
     outlet2
     {
         type            fixedValue;
         value           uniform 0;
     }
-    baffles
+
-    {
-        type            zeroGradient;
-    }
-    fan_half0
-    {
-        type            fan;
-        patchType       cyclic;
-        jump            uniform 0;
-        f               2(100 -0.1);
-        value           uniform 0;
-    }
-    fan_half1
-    {
-        type            fan;
-        patchType       cyclic;
-        jump            uniform 0;
-        f               2(100 -0.1);
-        value           uniform 0;
-    }
     defaultFaces
     {
         type            zeroGradient;
     }
 }
 
-
 // ************************************************************************* //

tutorials/incompressible/pimpleFoam/TJunctionFan/constant/p0vsTime

@@ -1,4 +0,0 @@
-(
-    (0 10)
-    (1 40)
-)

tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allclean

@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+# remove surface
+\rm -f constant/triSurface/motorBike.obj.gz
+
 rm -rf 0 > /dev/null 2>&1
 
 cleanCase

tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun

@@ -4,6 +4,8 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+# copy motorbike surface from resources folder
+cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
 
 # Make dummy 0 directory
 mkdir 0

tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/triSurface/README

@@ -0,0 +1,4 @@
+Folder to house tri-surfaces
+
+The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
+folder

tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/snappyHexMeshDict

@@ -28,7 +28,7 @@ addLayers       false;
 // - to 'snap' the mesh boundary to the surface
 geometry
 {
-    motorBike.stl
+    motorBike.obj
     {
         type triSurfaceMesh;
         name motorBike;

tutorials/incompressible/simpleFoam/motorBike/Allclean

@@ -3,6 +3,9 @@
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
+# remove surface
+\rm -f constant/triSurface/motorBike.obj.gz
+
 rm -rf 0 > /dev/null 2>&1
 
 cleanCase

tutorials/incompressible/simpleFoam/motorBike/Allrun

@@ -2,6 +2,9 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+# copy motorbike surface from resources folder
+cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+
 cp -r 0.org 0 > /dev/null 2>&1
 
 runApplication blockMesh

tutorials/incompressible/simpleFoam/motorBike/constant/triSurface/README

@@ -0,0 +1,4 @@
+Folder to house tri-surfaces
+
+The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
+folder

tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict

@@ -28,7 +28,7 @@ addLayers       true;
 // - to 'snap' the mesh boundary to the surface
 geometry
 {
-    motorBike.stl
+    motorBike.obj
     {
         type triSurfaceMesh;
         name motorBike;