From eaf5030600162e6d22a617c2b1ae08db5caf0ec9 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Wed, 2 Dec 2015 10:16:22 +0000
Subject: [PATCH 1/2] ENH: applyBoundaryLayer - determine compressibility
 automatically by the presence of a thermophysicalProperties file

---
 .../applyBoundaryLayer/applyBoundaryLayer.C   | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index e00f12b48e..d55085ee33 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,6 +33,10 @@ Description
     the thickness coefficient supplied via the option -Cbl.  If both options
     are provided -ybl is used.
 
+    Compressible modes is automatically selected based on the existence of the
+    "thermophysicalProperties" dictionary required to construct the
+    thermodynamics package.
+
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
@@ -331,11 +335,6 @@ int main(int argc, char *argv[])
         "scalar",
         "boundary-layer thickness as Cbl * mean distance to wall"
     );
-    argList::addBoolOption
-    (
-        "compressible",
-        "apply to compressible case"
-    );
 
     #include "setRootCase.H"
 
@@ -360,8 +359,6 @@ int main(int argc, char *argv[])
     #include "createNamedMesh.H"
     #include "createFields.H"
 
-    const bool compressible = args.optionFound("compressible");
-
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     // Modify velocity by applying a 1/7th power law boundary-layer
@@ -384,7 +381,15 @@ int main(int argc, char *argv[])
     U.write();
 
 
-    if (compressible)
+    if
+    (
+        IOobject
+        (
+            basicThermo::dictName,
+            runTime.constant(),
+            mesh
+        ).headerOk()
+    )
     {
         calcCompressible(mesh, mask, U, y, ybl);
     }

From 73dac8c7ee62090a2d2932e6df05e4976fde7570 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Wed, 2 Dec 2015 10:17:28 +0000
Subject: [PATCH 2/2] ENH: Updating utilities based on internal development
 line

---
 .../utilities/mesh/advanced/PDRMesh/PDRMesh.C |   3 +-
 .../mesh/advanced/PDRMesh/PDRMeshDict         |   3 +-
 .../createBaffles/createBaffles.C             |   4 +-
 .../manipulation/createPatch/createPatch.C    |  25 +-
 .../manipulation/flattenMesh/flattenMesh.C    |   2 +
 .../manipulation/mergeMeshes/mergeMeshes.C    |  15 +-
 .../manipulation/mirrorMesh/mirrorFvMesh.C    |  26 +-
 .../mesh/manipulation/mirrorMesh/mirrorMesh.C |   2 +-
 .../manipulation/renumberMesh/renumberMesh.C  | 204 ++++++--
 .../renumberMesh/renumberMeshDict             |   2 +
 .../mesh/manipulation/splitMesh/splitMesh.C   |   3 +-
 .../mesh/manipulation/stitchMesh/stitchMesh.C |   2 +-
 .../mesh/manipulation/subsetMesh/subsetMesh.C | 229 ++++++++-
 .../mesh/manipulation/topoSet/topoSetDict     |  29 +-
 .../transformPoints/transformPoints.C         |   2 +
 .../foamDebugSwitches/foamDebugSwitches.C     |   6 +-
 .../dataConversion/foamToVTK/foamToVTK.C      |  66 ++-
 .../dataConversion/foamToVTK/internalWriter.H |  15 +
 .../foamToVTK/internalWriterTemplates.C       |  36 +-
 .../dataConversion/foamToVTK/writeFuns.H      |  16 +-
 .../foamToVTK/writeFunsTemplates.C            |  26 +-
 .../PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H     |  30 +-
 .../vtkPV4Foam/vtkPV4FoamFields.C             |  23 +-
 .../vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H   |  28 ++
 .../vtkPV4Foam/vtkPV4FoamVolFields.H          | 457 ++++++++++--------
 .../particleTracks/particleTracks.C           |   4 +-
 .../steadyParticleTracks.C                    |   4 +-
 .../execFlowFunctionObjects.C                 |   6 +-
 .../postProcessing/miscellaneous/ptot/ptot.C  |   2 +
 .../postProcessing/miscellaneous/wdot/wdot.C  |   6 +
 .../scalarField/pPrime2/pPrime2.C             |   2 +
 .../postProcessing/velocityField/Mach/Mach.C  |   2 +-
 .../postProcessing/velocityField/Pe/Pe.C      |   2 +
 .../utilities/preProcessing/boxTurb/boxTurb.C |   4 +-
 .../changeDictionary/changeDictionary.C       |  60 ++-
 .../preProcessing/engineSwirl/engineSwirl.C   |   2 +-
 .../surfaceBooleanFeatures/CGAL3DKernel.H     |   2 +-
 .../CGALIndexedPolyhedron.H                   |   2 +-
 .../PolyhedronReader/PolyhedronReader.C       |   2 +-
 .../PolyhedronReader/PolyhedronReader.H       |   2 +-
 .../PolyhedronReaderTemplates.C               |   2 +-
 .../surfaceBooleanFeatures.C                  |   2 +-
 .../surface/surfaceCheck/surfaceCheck.C       |   2 +-
 .../surfaceFeatureConvert.C                   |   4 +-
 .../surface/surfaceInertia/surfaceInertia.C   |   4 +-
 .../surface/surfaceInflate/surfaceInflate.C   |   2 +-
 .../surfaceLambdaMuSmooth.C                   |   4 +-
 .../searchableSurfaceModifier/autoPatch.C     |   2 +-
 .../searchableSurfaceModifier/autoPatch.H     |   2 +-
 .../searchableSurfaceModifier/cut.C           |   2 +-
 .../searchableSurfaceModifier/cut.H           |   2 +-
 .../searchableSurfaceModifier.C               |   2 +-
 .../searchableSurfaceModifier.H               |   2 +-
 .../surface/surfaceSubset/surfaceSubset.C     |   4 +-
 .../equilibriumCO/equilibriumCO.C             |   4 +-
 .../equilibriumFlameT/equilibriumFlameT.C     |   4 +-
 56 files changed, 1040 insertions(+), 360 deletions(-)

diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 6473bb4d88..b380a2938c 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -34,7 +34,8 @@ Description
     NOTE: To avoid exposing wrong fields values faceSets should include
     faces contained in the blockedCells cellset.
 
-    - coupledFaces reads coupledFacesSet to introduces mixe-coupled baffles
+    - coupledFaces reads coupledFacesSet to introduces mixed-coupled
+      duplicate baffles
 
     Subsets out the blocked cells and splits the blockedFaces and updates
     fields.
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict b/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict
index 94fb1d6b8c..62471e0ec6 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict
@@ -17,7 +17,8 @@ FoamFile
 //- Per faceSet the patch the faces should go into blocked baffles
 blockedFaces ((blockedFacesSet blockedFaces));
 
