GIT: Initial commit after latest foundation merge

applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -130,7 +130,7 @@ void subsetVolFields
     const label patchI,
     const Type& exposedValue,
     const word GeomVolType,
-    PtrList<GeometricField<Type, fvPatchField, volMesh> >& subFields
+    PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -202,7 +202,7 @@ void subsetSurfaceFields
     const label patchI,
     const Type& exposedValue,
     const word GeomSurfType,
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh> >& subFields
+    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -581,10 +581,10 @@ int main(int argc, char *argv[])
     );
 
     // Per faceSet the patch to put the baffles into
-    const List<Pair<word> > setsAndPatches(dict.lookup("blockedFaces"));
+    const List<Pair<word>> setsAndPatches(dict.lookup("blockedFaces"));
 
     // Per faceSet the patch to put the coupled baffles into
-    DynamicList<FixedList<word, 3> > coupledAndPatches(10);
+    DynamicList<FixedList<word, 3>> coupledAndPatches(10);
     const dictionary& functionDicts = dict.subDict("coupledFaces");
     forAllConstIter(dictionary, functionDicts, iter)
     {
@@ -782,7 +782,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<scalar>::zero,
+        scalar(Zero),
         volScalarField::typeName,
         scalarFlds
     );
@@ -794,7 +794,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<vector>::zero,
+        vector(Zero),
         volVectorField::typeName,
         vectorFlds
     );
@@ -812,7 +812,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<sphericalTensor>::zero,
+        sphericalTensor(Zero),
         volSphericalTensorField::typeName,
         sphericalTensorFlds
     );
@@ -824,7 +824,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<symmTensor>::zero,
+        symmTensor(Zero),
         volSymmTensorField::typeName,
         symmTensorFlds
     );
@@ -836,7 +836,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<tensor>::zero,
+        tensor(Zero),
         volTensorField::typeName,
         tensorFlds
     );
@@ -850,7 +850,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<scalar>::zero,
+        scalar(Zero),
         surfaceScalarField::typeName,
         surfScalarFlds
     );
@@ -862,7 +862,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<vector>::zero,
+        vector(Zero),
         surfaceVectorField::typeName,
         surfVectorFlds
     );
@@ -880,7 +880,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<sphericalTensor>::zero,
+        sphericalTensor(Zero),
         surfaceSphericalTensorField::typeName,
         surfSphericalTensorFlds
     );
@@ -900,7 +900,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<symmTensor>::zero,
+        symmTensor(Zero),
         surfaceSymmTensorField::typeName,
         surfSymmTensorFlds
     );
@@ -912,7 +912,7 @@ int main(int argc, char *argv[])
         subsetter,
         objects,
         defaultPatchI,
-        pTraits<tensor>::zero,
+        tensor(Zero),
         surfaceTensorField::typeName,
         surfTensorFlds
     );
@@ -1076,25 +1076,25 @@ int main(int argc, char *argv[])
     (
         subsetter.subMesh(),
         map,
-        vector::zero
+        Zero
     );
     initCreatedPatches<volSphericalTensorField>
     (
         subsetter.subMesh(),
         map,
-        sphericalTensor::zero
+        Zero
     );
     initCreatedPatches<volSymmTensorField>
     (
         subsetter.subMesh(),
         map,
-        symmTensor::zero
+        Zero
     );
     initCreatedPatches<volTensorField>
     (
         subsetter.subMesh(),
         map,
-        tensor::zero
+        Zero
     );
 
     initCreatedPatches<surfaceScalarField>
@@ -1107,25 +1107,25 @@ int main(int argc, char *argv[])
     (
         subsetter.subMesh(),
         map,
-        vector::zero
+        Zero
     );
     initCreatedPatches<surfaceSphericalTensorField>
     (
         subsetter.subMesh(),
         map,
-        sphericalTensor::zero
+        Zero
     );
     initCreatedPatches<surfaceSymmTensorField>
     (
         subsetter.subMesh(),
         map,
-        symmTensor::zero
+        Zero
     );
     initCreatedPatches<surfaceTensorField>
     (
         subsetter.subMesh(),
         map,
-        tensor::zero
+        Zero
     );
 
 

applications/utilities/mesh/advanced/autoRefineMesh/Make/files

@@ -1,4 +1,4 @@
-autoRefineMesh.C
+snappyRefineMesh.C
 
-EXE = $(FOAM_APPBIN)/autoRefineMesh
+EXE = $(FOAM_APPBIN)/snappyRefineMesh
 

applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    autoRefineMesh
+    snappyRefineMesh
 
 Description
     Utility to refine cells near to a surface.