-//- Per faceSet the patch the faces should go into coupled baffles
+//- Per faceSet the duplicate baffles to generate (one 'normal', wall baffle,
+//  one cyclic baffle). For use with active baffle boundary conditions.
 coupledFaces
 {
     coupledFacesSet
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 66bc3bcb11..8fbfdf933d 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -525,7 +525,7 @@ int main(int argc, char *argv[])
 
         Info<< "Created zone " << name
             << " at index " << zoneID
-            << " with " << n << " faces" << endl;
+            << " with " << returnReduce(n, sumOp<label>()) << " faces" << endl;
 
         mesh.faceZones().set
         (
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index deefbaef38..d4780f1b10 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -512,6 +512,11 @@ int main(int argc, char *argv[])
     #include "addOverwriteOption.H"
     #include "addRegionOption.H"
     #include "addDictOption.H"
+    Foam::argList::addBoolOption
+    (
+        "writeObj",
+        "write obj files showing the cyclic matching process"
+    );
     #include "setRootCase.H"
     #include "createTime.H"
     runTime.functionObjects().off();
@@ -523,12 +528,13 @@ int main(int argc, char *argv[])
 
     #include "createNamedPolyMesh.H"
 
+    const bool writeObj = args.optionFound("writeObj");
+
     const word oldInstance = mesh.pointsInstance();
 
     const word dictName("createPatchDict");
     #include "setSystemMeshDictionaryIO.H"
-
-    Info<< "Reading " << dictName << nl << endl;
+    Info<< "Reading " << dictIO.instance()/dictIO.name() << nl << endl;
 
     IOdictionary dict(dictIO);
 
@@ -542,7 +548,10 @@ int main(int argc, char *argv[])
     patches.checkParallelSync(true);
 
 
-    dumpCyclicMatch("initial_", mesh);
+    if (writeObj)
+    {
+        dumpCyclicMatch("initial_", mesh);
+    }
 
     // Read patch construct info from dictionary
     PtrList<dictionary> patchSources(dict.lookup("patches"));
@@ -761,7 +770,10 @@ int main(int argc, char *argv[])
     autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, true);
     mesh.movePoints(map().preMotionPoints());
 
-    dumpCyclicMatch("coupled_", mesh);
+    if (writeObj)
+    {
+        dumpCyclicMatch("coupled_", mesh);
+    }
 
     // Synchronise points.
     if (!pointSync)
@@ -872,7 +884,10 @@ int main(int argc, char *argv[])
     filterPatches(mesh, addedPatchNames);
 
 
-    dumpCyclicMatch("final_", mesh);
+    if (writeObj)
+    {
+        dumpCyclicMatch("final_", mesh);
+    }
 
 
     // Set the precision of the points data to 10
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
index 6aed660ed8..1f9480a5c4 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
+++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
@@ -96,6 +96,8 @@ int main(int argc, char *argv[])
     Info<< "Writing points into directory " << points.path() << nl << endl;
     points.write();
 
+    Info<< nl << "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
index 46f59e91e8..62ef9e13fd 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
+++ b/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-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,7 +62,6 @@ int main(int argc, char *argv[])
         "merge two meshes"
     );
 
-    argList::noParallel();
     #include "addOverwriteOption.H"
 
     argList::validArgs.append("masterCase");
@@ -97,6 +96,18 @@ int main(int argc, char *argv[])
     word addRegion = polyMesh::defaultRegion;
     args.optionReadIfPresent("addRegion", addRegion);
 
+    // Since we don't use argList processor directory detection, add it to
+    // the casename ourselves so it triggers the logic inside TimePath.
+    const fileName& cName = args.caseName();
+    std::string::size_type pos = cName.find("processor");
+    if (pos != string::npos && pos != 0)
+    {
+        fileName processorName = cName.substr(pos, cName.size()-pos);
+        masterCase += '/' + processorName;
+        addCase += '/' + processorName;
+    }
+
+
     getRootCase(masterCase);
     getRootCase(addCase);
 
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
index a13f5ace43..da835851b4 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -243,8 +243,9 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
 
     // Mirror boundary faces patch by patch
 
-    wordList newPatchTypes(boundary().size());
-    wordList newPatchNames(boundary().size());
+
+    labelList newToOldPatch(boundary().size(), -1);
+
     labelList newPatchSizes(boundary().size(), -1);
     labelList newPatchStarts(boundary().size(), -1);
     label nNewPatches = 0;
@@ -303,8 +304,8 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
         // If patch exists, grab the name and type of the original patch
         if (nNewFaces > newPatchStarts[nNewPatches])
         {
-            newPatchTypes[nNewPatches] = boundaryMesh()[patchI].type();
-            newPatchNames[nNewPatches] = boundaryMesh()[patchI].name();
+            newToOldPatch[nNewPatches] = patchI;
+
             newPatchSizes[nNewPatches] =
                 nNewFaces - newPatchStarts[nNewPatches];
 
@@ -316,8 +317,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
     newFaces.setSize(nNewFaces);
     Info<< " New faces: " << nNewFaces << endl;
 
-    newPatchTypes.setSize(nNewPatches);
-    newPatchNames.setSize(nNewPatches);
+    newToOldPatch.setSize(nNewPatches);
     newPatchSizes.setSize(nNewPatches);
     newPatchStarts.setSize(nNewPatches);
 
@@ -377,18 +377,16 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
     fvMesh& pMesh = *mirrorMeshPtr_;
 
     // Add the boundary patches
-    List<polyPatch*> p(newPatchTypes.size());
+    List<polyPatch*> p(newPatchSizes.size());
 
     forAll(p, patchI)
     {
-        p[patchI] = polyPatch::New
+        p[patchI] = boundaryMesh()[newToOldPatch[patchI]].clone
         (
-            newPatchTypes[patchI],
-            newPatchNames[patchI],
-            newPatchSizes[patchI],
-            newPatchStarts[patchI],
+            pMesh.boundaryMesh(),
             patchI,
-            pMesh.boundaryMesh()
+            newPatchSizes[patchI],
+            newPatchStarts[patchI]
         ).ptr();
     }
 
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
index f90ed99eef..f7383289cb 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
     Info<< "Writing mirrored mesh" << endl;
     mesh.mirrorMesh().write();
 
-    Info<< "End" << endl;
+    Info<< "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 6b3b632467..4e1933ac44 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anispulation  |
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -46,6 +46,9 @@ Description
 #include "zeroGradientFvPatchFields.H"
 #include "CuthillMcKeeRenumber.H"
 #include "fvMeshSubset.H"
+#include "cellSet.H"
+#include "faceSet.H"
+#include "pointSet.H"
 
 #ifdef FOAM_USE_ZOLTAN
     #include "zoltanRenumber.H"
@@ -634,6 +637,12 @@ int main(int argc, char *argv[])
         "calculate the rms of the frontwidth"
     );
 
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+    runTime.functionObjects().off();
+
+
     // Force linker to include zoltan symbols. This section is only needed since
     // Zoltan is a static library
     #ifdef FOAM_USE_ZOLTAN
@@ -641,9 +650,6 @@ int main(int argc, char *argv[])
     (void)zoltanRenumber::typeName;
     #endif
 
-    #include "setRootCase.H"
-    #include "createTime.H"
-    runTime.functionObjects().off();
 
     // Get times list
     instantList Times = runTime.times();
@@ -700,6 +706,7 @@ int main(int argc, char *argv[])
     bool writeMaps = false;
     bool orderPoints = false;
     label blockSize = 0;
+    bool renumberSets = true;
 
     // Construct renumberMethod
     autoPtr<IOdictionary> renumberDictPtr;
@@ -760,6 +767,8 @@ int main(int argc, char *argv[])
             Info<< "Writing renumber maps (new to old) to polyMesh." << nl
                 << endl;
         }
+
+        renumberSets = renumberDict.lookupOrDefault("renumberSets", true);
     }
     else
     {
@@ -861,6 +870,71 @@ int main(int argc, char *argv[])
     PtrList<surfaceTensorField> stFlds;
     ReadFields(mesh, objects, stFlds);
 
+    // Read point fields.
+
+    PtrList<pointScalarField> psFlds;
+    ReadFields(pointMesh::New(mesh), objects, psFlds);
+
+    PtrList<pointVectorField> pvFlds;
+    ReadFields(pointMesh::New(mesh), objects, pvFlds);
+
+    PtrList<pointSphericalTensorField> pstFlds;
+    ReadFields(pointMesh::New(mesh), objects, pstFlds);
+
+    PtrList<pointSymmTensorField> psymtFlds;
+    ReadFields(pointMesh::New(mesh), objects, psymtFlds);
+
+    PtrList<pointTensorField> ptFlds;
+    ReadFields(pointMesh::New(mesh), objects, ptFlds);
+
+    // Read sets
+    PtrList<cellSet> cellSets;
+    PtrList<faceSet> faceSets;
+    PtrList<pointSet> pointSets;
+    if (renumberSets)
+    {
+        // Read sets
+        IOobjectList objects(mesh, mesh.facesInstance(), "polyMesh/sets");
+        {
+            IOobjectList cSets(objects.lookupClass(cellSet::typeName));
+            if (cSets.size())
+            {
+                Info<< "Reading cellSets:" << endl;
+                forAllConstIter(IOobjectList, cSets, iter)
+                {
+                    cellSets.append(new cellSet(*iter()));
+                    Info<< "    " << cellSets.last().name() << endl;
+                }
+            }
+        }
+        {
+            IOobjectList fSets(objects.lookupClass(faceSet::typeName));
+            if (fSets.size())
+            {
+                Info<< "Reading faceSets:" << endl;
+                forAllConstIter(IOobjectList, fSets, iter)
+                {
+                    faceSets.append(new faceSet(*iter()));
+                    Info<< "    " << faceSets.last().name() << endl;
+                }
+            }
+        }
+        {
+            IOobjectList pSets(objects.lookupClass(pointSet::typeName));
+            if (pSets.size())
+            {
+                Info<< "Reading pointSets:" << endl;
+                forAllConstIter(IOobjectList, pSets, iter)
+                {
+                    pointSets.append(new pointSet(*iter()));
+                    Info<< "    " << pointSets.last().name() << endl;
+                }
+            }
+        }
+    }
+
+
+
     Info<< endl;
 
     // From renumbering:
@@ -1055,7 +1129,6 @@ int main(int argc, char *argv[])
     mesh.updateMesh(map);
 
     // Update proc maps
-    if (cellProcAddressing.headerOk())
     if
     (
         cellProcAddressing.headerOk()
@@ -1070,7 +1143,6 @@ int main(int argc, char *argv[])
             UIndirectList<label>(cellProcAddressing, map().cellMap())
         );
     }
-    if (faceProcAddressing.headerOk())
     if
     (
         faceProcAddressing.headerOk()
@@ -1101,7 +1173,6 @@ int main(int argc, char *argv[])
             }
         }
     }
-    if (pointProcAddressing.headerOk())
     if
     (
         pointProcAddressing.headerOk()
@@ -1226,46 +1297,79 @@ int main(int argc, char *argv[])
 
     mesh.write();
     if (cellProcAddressing.headerOk())
-    if
-    (
-        cellProcAddressing.headerOk()
-     && cellProcAddressing.size() == mesh.nCells()
-    )
     {
         cellProcAddressing.instance() = mesh.facesInstance();
-        cellProcAddressing.write();
+        if (cellProcAddressing.size() == mesh.nCells())
+        {
+            cellProcAddressing.write();
+        }
+        else
+        {
+            // procAddressing no longer valid. Delete it.
+            const fileName fName(cellProcAddressing.filePath());
+            if (fName.size())
+            {
+                Info<< "Deleting inconsistent processor cell decomposition"
+                    << " map " << fName << endl;
+                rm(fName);
+            }
+        }
     }
     if (faceProcAddressing.headerOk())
-    if
-    (
-        faceProcAddressing.headerOk()
-     && faceProcAddressing.size() == mesh.nFaces()
-    )
     {
         faceProcAddressing.instance() = mesh.facesInstance();
-        faceProcAddressing.write();
-    }
-    if (pointProcAddressing.headerOk())
-    if
-    (
-        pointProcAddressing.headerOk()
-     && pointProcAddressing.size() == mesh.nPoints()
-    )
-    {
-        pointProcAddressing.instance() = mesh.facesInstance();
-        pointProcAddressing.write();
-    }
-    if (boundaryProcAddressing.headerOk())
-    if
-    (
-        boundaryProcAddressing.headerOk()
-     && boundaryProcAddressing.size() == mesh.boundaryMesh().size()
-    )
-    {
-        boundaryProcAddressing.instance() = mesh.facesInstance();
-        boundaryProcAddressing.write();
+        if (faceProcAddressing.size() == mesh.nFaces())
+        {
+            faceProcAddressing.write();
+        }
+        else
+        {
+            const fileName fName(faceProcAddressing.filePath());
+            if (fName.size())
+            {
+                Info<< "Deleting inconsistent processor face decomposition"
+                    << " map " << fName << endl;
+                rm(fName);
+            }
+        }
     }
 
+    if (pointProcAddressing.headerOk())
+    {
+        pointProcAddressing.instance() = mesh.facesInstance();
+        if (pointProcAddressing.size() == mesh.nPoints())
+        {
+            pointProcAddressing.write();
+        }
+        else
+        {
+            const fileName fName(pointProcAddressing.filePath());
+            if (fName.size())
+            {
+                Info<< "Deleting inconsistent processor point decomposition"
+                    << " map " << fName << endl;
+                rm(fName);
+            }
+        }
+    }
+    if (boundaryProcAddressing.headerOk())
+    {
+        boundaryProcAddressing.instance() = mesh.facesInstance();
+        if (boundaryProcAddressing.size() == mesh.boundaryMesh().size())
+        {
+            boundaryProcAddressing.write();
+        }
+        else
+        {
+            const fileName fName(boundaryProcAddressing.filePath());
+            if (fName.size())
+            {
+                Info<< "Deleting inconsistent processor patch decomposition"
+                    << " map " << fName << endl;
+                rm(fName);
+            }
+        }
+    }
 
     if (writeMaps)
     {
@@ -1331,6 +1435,28 @@ int main(int argc, char *argv[])
         ).write();
     }
 
+    if (renumberSets)
+    {
+        forAll(cellSets, i)
+        {
+            cellSets[i].updateMesh(map());
+            cellSets[i].instance() = mesh.facesInstance();
+            cellSets[i].write();
+        }
+        forAll(faceSets, i)
+        {
+            faceSets[i].updateMesh(map());
+            faceSets[i].instance() = mesh.facesInstance();
+            faceSets[i].write();
+        }
+        forAll(pointSets, i)
+        {
+            pointSets[i].updateMesh(map());
+            pointSets[i].instance() = mesh.facesInstance();
+            pointSets[i].write();
+        }
+    }
+
     Info<< "\nEnd\n" << endl;
 
     return 0;
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
index 2cd1a68ca5..8b44fd1c4a 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict
@@ -34,6 +34,8 @@ sortCoupledFaceCells false;
 // Optional entry: sort points into internal and boundary points
 //orderPoints false;
 
+// Optional: suppress renumbering cellSets,faceSets,pointSets
+//renumberSets false;
 
 
 method          CuthillMcKee;
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index f1ed44e653..a6d53a201c 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -287,7 +287,8 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    Info<< nl << "end" << endl;
+    Info<< nl << "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 8e64c28a38..d1db6fb365 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -499,7 +499,7 @@ int main(int argc, char *argv[])
     // Write fields
     runTime.write();
 
-    Info<< nl << "end" << endl;
+    Info<< nl << "End" << nl <<  endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 63d91ac178..9a3a72248d 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,11 +41,86 @@ Description
 #include "cellSet.H"
 #include "IOobjectList.H"
 #include "volFields.H"
+#include "topoDistanceData.H"
+#include "FaceCellWave.H"
 
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+labelList nearestPatch(const polyMesh& mesh, const labelList& patchIDs)
+{
+    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
+
+    // Count number of faces in exposedPatchIDs
+    label nFaces = 0;
+    forAll(patchIDs, i)
+    {
+        const polyPatch& pp = pbm[patchIDs[i]];
+        nFaces += pp.size();
+    }
+
+    // Field on cells and faces.
+    List<topoDistanceData> cellData(mesh.nCells());
+    List<topoDistanceData> faceData(mesh.nFaces());
+
+    // Start of changes
+    labelList patchFaces(nFaces);
+    List<topoDistanceData> patchData(nFaces);
+    nFaces = 0;
+    forAll(patchIDs, i)
+    {
+        label patchI = patchIDs[i];
+        const polyPatch& pp = pbm[patchI];
+
+        forAll(pp, i)
+        {
+            patchFaces[nFaces] = pp.start()+i;
+            patchData[nFaces] = topoDistanceData(patchI, 0);
+            nFaces++;
+        }
+    }
+
+    // Propagate information inwards
+    FaceCellWave<topoDistanceData> deltaCalc
+    (
+        mesh,
+        patchFaces,
+        patchData,
+        faceData,
+        cellData,
+        mesh.globalData().nTotalCells()+1
+    );
+
+    // And extract
+
+    labelList nearest(mesh.nFaces());
+
+    bool haveWarned = false;
+    forAll(faceData, faceI)
+    {
+        if (!faceData[faceI].valid(deltaCalc.data()))
+        {
+            if (!haveWarned)
+            {
+                WarningIn("meshRefinement::nearestPatch(..)")
+                    << "Did not visit some faces, e.g. face " << faceI
+                    << " at " << mesh.faceCentres()[faceI] << endl
+                    << "Using patch " << patchIDs[0] << " as nearest"
+                    << endl;
+                haveWarned = true;
+            }
+            nearest[faceI] = patchIDs[0];
+        }
+        else
+        {
+            nearest[faceI] = faceData[faceI].data();
+        }
+    }
+
+    return nearest;
+}
+
 
 template<class Type>
 void subsetVolFields