@@ -670,7 +670,7 @@ int main(int argc, char *argv[])
     (
         IOobject
         (
-            "autoRefineMeshDict",
+            "snappyRefineMeshDict",
             runTime.system(),
             mesh,
             IOobject::MUST_READ_IF_MODIFIED,

applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMeshDict

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      autoRefineMeshDict;
+    object      snappyRefineMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,6 +80,7 @@ int main(int argc, char *argv[])
         "Collapse faces that are in the supplied face set"
     );
 
+    #include "addDictOption.H"
     #include "addOverwriteOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
@@ -91,6 +92,13 @@ int main(int argc, char *argv[])
 
     const word oldInstance = mesh.pointsInstance();
 
+    const word dictName("collapseDict");
+    #include "setSystemMeshDictionaryIO.H"
+
+    Info<< "Reading " << dictName << nl << endl;
+
+    IOdictionary collapseDict(dictIO);
+
     const bool overwrite = args.optionFound("overwrite");
 
     const bool collapseFaces = args.optionFound("collapseFaces");
@@ -155,7 +163,10 @@ int main(int argc, char *argv[])
 
 
         {
-            meshFilterPtr.set(new polyMeshFilter(mesh, pointPriority));
+            meshFilterPtr.set
+            (
+                new polyMeshFilter(mesh, pointPriority, collapseDict)
+            );
             polyMeshFilter& meshFilter = meshFilterPtr();
 
             // newMesh will be empty until it is filtered
@@ -177,7 +188,10 @@ int main(int argc, char *argv[])
 
         if (collapseFaceSet)
         {
-            meshFilterPtr.reset(new polyMeshFilter(mesh, pointPriority));
+            meshFilterPtr.reset
+            (
+                new polyMeshFilter(mesh, pointPriority, collapseDict)
+            );
             polyMeshFilter& meshFilter = meshFilterPtr();
 
             const autoPtr<fvMesh>& newMesh = meshFilter.filteredMesh();
@@ -198,7 +212,10 @@ int main(int argc, char *argv[])
 
         if (collapseFaces)
         {
-            meshFilterPtr.reset(new polyMeshFilter(mesh, pointPriority));
+            meshFilterPtr.reset
+            (
+                new polyMeshFilter(mesh, pointPriority, collapseDict)
+            );
             polyMeshFilter& meshFilter = meshFilterPtr();
 
             const autoPtr<fvMesh>& newMesh = meshFilter.filteredMesh();

applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -355,9 +355,9 @@ int main(int argc, char *argv[])
     );
 
     // Read all from the dictionary.
-    List<Pair<point> > pointsToMove(dict.lookup("pointsToMove"));
-    List<Pair<point> > edgesToSplit(dict.lookup("edgesToSplit"));
-    List<Pair<point> > facesToTriangulate
+    List<Pair<point>> pointsToMove(dict.lookup("pointsToMove"));
+    List<Pair<point>> edgesToSplit(dict.lookup("edgesToSplit"));
+    List<Pair<point>> facesToTriangulate
     (
         dict.lookup("facesToTriangulate")
     );
@@ -369,15 +369,15 @@ int main(int argc, char *argv[])
      || facesToTriangulate.size()
     );
 
-    List<Pair<point> > edgesToCollapse(dict.lookup("edgesToCollapse"));
+    List<Pair<point>> edgesToCollapse(dict.lookup("edgesToCollapse"));
 
     bool collapseEdge = edgesToCollapse.size();
 
-    List<Pair<point> > cellsToPyramidise(dict.lookup("cellsToSplit"));
+    List<Pair<point>> cellsToPyramidise(dict.lookup("cellsToSplit"));
 
     bool cellsToSplit = cellsToPyramidise.size();
 
-    // List<Tuple2<pointField,point> >
+    // List<Tuple2<pointField,point>>
     //     cellsToCreate(dict.lookup("cellsToCreate"));
 
     Info<< "Read from " << dict.name() << nl
@@ -442,7 +442,7 @@ int main(int argc, char *argv[])
 
 
     Info<< nl << "Looking up edges to split ..." << nl << endl;
-    Map<List<point> > edgeToCuts(edgesToSplit.size());
+    Map<List<point>> edgeToCuts(edgesToSplit.size());
     forAll(edgesToSplit, i)
     {
         const Pair<point>& pts = edgesToSplit[i];

applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
     SortableList<scalar> sortedVols(vols);
 
     // All cell labels, sorted per bin.
-    DynamicList<DynamicList<label> > bins;
+    DynamicList<DynamicList<label>> bins;
 
     // Lower/upper limits
     DynamicList<scalar> lowerLimits;

applications/utilities/mesh/conversion/Optional/Allwmake

@@ -1,8 +1,11 @@
 #!/bin/sh
 #
 # Build optional components (eg, may depend on third-party libraries)
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 # build libccmio and create lnInclude directory
@@ -14,4 +17,4 @@ then
     wmake ccm26ToFoam
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------

applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -131,7 +131,7 @@ void storeCellInZone
     const label cellI,
     const label cellType,
     Map<label>& typeToZone,
-    List<DynamicList<label> >& zoneCells
+    List<DynamicList<label>>& zoneCells
 )
 {
     if (cellType >= 0)
@@ -213,7 +213,7 @@ void ReadVertices
 
     // Convert to foamPoints
     foamPoints.setSize(nVertices);
-    foamPoints = vector::zero;
+    foamPoints = Zero;
     foamPointMap.setSize(nVertices);
 
     forAll(foamPointMap, i)
@@ -1022,7 +1022,7 @@ int main(int argc, char *argv[])
         // From foamCellType physical region to Foam cellZone
         Map<label> typeToZone;
         // Storage for cell zones.
-        List<DynamicList<label> > zoneCells(0);
+        List<DynamicList<label>> zoneCells(0);
 
         forAll(foamCellType, cellI)
         {

applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,8 +66,8 @@ SLList<label> slCellMap;
 SLList<label> slCellType;
 label maxCelli = 0;
 
-PtrList<SLList<label> > slPatchCells;
-PtrList<SLList<label> > slPatchCellFaces;
+PtrList<SLList<label>> slPatchCells;
+PtrList<SLList<label>> slPatchCellFaces;
 
 // Cell types
 Map<word> cellTypes;
@@ -77,7 +77,7 @@ label currentTypei = -1;
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()

applications/utilities/mesh/conversion/datToFoam/datToFoam.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
     // We ignore the first layer of points in i and j the biconic meshes
     label nPointsij = (iPoints - 1)*(jPoints - 1);
 
-    pointField points(nPointsij, vector::zero);
+    pointField points(nPointsij, Zero);
 
     for (direction comp = 0; comp < 2; comp++)
     {
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    pointField pointsWedge(nPointsij*2, vector::zero);
+    pointField pointsWedge(nPointsij*2, Zero);
 
     fileName pointsFile(runTime.constantPath()/"points.tmp");
     OFstream pFile(pointsFile);

applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,7 +123,7 @@ void uniquify(word& name, HashSet<word>& patchNames)
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()
@@ -1089,9 +1089,9 @@ int main(int argc, char *argv[])
                     mesh.boundaryMesh(),
                     neighbPatchName,
                     cyclicPolyPatch::NOORDERING,
-                    vector::zero,
-                    vector::zero,
-                    vector::zero
+                    Zero,
+                    Zero,
+                    Zero
                 );
             }
             else

applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ wordList patchNameIDs(maxZoneID);
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()
@@ -1578,7 +1578,7 @@ int main(int argc, char *argv[])
 
         // List of patch names and the cellZone(s) they border
         // this is just an info file to make MRF easier to setup
-        List<DynamicList<word> > boundaryZones
+        List<DynamicList<word>> boundaryZones
         (
             pShapeMesh.boundaryMesh().size()
         );

applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ label nValuesForPatchFaces = 0;
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()

applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -211,7 +211,7 @@ void storeCellInZone
     Map<label>& physToZone,
 
     labelList& zoneToPhys,
-    List<DynamicList<label> >& zoneCells
+    List<DynamicList<label>>& zoneCells
 )
 {
     Map<label>::const_iterator zoneFnd = physToZone.find(regPhys);
@@ -415,10 +415,10 @@ void readCells
     cellShapeList& cells,
 
     labelList& patchToPhys,
-    List<DynamicList<face> >& patchFaces,
+    List<DynamicList<face>>& patchFaces,
 
     labelList& zoneToPhys,
-    List<DynamicList<label> >& zoneCells
+    List<DynamicList<label>>& zoneCells
 )
 {
     Info<< "Starting to read cells at line " << inFile.lineNumber() << endl;
@@ -791,12 +791,12 @@ int main(int argc, char *argv[])
     // Map from patch to gmsh physical region
     labelList patchToPhys;
     // Storage for patch faces.
-    List<DynamicList<face> > patchFaces(0);
+    List<DynamicList<face>> patchFaces(0);
 
     // Map from cellZone to gmsh physical region
     labelList zoneToPhys;
     // Storage for cell zones.
-    List<DynamicList<label> > zoneCells(0);
+    List<DynamicList<label>> zoneCells(0);
 
     // Name per physical region
     Map<word> physicalNames;
@@ -934,7 +934,7 @@ int main(int argc, char *argv[])
     const polyPatch& pp = mesh.boundaryMesh().last();
 
     // Storage for faceZones.
-    List<DynamicList<label> > zoneFaces(patchFaces.size());
+    List<DynamicList<label>> zoneFaces(patchFaces.size());
 
 
     // Go through all the patchFaces and find corresponding face in pp.

applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -849,7 +849,7 @@ int main(int argc, char *argv[])
     HashTable<label, label> faceToCell[2];
 
     {
-        HashTable<label, face, Hash<face> > faceToFaceID(boundaryFaces.size());
+        HashTable<label, face, Hash<face>> faceToFaceID(boundaryFaces.size());
         forAll(boundaryFaces, faceI)
         {
             SortableList<label> sortedVerts(boundaryFaces[faceI]);
@@ -862,7 +862,7 @@ int main(int argc, char *argv[])
             forAll(faces, i)
             {
                 SortableList<label> sortedVerts(faces[i]);
-                HashTable<label, face, Hash<face> >::const_iterator fnd =
+                HashTable<label, face, Hash<face>>::const_iterator fnd =
                     faceToFaceID.find(face(sortedVerts));
 
                 if (fnd != faceToFaceID.end())
@@ -956,7 +956,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        List<DynamicList<face> > dynPatchFaces(dofVertIndices.size());
+        List<DynamicList<face>> dynPatchFaces(dofVertIndices.size());
 
         forAll(cellVerts, cellI)
         {
@@ -1124,7 +1124,7 @@ int main(int argc, char *argv[])
         meshedSurface rawSurface
         (
             xferCopy(polyPoints),
-            xferCopyTo< faceList >(boundaryFaces)
+            xferCopyTo<faceList>(boundaryFaces)
         );
 
         // Write locally numbered surface

applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H

@@ -232,7 +232,7 @@ const char* kivaPatchNames[nBCs] =
 };
 
 
-List<SLList<face> > pFaces[nBCs];
+List<SLList<face>> pFaces[nBCs];
 
 face quadFace(4);
 face triFace(3);

applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
     label maxPatch = 0;
 
     // Boundary faces as three vertices
-    HashTable<label, triFace, Hash<triFace> > vertsToBoundary(nFaces);
+    HashTable<label, triFace, Hash<triFace>> vertsToBoundary(nFaces);
 
     forAll(boundaryFaces, faceI)
     {
@@ -212,7 +212,7 @@ int main(int argc, char *argv[])
 
             // Is there any boundary face with same vertices?
             // (uses commutative hash)
-            HashTable<label, triFace, Hash<triFace> >::iterator iter =
+            HashTable<label, triFace, Hash<triFace>>::iterator iter =
                 vertsToBoundary.find(triFace(f[0], f[1], f[2]));
 
             if (iter != vertsToBoundary.end())
@@ -266,7 +266,7 @@ int main(int argc, char *argv[])
 
     {
         // Sort boundaryFaces by patch.
-        List<DynamicList<face> > allPatchFaces(nPatches);
+        List<DynamicList<face>> allPatchFaces(nPatches);
 
         forAll(boundaryPatch, faceI)
         {

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,9 +51,9 @@ void Foam::starMesh::createCoupleMatches()
     );
 
     // Store newly created faces for each cell
-    Map<SLList<face> > cellAddedFaces(cellMapSize);
+    Map<SLList<face>> cellAddedFaces(cellMapSize);
 
-    Map<SLList<label> > cellRemovedFaces(cellMapSize);
+    Map<SLList<label>> cellRemovedFaces(cellMapSize);
 
     // In order to remove often allocation, remember the number of live points.
     // If you run out of space in point creation, increase it by the number of
@@ -75,14 +75,14 @@ void Foam::starMesh::createCoupleMatches()
         const face& masterFace = cellFaces_[fp.masterCell()][fp.masterFace()];
         const face& slaveFace = cellFaces_[fp.slaveCell()][fp.slaveFace()];
 
-#       ifdef DEBUG_COUPLE
+        #ifdef DEBUG_COUPLE
         Info<< "coupleI: " << coupleI << endl
             << "masterFace: " << masterFace << endl
             << "master points: " << masterFace.points(points_) << endl
             << "slaveFace: " << slaveFace << endl
             << "slave points: " << slaveFace.points(points_)
             << endl << endl;
-#       endif
+        #endif
 
         // check the angle of face area vectors
          scalar faceAreaAngle =
@@ -115,7 +115,7 @@ void Foam::starMesh::createCoupleMatches()
         {
             // Master face is replaced by a set of slave faces
 
-            Map<SLList<label> >::iterator crfIter =
+            Map<SLList<label>>::iterator crfIter =
                 cellRemovedFaces.find(fp.masterCell());
 
             if (crfIter == cellRemovedFaces.end())
@@ -131,7 +131,7 @@ void Foam::starMesh::createCoupleMatches()
                 crfIter().append(fp.masterFace());
             }
 
-            Map<SLList<face> >::iterator cafIter =
+            Map<SLList<face>>::iterator cafIter =
                 cellAddedFaces.find(fp.masterCell());
             if (cafIter == cellAddedFaces.end())
             {
@@ -155,11 +155,11 @@ void Foam::starMesh::createCoupleMatches()
 
             // Master data
             edgeList masterEdges = masterFace.edges();
-            List<SLList<label> > masterEdgePoints(masterEdges.size());
+            List<SLList<label>> masterEdgePoints(masterEdges.size());
 
             // Slave data
             edgeList slaveEdges = slaveFace.edges();
-            List<SLList<label> > slaveEdgePoints(slaveEdges.size());
+            List<SLList<label>> slaveEdgePoints(slaveEdges.size());
 
             // Find common plane
             vector n = masterFace.normal(points_);
@@ -177,10 +177,10 @@ void Foam::starMesh::createCoupleMatches()
                 vector d = curMasterEdge.vec(points_);
                 d -= n*(n & d);
 
-#               ifdef DEBUG_COUPLE_INTERSECTION
+                #ifdef DEBUG_COUPLE_INTERSECTION
                 Info<< "curMasterEdge: " << curMasterEdge << endl
                     << "P: " << P << endl << "d: " << d << endl;
-#               endif
+                #endif
 
                 // go through all slave edges and try to get an intersection.
                 // The point is created along the original master edge rather
@@ -196,20 +196,20 @@ void Foam::starMesh::createCoupleMatches()
                     e -= n*(n & e);
                     scalar det = -(e & (n ^ d));
 
-#                   ifdef DEBUG_COUPLE_INTERSECTION
+                    #ifdef DEBUG_COUPLE_INTERSECTION
                     Info<< "curSlaveEdge: " << curSlaveEdge << endl
                         << "S: " << S << endl
                         << "e: " << e << endl;
-#                   endif
+                    #endif
 
                     if (mag(det) > SMALL)
                     {
                         // non-singular matrix. Look for intersection
                         scalar beta = ((S - P) & (n ^ d))/det;
 
-#                       ifdef DEBUG_COUPLE_INTERSECTION
+                        #ifdef DEBUG_COUPLE_INTERSECTION
                         Info<< " beta: " << beta << endl;
-#                       endif
+                        #endif
 
                         if (beta > -smallMergeTol_ && beta < 1 + smallMergeTol_)
                         {
@@ -217,9 +217,9 @@ void Foam::starMesh::createCoupleMatches()
                             scalar alpha =
                                 (((S - P) & d) + beta*(d & e))/magSqr(d);
 
-#                           ifdef DEBUG_COUPLE_INTERSECTION
+                            #ifdef DEBUG_COUPLE_INTERSECTION
                             Info<< " alpha: " << alpha << endl;
-#                           endif
+                            #endif
 
                             if
                             (
@@ -228,10 +228,10 @@ void Foam::starMesh::createCoupleMatches()
                             )
                             {
                                 // intersection of non-parallel edges
-#                               ifdef DEBUG_COUPLE_INTERSECTION
+                                #ifdef DEBUG_COUPLE_INTERSECTION
                                 Info<< "intersection of non-parallel edges"
                                     << endl;
-#                               endif
+                                #endif
 
 
                                 // check for insertion of start-end
@@ -309,14 +309,14 @@ void Foam::starMesh::createCoupleMatches()
                                         nLivePoints + coupleFacePoints.size()
                                     );
 
-#                                   ifdef DEBUG_COUPLE_INTERSECTION
+                                    #ifdef DEBUG_COUPLE_INTERSECTION
                                     Info<< "regular intersection. "
                                         << "Adding point: "
                                         << coupleFacePoints.size()
                                         << " which is "
                                         << P + alpha*curMasterEdge.vec(points_)
                                         << endl;
-#                                   endif
+                                    #endif
 
                                     // A new point is created. Warning:
                                     // using original edge for accuracy.
@@ -369,12 +369,12 @@ void Foam::starMesh::createCoupleMatches()
                              && alpha1 < 1 + smallMergeTol_
                             )
                             {
-#                               ifdef DEBUG_COUPLE_INTERSECTION
+                                #ifdef DEBUG_COUPLE_INTERSECTION
                                 Info<< "adding irregular master "
                                     << "intersection1: "
                                     << points_[slaveEdges[slaveEdgeI].start()]
                                     << endl;
-#                               endif
+                                #endif
 
                                 masterEdgePoints[masterEdgeI].append
                                 (
@@ -390,12 +390,12 @@ void Foam::starMesh::createCoupleMatches()
                              && alpha2 < 1 + smallMergeTol_
                             )
                             {
-#                               ifdef DEBUG_COUPLE_INTERSECTION
+                                #ifdef DEBUG_COUPLE_INTERSECTION
                                 Info<< "adding irregular master "
                                     << "intersection2: "
                                     << points_[slaveEdges[slaveEdgeI].end()]
                                     << endl;
-#                               endif
+                                #endif
 
                                 masterEdgePoints[masterEdgeI].append
                                 (
@@ -411,11 +411,11 @@ void Foam::starMesh::createCoupleMatches()
 
                             scalar beta1 = (sp & e)/magSqr(e);
 
-#                           ifdef DEBUG_COUPLE_INTERSECTION
+                            #ifdef DEBUG_COUPLE_INTERSECTION
                             Info<< "P: " << P << " S: " << S << " d: " << d
                                 << " e: " << e << " sp: " << sp
                                 << " beta1: " << beta1 << endl;
-#                           endif
+                            #endif
 
                             if
                             (
@@ -423,12 +423,12 @@ void Foam::starMesh::createCoupleMatches()
                              && beta1 < 1 + smallMergeTol_
                             )
                             {
-#                               ifdef DEBUG_COUPLE_INTERSECTION
+                                #ifdef DEBUG_COUPLE_INTERSECTION
                                 Info<< "adding irregular slave "
                                     << "intersection1: "
                                     << points_[masterEdges[masterEdgeI].start()]
                                     << endl;
-#                               endif
+                                #endif
 
                                 slaveEdgePoints[slaveEdgeI].append
                                 (
@@ -444,12 +444,12 @@ void Foam::starMesh::createCoupleMatches()
                              && beta2 < 1 + smallMergeTol_
                             )
                             {
-#                               ifdef DEBUG_COUPLE_INTERSECTION
+                                #ifdef DEBUG_COUPLE_INTERSECTION
                                 Info<< "adding irregular slave "
                                     << "intersection2: "
                                     << points_[masterEdges[masterEdgeI].end()]
                                     << endl;
-#                               endif
+                                #endif
 
                                 slaveEdgePoints[slaveEdgeI].append
                                 (
@@ -461,14 +461,14 @@ void Foam::starMesh::createCoupleMatches()
                 } // end of slave edges
             } // end of master edges
 
-#           ifdef DEBUG_COUPLE_INTERSECTION
+            #ifdef DEBUG_COUPLE_INTERSECTION
             Info<< "additional slave edge points: " << endl;
             forAll(slaveEdgePoints, edgeI)
             {
                 Info<< "edge: " << edgeI << ": " << slaveEdgePoints[edgeI]
                     << endl;
             }
-#           endif
+            #endif
 
             // Add new points
             if (nLivePoints + coupleFacePoints.size() >= points_.size())
@@ -509,11 +509,11 @@ void Foam::starMesh::createCoupleMatches()
             );
             label nTmpMasterLabels = 0;
 
-#           ifdef DEBUG_COUPLE_INTERSECTION
+            #ifdef DEBUG_COUPLE_INTERSECTION
             Info<< "masterFace: " << masterFace << endl
                 << "nAdditionalMasterPoints: " << nAdditionalMasterPoints
                 << endl;
-#           endif
+            #endif
 
             forAll(masterEdges, masterEdgeI)
             {
@@ -531,11 +531,11 @@ void Foam::starMesh::createCoupleMatches()
 
                 vector edgeVector = masterEdges[masterEdgeI].vec(points_);
 
-#               ifdef DEBUG_FACE_ORDERING
+                #ifdef DEBUG_FACE_ORDERING
                 Info<< "edgeVector: " << edgeVector << endl
                     << "curMEdgePoints.size(): " << curMEdgePoints.size()
                     << endl;
-#               endif
+                #endif
 
                 // renormalise
                 edgeVector /= magSqr(edgeVector);
@@ -569,14 +569,14 @@ void Foam::starMesh::createCoupleMatches()
                                   - edgeStartPoint
                                 );
 
-#                           ifdef DEBUG_FACE_ORDERING
+                            #ifdef DEBUG_FACE_ORDERING
                             Info<< " edgeStartPoint: " << edgeStartPoint
                                 << " edgeEndPoint: "
                                 << points_[masterEdges[masterEdgeI].end()]
                                 << " other point: "
                                 << points_[curMEdgePointsIter()]
                                 << " alpha: " << alpha << endl;
-#                           endif
+                            #endif
 
                             if (alpha < minAlpha)
                             {
@@ -586,20 +586,20 @@ void Foam::starMesh::createCoupleMatches()
                             }
                         }
 
-#                       ifdef DEBUG_FACE_ORDERING
+                        #ifdef DEBUG_FACE_ORDERING
                         Info<< "nextPointLabel: " << nextPointLabel << endl;
-#                       endif
+                        #endif
 
                         i++;
                     }
 
                     if (nextPointLabel > -1)
                     {
-#                       ifdef DEBUG_FACE_ORDERING
+                        #ifdef DEBUG_FACE_ORDERING
                         Info<< "added nextPointLabel: " << nextPointLabel
                             << " nTmpMasterLabels: " << nTmpMasterLabels
                             << " to place " << nTmpMasterLabels << endl;
-#                       endif
+                        #endif
 
                         usedMasterPoint[usedI] = true;
                         // add the next point
@@ -617,9 +617,9 @@ void Foam::starMesh::createCoupleMatches()
             // reset the size of master
             tmpMasterFace.setSize(nTmpMasterLabels);
 
-#           ifdef DEBUG_FACE_ORDERING
+            #ifdef DEBUG_FACE_ORDERING
             Info<< "tmpMasterFace: " << tmpMasterFace << endl;
-#           endif
+            #endif
 
             // Eliminate all zero-length edges
             face newMasterFace(labelList(tmpMasterFace.size(), labelMax));
@@ -638,12 +638,12 @@ void Foam::starMesh::createCoupleMatches()
 
             forAll(mstEdgesToCollapse, edgeI)
             {
-#               ifdef DEBUG_FACE_ORDERING
+                #ifdef DEBUG_FACE_ORDERING
                 Info<< "edgeI: " << edgeI << " curEdge: "
                     << mstEdgesToCollapse[edgeI] << endl
                     << "master edge " << edgeI << ", "
                     << mstEdgesToCollapse[edgeI].mag(points_) << endl;
-#               endif
+                #endif
 
                 // Edge merge tolerance = masterTol
                 if (mstEdgesToCollapse[edgeI].mag(points_) < masterTol)
@@ -655,10 +655,10 @@ void Foam::starMesh::createCoupleMatches()
                             mstEdgesToCollapse[edgeI].end()
                         );
 
-#                   ifdef DEBUG_FACE_ORDERING
+                    #ifdef DEBUG_FACE_ORDERING
                     Info<< "Collapsed: nMaster: " << nMaster
                         << " label: " << newMasterFace[nMaster] << endl;
-#                   endif
+                    #endif
 
                 }
                 else
@@ -668,11 +668,11 @@ void Foam::starMesh::createCoupleMatches()
                     if (edgeI < mstEdgesToCollapse.size() - 1)
                     {
                         // last edge does not add the point
-#                   ifdef DEBUG_FACE_ORDERING
+                    #ifdef DEBUG_FACE_ORDERING
                         Info<< "Added: nMaster: " << nMaster
                             << " label: " << mstEdgesToCollapse[edgeI].end()
                             << endl;
-#                   endif
+                    #endif
 
                         newMasterFace[nMaster] =
                             mstEdgesToCollapse[edgeI].end();
@@ -682,10 +682,10 @@ void Foam::starMesh::createCoupleMatches()
 
             newMasterFace.setSize(nMaster);
 
-#           ifdef DEBUG_COUPLE
+            #ifdef DEBUG_COUPLE
             Info<< "newMasterFace: " << newMasterFace << endl
                 << "points: " << newMasterFace.points(points_) << endl;
-#           endif
+            #endif
 
             // Creating new slave side
 
@@ -704,10 +704,10 @@ void Foam::starMesh::createCoupleMatches()
             );
             label nTmpSlaveLabels = 0;
 
-#           ifdef DEBUG_COUPLE_INTERSECTION
+            #ifdef DEBUG_COUPLE_INTERSECTION
             Info<< "slaveFace: " << slaveFace << endl
                 << "nAdditionalSlavePoints: " << nAdditionalSlavePoints << endl;
-#           endif
+            #endif
 
             forAll(slaveEdges, slaveEdgeI)
             {
@@ -725,11 +725,11 @@ void Foam::starMesh::createCoupleMatches()
 
                 vector edgeVector = slaveEdges[slaveEdgeI].vec(points_);
 
-#               ifdef DEBUG_FACE_ORDERING
+                #ifdef DEBUG_FACE_ORDERING
                 Info<< "curSEdgePoints.size(): "
                     << curSEdgePoints.size() << endl
                     << "edgeVector: " << edgeVector << endl;
-#               endif
+                #endif
 
                 // renormalise
                 edgeVector /= magSqr(edgeVector);
@@ -763,14 +763,14 @@ void Foam::starMesh::createCoupleMatches()
                                   - edgeStartPoint
                                 );
 
-#                           ifdef DEBUG_FACE_ORDERING
+                            #ifdef DEBUG_FACE_ORDERING
                             Info<< " edgeStartPoint: " << edgeStartPoint
                                 << " edgeEndPoint: "
                                 << points_[slaveEdges[slaveEdgeI].end()]
                                 << " other point: "
                                 << points_[curSEdgePointsIter()]
                                 << " alpha: " << alpha << endl;
-#                           endif
+                            #endif
 
                             if (alpha < minAlpha)
                             {
@@ -780,20 +780,20 @@ void Foam::starMesh::createCoupleMatches()
                             }
                         }
 
-#                       ifdef DEBUG_FACE_ORDERING
+                        #ifdef DEBUG_FACE_ORDERING
                         Info<< "nextPointLabel: " << nextPointLabel << endl;
-#                       endif
+                        #endif
 
                         i++;
                     }
 
                     if (nextPointLabel > -1)
                     {
-#                       ifdef DEBUG_FACE_ORDERING
+                        #ifdef DEBUG_FACE_ORDERING
                         Info<< "added nextPointLabel: " << nextPointLabel
                             << " nTmpSlaveLabels: " << nTmpSlaveLabels
                             << " to place " << nTmpSlaveLabels << endl;
-#                       endif
+                        #endif
 
                         usedSlavePoint[usedI] = true;
                         // add the next point
@@ -811,9 +811,9 @@ void Foam::starMesh::createCoupleMatches()
             // reset the size of slave
             tmpSlaveFace.setSize(nTmpSlaveLabels);
 
-#           ifdef DEBUG_FACE_ORDERING
+            #ifdef DEBUG_FACE_ORDERING
             Info<< "tmpSlaveFace: " << tmpSlaveFace << endl;
-#           endif
+            #endif
 
             // Eliminate all zero-length edges
             face newSlaveFace(labelList(tmpSlaveFace.size(), labelMax));
@@ -832,10 +832,10 @@ void Foam::starMesh::createCoupleMatches()
 
             forAll(slvEdgesToCollapse, edgeI)
             {
-#               ifdef DEBUG_FACE_ORDERING
+                #ifdef DEBUG_FACE_ORDERING
                 Info<< "slave edge length: " << edgeI << ", "
                     << slvEdgesToCollapse[edgeI].mag(points_)<< endl;
-#               endif
+                #endif
 
                  // edge merge tolerance = slaveTol
                 if (slvEdgesToCollapse[edgeI].mag(points_) < slaveTol)
@@ -860,10 +860,10 @@ void Foam::starMesh::createCoupleMatches()
 
             newSlaveFace.setSize(nSlave);
 
-#           ifdef DEBUG_COUPLE
+            #ifdef DEBUG_COUPLE
             Info<< "newSlaveFace: " << newSlaveFace << endl
                 << "points: " << newSlaveFace.points(points_) << endl << endl;
-#           endif
+            #endif
 
             // Create the intersection face
 
@@ -878,10 +878,10 @@ void Foam::starMesh::createCoupleMatches()
             edgeList newMasterEdges = newMasterFace.edges();
             edgeList newSlaveEdges = newSlaveFace.edges();
 
-#           ifdef DEBUG_RIGHT_HAND_WALK
+            #ifdef DEBUG_RIGHT_HAND_WALK
             Info<< "newMasterEdges: " << newMasterEdges << endl
                 << "newSlaveEdges: " << newSlaveEdges << endl;
-#           endif
+            #endif
 
             edge startEdge(-1, -1);
 
@@ -924,9 +924,9 @@ void Foam::starMesh::createCoupleMatches()
                     startEdge = newSlaveEdges[edgeI];
                     startEdgeFound = 2;
 
-#                   ifdef DEBUG_RIGHT_HAND_WALK
+                    #ifdef DEBUG_RIGHT_HAND_WALK
                     Info<< "slave edge found" << endl;
-#                   endif
+                    #endif
 
                     break;
                 }
@@ -967,9 +967,9 @@ void Foam::starMesh::createCoupleMatches()
                         startEdge = newMasterEdges[edgeI];
                         startEdgeFound = 1;
 
-#                       ifdef DEBUG_RIGHT_HAND_WALK
+                        #ifdef DEBUG_RIGHT_HAND_WALK
                         Info<< "master edge found" << endl;
-#                       endif
+                        #endif
 
                         break;
                     }
@@ -984,9 +984,9 @@ void Foam::starMesh::createCoupleMatches()
 
             if (startEdgeFound > 0)
             {
-#               ifdef DEBUG_RIGHT_HAND_WALK
+                #ifdef DEBUG_RIGHT_HAND_WALK
                 Info<< "start edge: " << startEdge << endl;
-#               endif
+                #endif
 
                 // Loop through both faces and add all edges
                 // containing the current point and add them to the
@@ -1002,9 +1002,9 @@ void Foam::starMesh::createCoupleMatches()
                 vector planeNormal = newMasterFace.normal(points_);
                 planeNormal /= mag(planeNormal) + VSMALL;
 
-#               ifdef DEBUG_RIGHT_HAND_WALK
+                #ifdef DEBUG_RIGHT_HAND_WALK
                 Info<< "planeNormal: " << planeNormal << endl;
-#               endif
+                #endif
 
                 // Do a check to control the right-hand turn.  This is
                 // based on the triple product of the edge start
@@ -1032,9 +1032,9 @@ void Foam::starMesh::createCoupleMatches()
 
                 if (tripleProduct < 0)
                 {
-#                   ifdef DEBUG_RIGHT_HAND_WALK
+                    #ifdef DEBUG_RIGHT_HAND_WALK
                     Info<< "Turning edge for right-hand turn rule" << endl;
-#                   endif
+                    #endif
                     startEdge.flip();
                 }
 
@@ -1089,11 +1089,11 @@ void Foam::starMesh::createCoupleMatches()
                         }
                     }
 
-#                   ifdef DEBUG_RIGHT_HAND_WALK
+                    #ifdef DEBUG_RIGHT_HAND_WALK
                     Info<< "number of edges to consider: "
                         << edgesToConsider.size() << endl
                         << "edges to consider: " << edgesToConsider << endl;
-#                   endif
+                    #endif
 
                     if (edgesToConsider.empty())
                     {
@@ -1132,10 +1132,10 @@ void Foam::starMesh::createCoupleMatches()
                     scalar rightTurn = nextEdgeVec & right;
                     scalar goStraight = nextEdgeVec & ahead;
 
-#                   ifdef DEBUG_RIGHT_HAND_WALK
+                    #ifdef DEBUG_RIGHT_HAND_WALK
                     Info<< "rightTurn: " << rightTurn
                         << " goStraight: " << goStraight << endl;
-#                   endif
+                    #endif
 
                     for
                     (
@@ -1153,10 +1153,10 @@ void Foam::starMesh::createCoupleMatches()
                         scalar curRightTurn = newDir & right;
                         scalar curGoStraight = newDir & ahead;
 
-#                       ifdef DEBUG_RIGHT_HAND_WALK
+                        #ifdef DEBUG_RIGHT_HAND_WALK
                         Info<< "curRightTurn: " << curRightTurn
                             << " curGoStraight: " << curGoStraight << endl;
-#                       endif
+                        #endif
 
                         if (rightTurn < 0) // old edge turning left
                         {
@@ -1165,9 +1165,9 @@ void Foam::starMesh::createCoupleMatches()
                                 // both go left. Grab one with greater ahead
                                 if (curGoStraight > goStraight)
                                 {
-#                                   ifdef DEBUG_RIGHT_HAND_WALK
+                                    #ifdef DEBUG_RIGHT_HAND_WALK
                                     Info<< "a" << endl;
-#                                   endif
+                                    #endif
 
                                     // Good edge, turning left less than before
                                     nextEdge = etcIter();
@@ -1177,9 +1177,9 @@ void Foam::starMesh::createCoupleMatches()
                             }
                             else // new edge turning right
                             {
-#                               ifdef DEBUG_RIGHT_HAND_WALK
+                                #ifdef DEBUG_RIGHT_HAND_WALK
                                 Info<< "b" << endl;
-#                               endif
+                                #endif
 
                                 // good edge, turning right
                                 nextEdge = etcIter();
@@ -1195,9 +1195,9 @@ void Foam::starMesh::createCoupleMatches()
                                 // grab one with smaller ahead
                                 if (curGoStraight < goStraight)
                                 {
-#                                   ifdef DEBUG_RIGHT_HAND_WALK
+                                    #ifdef DEBUG_RIGHT_HAND_WALK
                                     Info<< "c" << endl;
-#                                   endif
+                                    #endif
 
                                     // good edge, turning right more than before
                                     nextEdge = etcIter();
@@ -1243,10 +1243,10 @@ void Foam::starMesh::createCoupleMatches()
                         // grab the current point and the current edge
                         curEdge = nextEdge;
 
-#                       ifdef DEBUG_RIGHT_HAND_WALK
+                        #ifdef DEBUG_RIGHT_HAND_WALK
                         Info<< "inserted point " << nextEdge.end() << endl
                             << "curEdge: " << curEdge << endl;
-#                       endif
+                        #endif
                     }
                 }
                 while (!completedFace);
@@ -1254,9 +1254,9 @@ void Foam::starMesh::createCoupleMatches()
                 // resize the face
                 intersectedFace.setSize(nIntFacePoints);
 
-#               ifdef DEBUG_COUPLE
+                #ifdef DEBUG_COUPLE
                 Info<< "intersectedFace: " << intersectedFace << endl;
-#               endif
+                #endif
 
                 // check the intersection face for duplicate points
                 forAll(intersectedFace, checkI)
@@ -1313,10 +1313,10 @@ void Foam::starMesh::createCoupleMatches()
 
             forAll(intersectedFace, intPointI)
             {
-#               ifdef DEBUG_COUPLE_PROJECTION
+                #ifdef DEBUG_COUPLE_PROJECTION
                 Info<< "Proj: old point: "
                     << points_[intersectedFace[intPointI]] << endl;
-#               endif
+                #endif
 
                 pointHit projHit =
                     masterFace.ray
@@ -1332,10 +1332,10 @@ void Foam::starMesh::createCoupleMatches()
                     points_[intersectedFace[intPointI]] =
                         projHit.hitPoint();
 
-#                   ifdef DEBUG_COUPLE_PROJECTION
+                    #ifdef DEBUG_COUPLE_PROJECTION
                     Info<< "      new point: "
                         << points_[intersectedFace[intPointI]] << endl;
-#                   endif
+                    #endif
                 }
             }
 
@@ -1354,7 +1354,7 @@ void Foam::starMesh::createCoupleMatches()
             // Add the new face to both master and slave
 
             // Master face is replaced by a set of slave faces
-            Map<SLList<label> >::iterator crfMasterIter =
+            Map<SLList<label>>::iterator crfMasterIter =
                 cellRemovedFaces.find(fp.masterCell());
 
             if (crfMasterIter == cellRemovedFaces.end())
@@ -1370,7 +1370,7 @@ void Foam::starMesh::createCoupleMatches()
                 crfMasterIter().append(fp.masterFace());
             }
 
-            Map<SLList<label> >::iterator crfSlaveIter =
+            Map<SLList<label>>::iterator crfSlaveIter =
                 cellRemovedFaces.find(fp.slaveCell());
 
             if (crfSlaveIter == cellRemovedFaces.end())
@@ -1386,7 +1386,7 @@ void Foam::starMesh::createCoupleMatches()
                 crfSlaveIter().append(fp.slaveFace());
             }
 
-            Map<SLList<face> >::iterator cafMasterIter =
+            Map<SLList<face>>::iterator cafMasterIter =
                 cellAddedFaces.find(fp.masterCell());
             if (cafMasterIter == cellAddedFaces.end())
             {
@@ -1401,7 +1401,7 @@ void Foam::starMesh::createCoupleMatches()
                 cafMasterIter().append(intersectedFace);
             }
 
-            Map<SLList<face> >::iterator cafSlaveIter =
+            Map<SLList<face>>::iterator cafSlaveIter =
                 cellAddedFaces.find(fp.slaveCell());
             if (cafSlaveIter == cellAddedFaces.end())
             {

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,9 +89,8 @@ void Foam::starMesh::createPolyBoundary()
                                   > nInternalFaces_
                                 )
                                 {
-                                    Info
-                                        << "void starMesh::createPolyBoundary()"
-                                        << ": Problem with face: " << curFace
+                                    InfoInFunction
+                                        << "Problem with face: " << curFace
                                         << "\nProbably multiple definitions "
                                         << "of a single boundary face. " << endl
                                         << "Other boundary face: "
@@ -110,8 +109,7 @@ void Foam::starMesh::createPolyBoundary()
                                                 < starPointID_.size()
                                         )
                                         {
-                                            Info
-                                                << ","
+                                            Info<< ","
                                                 << starPointID_
                                                  [curCellFaces[cellFaceI][spI]];
                                         }
@@ -124,9 +122,8 @@ void Foam::starMesh::createPolyBoundary()
                                 }
                                 else
                                 {
-                                    Info
-                                        << "void starMesh::createPolyBoundary()"
-                                        << ": Problem with face: " << curFace
+                                    InfoInFunction
+                                        << "Problem with face: " << curFace
                                         << "\nProbably trying to define a "
                                         << "boundary face on a previously "
                                         << "matched internal face. " << endl
@@ -146,8 +143,7 @@ void Foam::starMesh::createPolyBoundary()
                                                 < starPointID_.size()
                                         )
                                         {
-                                            Info
-                                                << ","
+                                            Info<< ","
                                                 << starPointID_
                                                  [curCellFaces[cellFaceI][spI]];
                                         }
@@ -190,8 +186,8 @@ void Foam::starMesh::createPolyBoundary()
             {
                 const face& missingFace = cellFaces_[cellI][faceI];
 
-                Info<< "starMesh::createPolyBoundary() : "
-                    << "missing face found in cell " << cellI
+                InfoInFunction
+                    << "Missing face found in cell " << cellI
                     << ".\nType: " << cellShapes_[cellI].model().name()
                     << ". STAR cell number: " << starCellID_[cellI]
                     << ". Face: " << missingFace << endl;
@@ -255,8 +251,8 @@ void Foam::starMesh::createPolyBoundary()
         {
             const face& problemFace = meshFaces_[faceI];
 
-            Info<< "starMesh::createPolyBoundary() : "
-                << "problem with face " << faceI << ": addressed "
+            InfoInFunction
+                << "Problem with face " << faceI << ": addressed "
                 << markupFaces[faceI] << " times (should be 2!). Face: "
                 << problemFace << endl;
 

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -126,9 +126,9 @@ void Foam::starMesh::mergeCoupleFacePoints()
                     if (edge (a, b).mag(points_) < pointMergeTol)
                     {
                         // found a pair of points to merge
-#                       ifdef DEBUG_MERGE
+                        #ifdef DEBUG_MERGE
                         Info<< "Merging points " << a << " and " << b << endl;
-#                       endif
+                        #endif
 
                         // are the two points in a merge group?
                         label mergeSetA = -1;
@@ -147,10 +147,10 @@ void Foam::starMesh::mergeCoupleFacePoints()
                         if (mergeSetA == -1 && mergeSetB == -1)
                         {
                             // add new merge group
-#                           ifdef DEBUG_MERGE
+                            #ifdef DEBUG_MERGE
                             Info<< "adding new merge group " << nMergeSets
                                 << endl;
-#                           endif
+                            #endif
 
                             // mark points as belonging to a new merge set
                             renumberPoints[a] = nMergeSets;
@@ -169,10 +169,10 @@ void Foam::starMesh::mergeCoupleFacePoints()
                         }
                         else if (mergeSetA == -1 && mergeSetB != -1)
                         {
-#                           ifdef DEBUG_MERGE
+                            #ifdef DEBUG_MERGE
                             Info<< "adding point a into the merge set of b. "
                                 << "a: " << a << endl;
-#                           endif
+                            #endif
 
                             // add point a into the merge set of b
                             renumberPoints[a] = mergeSetB;
@@ -183,10 +183,10 @@ void Foam::starMesh::mergeCoupleFacePoints()
                         }
                         else if  (mergeSetA != -1 && mergeSetB == -1)
                         {
-#                           ifdef DEBUG_MERGE
+                            #ifdef DEBUG_MERGE
                             Info<< "adding point b into the merge set of a. "
                                 << "b: " << b << endl;
-#                           endif
+                            #endif
 
                             // add point b into the merge set of a
                             renumberPoints[b] = mergeSetA;
@@ -202,12 +202,12 @@ void Foam::starMesh::mergeCoupleFacePoints()
                             label minMerge = min(mergeSetA, mergeSetB);
                             label maxMerge = max(mergeSetA, mergeSetB);
 
-#                           ifdef DEBUG_MERGE
+                            #ifdef DEBUG_MERGE
                             Info<< "Points already belong to two "
                                 << "different merge sets. "
                                 << "Eliminate the higher merge set. Sets: "
                                 << minMerge << " and " << maxMerge << endl;
-#                           endif
+                            #endif
 
                             forAll(renumberPoints, elimI)
                             {

applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@@ -498,7 +498,7 @@ int main(int argc, char *argv[])
 
 
         // Sort boundaryFaces by patch using boundaryPatch.
-        List<DynamicList<face> > allPatchFaces(nPatches);
+        List<DynamicList<face>> allPatchFaces(nPatches);
 
         forAll(boundaryPatch, faceI)
         {

applications/utilities/mesh/generation/Allwmake

@@ -1,5 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
+# Get CGAL and boost versions
+. $WM_PROJECT_DIR/etc/config.sh/functions
+_foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \
+          $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
+
 set -x
 
 wmake -all blockMesh
@@ -7,10 +16,10 @@ wmake -all extrude
 wmake -all extrude2DMesh
 wmake -all snappyHexMesh
 
-if [ -n "$CGAL_ARCH_PATH" ]
+if [ -n "$CGAL_ARCH_PATH" -o "$cgal_version" = "cgal-system" ]
 then
-    foamyMesh/Allwmake
+    foamyMesh/Allwmake $*
 fi
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------

applications/utilities/mesh/generation/blockMesh/blockMeshApp.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -228,7 +228,7 @@ int main(int argc, char *argv[])
     // Read in a list of dictionaries for the merge patch pairs
     if (meshDict.found("mergePatchPairs"))
     {
-        List<Pair<word> > mergePatchPairs
+        List<Pair<word>> mergePatchPairs
         (
             meshDict.lookup("mergePatchPairs")
         );
@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
         HashTable<label> zoneMap(nZones);
 
         // Cells per zone.
-        List<DynamicList<label> > zoneCells(nZones);
+        List<DynamicList<label>> zoneCells(nZones);
 
         // Running cell counter
         label cellI = 0;

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@@ -549,24 +549,15 @@ int main(int argc, char *argv[])
             {
                 label nbrProcI = patchToNbrProc[patchI];
 
-                word name =
-                        "procBoundary"
-                      + Foam::name(Pstream::myProcNo())
-                      + "to"
-                      + Foam::name(nbrProcI);
-
                 Pout<< "Adding patch " << patchI
-                    << " name:" << name
                     << " between " << Pstream::myProcNo()
                     << " and " << nbrProcI
                     << endl;
 
-
                 newPatches.append
                 (
                     new processorPolyPatch
                     (
-                        name,
                         0,                  // size
                         mesh.nFaces(),      // start
                         patchI,             // index

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@@ -955,13 +955,11 @@ void addCoupledPatches
             }
             else
             {
-                // Rrocessor patch
-
-                word name =
-                    "procBoundary"
-                  + Foam::name(Pstream::myProcNo())
-                  + "to"
-                  + Foam::name(nbrProcI);
+                // Processor patch
+                word name
+                (
+                    processorPolyPatch::newName(Pstream::myProcNo(), nbrProcI)
+                );
 
                 sidePatchID[edgeI] = findPatchID(newPatches, name);
 
@@ -1152,7 +1150,7 @@ tmp<pointField> calcOffset
     vectorField::subField fc = pp.faceCentres();
 
     tmp<pointField> toffsets(new pointField(fc.size()));
-    pointField& offsets = toffsets();
+    pointField& offsets = toffsets.ref();
 
     forAll(fc, i)
     {
@@ -1927,7 +1925,7 @@ int main(int argc, char *argv[])
             extrudeMeshEdges
         )
     );
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     const mapDistribute extrudeEdgeFacesMap
     (
         globalExtrudeFaces,
@@ -2298,7 +2296,7 @@ int main(int argc, char *argv[])
     // Calculate region normals by reducing local region normals
     pointField localRegionNormals(localToGlobalRegion.size());
     {
-        pointField localSum(localToGlobalRegion.size(), vector::zero);
+        pointField localSum(localToGlobalRegion.size(), Zero);
 
         forAll(pointLocalRegions, faceI)
         {

applications/utilities/mesh/generation/extrude2DMesh/Allwclean

@@ -5,4 +5,4 @@ set -x
 wclean libso extrude2DMesh
 wclean
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------

applications/utilities/mesh/generation/extrude2DMesh/Allwmake

@@ -1,8 +1,12 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso extrude2DMesh
+wmake $targetType extrude2DMesh
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------

applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
     // Point generator
     autoPtr<extrudeModel> model(extrudeModel::New(extrude2DMeshDict));
 
-    autoPtr<MeshedSurface<face> > fMesh;
+    autoPtr<MeshedSurface<face>> fMesh;
 
     autoPtr<polyMesh> mesh;
 

applications/utilities/mesh/generation/foamyMesh/Allwclean

@@ -10,4 +10,4 @@ wclean foamyHexMeshSurfaceSimplify
 wclean foamyHexMeshBackgroundMesh
 wclean cellSizeAndAlignmentGrid
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------

applications/utilities/mesh/generation/foamyMesh/Allwmake

@@ -1,9 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake libso conformalVoronoiMesh
-wmake libso conformalVoronoi2DMesh
+wmake $targetType conformalVoronoiMesh
+wmake $targetType conformalVoronoi2DMesh
 wmake foamyQuadMesh
 wmake foamyHexMesh
 #wmake foamyHexMeshBackgroundMesh
@@ -11,4 +15,4 @@ wmake foamyHexMesh
 #wmake cellSizeAndAlignmentGrid
 
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------

applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options

@@ -20,7 +20,7 @@ EXE_INC =  \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I../conformalVoronoiMesh/lnInclude
 
 EXE_LIBS =  \

applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,13 +55,13 @@ using namespace Foam;
 // Main program:
 
 template<class Triangulation, class Type>
-Foam::tmp<Foam::Field<Type> > filterFarPoints
+Foam::tmp<Foam::Field<Type>> filterFarPoints
 (
     const Triangulation& mesh,
     const Field<Type>& field
 )
 {
-    tmp<Field<Type> > tNewField(new Field<Type>(field.size()));
+    tmp<Field<Type>> tNewField(new Field<Type>(field.size()));
     Field<Type>& newField = tNewField();
 
     label added = 0;
@@ -139,7 +139,7 @@ autoPtr<mapDistribute> buildMap
         pointPoints[vit->index()].transfer(indices);
     }
 
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
 
     return autoPtr<mapDistribute>
     (

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -154,8 +154,8 @@ private:
             faceList& faces,
             labelList& owner,
             PtrList<dictionary>& patchDicts,
-            const List<DynamicList<face> >& patchFaces,
-            const List<DynamicList<label> >& patchOwners
+            const List<DynamicList<face>>& patchFaces,
+            const List<DynamicList<label>>& patchOwners
         ) const;
 
         //- Disallow default bitwise copy construct

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,8 +84,8 @@ void Foam::DelaunayMesh<Triangulation>::addPatches
     faceList& faces,
     labelList& owner,
     PtrList<dictionary>& patchDicts,
-    const List<DynamicList<face> >& patchFaces,
-    const List<DynamicList<label> >& patchOwners
+    const List<DynamicList<face>>& patchFaces,
+    const List<DynamicList<label>>& patchOwners
 ) const
 {
     label nPatches = patchFaces.size();
@@ -353,8 +353,8 @@ Foam::DelaunayMesh<Triangulation>::createMesh
     PtrList<dictionary> patchDicts(1);
     patchDicts.set(0, new dictionary());
 
-    List<DynamicList<face> > patchFaces(1, DynamicList<face>());
-    List<DynamicList<label> > patchOwners(1, DynamicList<label>());
+    List<DynamicList<face>> patchFaces(1, DynamicList<face>());
+    List<DynamicList<label>> patchOwners(1, DynamicList<label>());
 
     vertexMap.resize(vertexCount());
     cellMap.setSize(Triangulation::number_of_finite_cells(), -1);

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,14 +56,6 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
         nSend[procI]++;
     }
 
-    // Send over how many I need to receive
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    labelListList sendSizes(Pstream::nProcs());
-
-    sendSizes[Pstream::myProcNo()] = nSend;
-
-    combineReduce(sendSizes, UPstream::listEq());
 
     // 2. Size sendMap
     labelListList sendMap(Pstream::nProcs());
@@ -83,6 +75,11 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
         sendMap[procI][nSend[procI]++] = i;
     }
 
+    // 4. Send over how many I need to receive
+    labelList recvSizes;
+    Pstream::exchangeSizes(sendMap, recvSizes);
+
+
     // Determine receive map
     // ~~~~~~~~~~~~~~~~~~~~~
 
@@ -100,7 +97,7 @@ Foam::DistributedDelaunayMesh<Triangulation>::buildMap
     {
         if (procI != Pstream::myProcNo())
         {
-            label nRecv = sendSizes[procI][Pstream::myProcNo()];
+            label nRecv = recvSizes[procI];
 
             constructMap[procI].setSize(nRecv);
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
 
 private:
 
-        autoPtr<List<boundBox> > allBackgroundMeshBounds_;
+        autoPtr<List<boundBox>> allBackgroundMeshBounds_;
 
 
     // Private Member Functions

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshTools.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ namespace DelaunayMeshTools
 
     //- Write Delaunay points in the range between (and including)
     //  type startPointType and endPointType to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeOBJ
     (
         const fileName& fName,
@@ -85,7 +85,7 @@ namespace DelaunayMeshTools
     );
 
     //- Write Delaunay points of type pointType to .obj file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeOBJ
     (
         const fileName& fName,
@@ -94,15 +94,15 @@ namespace DelaunayMeshTools
     );
 
     //- Write the fixed Delaunay points to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeFixedPoints(const fileName& fName, const Triangulation& t);
 
     //- Write the boundary Delaunay points to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeBoundaryPoints(const fileName& fName, const Triangulation& t);
 
     //- Write the processor interface to an OBJ file
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeProcessorInterface
     (
         const fileName& fName,
@@ -112,7 +112,7 @@ namespace DelaunayMeshTools
 
     //- Write the internal Delaunay vertices of the tessellation as a
     //  pointField that may be used to restart the meshing process
-    template<typename Triangulation>
+    template<class Triangulation>
     void writeInternalDelaunayVertices
     (
         const fileName& instance,
@@ -121,14 +121,14 @@ namespace DelaunayMeshTools
 
     //- Draws a tet cell to an output stream. The offset is supplied as the tet
     //  number to be drawn.
-    template<typename CellHandle>
+    template<class CellHandle>
     void drawDelaunayCell(Ostream& os, const CellHandle& c, label offset = 0);
 
 
 // Field extraction
 
     //- Extract all points in vertex-index order
-    template<typename Triangulation>
+    template<class Triangulation>
     tmp<pointField> allPoints(const Triangulation& t);
 
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMeshTools/DelaunayMeshToolsTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ License
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeOBJ
 (
     const fileName& fName,
@@ -77,7 +77,7 @@ void Foam::DelaunayMeshTools::writeOBJ
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeOBJ
 (
     const fileName& fName,
@@ -89,7 +89,7 @@ void Foam::DelaunayMeshTools::writeOBJ
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeFixedPoints
 (
     const fileName& fName,
@@ -117,7 +117,7 @@ void Foam::DelaunayMeshTools::writeFixedPoints
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeBoundaryPoints
 (
     const fileName& fName,
@@ -145,7 +145,7 @@ void Foam::DelaunayMeshTools::writeBoundaryPoints
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeProcessorInterface
 (
     const fileName& fName,
@@ -175,7 +175,7 @@ void Foam::DelaunayMeshTools::writeProcessorInterface
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 void Foam::DelaunayMeshTools::writeInternalDelaunayVertices
 (
     const fileName& instance,
@@ -224,7 +224,7 @@ void Foam::DelaunayMeshTools::writeInternalDelaunayVertices
 }
 
 
-template<typename CellHandle>
+template<class CellHandle>
 void Foam::DelaunayMeshTools::drawDelaunayCell
 (
     Ostream& os,
@@ -273,14 +273,14 @@ void Foam::DelaunayMeshTools::drawDelaunayCell
 }
 
 
-template<typename Triangulation>
+template<class Triangulation>
 Foam::tmp<Foam::pointField> Foam::DelaunayMeshTools::allPoints
 (
     const Triangulation& t
 )
 {
     tmp<pointField> tpts(new pointField(t.vertexCount(), point::max));
-    pointField& pts = tpts();
+    pointField& pts = tpts.ref();
 
     for
     (

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options

@@ -23,7 +23,7 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -IPrintTable \
     -I/usr/include
 
@@ -37,4 +37,4 @@ LIB_LIBS = \
     -ldynamicMesh \
     -lsurfMesh \
     -lsampling \
-    -lautoMesh
+    -lsnappyHexMesh

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,14 +62,6 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
         nSend[procI]++;
     }
 
-    // Send over how many I need to receive
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    labelListList sendSizes(Pstream::nProcs());
-
-    sendSizes[Pstream::myProcNo()] = nSend;
-
-    combineReduce(sendSizes, UPstream::listEq());
 
     // 2. Size sendMap
     labelListList sendMap(Pstream::nProcs());
@@ -89,6 +81,11 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
         sendMap[procI][nSend[procI]++] = i;
     }
 
+    // 4. Send over how many I need to receive
+    labelList recvSizes;
+    Pstream::exchangeSizes(sendMap, recvSizes);
+
+
     // Determine receive map
     // ~~~~~~~~~~~~~~~~~~~~~
 
@@ -106,7 +103,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::backgroundMeshDecomposition::buildMap
     {
         if (procI != Pstream::myProcNo())
         {
-            label nRecv = sendSizes[procI][Pstream::myProcNo()];
+            label nRecv = recvSizes[procI];
 
             constructMap[procI].setSize(nRecv);
 
@@ -538,7 +535,7 @@ bool Foam::backgroundMeshDecomposition::refineCell
 //        pointField samplePoints
 //        (
 //            volRes_*volRes_*volRes_,
-//            vector::zero
+//            Zero
 //        );
 //
 //        // scalar sampleVol = cellBb.volume()/samplePoints.size();
@@ -1216,7 +1213,7 @@ Foam::labelList Foam::backgroundMeshDecomposition::processorNearestPosition
 
 
 
-Foam::List<Foam::List<Foam::pointIndexHit> >
+Foam::List<Foam::List<Foam::pointIndexHit>>
 Foam::backgroundMeshDecomposition::intersectsProcessors
 (
     const List<point>& starts,
@@ -1238,7 +1235,7 @@ Foam::backgroundMeshDecomposition::intersectsProcessors
         const point& e = ends[sI];
 
         // Dummy point for treeBoundBox::intersects
-        point p(vector::zero);
+        point p(Zero);
 
         label nCandidates = 0;
 
@@ -1292,7 +1289,7 @@ Foam::backgroundMeshDecomposition::intersectsProcessors
         segmentIntersectsCandidate
     );
 
-    List<List<pointIndexHit> > segmentHitProcs(starts.size());
+    List<List<pointIndexHit>> segmentHitProcs(starts.size());
 
     // Working storage for assessing processors
     DynamicList<pointIndexHit> tmpProcHits;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ class backgroundMeshDecomposition
         autoPtr<bPatch> boundaryFacesPtr_;
 
         //- Search tree for the boundaryFaces_ patch
-        autoPtr<indexedOctree<treeDataBPatch> > bFTreePtr_;
+        autoPtr<indexedOctree<treeDataBPatch>> bFTreePtr_;
 
         //- The bounds of all background meshes on all processors
         treeBoundBoxList allBackgroundMeshBounds_;
@@ -220,7 +220,7 @@ public:
         );
 
         //- Distribute supplied the points to the appropriate processor
-        template<typename PointType>
+        template<class PointType>
         autoPtr<mapDistribute> distributePoints(List<PointType>& points) const;
 
         //- Is the given position inside the domain of this decomposition
@@ -258,7 +258,7 @@ public:
         ) const;
 
         //- What processor is the given position on?
-        template<typename PointType>
+        template<class PointType>
         labelList processorPosition(const List<PointType>& pts) const;
 
         //- What is the nearest processor to the given position?
@@ -270,7 +270,7 @@ public:
         //  launched from, it is assumed that the point is on that processor.
         //  The index data member of the pointIndexHit is replaced with the
         //  processor index.
-        List<List<pointIndexHit> > intersectsProcessors
+        List<List<pointIndexHit>> intersectsProcessors
         (
             const List<point>& starts,
             const List<point>& ends,

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<typename PointType>
+template<class PointType>
 Foam::autoPtr<Foam::mapDistribute>
 Foam::backgroundMeshDecomposition::distributePoints
 (
@@ -45,7 +45,7 @@ Foam::backgroundMeshDecomposition::distributePoints
 }
 
 
-template<typename PointType>
+template<class PointType>
 Foam::labelList Foam::backgroundMeshDecomposition::processorPosition
 (
     const List<PointType>& pts

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Foam::cellAspectRatioControl::cellAspectRatioControl
         aspectRatioDict_.lookupOrDefault<vector>
         (
             "aspectRatioDirection",
-            vector::zero
+            Zero
         )
     )
 {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControl/cellShapeControl.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,13 +36,10 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(cellShapeControl, 0);
+    defineTypeNameAndDebug(cellShapeControl, 0);
 }
 
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::cellShapeControl::cellShapeControl
@@ -173,7 +170,6 @@ Foam::scalar Foam::cellShapeControl::cellSize(const point& pt) const
 }
 
 
-//- Return the cell alignment at the given location
 Foam::tensor Foam::cellShapeControl::cellAlignment(const point& pt) const
 {
     scalarList bary;
@@ -181,7 +177,7 @@ Foam::tensor Foam::cellShapeControl::cellAlignment(const point& pt) const
 
     shapeControlMesh_.barycentricCoords(pt, bary, ch);
 
-    tensor alignment = tensor::zero;
+    tensor alignment = Zero;
 
     if (shapeControlMesh_.dimension() < 3 || shapeControlMesh_.is_infinite(ch))
     {
@@ -253,7 +249,7 @@ void Foam::cellShapeControl::cellSizeAndAlignment
 
     shapeControlMesh_.barycentricCoords(pt, bary, ch);
 
-    alignment = tensor::zero;
+    alignment = Zero;
     size = 0;
 
     if (shapeControlMesh_.dimension() < 3 || shapeControlMesh_.is_infinite(ch))

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@@ -262,7 +262,7 @@ Foam::label Foam::cellShapeControlMesh::removePoints()
 Foam::tmp<Foam::pointField> Foam::cellShapeControlMesh::cellCentres() const
 {
     tmp<pointField> tcellCentres(new pointField(number_of_finite_cells()));
-    pointField& cellCentres = tcellCentres();
+    pointField& cellCentres = tcellCentres.ref();
 
     label count = 0;
     for
@@ -599,7 +599,7 @@ void Foam::cellShapeControlMesh::distribute
 
 Foam::tensorField Foam::cellShapeControlMesh::dumpAlignments() const
 {
-    tensorField alignmentsTmp(number_of_vertices(), tensor::zero);
+    tensorField alignmentsTmp(number_of_vertices(), Zero);
 
     label count = 0;
     for

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -119,7 +119,7 @@ Foam::fileControl::~fileControl()
 //
 //    label nearest = 0;
 //
-//    tensor alignment = Foam::tensor::zero;
+//    tensor alignment = Zero;
 //    forAll(bary, pI)
 //    {
 //        //alignment += bary[pI]*ch->vertex(pI)->alignment();
@@ -155,7 +155,7 @@ Foam::fileControl::~fileControl()
 //        size += bary[pI]*ch->vertex(pI)->size();
 //    }
 //
-////    alignment = Foam::tensor::zero;
+////    alignment = Zero;
 ////    forAll(bary, pI)
 ////    {
 ////        alignment += bary[pI]*ch->vertex(pI)->alignment();

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/searchableSurfaceControl/searchableSurfaceControl.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,7 +100,7 @@ addToRunTimeSelectionTable
 //
 //    const tensor Rp = rotationTensor(vector(0,0,1), np);
 //
-//    vector na = vector::zero;
+//    vector na = Zero;
 //
 //    scalar smallestAngle = GREAT;
 //

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,13 +28,13 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Triangulation, class Type>
-Foam::tmp<Foam::Field<Type> > Foam::smoothAlignmentSolver::filterFarPoints
+Foam::tmp<Foam::Field<Type>> Foam::smoothAlignmentSolver::filterFarPoints
 (
     const Triangulation& mesh,
     const Field<Type>& field
 )
 {
-    tmp<Field<Type> > tNewField(new Field<Type>(field.size()));
+    tmp<Field<Type>> tNewField(new Field<Type>(field.size()));
     Field<Type>& newField = tNewField();
 
     label added = 0;
@@ -92,7 +92,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildReferredMap
 
     indices.transfer(dynIndices);
 
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     return autoPtr<mapDistribute>
     (
         new mapDistribute
@@ -156,7 +156,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::smoothAlignmentSolver::buildMap
         pointPoints[vit->index()].transfer(indices);
     }
 
-    List<Map<label> > compactMap;
+    List<Map<label>> compactMap;
     return autoPtr<mapDistribute>
     (
         new mapDistribute
@@ -179,7 +179,7 @@ Foam::tmp<Foam::triadField> Foam::smoothAlignmentSolver::buildAlignmentField
     (
         new triadField(mesh.vertexCount(), triad::unset)
     );
-    triadField& alignments = tAlignments();
+    triadField& alignments = tAlignments.ref();
 
     for
     (
@@ -211,7 +211,7 @@ Foam::tmp<Foam::pointField> Foam::smoothAlignmentSolver::buildPointField
     (
         new pointField(mesh.vertexCount(), point(GREAT, GREAT, GREAT))
     );
-    pointField& points = tPoints();
+    pointField& points = tPoints.ref();
 
     for
     (

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ class smoothAlignmentSolver
     // Private Member Functions
 
         template<class Triangulation, class Type>
-        tmp<Field<Type> > filterFarPoints
+        tmp<Field<Type>> filterFarPoints
         (
             const Triangulation& mesh,
             const Field<Type>& field

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,7 +152,7 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
         )
     );
 
-    triSurfacePointScalarField& pointCellSize = tPointCellSize();
+    triSurfacePointScalarField& pointCellSize = tPointCellSize.ref();
 
     if (readCurvature_)
     {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/fieldFromFile/fieldFromFile.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,7 +95,7 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::fieldFromFile::load()
         )
     );
 
-    pointCellSize() *= cellSizeMultipleCoeff_;
+    pointCellSize.ref() *= cellSizeMultipleCoeff_;
 
     return pointCellSize;
 }

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1082,7 +1082,7 @@ void Foam::conformalVoronoiMesh::move()
     vectorField displacementAccumulator
     (
         number_of_vertices(),
-        vector::zero
+        Zero
     );
 
     PackedBoolList pointToBeRetained

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
     typedef Delaunay::Facet            Facet;
     typedef Delaunay::Point            Point;
 
-    typedef List<DynamicList<Pair<labelPair> > > labelPairPairDynListList;
+    typedef List<DynamicList<Pair<labelPair>>> labelPairPairDynListList;
 
     typedef Tuple2<pointIndexHit, label>         pointIndexHitAndFeature;
     typedef List<pointIndexHitAndFeature>        pointIndexHitAndFeatureList;
@@ -168,13 +168,13 @@ private:
         featurePointConformer ftPtConformer_;
 
         //- Search tree for edge point locations
-        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint> >
+        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint>>
             edgeLocationTreePtr_;
 
         mutable DynamicList<Foam::point> existingEdgeLocations_;
 
         //- Search tree for surface point locations
-        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint> >
+        mutable autoPtr<dynamicIndexedOctree<dynamicTreeDataPoint>>
             surfacePtLocationTreePtr_;
 
         mutable DynamicList<Foam::point> existingSurfacePtLocations_;
@@ -708,7 +708,7 @@ private:
         (
             labelList& owner,
             labelList& neighbour,
-            const HashSet<labelPair, labelPair::Hash<> >& deferredCollapseFaces
+            const HashSet<labelPair, labelPair::Hash<>>& deferredCollapseFaces
         ) const;
 
         //- Check whether the cell sizes are fine enough. Creates a polyMesh.
@@ -780,9 +780,9 @@ private:
         //  on both processors
         void sortProcPatches
         (
-            List<DynamicList<face> >& patchFaces,
-            List<DynamicList<label> >& patchOwners,
-            List<DynamicList<label> >& patchPointPairSlaves,
+            List<DynamicList<face>>& patchFaces,
+            List<DynamicList<label>>& patchOwners,
+            List<DynamicList<label>>& patchPointPairSlaves,
             labelPairPairDynListList& patchSortingIndices
         ) const;
 
@@ -794,9 +794,9 @@ private:
             labelList& owner,
             PtrList<dictionary>& patchDicts,
             PackedBoolList& boundaryFacesToRemove,
-            const List<DynamicList<face> >& patchFaces,
-            const List<DynamicList<label> >& patchOwners,
-            const List<DynamicList<bool> >& indirectPatchFace
+            const List<DynamicList<face>>& patchFaces,
+            const List<DynamicList<label>>& patchOwners,
+            const List<DynamicList<bool>>& indirectPatchFace
         ) const;
 
         //- Remove points that are no longer used by any faces

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -160,9 +160,9 @@ void Foam::conformalVoronoiMesh::calcTetMesh
 
     label nPatches = patchNames.size();
 
-    List<DynamicList<face> > patchFaces(nPatches, DynamicList<face>(0));
+    List<DynamicList<face>> patchFaces(nPatches, DynamicList<face>(0));
 
-    List<DynamicList<label> > patchOwners(nPatches, DynamicList<label>(0));
+    List<DynamicList<label>> patchOwners(nPatches, DynamicList<label>(0));
 
     faces.setSize(number_of_finite_facets());
 
@@ -278,7 +278,7 @@ void Foam::conformalVoronoiMesh::calcTetMesh
     sortFaces(faces, owner, neighbour);
 
 //    PackedBoolList boundaryFacesToRemove;
-//    List<DynamicList<bool> > indirectPatchFace;
+//    List<DynamicList<bool>> indirectPatchFace;
 //
 //    addPatches
 //    (
@@ -673,7 +673,7 @@ void Foam::conformalVoronoiMesh::deferredCollapseFaceSet
 (
     labelList& owner,
     labelList& neighbour,
-    const HashSet<labelPair, labelPair::Hash<> >& deferredCollapseFaces
+    const HashSet<labelPair, labelPair::Hash<>>& deferredCollapseFaces
 ) const
 {
     DynamicList<label> faceLabels;
@@ -1631,10 +1631,7 @@ Foam::label Foam::conformalVoronoiMesh::createPatchInfo
             if (procUsed[pUI])
             {
                 patchNames[nNonProcPatches + procAddI] =
-                    "procBoundary"
-                   + name(Pstream::myProcNo())
-                   + "to"
-                   + name(pUI);
+                    processorPolyPatch::newName(Pstream::myProcNo(), pUI);
 
                 patchDicts[nNonProcPatches + procAddI].set
                 (
@@ -1750,12 +1747,12 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
         }
     }
 
-    List<DynamicList<face> > patchFaces(nPatches, DynamicList<face>(0));
-    List<DynamicList<label> > patchOwners(nPatches, DynamicList<label>(0));
+    List<DynamicList<face>> patchFaces(nPatches, DynamicList<face>(0));
+    List<DynamicList<label>> patchOwners(nPatches, DynamicList<label>(0));
     // Per patch face the index of the slave node of the point pair
-    List<DynamicList<label> > patchPPSlaves(nPatches, DynamicList<label>(0));
+    List<DynamicList<label>> patchPPSlaves(nPatches, DynamicList<label>(0));
 
-    List<DynamicList<bool> > indirectPatchFace(nPatches, DynamicList<bool>(0));
+    List<DynamicList<bool>> indirectPatchFace(nPatches, DynamicList<bool>(0));
 
 
     faces.setSize(number_of_finite_edges());
@@ -2134,7 +2131,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                             // Use this processor's vertex index as the master
                             // for sorting
 
-                            DynamicList<Pair<labelPair> >& sortingIndex =
+                            DynamicList<Pair<labelPair>>& sortingIndex =
                                 procPatchSortingIndex[patchIndex];
 
                             if (vB->internalOrBoundaryPoint() && vB->referred())
@@ -2165,7 +2162,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                             // Use the other processor's vertex index as the
                             // master for sorting
 
-                            DynamicList<Pair<labelPair> >& sortingIndex =
+                            DynamicList<Pair<labelPair>>& sortingIndex =
                                 procPatchSortingIndex[patchIndex];
 
                             if (vA->internalOrBoundaryPoint() && vA->referred())
@@ -2450,9 +2447,9 @@ void Foam::conformalVoronoiMesh::sortFaces
 
 void Foam::conformalVoronoiMesh::sortProcPatches
 (
-    List<DynamicList<face> >& patchFaces,
-    List<DynamicList<label> >& patchOwners,
-    List<DynamicList<label> >& patchPointPairSlaves,
+    List<DynamicList<face>>& patchFaces,
+    List<DynamicList<label>>& patchOwners,
+    List<DynamicList<label>>& patchPointPairSlaves,
     labelPairPairDynListList& patchSortingIndices
 ) const
 {
@@ -2466,7 +2463,7 @@ void Foam::conformalVoronoiMesh::sortProcPatches
         faceList& faces = patchFaces[patchI];
         labelList& owner = patchOwners[patchI];
         DynamicList<label>& slaves = patchPointPairSlaves[patchI];
-        DynamicList<Pair<labelPair> >& sortingIndices
+        DynamicList<Pair<labelPair>>& sortingIndices
             = patchSortingIndices[patchI];
 
         if (!sortingIndices.empty())
@@ -2511,9 +2508,9 @@ void Foam::conformalVoronoiMesh::addPatches
     labelList& owner,
     PtrList<dictionary>& patchDicts,
     PackedBoolList& boundaryFacesToRemove,
-    const List<DynamicList<face> >& patchFaces,
-    const List<DynamicList<label> >& patchOwners,
-    const List<DynamicList<bool> >& indirectPatchFace
+    const List<DynamicList<face>>& patchFaces,
+    const List<DynamicList<label>>& patchOwners,
+    const List<DynamicList<bool>>& indirectPatchFace
 ) const
 {
     label nBoundaryFaces = 0;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1581,7 +1581,7 @@ void Foam::conformalVoronoiMesh::limitDisplacement
     // Do not allow infinite recursion
     if (callCount > 7)
     {
-        displacement = vector::zero;
+        displacement = Zero;
         return;
     }
 
@@ -1630,7 +1630,7 @@ void Foam::conformalVoronoiMesh::limitDisplacement
             if (magSqr(pt - surfHit.hitPoint()) <= searchDistanceSqr)
             {
                 // Cannot limit displacement, point closer than tolerance
-                displacement = vector::zero;
+                displacement = Zero;
                 return;
             }
         }
@@ -2066,7 +2066,7 @@ void Foam::conformalVoronoiMesh::addSurfaceAndEdgeHits
             keepSurfacePoint = false;
         }
 
-        List<List<pointIndexHit> > edHitsByFeature;
+        List<List<pointIndexHit>> edHitsByFeature;
 
         labelList featuresHit;
 
@@ -2295,7 +2295,7 @@ void Foam::conformalVoronoiMesh::reinsertSurfaceConformation()
         }
     }
 
-    inplaceSubset<PackedBoolList, List<Vb> >
+    inplaceSubset<PackedBoolList, List<Vb>>
     (
         selectedElems,
         surfaceConformationVertices_

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@@ -432,7 +432,6 @@ Foam::autoPtr<Foam::fvMesh> Foam::conformalVoronoiMesh::createDummyMesh
         {
             patches[patchI] = new processorPolyPatch
             (
-                patchNames[patchI],
                 0,          //patchSizes[p],
                 0,          //patchStarts[p],
                 patchI,

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,12 +118,12 @@ void Foam::featurePointConformer::addMasterAndSlavePoints
 (
     const DynamicList<Foam::point>& masterPoints,
     const DynamicList<Foam::indexedVertexEnum::vertexType>& masterPointsTypes,
-    const Map<DynamicList<autoPtr<plane> > >& masterPointReflections,
+    const Map<DynamicList<autoPtr<plane>>>& masterPointReflections,
     DynamicList<Vb>& pts,
     const label ptI
 ) const
 {
-    typedef DynamicList<autoPtr<plane> >        planeDynList;
+    typedef DynamicList<autoPtr<plane>>        planeDynList;
     typedef Foam::indexedVertexEnum::vertexType vertexType;
 
     forAll(masterPoints, pI)
@@ -199,7 +199,7 @@ void Foam::featurePointConformer::createMasterAndSlavePoints
     DynamicList<Vb>& pts
 ) const
 {
-    typedef DynamicList<autoPtr<plane> >          planeDynList;
+    typedef DynamicList<autoPtr<plane>>          planeDynList;
     typedef indexedVertexEnum::vertexType         vertexType;
     typedef extendedFeatureEdgeMesh::edgeStatus   edgeStatus;
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformer.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -117,7 +117,7 @@ class featurePointConformer
         (
             const DynamicList<point>& masterPoints,
             const DynamicList<indexedVertexEnum::vertexType>& masterPointsTypes,
-            const Map<DynamicList<autoPtr<plane> > >& masterPointReflections,
+            const Map<DynamicList<autoPtr<plane>>>& masterPointReflections,
             DynamicList<Vb>& pts,
             const label ptI
         ) const;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/featurePointConformer/featurePointConformerSpecialisations.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -200,8 +200,8 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
         Foam::point externalPtD;
         Foam::point externalPtE;
 
-        vector convexEdgePlaneCNormal(vector::zero);
-        vector convexEdgePlaneDNormal(vector::zero);
+        vector convexEdgePlaneCNormal(Zero);
+        vector convexEdgePlaneDNormal(Zero);
 
         const labelList& concaveEdgeNormals = edgeNormals[concaveEdgeI];
         const labelList& convexEdgeANormals = edgeNormals[convexEdgesI[0]];
@@ -632,8 +632,8 @@ bool Foam::featurePointConformer::createSpecialisedFeaturePoint
         Foam::point externalPtD;
         Foam::point externalPtE;
 
-        vector concaveEdgePlaneCNormal(vector::zero);
-        vector concaveEdgePlaneDNormal(vector::zero);
+        vector concaveEdgePlaneCNormal(Zero);
+        vector concaveEdgePlaneDNormal(Zero);
 
         const labelList& convexEdgeNormals = edgeNormals[convexEdgeI];
         const labelList& concaveEdgeANormals = edgeNormals[concaveEdgesI[0]];

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ template<class Gt, class Cb>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<CGAL::indexedCell<Gt, Cb> >& p
+    const InfoProxy<CGAL::indexedCell<Gt, Cb>>& p
 )
 {
     const CGAL::indexedCell<Gt, Cb>& iv = p.t_;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ class Ostream;
 template<class Gt, class Cb> Ostream& operator<<
 (
     Ostream&,
-    const Foam::InfoProxy<CGAL::indexedCell<Gt, Cb> >&
+    const Foam::InfoProxy<CGAL::indexedCell<Gt, Cb>>&
 );
 }
 
@@ -117,7 +117,7 @@ public:
     typedef typename Cb::Vertex_handle                   Vertex_handle;
     typedef typename Cb::Cell_handle                     Cell_handle;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Cb::template Rebind_TDS<TDS2>::Other Cb2;
@@ -241,7 +241,7 @@ public:
 
         //- Return info proxy.
         //  Used to print indexedCell information to a stream
-        Foam::InfoProxy<indexedCell<Gt, Cb> > info() const
+        Foam::InfoProxy<indexedCell<Gt, Cb>> info() const
         {
             return *this;
         }
@@ -249,7 +249,7 @@ public:
         friend Foam::Ostream& Foam::operator<< <Gt, Cb>
         (
             Foam::Ostream&,
-            const Foam::InfoProxy<indexedCell<Gt, Cb> >&
+            const Foam::InfoProxy<indexedCell<Gt, Cb>>&
         );
 
 };

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 #include "CGALTriangulation3DKernel.H"
 
 
-template<typename Cell>
+template<class Cell>
 Foam::scalar Foam::foamyHexMeshChecks::coplanarTet
 (
     Cell& c,
@@ -74,7 +74,7 @@ Foam::scalar Foam::foamyHexMeshChecks::coplanarTet
 }
 
 
-template<typename Cell>
+template<class Cell>
 bool Foam::foamyHexMeshChecks::closePoints
 (
     Cell& c,
@@ -104,7 +104,7 @@ bool Foam::foamyHexMeshChecks::closePoints
 }
 
 
-template<typename Cell>
+template<class Cell>
 bool Foam::foamyHexMeshChecks::smallVolume
 (
     Cell& c,

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellChecks.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,21 +34,21 @@ namespace Foam
 namespace foamyHexMeshChecks
 {
 
-    template<typename Cell>
+    template<class Cell>
     scalar coplanarTet
     (
         Cell& c,
         const scalar tol = 1e-12
     );
 
-    template<typename Cell>
+    template<class Cell>
     bool closePoints
     (
         Cell& c,
         const scalar tol = 1e-12
     );
 
-    template<typename Cell>
+    template<class Cell>
     bool smallVolume
     (
         Cell& c,

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,8 +23,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-//#include "indexedCellChecks.H"
-
 template<class Gt, class Cb>
 Foam::tetCell CGAL::indexedCell<Gt, Cb>::unsortedVertexGlobalIndices
 (
@@ -578,8 +576,8 @@ inline bool CGAL::indexedCell<Gt, Cb>::potentialCoplanarCell() const
 
     if (nMasters == 2 && nSlaves == 2)
     {
-        Foam::vector vp0(Foam::vector::zero);
-        Foam::vector vp1(Foam::vector::zero);
+        Foam::vector vp0(Foam::Zero);
+        Foam::vector vp1(Foam::Zero);
 
         if
         (

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOps.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,10 @@ namespace indexedCellOps
 {
 
 //- Does the Dual vertex form part of a processor patch
-template<typename CellType>
+template<class CellType>
 Foam::label dualVertexMasterProc(const CellType& c);
 
-template<typename CellType>
+template<class CellType>
 Foam::FixedList<Foam::label, 4> processorsAttached(const CellType& c);
 
 } // End namespace indexedCellOps

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellOpsTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-template<typename CellType>
+template<class CellType>
 Foam::label CGAL::indexedCellOps::dualVertexMasterProc(const CellType& c)
 {
     if (!c->parallelDualVertex())
@@ -56,7 +56,7 @@ Foam::label CGAL::indexedCellOps::dualVertexMasterProc(const CellType& c)
 }
 
 
-template<typename CellType>
+template<class CellType>
 Foam::FixedList<Foam::label, 4>
 CGAL::indexedCellOps::processorsAttached(const CellType& c)
 {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -155,7 +155,7 @@ template<class Gt, class Vb>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const InfoProxy<CGAL::indexedVertex<Gt, Vb> >& p
+    const InfoProxy<CGAL::indexedVertex<Gt, Vb>>& p
 )
 {
     const CGAL::indexedVertex<Gt, Vb>& iv = p.t_;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -61,7 +61,7 @@ class Istream;
 template<class Gt, class Vb> Ostream& operator<<
 (
     Ostream&,
-    const Foam::InfoProxy<CGAL::indexedVertex<Gt, Vb> >&
+    const Foam::InfoProxy<CGAL::indexedVertex<Gt, Vb>>&
 );
 
 template<class Gt, class Vb> Ostream& operator<<
@@ -98,7 +98,7 @@ namespace CGAL
                        Class indexedVertex Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Gt, class Vb = CGAL::Triangulation_vertex_base_3<Gt> >
+template<class Gt, class Vb = CGAL::Triangulation_vertex_base_3<Gt>>
 class indexedVertex
 :
     public Foam::indexedVertexEnum,
@@ -134,7 +134,7 @@ public:
     typedef typename Tds::Vertex_handle                 Vertex_handle;
     typedef typename Tds::Cell_handle                   Cell_handle;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Vb::template Rebind_TDS<TDS2>::Other   Vb2;
@@ -258,7 +258,7 @@ public:
         //- Fix the vertex so that it can't be moved
         inline bool& fixed();
 
-        inline indexedVertex& operator=(const indexedVertex& rhs)
+        inline void operator=(const indexedVertex& rhs)
         {
             Vb::operator=(rhs);
 
@@ -268,8 +268,6 @@ public:
             this->alignment_ = rhs.alignment();
             this->targetCellSize_ = rhs.targetCellSize();
             this->vertexFixed_ = rhs.fixed();
-
-            return *this;
         }
 
         inline bool operator==(const indexedVertex& rhs) const
@@ -294,7 +292,7 @@ public:
 
         //- Return info proxy.
         //  Used to print indexedVertex information to a stream
-        Foam::InfoProxy<indexedVertex<Gt, Vb> > info() const
+        Foam::InfoProxy<indexedVertex<Gt, Vb>> info() const
         {
             return *this;
         }
@@ -302,7 +300,7 @@ public:
         friend Foam::Ostream& Foam::operator<< <Gt, Vb>
         (
             Foam::Ostream&,
-            const Foam::InfoProxy<indexedVertex<Gt, Vb> >&
+            const Foam::InfoProxy<indexedVertex<Gt, Vb>>&
         );
 
         friend Foam::Ostream& Foam::operator<< <Gt, Vb>

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,11 +50,11 @@ namespace indexedVertexOps
 
 //- Return the target cell size from that stored on a pair of Delaunay vertices,
 //  using a mean function.
-template<typename VertexType>
+template<class VertexType>
 Foam::scalar averageCellSize(const VertexType& vA, const VertexType& vB);
 
 
-template<typename VertexType>
+template<class VertexType>
 inline bool uninitialised(const VertexType& v);
 
 } // End namespace indexedVertexOps

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOpsTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,7 +27,7 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-template<typename VertexType>
+template<class VertexType>
 Foam::scalar CGAL::indexedVertexOps::averageCellSize
 (
     const VertexType& vA,
@@ -47,7 +47,7 @@ Foam::scalar CGAL::indexedVertexOps::averageCellSize
 }
 
 
-template<typename VertexType>
+template<class VertexType>
 inline bool CGAL::indexedVertexOps::uninitialised(const VertexType& v)
 {
     return v->type() == Foam::indexedVertexEnum::vtUnassigned;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/pointConversion.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,7 @@ namespace Foam
 
 #ifdef CGAL_INEXACT
 
-    template<typename Point>
+    template<class Point>
     inline pointFromPoint topoint(const Point& P)
     {
         return reinterpret_cast<pointFromPoint>(P);
@@ -67,7 +67,7 @@ namespace Foam
 
 #else
 
-    template<typename Point>
+    template<class Point>
     inline pointFromPoint topoint(const Point& P)
     {
         return Foam::point
@@ -87,7 +87,7 @@ namespace Foam
 
     //- Specialisation for indexedVertex.
     template<>
-    inline pointFromPoint topoint<CGAL::indexedVertex<K> >
+    inline pointFromPoint topoint<CGAL::indexedVertex<K>>
     (
         const CGAL::indexedVertex<K>& P
     )

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ void Foam::conformationSurfaces::hasBoundedVolume
     List<volumeType>& referenceVolumeTypes
 ) const
 {
-    vector sum(vector::zero);
+    vector sum(Zero);
     label totalTriangles = 0;
 
     forAll(surfaces_, s)
@@ -327,9 +327,9 @@ Foam::conformationSurfaces::conformationSurfaces
     regionOffset_.setSize(surfI, 0);
 
     PtrList<dictionary> globalPatchInfo(surfI);
-    List<Map<autoPtr<dictionary> > > regionPatchInfo(surfI);
+    List<Map<autoPtr<dictionary>>> regionPatchInfo(surfI);
     List<sideVolumeType> globalVolumeTypes(surfI);
-    List<Map<sideVolumeType> > regionVolumeTypes(surfI);
+    List<Map<sideVolumeType>> regionVolumeTypes(surfI);
 
     HashSet<word> unmatchedKeys(surfacesDict.toc());
 
@@ -514,8 +514,8 @@ Foam::conformationSurfaces::conformationSurfaces
                 regionVolumeTypes[surfI][iter.key()];
         }
 
-        const Map<autoPtr<dictionary> >& localInfo = regionPatchInfo[surfI];
-        forAllConstIter(Map<autoPtr<dictionary> >, localInfo, iter)
+        const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfI];
+        forAllConstIter(Map<autoPtr<dictionary>>, localInfo, iter)
         {
             label globalRegionI = regionOffset_[surfI] + iter.key();
 
@@ -659,7 +659,7 @@ Foam::Field<bool> Foam::conformationSurfaces::wellInOutSide
     const bool testForInside
 ) const
 {
-    List<List<volumeType> > surfaceVolumeTests
+    List<List<volumeType>> surfaceVolumeTests
     (
         surfaces_.size(),
         List<volumeType>
@@ -896,7 +896,7 @@ void Foam::conformationSurfaces::findSurfaceAllIntersections
 ) const
 {
     labelListList hitSurfaces;
-    List<List<pointIndexHit> > hitInfo;
+    List<List<pointIndexHit>> hitInfo;
 
     searchableSurfacesQueries::findAllIntersections
     (
@@ -1173,7 +1173,7 @@ void Foam::conformationSurfaces::findAllNearestEdges
 (
     const point& sample,
     const scalar searchRadiusSqr,
-    List<List<pointIndexHit> >& edgeHitsByFeature,
+    List<List<pointIndexHit>>& edgeHitsByFeature,
     List<label>& featuresHit
 ) const
 {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -335,7 +335,7 @@ public:
             (
                 const point& sample,
                 const scalar searchRadiusSqr,
-                List<List<pointIndexHit> >& edgeHitsByFeature,
+                List<List<pointIndexHit>>& edgeHitsByFeature,
                 List<label>& featuresHit
             ) const;
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -416,7 +416,7 @@ bool Foam::autoDensity::fillBox
 
             label nLine = 6*(surfRes_ - 2);
 
-            pointField linePoints(nLine, vector::zero);
+            pointField linePoints(nLine, Zero);
 
             scalarField lineSizes(nLine, 0.0);
 
@@ -532,7 +532,7 @@ bool Foam::autoDensity::fillBox
         pointField samplePoints
         (
             volRes_*volRes_*volRes_,
-            vector::zero
+            Zero
         );
 
         vector delta = span/volRes_;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/searchableSurfaceFeatures/searchableBoxFeatures.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ Foam::searchableBoxFeatures::features() const
     edgeNormals[11][0] = 3; edgeNormals[11][1] = 0;
 
     tmp<pointField> surfacePointsTmp(surface().points());
-    pointField& surfacePoints = surfacePointsTmp();
+    pointField& surfacePoints = surfacePointsTmp.ref();
 
     forAll(edgeDirections, eI)
     {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools/vectorTools.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ namespace vectorTools
     //- Test if a and b are parallel: a^b = 0
     //  Uses the cross product, so the tolerance is proportional to
     //  the sine of the angle between a and b in radians
-    template<typename T>
+    template<class T>
     bool areParallel
     (
         const Vector<T>& a,
@@ -67,7 +67,7 @@ namespace vectorTools
     //- Test if a and b are orthogonal: a.b = 0
     //  Uses the dot product, so the tolerance is proportional to
     //  the cosine of the angle between a and b in radians
-    template<typename T>
+    template<class T>
     bool areOrthogonal
     (
         const Vector<T>& a,
@@ -79,7 +79,7 @@ namespace vectorTools
     }
 
     //- Test if angle between a and b is acute: a.b > 0
-    template<typename T>
+    template<class T>
     bool areAcute
     (
         const Vector<T>& a,
@@ -90,7 +90,7 @@ namespace vectorTools
     }
 
     //- Test if angle between a and b is obtuse: a.b < 0
-    template<typename T>
+    template<class T>
     bool areObtuse
     (
         const Vector<T>& a,
@@ -101,7 +101,7 @@ namespace vectorTools
     }
 
     //- Calculate angle between a and b in radians
-    template<typename T>
+    template<class T>
     T cosPhi
     (
         const Vector<T>& a,
@@ -116,7 +116,7 @@ namespace vectorTools
     }
 
     //- Calculate angle between a and b in radians
-    template<typename T>
+    template<class T>
     T radAngleBetween
     (
         const Vector<T>& a,
@@ -131,7 +131,7 @@ namespace vectorTools
     }
 
     //- Calculate angle between a and b in degrees
-    template<typename T>
+    template<class T>
     T degAngleBetween
     (
         const Vector<T>& a,

applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options

@@ -22,7 +22,7 @@ EXE_INC = \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -IvectorTools
 
 EXE_LIBS = \

applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/foamyHexMesh.C

@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011-2015 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
         (
             100.0,      // max size ratio
             1e-9,       // intersection tolerance
-            autoPtr<writer<scalar> >(new vtkSetWriter<scalar>()),
+            autoPtr<writer<scalar>>(new vtkSetWriter<scalar>()),
             0.01,       // min triangle quality
             true
         );

applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options

@@ -11,7 +11,7 @@ EXE_INC = \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C

@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2012-2015 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2012-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License

applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake

@@ -1,5 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for compilation (at least for error catching)
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 if [ -d "${FASTDUALOCTREE_SRC_PATH}" ]
@@ -7,4 +10,4 @@ then
     wmake
 fi
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------

applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options

@@ -9,7 +9,7 @@ EXE_INC = \
     -I$(FASTDUALOCTREE_SRC_PATH) \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude

applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/foamyHexMeshSurfaceSimplify.C

@@ -2,7 +2,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2012-2015 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2012-2016 OpenFOAM Foundation
     \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
@@ -229,7 +229,7 @@ public:
             //    start[i] = points[edges[i][0]];
             //    end[i] = points[edges[i][1]];
             //}
-            //Foam::List<Foam::List<pointIndexHit> > hitInfo;
+            //Foam::List<Foam::List<pointIndexHit>> hitInfo;
             //labelListList hitSurfaces;
             //searchableSurfacesQueries::findAllIntersections
             //(

applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -749,212 +749,211 @@ void Foam::CV2D::newPoints()
     boundaryConform();
 
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Old Method
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Old Method
+    /*
+    for
+    (
+        Triangulation::Finite_vertices_iterator vit = finite_vertices_begin();
+        vit != finite_vertices_end();
+        ++vit
+    )
+    {
+        if (vit->internalPoint())
+        {
+            // Current dual-cell defining vertex ("centre")
+            point2DFromPoint defVert0 = toPoint2D(vit->point());
 
-// for
-// (
-//     Triangulation::Finite_vertices_iterator vit = finite_vertices_begin();
-//     vit != finite_vertices_end();
-//     ++vit
-// )
-// {
-//     if (vit->internalPoint())
-//     {
-//         // Current dual-cell defining vertex ("centre")
-//         point2DFromPoint defVert0 = toPoint2D(vit->point());
+            Triangulation::Edge_circulator ec = incident_edges(vit);
+            Triangulation::Edge_circulator ecStart = ec;
 
-//         Triangulation::Edge_circulator ec = incident_edges(vit);
-//         Triangulation::Edge_circulator ecStart = ec;
+            // Circulate around the edges to find the first which is not
+            // infinite
+            do
+            {
+                if (!is_infinite(ec)) break;
+            } while (++ec != ecStart);
 
-//         // Circulate around the edges to find the first which is not
-//         // infinite
-//         do
-//         {
-//             if (!is_infinite(ec)) break;
-//         } while (++ec != ecStart);
+            // Store the start-end of the first non-infinte edge
+            point2D de0 = toPoint2D(circumcenter(ec->first));
 
-//         // Store the start-end of the first non-infinte edge
-//         point2D de0 = toPoint2D(circumcenter(ec->first));
+            // Keep track of the maximum edge length^2
+            scalar maxEdgeLen2 = 0.0;
 
-//         // Keep track of the maximum edge length^2
-//         scalar maxEdgeLen2 = 0.0;
+            // Keep track of the index of the longest edge
+            label edgecd0i = -1;
 
-//         // Keep track of the index of the longest edge
-//         label edgecd0i = -1;
+            // Edge counter
+            label edgei = 0;
 
-//         // Edge counter
-//         label edgei = 0;
+            do
+            {
+                if (!is_infinite(ec))
+                {
+                    // Get the end of the current edge
+                    point2D de1 = toPoint2D
+                    (
+                        circumcenter(ec->first->neighbor(ec->second))
+                    );
 
-//         do
-//         {
-//             if (!is_infinite(ec))
-//             {
-//                 // Get the end of the current edge
-//                 point2D de1 = toPoint2D
-//                 (
-//                     circumcenter(ec->first->neighbor(ec->second))
-//                 );
+                    // Store the current edge vector
+                    edges[edgei] = de1 - de0;
 
-//                 // Store the current edge vector
-//                 edges[edgei] = de1 - de0;
+                    // Store the edge mid-point in the vertices array
+                    vertices[edgei] = 0.5*(de1 + de0);
 
-//                 // Store the edge mid-point in the vertices array
-//                 vertices[edgei] = 0.5*(de1 + de0);
+                    // Move the current edge end into the edge start for the
+                    // next iteration
+                    de0 = de1;
 
-//                 // Move the current edge end into the edge start for the
-//                 // next iteration
-//                 de0 = de1;
+                    // Keep track of the longest edge
 
-//                 // Keep track of the longest edge
+                    scalar edgeLen2 = magSqr(edges[edgei]);
 
-//                 scalar edgeLen2 = magSqr(edges[edgei]);
+                    if (edgeLen2 > maxEdgeLen2)
+                    {
+                        maxEdgeLen2 = edgeLen2;
+                        edgecd0i = edgei;
+                    }
 
-//                 if (edgeLen2 > maxEdgeLen2)
-//                 {
-//                     maxEdgeLen2 = edgeLen2;
-//                     edgecd0i = edgei;
-//                 }
+                    edgei++;
+                }
+            } while (++ec != ecStart);
 
-//                 edgei++;
-//             }
-//         } while (++ec != ecStart);
+            // Initialise cd0 such that the mesh will align
+            // in in the x-y directions
+            vector2D cd0(1, 0);
 
-//         // Initialise cd0 such that the mesh will align
-//         // in in the x-y directions
-//         vector2D cd0(1, 0);
+            if (meshControls().relaxOrientation())
+            {
+                // Get the longest edge from the array and use as the primary
+                // direction of the coordinate system of the "square" cell
+                cd0 = edges[edgecd0i];
+            }
 
-//         if (meshControls().relaxOrientation())
-//         {
-//             // Get the longest edge from the array and use as the primary
-//             // direction of the coordinate system of the "square" cell
-//             cd0 = edges[edgecd0i];
-//         }
+            if (meshControls().nearWallAlignedDist() > 0)
+            {
+                pointIndexHit pHit = qSurf_.tree().findNearest
+                (
+                    toPoint3D(defVert0),
+                    meshControls().nearWallAlignedDist2()
+                );
 
-//         if (meshControls().nearWallAlignedDist() > 0)
-//         {
-//             pointIndexHit pHit = qSurf_.tree().findNearest
-//             (
-//                 toPoint3D(defVert0),
-//                 meshControls().nearWallAlignedDist2()
-//             );
+                if (pHit.hit())
+                {
+                    cd0 = toPoint2D(faceNormals[pHit.index()]);
+                }
+            }
 
-//             if (pHit.hit())
-//             {
-//                 cd0 = toPoint2D(faceNormals[pHit.index()]);
-//             }
-//         }
+            // Rotate by 45deg needed to create an averaging procedure which
+            // encourages the cells to be square
+            cd0 = vector2D(cd0.x() + cd0.y(), cd0.y() - cd0.x());
 
-//         // Rotate by 45deg needed to create an averaging procedure which
-//         // encourages the cells to be square
-//         cd0 = vector2D(cd0.x() + cd0.y(), cd0.y() - cd0.x());
+            // Normalise the primary coordinate direction
+            cd0 /= mag(cd0);
 
-//         // Normalise the primary coordinate direction
-//         cd0 /= mag(cd0);
-
-//         // Calculate the orthogonal coordinate direction
-//         vector2D cd1(-cd0.y(), cd0.x());
+            // Calculate the orthogonal coordinate direction
+            vector2D cd1(-cd0.y(), cd0.x());
 
 
-//         // Restart the circulator
-//         ec = ecStart;
+            // Restart the circulator
+            ec = ecStart;
 
-//         // ... and the counter
-//         edgei = 0;
+            // ... and the counter
+            edgei = 0;
 
-//         // Initialise the displacement for the centre and sum-weights
-//         vector2D disp = vector2D::zero;
-//         scalar sumw = 0;
+            // Initialise the displacement for the centre and sum-weights
+            vector2D disp = Zero;
+            scalar sumw = 0;
 
-//         do
-//         {
-//             if (!is_infinite(ec))
-//             {
-//                 // Pick up the current edge
-//                 const vector2D& ei = edges[edgei];
+            do
+            {
+                if (!is_infinite(ec))
+                {
+                    // Pick up the current edge
+                    const vector2D& ei = edges[edgei];
 
-//                 // Calculate the centre to edge-centre vector
-//                 vector2D deltai = vertices[edgei] - defVert0;
+                    // Calculate the centre to edge-centre vector
+                    vector2D deltai = vertices[edgei] - defVert0;
 
-//                 // Set the weight for this edge contribution
-//                 scalar w = 1;
+                    // Set the weight for this edge contribution
+                    scalar w = 1;
 
-//                 if (meshControls().squares())
-//                 {
-//                     w = magSqr(deltai.x()*ei.y() - deltai.y()*ei.x());
-//                     // alternative weights
-//                     //w = mag(deltai.x()*ei.y() - deltai.y()*ei.x());
-//                     //w = magSqr(ei)*mag(deltai);
+                    if (meshControls().squares())
+                    {
+                        w = magSqr(deltai.x()*ei.y() - deltai.y()*ei.x());
+                        // alternative weights
+                        //w = mag(deltai.x()*ei.y() - deltai.y()*ei.x());
+                        //w = magSqr(ei)*mag(deltai);
 
-//                     // Use the following for an ~square mesh
-//                     // Find the coordinate contributions for this edge delta
-//                     scalar cd0deltai = cd0 & deltai;
-//                     scalar cd1deltai = cd1 & deltai;
+                        // Use the following for an ~square mesh
+                        // Find the coordinate contributions for this edge delta
+                        scalar cd0deltai = cd0 & deltai;
+                        scalar cd1deltai = cd1 & deltai;
 
-//                     // Create a "square" displacement
-//                     if (mag(cd0deltai) > mag(cd1deltai))
-//                     {
-//                         disp += (w*cd0deltai)*cd0;
-//                     }
-//                     else
-//                     {
-//                         disp += (w*cd1deltai)*cd1;
-//                     }
-//                 }
-//                 else
-//                 {
-//                     // Use this for a hexagon/pentagon mesh
-//                     disp += w*deltai;
-//                 }
+                        // Create a "square" displacement
+                        if (mag(cd0deltai) > mag(cd1deltai))
+                        {
+                            disp += (w*cd0deltai)*cd0;
+                        }
+                        else
+                        {
+                            disp += (w*cd1deltai)*cd1;
+                        }
+                    }
+                    else
+                    {
+                        // Use this for a hexagon/pentagon mesh
+                        disp += w*deltai;
+                    }
 
-//                 // Sum the weights
-//                 sumw += w;
-//             }
-//             else
-//             {
-//                 FatalErrorInFunction
-//                     << "Infinite triangle found in internal mesh"
-//                     << exit(FatalError);
-//             }
+                    // Sum the weights
+                    sumw += w;
+                }
+                else
+                {
+                    FatalErrorInFunction
+                        << "Infinite triangle found in internal mesh"
+                        << exit(FatalError);
+                }
 
-//             edgei++;
+                edgei++;
 
-//         } while (++ec != ecStart);
+            } while (++ec != ecStart);
 
-//         // Calculate the average displacement
-//         disp /= sumw;
-//         totalDisp += disp;
-//         totalDist += mag(disp);
+            // Calculate the average displacement
+            disp /= sumw;
+            totalDisp += disp;
+            totalDist += mag(disp);
 
-//         // Move the point by a fraction of the average displacement
-//         movePoint(vit, defVert0 + relaxation*disp);
-//     }
-// }
+            // Move the point by a fraction of the average displacement
+            movePoint(vit, defVert0 + relaxation*disp);
+        }
+    }
 
-// Info << "\nTotal displacement = " << totalDisp
-//      << " total distance = " << totalDist << endl;
+    Info << "\nTotal displacement = " << totalDisp
+         << " total distance = " << totalDist << endl;
+    */
 }
 
+/*
+void Foam::CV2D::moveInternalPoints(const point2DField& newPoints)
+{
+    label pointI = 0;
 
-//void Foam::CV2D::moveInternalPoints(const point2DField& newPoints)
-//{
-//    label pointI = 0;
-
-//    for
-//    (
-//        Triangulation::Finite_vertices_iterator vit = finite_vertices_begin();
-//        vit != finite_vertices_end();
-//        ++vit
-//    )
-//    {
-//        if (vit->internalPoint())
-//        {
-//            movePoint(vit, newPoints[pointI++]);
-//        }
-//    }
-//}
-
+    for
+    (
+        Triangulation::Finite_vertices_iterator vit = finite_vertices_begin();
+        vit != finite_vertices_end();
+        ++vit
+    )
+    {
+        if (vit->internalPoint())
+        {
+            movePoint(vit, newPoints[pointI++]);
+        }
+    }
+}
+*/
 
 void Foam::CV2D::write() const
 {

applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2DI.H

@@ -31,7 +31,7 @@ inline Foam::label Foam::CV2D::insertPoint
     const label type
 )
 {
-    uint nVert = number_of_vertices();
+    unsigned int nVert = number_of_vertices();
 
     return insertPoint(toPoint(p), nVert, type);
 }
@@ -55,7 +55,7 @@ inline Foam::label Foam::CV2D::insertPoint
     const label type
 )
 {
-    uint nVert = number_of_vertices();
+    unsigned int nVert = number_of_vertices();
 
     Vertex_handle vh = insert(p);
 

applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options

@@ -21,7 +21,7 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I/usr/include
 
 EXE_LIBS = \

applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,7 +45,7 @@ namespace CGAL
                        Class indexedFace Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Gt, class Fb=CGAL::Triangulation_face_base_2<Gt> >
+template<class Gt, class Fb=CGAL::Triangulation_face_base_2<Gt>>
 class indexedFace
 :
     public Fb
@@ -70,7 +70,7 @@ public:
     typedef typename Fb::Vertex_handle                   Vertex_handle;
     typedef typename Fb::Face_handle                     Face_handle;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Fb::template Rebind_TDS<TDS2>::Other Fb2;

applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,7 +72,7 @@ bool outsideTriangle
                        Class indexedVertex Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Gt, class Vb=CGAL::Triangulation_vertex_base_2<Gt> >
+template<class Gt, class Vb=CGAL::Triangulation_vertex_base_2<Gt>>
 class indexedVertex
 :
     public Vb
@@ -105,7 +105,7 @@ public:
     typedef typename Vb::Face_handle        Face_handle;
     typedef typename Vb::Point              Point;
 
-    template<typename TDS2>
+    template<class TDS2>
     struct Rebind_TDS
     {
         typedef typename Vb::template Rebind_TDS<TDS2>::Other    Vb2;

applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ void Foam::shortEdgeFilter2D::addRegion
 
 void Foam::shortEdgeFilter2D::assignBoundaryPointRegions
 (
-    List<DynamicList<label> >& boundaryPointRegions
+    List<DynamicList<label>>& boundaryPointRegions
 ) const
 {
     forAllConstIter(EdgeMap<label>, mapEdgesRegion_, iter)
@@ -72,7 +72,7 @@ void Foam::shortEdgeFilter2D::assignBoundaryPointRegions
 void Foam::shortEdgeFilter2D::updateEdgeRegionMap
 (
     const MeshedSurface<face>& surfMesh,
-    const List<DynamicList<label> >& boundaryPtRegions,
+    const List<DynamicList<label>>& boundaryPtRegions,
     const labelList& surfPtToBoundaryPt,
     EdgeMap<label>& mapEdgesRegion,
     labelList& patchSizes
@@ -250,7 +250,7 @@ Foam::shortEdgeFilter2D::filter()
 
     // Check if the point is a boundary point. Flag if it is so that
     // it will not be deleted.
-    List<DynamicList<label> > boundaryPointRegions
+    List<DynamicList<label>> boundaryPointRegions
     (
         points.size(),
         DynamicList<label>()
@@ -426,7 +426,7 @@ Foam::shortEdgeFilter2D::filter()
 
     label totalNewPoints = points.size() - nPointsToRemove;
 
-    pointField newPoints(totalNewPoints, vector::zero);
+    pointField newPoints(totalNewPoints, Zero);
     labelList newPointNumbers(points.size(), -1);
     label numberRemoved = 0;
 

applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,13 +78,13 @@ class shortEdgeFilter2D
 
         void assignBoundaryPointRegions
         (
-            List<DynamicList<label> >& boundaryPointRegions
+            List<DynamicList<label>>& boundaryPointRegions
         ) const;
 
         void updateEdgeRegionMap
         (
             const MeshedSurface<face>& surfMesh,
-            const List<DynamicList<label> >& boundaryPtRegions,
+            const List<DynamicList<label>>& boundaryPtRegions,
             const labelList& surfPtToBoundaryPt,
             EdgeMap<label>& mapEdgesRegion,
             labelList& patchSizes

applications/utilities/mesh/generation/snappyHexMesh/Make/options

@@ -1,7 +1,7 @@
 EXE_INC = \
     /* -g -DFULLDEBUG -O0 */ \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
@@ -22,4 +22,4 @@ EXE_LIBS = \
     -lfileFormats \
     -ldynamicMesh \
     -ldecompose \
-    -lautoMesh
+    -lsnappyHexMesh

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  | Copyright 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@@ -32,9 +32,9 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "fvMesh.H"
-#include "autoRefineDriver.H"
-#include "autoSnapDriver.H"
-#include "autoLayerDriver.H"
+#include "snappyRefineDriver.H"
+#include "snappySnapDriver.H"
+#include "snappyLayerDriver.H"
 #include "searchableSurfaces.H"
 #include "refinementSurfaces.H"
 #include "refinementFeatures.H"
@@ -108,11 +108,11 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
     labelList globalMaxLevel(surfI, 0);
     labelList globalLevelIncr(surfI, 0);
     PtrList<dictionary> globalPatchInfo(surfI);
-    List<Map<label> > regionMinLevel(surfI);
-    List<Map<label> > regionMaxLevel(surfI);
-    List<Map<label> > regionLevelIncr(surfI);
-    List<Map<scalar> > regionAngle(surfI);
-    List<Map<autoPtr<dictionary> > > regionPatchInfo(surfI);
+    List<Map<label>> regionMinLevel(surfI);
+    List<Map<label>> regionMaxLevel(surfI);
+    List<Map<label>> regionLevelIncr(surfI);
+    List<Map<scalar>> regionAngle(surfI);
+    List<Map<autoPtr<dictionary>>> regionPatchInfo(surfI);
 
     HashSet<word> unmatchedKeys(surfacesDict.toc());
 
@@ -302,8 +302,8 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
               + regionLevelIncr[surfI][iter.key()];
         }
 
-        const Map<autoPtr<dictionary> >& localInfo = regionPatchInfo[surfI];
-        forAllConstIter(Map<autoPtr<dictionary> >, localInfo, iter)
+        const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfI];
+        forAllConstIter(Map<autoPtr<dictionary>>, localInfo, iter)
         {
             label globalRegionI = regionOffset[surfI] + iter.key();
             patchInfo.set(globalRegionI, iter()().clone());
@@ -686,7 +686,7 @@ int main(int argc, char *argv[])
 //                    runTime,
 //                    IOobject::NO_READ
 //                ),
-//                xferMove<Field<vector> >(bb.points()()),
+//                xferMove<Field<vector>>(bb.points()()),
 //                faces.xfer(),
 //                owner.xfer(),
 //                neighbour.xfer()
@@ -884,9 +884,9 @@ int main(int argc, char *argv[])
     if (debugLevel > 0)
     {
         meshRefinement::debug   = debugLevel;
-        autoRefineDriver::debug = debugLevel;
-        autoSnapDriver::debug   = debugLevel;
-        autoLayerDriver::debug  = debugLevel;
+        snappyRefineDriver::debug = debugLevel;
+        snappySnapDriver::debug   = debugLevel;
+        snappyLayerDriver::debug  = debugLevel;
     }
 
     // Set file writing level
@@ -1061,7 +1061,7 @@ int main(int argc, char *argv[])
         (
             100.0,      // max size ratio
             1e-9,       // intersection tolerance
-            autoPtr<writer<scalar> >(new vtkSetWriter<scalar>()),
+            autoPtr<writer<scalar>>(new vtkSetWriter<scalar>()),
             0.01,       // min triangle quality
             true
         );
@@ -1493,7 +1493,7 @@ int main(int argc, char *argv[])
     {
         cpuTime timer;
 
-        autoRefineDriver refineDriver
+        snappyRefineDriver refineDriver
         (
             meshRefiner,
             decomposer,
@@ -1541,7 +1541,7 @@ int main(int argc, char *argv[])
     {
         cpuTime timer;
 
-        autoSnapDriver snapDriver
+        snappySnapDriver snapDriver
         (
             meshRefiner,
             globalToMasterPatch,
@@ -1592,7 +1592,7 @@ int main(int argc, char *argv[])
         // Layer addition parameters
         const layerParameters layerParams(layerDict, mesh.boundaryMesh());
 
-        autoLayerDriver layerDriver
+        snappyLayerDriver layerDriver
         (
             meshRefiner,
             globalToMasterPatch,

applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C

@@ -287,7 +287,7 @@ namespace Foam
                 label n = 0;
 
                 // Extract for every face the i'th position
-                pointField ptsAtIndex(pts.size(), vector::zero);
+                pointField ptsAtIndex(pts.size(), Zero);
                 forAll(cpp, faceI)
                 {
                     const pointField& facePts = pts[faceI];

applications/utilities/mesh/manipulation/checkMesh/checkTopology.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-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -538,7 +538,7 @@ Foam::label Foam::checkTopology
                     if (returnReduce(mp.size(), sumOp<label>()) > 0)
                     {
                         boundBox bb(point::max, point::min);
-                        forAll (mp, i)
+                        forAll(mp, i)
                         {
                             bb.min() = min(bb.min(), pts[mp[i]]);
                             bb.max() = max(bb.max(), pts[mp[i]]);

applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
 
     masterMesh.write();
 
-    Info<< "\nEnd\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/utilities/mesh/manipulation/orientFaceZone/Make/options

@@ -1,9 +1,9 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
-    -lautoMesh \
+    -lsnappyHexMesh \
     -ltriSurface

applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -385,7 +385,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info<< "\nEnd\n" << endl;
+    Info<< "End\n" << endl;
 
     return 0;
 }

applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(meshDualiser, 0);
+    defineTypeNameAndDebug(meshDualiser, 0);
 }
 
 
@@ -123,8 +123,6 @@ void Foam::meshDualiser::dumpPolyTopoChange
 }
 
 
-//- Given cell and point on mesh finds the corresponding dualCell. Most
-//  points become only one cell but the feature points might be split.
 Foam::label Foam::meshDualiser::findDualCell
 (
     const label cellI,
@@ -146,8 +144,6 @@ Foam::label Foam::meshDualiser::findDualCell
 }
 
 
-// Helper function to generate dualpoints on all boundary edges emanating
-// from (boundary & feature) point
 void Foam::meshDualiser::generateDualBoundaryEdges
 (
     const PackedBoolList& isBoundaryEdge,