@@ -150,6 +225,40 @@ void subsetPointFields
 }
 
 
+template<class Type>
+void subsetDimensionedFields
+(
+    const fvMeshSubset& subsetter,
+    const wordList& fieldNames,
+    PtrList<DimensionedField<Type, volMesh> >& subFields
+)
+{
+    const fvMesh& baseMesh = subsetter.baseMesh();
+
+    forAll(fieldNames, i)
+    {
+        const word& fieldName = fieldNames[i];
+
+        Info<< "Subsetting field " << fieldName << endl;
+
+        DimensionedField<Type, volMesh> fld
+        (
+            IOobject
+            (
+                fieldName,
+                baseMesh.time().timeName(),
+                baseMesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            ),
+            baseMesh
+        );
+
+        subFields.set(i, subsetter.interpolate(fld));
+    }
+}
+
+
 
 int main(int argc, char *argv[])
 {
@@ -169,6 +278,13 @@ int main(int argc, char *argv[])
         "'oldInternalFaces'"
     );
     argList::addOption
+    (
+        "patches",
+        "names",
+        "add exposed internal faces to nearest of specified patches"
+        " instead of to 'oldInternalFaces'"
+    );
+    argList::addOption
     (
         "resultTime",
         "time",
@@ -207,15 +323,19 @@ int main(int argc, char *argv[])
     // Create mesh subsetting engine
     fvMeshSubset subsetter(mesh);
 
-    label patchI = -1;
+    labelList exposedPatchIDs;
 
     if (args.optionFound("patch"))
     {
         const word patchName = args["patch"];
 
-        patchI = mesh.boundaryMesh().findPatchID(patchName);
+        exposedPatchIDs = labelList
+        (
+            1,
+            mesh.boundaryMesh().findPatchID(patchName)
+        );
 
-        if (patchI == -1)
+        if (exposedPatchIDs[0] == -1)
         {
             FatalErrorIn(args.executable()) << "Illegal patch " << patchName
                 << nl << "Valid patches are " << mesh.boundaryMesh().names()
@@ -225,17 +345,53 @@ int main(int argc, char *argv[])
         Info<< "Adding exposed internal faces to patch " << patchName << endl
             << endl;
     }
+    else if (args.optionFound("patches"))
+    {
+        const wordReList patchNames(args.optionRead<wordReList>("patches"));
+
+        exposedPatchIDs = mesh.boundaryMesh().patchSet(patchNames).sortedToc();
+
+        Info<< "Adding exposed internal faces to nearest of patches "
+            << patchNames << endl << endl;
+    }
     else
     {
         Info<< "Adding exposed internal faces to a patch called"
             << " \"oldInternalFaces\" (created if necessary)" << endl
             << endl;
+        exposedPatchIDs = labelList(1, label(-1));
     }
 
 
     cellSet currentSet(mesh, setName);
 
-    subsetter.setLargeCellSubset(currentSet, patchI, true);
+    if (exposedPatchIDs.size() == 1)
+    {
+        subsetter.setLargeCellSubset(currentSet, exposedPatchIDs[0], true);
+    }
+    else
+    {
+
+        // Find per face the nearest patch
+        labelList nearestExposedPatch(nearestPatch(mesh, exposedPatchIDs));
+
+        labelList region(mesh.nCells(), 0);
+        forAllConstIter(cellSet, currentSet, iter)
+        {
+            region[iter.key()] = 1;
+        }
+
+        labelList exposedFaces(subsetter.getExposedFaces(region, 1, true));
+        subsetter.setLargeCellSubset
+        (
+            region,
+            1,
+            exposedFaces,
+            UIndirectList<label>(nearestExposedPatch, exposedFaces)(),
+            true
+        );
+    }
+
 
     IOobjectList objects(mesh, runTime.timeName());
 
@@ -361,6 +517,42 @@ int main(int argc, char *argv[])
     subsetPointFields(subsetter, pMesh, pointTensorNames, pointTensorFlds);
 
 
+    // Read dimensioned fields and subset
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    typedef volScalarField::DimensionedInternalField dimScalType;
+    wordList scalarDimNames(objects.names(dimScalType::typeName));
+    PtrList<dimScalType> scalarDimFlds(scalarDimNames.size());
+    subsetDimensionedFields(subsetter, scalarDimNames, scalarDimFlds);
+
+    typedef volVectorField::DimensionedInternalField dimVecType;
+    wordList vectorDimNames(objects.names(dimVecType::typeName));
+    PtrList<dimVecType> vectorDimFlds(vectorDimNames.size());
+    subsetDimensionedFields(subsetter, vectorDimNames, vectorDimFlds);
+
+    typedef volSphericalTensorField::DimensionedInternalField dimSphereType;
+    wordList sphericalTensorDimNames(objects.names(dimSphereType::typeName));
+    PtrList<dimSphereType> sphericalTensorDimFlds
+    (
+        sphericalTensorDimNames.size()
+    );
+    subsetDimensionedFields
+    (
+        subsetter,
+        sphericalTensorDimNames,
+        sphericalTensorDimFlds
+    );
+
+    typedef volSymmTensorField::DimensionedInternalField dimSymmTensorType;
+    wordList symmTensorDimNames(objects.names(dimSymmTensorType::typeName));
+    PtrList<dimSymmTensorType> symmTensorDimFlds(symmTensorDimNames.size());
+    subsetDimensionedFields(subsetter, symmTensorDimNames, symmTensorDimFlds);
+
+    typedef volTensorField::DimensionedInternalField dimTensorType;
+    wordList tensorDimNames(objects.names(dimTensorType::typeName));
+    PtrList<dimTensorType> tensorDimFlds(tensorDimNames.size());
+    subsetDimensionedFields(subsetter, tensorDimNames, tensorDimFlds);
+
 
     // Write mesh and fields to new time
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -461,6 +653,33 @@ int main(int argc, char *argv[])
         pointTensorFlds[i].write();
     }
 
+    // DimensionedFields
+    forAll(scalarDimFlds, i)
+    {
+        scalarDimFlds[i].rename(scalarDimNames[i]);
+        scalarDimFlds[i].write();
+    }
+    forAll(vectorDimFlds, i)
+    {
+        vectorDimFlds[i].rename(vectorDimNames[i]);
+        vectorDimFlds[i].write();
+    }
+    forAll(sphericalTensorDimFlds, i)
+    {
+        sphericalTensorDimFlds[i].rename(sphericalTensorDimNames[i]);
+        sphericalTensorDimFlds[i].write();
+    }
+    forAll(symmTensorDimFlds, i)
+    {
+        symmTensorDimFlds[i].rename(symmTensorDimNames[i]);
+        symmTensorDimFlds[i].write();
+    }
+    forAll(tensorDimFlds, i)
+    {
+        tensorDimFlds[i].rename(tensorDimNames[i]);
+        tensorDimFlds[i].write();
+    }
+
 
     Info<< "\nEnd\n" << endl;
 
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSetDict b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
index 5f0e5c0b39..045486fc21 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSetDict
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
@@ -372,19 +372,22 @@ FoamFile
 //                          //           is the master side)
 //    }
 //
-//    // Select based on surface. Orientation from normals on surface
+//    // Select based on faceSet, using supplied normal to determine orientation
+//    source setAndNormalToFaceZone;
+//    sourceInfo
 //    {
-//        name    fz0;
-//        type    faceZoneSet;
-//        action  new;
-//        source  searchableSurfaceToFaceZone;
-//        sourceInfo
-//        {
-//            surface searchableSphere;
-//            centre  (0.05 0.05 0.005);
-//            radius  0.025;
-//            //name  sphere.stl; // Optional name if surface triSurfaceMesh
-//        }
+//        faceSet f0;       // name of faceSet
+//        normal (1 0 0);   // normal orientation
+//    }
+//
+//    // Select based on surface. Orientation from normals on surface
+//    source  searchableSurfaceToFaceZone;
+//    sourceInfo
+//    {
+//        surface searchableSphere;
+//        centre  (0.05 0.05 0.005);
+//        radius  0.025;
+//        //name  sphere.stl; // Optional name if surface triSurfaceMesh
 //    }
 //
 //
@@ -413,7 +416,7 @@ actions
         name    c0;
         type    cellSet;
         action  new;
-        source labelToCell;
+        source  labelToCell;
         sourceInfo
         {
             value (12 13 56);
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 692cfd76db..d2181b25d7 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -308,6 +308,8 @@ int main(int argc, char *argv[])
     Info<< "Writing points into directory " << points.path() << nl << endl;
     points.write();
 
+    Info<< nl << "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C b/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
index 1943b7d631..1b5670fc83 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -158,9 +158,7 @@ int main(int argc, char *argv[])
         Info<< "OptimisationSwitches: " << currOpt << endl;
     }
 
-
-
-    Info<< "done" << endl;
+    Info<< nl << "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 2ef824b169..157af431bf 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -601,6 +601,53 @@ int main(int argc, char *argv[])
               + vtf.size();
 
 
+        // Construct dimensioned fields
+        PtrList<volScalarField::DimensionedInternalField> dsf;
+        PtrList<volVectorField::DimensionedInternalField> dvf;
+        PtrList<volSphericalTensorField::DimensionedInternalField> dSpheretf;
+        PtrList<volSymmTensorField::DimensionedInternalField> dSymmtf;
+        PtrList<volTensorField::DimensionedInternalField> dtf;
+
+        if (!specifiedFields || selectedFields.size())
+        {
+            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, dsf);
+            print("    volScalarFields::Internal          :", Info, dsf);
+
+            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, dvf);
+            print("    volVectorFields::Internal          :", Info, dvf);
+
+            readFields
+            (
+                vMesh,
+                vMesh.baseMesh(),
+                objects,
+                selectedFields,
+                dSpheretf
+            );
+            print("    volSphericalTensorFields::Internal :", Info, dSpheretf);
+
+            readFields
+            (
+                vMesh,
+                vMesh.baseMesh(),
+                objects,
+                selectedFields,
+                dSymmtf
+            );
+            print("    volSymmTensorFields::Internal      :", Info, dSymmtf);
+
+            readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, dtf);
+            print("    volTensorFields::Internal          :", Info, dtf);
+        }
+
+        label nDimFields =
+                dsf.size()
+              + dvf.size()
+              + dSpheretf.size()
+              + dSymmtf.size()
+              + dtf.size();
+
+
         // Construct pointMesh only if nessecary since constructs edge
         // addressing (expensive on polyhedral meshes)
         if (noPointValues)
@@ -701,7 +748,7 @@ int main(int argc, char *argv[])
             (
                 writer.os(),
                 vMesh.nFieldCells(),
-                1+nVolFields
+                1 + nVolFields + nDimFields
             );
 
             // Write cellID field
@@ -714,13 +761,20 @@ int main(int argc, char *argv[])
             writer.write(vSymmtf);
             writer.write(vtf);
 
+            // Write dimensionedFields
+            writer.write<scalar, volMesh>(dsf);
+            writer.write<vector, volMesh>(dvf);
+            writer.write<sphericalTensor, volMesh>(dSpheretf);
+            writer.write<symmTensor, volMesh>(dSymmtf);
+            writer.write<tensor, volMesh>(dtf);
+
             if (!noPointValues)
             {
                 writeFuns::writePointDataHeader
                 (
                     writer.os(),
                     vMesh.nFieldPoints(),
-                    nVolFields+nPointFields
+                    nVolFields + nDimFields + nPointFields
                 );
 
                 // pointFields
@@ -737,6 +791,12 @@ int main(int argc, char *argv[])
                 writer.write(pInterp, vSpheretf);
                 writer.write(pInterp, vSymmtf);
                 writer.write(pInterp, vtf);
+
+                writer.write<scalar, volMesh>(pInterp, dsf);
+                writer.write<vector, volMesh>(pInterp, dvf);
+                writer.write<sphericalTensor, volMesh>(pInterp, dSpheretf);
+                writer.write<symmTensor, volMesh>(pInterp, dSymmtf);
+                writer.write<tensor, volMesh>(pInterp, dtf);
             }
         }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
index 9c456f843c..fa805c37b7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
@@ -94,6 +94,13 @@ public:
             const PtrList<GeometricField<Type, PatchField, GeoMesh> >&
         );
 
+        //- Write generic internal fields
+        template<class Type, class GeoMesh>
+        void write
+        (
+            const PtrList<DimensionedField<Type, volMesh> >& flds
+        );
+
         //- Interpolate and write volFields
         template<class Type>
         void write
@@ -101,6 +108,14 @@ public:
             const volPointInterpolation&,
             const PtrList<GeometricField<Type, fvPatchField, volMesh> >&
         );
+
+        //- Interpolate and internal fields
+        template<class Type, class GeoMesh>
+        void write
+        (
+            const volPointInterpolation&,
+            const PtrList<DimensionedField<Type, volMesh> >&
+        );
 };
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
index 853caca75b..797f2d5661 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,6 +41,19 @@ void Foam::internalWriter::write
 }
 
 
+template<class Type, class GeoMesh>
+void Foam::internalWriter::write
+(
+    const PtrList<DimensionedField<Type, volMesh> >& flds
+)
+{
+    forAll(flds, i)
+    {
+        writeFuns::write(os_, binary_, flds[i], vMesh_);
+    }
+}
+
+
 template<class Type>
 void Foam::internalWriter::write
 (
@@ -62,4 +75,25 @@ void Foam::internalWriter::write
 }
 
 
+template<class Type, class GeoMesh>
+void Foam::internalWriter::write
+(
+    const volPointInterpolation& pInterp,
+    const PtrList<DimensionedField<Type, volMesh> >& flds
+)
+{
+    forAll(flds, i)
+    {
+        writeFuns::write
+        (
+            os_,
+            binary_,
+            flds[i],
+            pInterp.interpolate(flds[i])(),
+            vMesh_
+        );
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
index 11f18b3d76..56df1d5237 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
@@ -113,7 +113,7 @@ public:
     (
         std::ostream&,
         const bool binary,
-        const GeometricField<Type, fvPatchField, volMesh>&,
+        const DimensionedField<Type, volMesh>&,
         const vtkMesh&
     );
 
@@ -135,8 +135,8 @@ public:
     (
         std::ostream&,
         const bool binary,
-        const GeometricField<Type, fvPatchField, volMesh>&,
-        const GeometricField<Type, pointPatchField, pointMesh>&,
+        const DimensionedField<Type, volMesh>&,
+        const DimensionedField<Type, pointMesh>&,
         const vtkMesh&
     );
 
@@ -150,6 +150,16 @@ public:
         const vtkMesh&
     );
 
+    //- Write generic dimensioned internal fields
+    template<class Type>
+    static void write
+    (
+        std::ostream&,
+        const bool binary,
+        const PtrList<DimensionedField<Type, volMesh> >&,
+        const vtkMesh&
+    );
+
     //- Interpolate and write volFields
     template<class Type>
     static void write
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
index 5fe5d076dd..3082da1e61 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ void Foam::writeFuns::write
 (
     std::ostream& os,
     const bool binary,
-    const GeometricField<Type, fvPatchField, volMesh>& vvf,
+    const DimensionedField<Type, volMesh>& vvf,
     const vtkMesh& vMesh
 )
 {
@@ -79,7 +79,7 @@ void Foam::writeFuns::write
 
     DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nValues);
 
-    insert(vvf.internalField(), fField);
+    insert(vvf, fField);
 
     forAll(superCells, superCellI)
     {
@@ -128,8 +128,8 @@ void Foam::writeFuns::write
 (
     std::ostream& os,
     const bool binary,
-    const GeometricField<Type, fvPatchField, volMesh>& vvf,
-    const GeometricField<Type, pointPatchField, pointMesh>& pvf,
+    const DimensionedField<Type, volMesh>& vvf,
+    const DimensionedField<Type, pointMesh>& pvf,
     const vtkMesh& vMesh
 )
 {
@@ -164,6 +164,22 @@ void Foam::writeFuns::write
     const PtrList<GeometricField<Type, PatchField, GeoMesh> >& flds,
     const vtkMesh& vMesh
 )
+{
+    forAll(flds, i)
+    {
+        write(os, binary, flds[i].dimensionedInternalField(), vMesh);
+    }
+}
+
+
+template<class Type>
+void Foam::writeFuns::write
+(
+    std::ostream& os,
+    const bool binary,
+    const PtrList<DimensionedField<Type, volMesh> >& flds,
+    const vtkMesh& vMesh
+)
 {
     forAll(flds, i)
     {
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
index 0bd35573e1..78e4496f17 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H
@@ -390,15 +390,6 @@ class vtkPV4Foam
             //- Reduce memory footprint after conversion
             void reduceMemory();
 
-            //- Volume fields
-            void updateVolFields(vtkMultiBlockDataSet*);
-
-            //- Point fields
-            void updatePointFields(vtkMultiBlockDataSet*);
-
-            //- Lagrangian fields
-            void updateLagrangianFields(vtkMultiBlockDataSet*);
-
 
         // Mesh conversion functions
 
@@ -492,6 +483,16 @@ class vtkPV4Foam
 
         // Convert OpenFOAM fields
 
+            //- Volume field - all types
+            template<class Type>
+            void convertVolField
+            (
+                const PtrList<PrimitivePatchInterpolation<primitivePatch> >&,
+                const GeometricField<Type, fvPatchField, volMesh>&,
+                const bool interpFields,
+                vtkMultiBlockDataSet* output
+            );
+
             //- Volume fields - all types
             template<class Type>
             void convertVolFields
@@ -503,6 +504,17 @@ class vtkPV4Foam
                 vtkMultiBlockDataSet* output
             );
 
+            //- Volume internal fields (DimensionedField)- all types
+            template<class Type>
+            void convertDimFields
+            (
+                const fvMesh&,
+                const PtrList<PrimitivePatchInterpolation<primitivePatch> >&,
+                const IOobjectList&,
+                const bool interpFields,
+                vtkMultiBlockDataSet* output
+            );
+
             //- Volume field - all selected parts
             template<class Type>
             void convertVolFieldBlock
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
index 127f49d306..ec28f4dfe8 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -143,6 +143,27 @@ void Foam::vtkPV4Foam::convertVolFields
         mesh, ppInterpList, objects, interpFields, output
     );
 
+    convertDimFields<scalar>
+    (
+        mesh, ppInterpList, objects, interpFields, output
+    );
+    convertDimFields<vector>
+    (
+        mesh, ppInterpList, objects, interpFields, output
+    );
+    convertDimFields<sphericalTensor>
+    (
+        mesh, ppInterpList, objects, interpFields, output
+    );
+    convertDimFields<symmTensor>
+    (
+        mesh, ppInterpList, objects, interpFields, output
+    );
+    convertDimFields<tensor>
+    (
+        mesh, ppInterpList, objects, interpFields, output
+    );
+
     if (debug)
     {
         Info<< "<end> Foam::vtkPV4Foam::convertVolFields" << endl;
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
index b191e1c52b..784432ea4b 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfoFields.H
@@ -99,6 +99,34 @@ void Foam::vtkPV4Foam::updateInfoFields
         objects
     );
 
+    //- Add dimensioned fields to GUI
+    addToSelection<DimensionedField<scalar, meshType> >
+    (
+        select,
+        objects
+    );
+    addToSelection<DimensionedField<vector, meshType> >
+    (
+        select,
+        objects
+    );
+    addToSelection<DimensionedField<sphericalTensor, meshType> >
+    (
+        select,
+        objects
+    );
+    addToSelection<DimensionedField<symmTensor, meshType> >
+    (
+        select,
+        objects
+    );
+    addToSelection<DimensionedField<tensor, meshType> >
+    (
+        select,
+        objects
+    );
+
+
     // restore the enabled selections
     setSelectedArrayEntries(select, enabledEntries);
 
diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
index f4757a6137..fbc51aeaa1 100644
--- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,7 @@ InClass
 #include "wallPolyPatch.H"
 #include "faceSet.H"
 #include "volPointInterpolation.H"
+#include "zeroGradientFvPatchField.H"
 
 #include "vtkPV4FoamFaceField.H"
 #include "vtkPV4FoamPatchField.H"
@@ -42,6 +43,224 @@ InClass
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+template<class Type>
+void Foam::vtkPV4Foam::convertVolField
+(
+    const PtrList<PrimitivePatchInterpolation<primitivePatch> >& ppInterpList,
+    const GeometricField<Type, fvPatchField, volMesh>& tf,
+    const bool interpFields,
+    vtkMultiBlockDataSet* output
+)
+{
+    const fvMesh& mesh = tf.mesh();
+    const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+    // Interpolated field (demand driven)
+    autoPtr<GeometricField<Type, pointPatchField, pointMesh> > ptfPtr;
+    if (interpFields)
+    {
+        if (debug)
+        {
+            Info<< "convertVolFieldBlock interpolating:" << tf.name()
+                << endl;
+        }
+
+        ptfPtr.reset
+        (
+            volPointInterpolation::New(mesh).interpolate(tf).ptr()
+        );
+    }
+
+
+    // Convert activated internalMesh regions
+    convertVolFieldBlock
+    (
+        tf,
+        ptfPtr,
+        output,
+        arrayRangeVolume_,
+        regionPolyDecomp_
+    );
+
+    // Convert activated cellZones
+    convertVolFieldBlock
+    (
+        tf,
+        ptfPtr,
+        output,
+        arrayRangeCellZones_,
+        zonePolyDecomp_
+    );
+
+    // Convert activated cellSets
+    convertVolFieldBlock
+    (
+        tf,
+        ptfPtr,
+        output,
+        arrayRangeCellSets_,
+        csetPolyDecomp_
+    );
+
+
+    //
+    // Convert patches - if activated
+    //
+    for
+    (
+        int partId = arrayRangePatches_.start();
+        partId < arrayRangePatches_.end();
+        ++partId
+    )
+    {
+        const word patchName = getPartName(partId);
+        const label datasetNo = partDataset_[partId];
+        const label patchId = patches.findPatchID(patchName);
+
+        if (!partStatus_[partId] || datasetNo < 0 || patchId < 0)
+        {
+            continue;
+        }
+
+        const fvPatchField<Type>& ptf = tf.boundaryField()[patchId];
+
+        if
+        (
+            isType<emptyFvPatchField<Type> >(ptf)
+         ||
+            (
+                reader_->GetExtrapolatePatches()
+            && !polyPatch::constraintType(patches[patchId].type())
+            )
+        )
+        {
+            fvPatch p(ptf.patch().patch(), mesh.boundary());
+
+            tmp<Field<Type> > tpptf
+            (
+                fvPatchField<Type>(p, tf).patchInternalField()
+            );
+
+            convertPatchField
+            (
+                tf.name(),
+                tpptf(),
+                output,
+                arrayRangePatches_,
+                datasetNo
+            );
+
+            if (interpFields)
+            {
+                convertPatchPointField
+                (
+                    tf.name(),
+                    ppInterpList[patchId].faceToPointInterpolate(tpptf)(),
+                    output,
+                    arrayRangePatches_,
+                    datasetNo
+                );
+            }
+        }
+        else
+        {
+            convertPatchField
+            (
+                tf.name(),
+                ptf,
+                output,
+                arrayRangePatches_,
+                datasetNo
+            );
+
+            if (interpFields)
+            {
+                convertPatchPointField
+                (
+                    tf.name(),
+                    ppInterpList[patchId].faceToPointInterpolate(ptf)(),
+                    output,
+                    arrayRangePatches_,
+                    datasetNo
+                );
+            }
+        }
+    }
+
+    //
+    // Convert face zones - if activated
+    //
+    for
+    (
+        int partId = arrayRangeFaceZones_.start();
+        partId < arrayRangeFaceZones_.end();
+        ++partId
+    )
+    {
+        const word zoneName = getPartName(partId);
+        const label datasetNo = partDataset_[partId];
+
+        if (!partStatus_[partId] || datasetNo < 0)
+        {
+            continue;
+        }
+
+        const faceZoneMesh& zMesh = mesh.faceZones();
+        const label zoneId = zMesh.findZoneID(zoneName);
+
+        if (zoneId < 0)
+        {
+            continue;
+        }
+
+        convertFaceField
+        (
+            tf,
+            output,
+            arrayRangeFaceZones_,
+            datasetNo,
+            mesh,
+            zMesh[zoneId]
+        );
+
+        // TODO: points
+    }
+
+    //
+    // Convert face sets - if activated
+    //
+    for
+    (
+        int partId = arrayRangeFaceSets_.start();
+        partId < arrayRangeFaceSets_.end();
+        ++partId
+    )
+    {
+        const word selectName = getPartName(partId);
+        const label datasetNo = partDataset_[partId];
+
+        if (!partStatus_[partId] || datasetNo < 0)
+        {
+            continue;
+        }
+
+        const faceSet fSet(mesh, selectName);
+
+        convertFaceField
+        (
+            tf,
+            output,
+            arrayRangeFaceSets_,
+            datasetNo,
+            mesh,
+            fSet.toc()
+        );
+
+        // TODO: points
+    }
+}
+
+
 template<class Type>
 void Foam::vtkPV4Foam::convertVolFields
 (
@@ -52,8 +271,6 @@ void Foam::vtkPV4Foam::convertVolFields
     vtkMultiBlockDataSet* output
 )
 {
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
     forAllConstIter(IOobjectList, objects, iter)
     {
         // restrict to GeometricField<Type, ...>
@@ -73,209 +290,69 @@ void Foam::vtkPV4Foam::convertVolFields
             mesh
         );
 
-        // Interpolated field (demand driven)
-        autoPtr<GeometricField<Type, pointPatchField, pointMesh> > ptfPtr;
-        if (interpFields)
-        {
-            if (debug)
-            {
-                Info<< "convertVolFieldBlock interpolating:" << tf.name()
-                    << endl;
-            }
-
-            ptfPtr.reset
-            (
-                volPointInterpolation::New(tf.mesh()).interpolate(tf).ptr()
-            );
-        }
+        // Convert
+        convertVolField(ppInterpList, tf, interpFields, output);
+    }
+}
 
 
-        // Convert activated internalMesh regions
-        convertVolFieldBlock
+template<class Type>
+void Foam::vtkPV4Foam::convertDimFields
+(
+    const fvMesh& mesh,
+    const PtrList<PrimitivePatchInterpolation<primitivePatch> >& ppInterpList,
+    const IOobjectList& objects,
+    const bool interpFields,
+    vtkMultiBlockDataSet* output
+)
+{
+    forAllConstIter(IOobjectList, objects, iter)
+    {
+        // restrict to DimensionedField<Type, ...>
+        if
         (
-            tf,
-            ptfPtr,
-            output,
-            arrayRangeVolume_,
-            regionPolyDecomp_
-        );
-
-        // Convert activated cellZones
-        convertVolFieldBlock
-        (
-            tf,
-            ptfPtr,
-            output,
-            arrayRangeCellZones_,
-            zonePolyDecomp_
-        );
-
-        // Convert activated cellSets
-        convertVolFieldBlock
-        (
-            tf,
-            ptfPtr,
-            output,
-            arrayRangeCellSets_,
-            csetPolyDecomp_
-        );
-
-
-        //
-        // Convert patches - if activated
-        //
-        for
-        (
-            int partId = arrayRangePatches_.start();
-            partId < arrayRangePatches_.end();
-            ++partId
+            iter()->headerClassName()
+         != DimensionedField<Type, volMesh>::typeName
         )
         {
-            const word patchName = getPartName(partId);
-            const label datasetNo = partDataset_[partId];
-            const label patchId = patches.findPatchID(patchName);
+            continue;
+        }
 
-            if (!partStatus_[partId] || datasetNo < 0 || patchId < 0)
-            {
-                continue;
-            }
+        // Load field
+        DimensionedField<Type, volMesh> dimFld(*iter(), mesh);
 
-            const fvPatchField<Type>& ptf = tf.boundaryField()[patchId];
 
-            if
+        // Construct volField with zero-gradient patch fields
+
+        IOobject io(dimFld);
+        io.readOpt() = IOobject::NO_READ;
+
+        PtrList<fvPatchField<Type> > patchFields(mesh.boundary().size());
+        forAll(patchFields, patchI)
+        {
+            patchFields.set
             (
-                isType<emptyFvPatchField<Type> >(ptf)
-             ||
+                patchI,
+                fvPatchField<Type>::New
                 (
-                    reader_->GetExtrapolatePatches()
-                && !polyPatch::constraintType(patches[patchId].type())
+                    zeroGradientFvPatchField<scalar>::typeName,
+                    mesh.boundary()[patchI],
+                    dimFld
                 )
-            )
-            {
-                fvPatch p(ptf.patch().patch(), tf.mesh().boundary());
-
-                tmp<Field<Type> > tpptf
-                (
-                    fvPatchField<Type>(p, tf).patchInternalField()
-                );
-
-                convertPatchField
-                (
-                    tf.name(),
-                    tpptf(),
-                    output,
-                    arrayRangePatches_,
-                    datasetNo
-                );
-
-                if (interpFields)
-                {
-                    convertPatchPointField
-                    (
-                        tf.name(),
-                        ppInterpList[patchId].faceToPointInterpolate(tpptf)(),
-                        output,
-                        arrayRangePatches_,
-                        datasetNo
-                    );
-                }
-            }
-            else
-            {
-                convertPatchField
-                (
-                    tf.name(),
-                    ptf,
-                    output,
-                    arrayRangePatches_,
-                    datasetNo
-                );
-
-                if (interpFields)
-                {
-                    convertPatchPointField
-                    (
-                        tf.name(),
-                        ppInterpList[patchId].faceToPointInterpolate(ptf)(),
-                        output,
-                        arrayRangePatches_,
-                        datasetNo
-                    );
-                }
-            }
-        }
-
-        //
-        // Convert face zones - if activated
-        //
-        for
-        (
-            int partId = arrayRangeFaceZones_.start();
-            partId < arrayRangeFaceZones_.end();
-            ++partId
-        )
-        {
-            const word zoneName = getPartName(partId);
-            const label datasetNo = partDataset_[partId];
-
-            if (!partStatus_[partId] || datasetNo < 0)
-            {
-                continue;
-            }
-
-            const faceZoneMesh& zMesh = mesh.faceZones();
-            const label zoneId = zMesh.findZoneID(zoneName);
-
-            if (zoneId < 0)
-            {
-                continue;
-            }
-
-            convertFaceField
-            (
-                tf,
-                output,
-                arrayRangeFaceZones_,
-                datasetNo,
-                mesh,
-                zMesh[zoneId]
             );
-
-            // TODO: points
         }
 
-        //
-        // Convert face sets - if activated
-        //
-        for
+        GeometricField<Type, fvPatchField, volMesh> volFld
         (
-            int partId = arrayRangeFaceSets_.start();
-            partId < arrayRangeFaceSets_.end();
-            ++partId
-        )
-        {
-            const word selectName = getPartName(partId);
-            const label datasetNo = partDataset_[partId];
+            io,
+            dimFld.mesh(),
+            dimFld.dimensions(),
+            dimFld,
+            patchFields
+        );
+        volFld.correctBoundaryConditions();
 
-            if (!partStatus_[partId] || datasetNo < 0)
-            {
-                continue;
-            }
-
-            const faceSet fSet(mesh, selectName);
-
-            convertFaceField
-            (
-                tf,
-                output,
-                arrayRangeFaceSets_,
-                datasetNo,
-                mesh,
-                fSet.toc()
-            );
-
-            // TODO: points
-        }
+        convertVolField(ppInterpList, volFld, interpFields, output);
     }
 }
 
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index 4988fc969f..83f9bc2ebb 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -247,6 +247,8 @@ int main(int argc, char *argv[])
         );
     }
 
+    Info<< "End\n" << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
index 4d2ab943ac..2941df5d5a 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -331,7 +331,7 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    Info<< "\ndone" << endl;
+    Info<< "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 8e0c2ce7cf..40b6b1f4fb 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -156,7 +156,11 @@ void calc
     functionObjectList& fol
 )
 {
-    if (args.optionFound("noFlow"))
+    if (args.optionFound("noRead"))
+    {
+        fol.execute(true);
+    }
+    else if (args.optionFound("noFlow"))
     {
         Info<< "    Operating in no-flow mode; no models will be loaded."
             << " All vol, surface and point fields will be loaded." << endl;
diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
index 41ca210179..3f3213cd3e 100644
--- a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
+++ b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
@@ -138,6 +138,8 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
+    Info<< "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
index e670d9150f..873bb53a72 100644
--- a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
+++ b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
@@ -49,6 +49,8 @@ int main(int argc, char *argv[])
     {
         runTime.setTime(timeDirs[timeI], timeI);
 
+        Info<< "Time = " << runTime.timeName() << endl;
+
         mesh.readUpdate();
 
         volScalarField mgb
@@ -114,8 +116,12 @@ int main(int argc, char *argv[])
         );
 
         wdot.write();
+
+        Info<< endl;
     }
 
+    Info<< "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
index 7848679a25..f03ed13570 100644
--- a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
+++ b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
@@ -105,6 +105,8 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
+    Info<< nl << "End" << nl << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Mach.C b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
index 39136a389b..a65eb0a07c 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Mach.C
+++ b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
@@ -144,7 +144,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
         Info<< "    Missing U or T" << endl;
     }
 
-    Info<< "\nEnd\n" << endl;
+    Info<< nl << "End" << nl << endl;
 }
 
 
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index a82837d83c..c52565af50 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -274,6 +274,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
     {
         Info<< "    No phi" << endl;
     }
+
+    Info<< "End" << nl << endl;
 }
 
 
diff --git a/applications/utilities/preProcessing/boxTurb/boxTurb.C b/applications/utilities/preProcessing/boxTurb/boxTurb.C
index 55a35322ab..4ed0356e1c 100644
--- a/applications/utilities/preProcessing/boxTurb/boxTurb.C
+++ b/applications/utilities/preProcessing/boxTurb/boxTurb.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
         runTime.graphFormat()
     );
 
-    Info<< "end" << endl;
+    Info<< "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index a6b18b6114..906127a268 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.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-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -612,41 +612,51 @@ int main(int argc, char *argv[])
         }
         else
         {
-            // Read dictionary. (disable class type checking so we can load
-            // field)
+            // Read dictionary
+            // Note: disable class type checking so we can load field
             Info<< "Loading dictionary " << fieldName << endl;
             const word oldTypeName = IOdictionary::typeName;
             const_cast<word&>(IOdictionary::typeName) = word::null;
 
-            IOdictionary fieldDict
+            IOobject fieldHeader
             (
-                IOobject
-                (
-                    fieldName,
-                    instance,
-                    mesh,
-                    IOobject::MUST_READ_IF_MODIFIED,
-                    IOobject::NO_WRITE,
-                    false
-                )
+                fieldName,
+                instance,
+                mesh,
+                IOobject::MUST_READ_IF_MODIFIED,
+                IOobject::NO_WRITE,
+                false
             );
 
-            const_cast<word&>(IOdictionary::typeName) = oldTypeName;
-            // Fake type back to what was in field
-            const_cast<word&>(fieldDict.type()) = fieldDict.headerClassName();
+            if (fieldHeader.headerOk())
+            {
+                IOdictionary fieldDict(fieldHeader);
 
-            Info<< "Loaded dictionary " << fieldName
-                << " with entries " << fieldDict.toc() << endl;
+                const_cast<word&>(IOdictionary::typeName) = oldTypeName;
 
-            // Get the replacement dictionary for the field
-            const dictionary& replaceDict = fieldIter().dict();
-            Info<< "Merging entries from " << replaceDict.toc() << endl;
+                // Fake type back to what was in field
+                const_cast<word&>(fieldDict.type()) =
+                    fieldDict.headerClassName();
 
-            // Merge the replacements in
-            merge(fieldDict, replaceDict, literalRE, patchGroups);
+                Info<< "Loaded dictionary " << fieldName
+                    << " with entries " << fieldDict.toc() << endl;
 
-            Info<< "Writing modified fieldDict " << fieldName << endl;
-            fieldDict.regIOobject::write();
+                // Get the replacement dictionary for the field
+                const dictionary& replaceDict = fieldIter().dict();
+                Info<< "Merging entries from " << replaceDict.toc() << endl;
+
+                // Merge the replacements in
+                merge(fieldDict, replaceDict, literalRE, patchGroups);
+
+                Info<< "Writing modified fieldDict " << fieldName << endl;
+                fieldDict.regIOobject::write();
+            }
+            else
+            {
+                WarningIn(args.executable())
+                    << "Requested field to change " << fieldName
+                    << " does not exist in " << fieldHeader.path() << endl;
+            }
         }
     }
 
diff --git a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
index 43e86814c3..4652cb2afd 100644
--- a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
+++ b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 
     U.write();
 
-    Info<< "\n end\n";
+    Info<< nl << "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/CGAL3DKernel.H b/applications/utilities/surface/surfaceBooleanFeatures/CGAL3DKernel.H
index e753060ce0..7fda691d05 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/CGAL3DKernel.H
+++ b/applications/utilities/surface/surfaceBooleanFeatures/CGAL3DKernel.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H b/applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H
index 0eba1bee2f..e17039cd03 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H
+++ b/applications/utilities/surface/surfaceBooleanFeatures/CGALIndexedPolyhedron.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.C b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.C
index 462b9a6f05..693237a7ea 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H
index ef3e88a0ac..bf1abc1e2a 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReader.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReaderTemplates.C b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReaderTemplates.C
index 53ea3b1b87..76a192c108 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReaderTemplates.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/PolyhedronReaderTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index e948cd1fdb..34a6925637 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index c292ebe6b5..f94c5cb82f 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
index e62bee9a68..a35579ac4b 100644
--- a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
+++ b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index 14ff3cc5c8..d4c7a757c9 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -2,8 +2,8 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011-2013 OpenFOAM Foundation
-    \\/      M anipulation   | Copyright (C) 2015 OpenCFD Ltd.
+   \\  /     A nd            | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\/      M anipulation   |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfaceInflate/surfaceInflate.C b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
index dfc4154321..a1b4329935 100644
--- a/applications/utilities/surface/surfaceInflate/surfaceInflate.C
+++ b/applications/utilities/surface/surfaceInflate/surfaceInflate.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
index 93f29a2283..26972f2a38 100644
--- a/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
+++ b/applications/utilities/surface/surfaceLambdaMuSmooth/surfaceLambdaMuSmooth.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.C b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.C
index e8ca9a0125..5ff45cecc0 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.C
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
index 4a7e0459b3..bf46c9f939 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
index c04c47da0b..9dab08b528 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
index 4081b753b3..6cca7cd6fe 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C
index e28036012c..b4fe619b12 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
index 8955dea741..0f196efdcf 100644
--- a/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
+++ b/applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index c2a168ba68..f29b38faca 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index 7af84242b9..7f7994bdf1 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
         Info<< "Kc(EQreactions) = " << iter().Kc(P, T) << endl;
     }
 
-    Info<< nl << "end" << endl;
+    Info<< nl << "End" << nl << endl;
 
     return 0;
 }
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index 9879031cf8..567bc234dc 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
     }
     }
 
-    Info<< nl << "end" << endl;
+    Info<< nl << "End" << nl << endl;
 
     return 0;
 }