diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
index cbe13fd0d2..49f9016dc1 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
@@ -359,4 +359,5 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
     return vtkmesh;
 }
 
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
index 3151813864..14c5da92c2 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
@@ -38,7 +38,6 @@ Description
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
 vtkPolyData* Foam::vtkPV3Foam::faceZoneVTKMesh
 (
     const fvMesh& mesh,
@@ -111,7 +110,6 @@ vtkPolyData* Foam::vtkPV3Foam::faceZoneVTKMesh
 }
 
 
-
 vtkPolyData* Foam::vtkPV3Foam::pointZoneVTKMesh
 (
     const fvMesh& mesh,
@@ -148,4 +146,5 @@ vtkPolyData* Foam::vtkPV3Foam::pointZoneVTKMesh
     return vtkmesh;
 }
 
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
index 310a12efdf..59e445e341 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
@@ -519,6 +519,5 @@ void Foam::vtkPV3Foam::updateInfoLagrangianFields()
     }
 }
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C
index 9d37d2e1bf..aff0ea4eec 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C
@@ -338,4 +338,5 @@ void Foam::vtkPV3Foam::printMemory()
     }
 }
 
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
new file mode 100644
index 0000000000..1dcc0258d5
--- /dev/null
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      particleTrackProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+cloudName       reactingCloud1;
+
+sampleFrequency 1;
+
+maxPositions    1000000;
+
+
+// ************************************************************************* //
diff --git a/bin/foamTemplates/source/foamTemplate.C b/bin/foamTemplates/source/foamTemplate.C
index 903fe66b5f..1f86ef69f8 100644
--- a/bin/foamTemplates/source/foamTemplate.C
+++ b/bin/foamTemplates/source/foamTemplate.C
@@ -31,7 +31,13 @@ License
 const dataType Foam::className::staticData();
 
 
-// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -71,12 +77,6 @@ Foam::className::~className()
 {}
 
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 
diff --git a/bin/foamTemplates/source/newSource b/bin/foamTemplates/source/newSource
old mode 100644
new mode 100755
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index e43a0d741d..61087c20d3 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -97,7 +97,7 @@ public:
         //- Construct given SphericalTensor
         inline SymmTensor(const SphericalTensor<Cmpt>&);
 
-        //- Construct given the nine components
+        //- Construct given the six components
         inline SymmTensor
         (
             const Cmpt txx, const Cmpt txy, const Cmpt txz,
diff --git a/src/conversion/meshTables/remappingDict b/src/conversion/meshTables/remappingDict
index 1a53982f79..bde8b0b38a 100644
--- a/src/conversion/meshTables/remappingDict
+++ b/src/conversion/meshTables/remappingDict
@@ -1,9 +1,9 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           |                                                 |
-|    \\/     M anipulation  |                                www.OpenFOAM.org |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C
index 0db23c7ed6..1332d90fd4 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.C
+++ b/src/conversion/polyDualMesh/polyDualMesh.C
@@ -1640,16 +1640,4 @@ Foam::polyDualMesh::~polyDualMesh()
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index e473102c1a..650cb7ddcb 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -249,10 +249,10 @@ template<class ParcelType>
 void Foam::KinematicCloud<ParcelType>::info() const
 {
     Info<< "Cloud: " << this->name() << nl
-        << "    Parcels added during this run   = "
+        << "    Total number of parcels added   = "
         << returnReduce(this->injection().parcelsAddedTotal(), sumOp<label>())
             << nl
-        << "    Mass introduced during this run = "
+        << "    Total mass introduced           = "
         << returnReduce(this->injection().massInjected(), sumOp<scalar>())
             << nl
         << "    Current number of parcels       = "
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index b1733762e5..8d388e6d66 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -298,7 +298,7 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
         dt,
         cellI,
         d,
-        T,
+        min(T, td.constProps().Tbp()), // Limit to boiling temperature
         pc_,
         this->Tc_,
         this->muc_/(this->rhoc_ + ROOTVSMALL),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 8e351f96f0..f17cd21171 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -91,6 +91,9 @@ public:
             //- Vaporisation temperature [K]
             const scalar Tvap_;
 
+            //- Boiling point [K]
+            const scalar Tbp_;
+
 
     public:
 
@@ -107,7 +110,10 @@ public:
 
             //- Return const access to the vaporisation temperature
             inline scalar Tvap() const;
-    };
+
+            //- Return const access to the boiling point
+            inline scalar Tbp() const;
+   };
 
 
     //- Class used to pass reacting tracking data to the trackToFace function
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 5c2b3c7b2d..55aa90eb7e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -35,7 +35,8 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
     ThermoParcel<ParcelType>::constantProperties(parentDict),
     pMin_(dimensionedScalar(this->dict().lookup("pMin")).value()),
     constantVolume_(this->dict().lookup("constantVolume")),
-    Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value())
+    Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value()),
+    Tbp_(dimensionedScalar(this->dict().lookup("Tbp")).value())
 {}
 
 
@@ -145,6 +146,14 @@ Foam::ReactingParcel<ParcelType>::constantProperties::Tvap() const
 }
 
 
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingParcel<ParcelType>::constantProperties::Tbp() const
+{
+    return Tbp_;
+}
+
+
 // * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
 
 template<class ParcelType>
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 7c63f1c262..42134dcded 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -186,7 +186,6 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
 (
     const label parcels,
     const scalar volume,
-    const scalar volumeFraction,
     const scalar diameter,
     const scalar rho
 )
@@ -196,13 +195,14 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
     {
         case pbMass:
         {
-            nP = volumeFraction*massTotal_/parcels
-               /(rho*mathematicalConstant::pi/6.0*pow3(diameter));
+            nP = volume/volumeTotal_
+                *massTotal_/rho
+               /(parcels*mathematicalConstant::pi/6.0*pow3(diameter));
             break;
         }
         case pbNumber:
         {
-            nP = volumeFraction*massTotal_/(rho*volume);
+            nP = massTotal_/(rho*volumeTotal_*parcels);
             break;
         }
         default:
@@ -363,9 +363,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
         return;
     }
 
-    // Volume fraction to introduce during this timestep
-    const scalar volFraction = volumeFraction(newVolume);
-
     // Duration of injection period during this timestep
     const scalar deltaT =
         max(0.0, min(carrierDt, min(time - SOI_, timeEnd() - time0_)));
@@ -418,7 +415,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                     (
                         newParcels,
                         newVolume,
-                        volFraction,
                         pPtr->d(),
                         pPtr->rho()
                     );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index ad42a27030..dc3b9ff61b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -113,8 +113,8 @@ protected:
             //- Start of injection [s]
             const scalar SOI_;
 
-            //- Total volume of parcels to introduce [m^3]
-            //  Initialised in the individual injection models
+            //- Total volume of particles introduced by this injector [m^3]
+            //  - scaled to ensure massTotal is achieved
             scalar volumeTotal_;
 
             //- Total mass to inject [kg]
@@ -183,7 +183,6 @@ protected:
         (
             const label parcels,
             const scalar volume,
-            const scalar volumeFraction,
             const scalar diameter,
             const scalar rho
         );
@@ -290,9 +289,6 @@ public:
             template<class TrackData>
             void inject(TrackData& td);
 
-            //- Return the volume fraction to introduce
-            inline scalar volumeFraction(const scalar volume) const;
-
 
         // Injection geometry
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
index 80a142816c..716208c092 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
@@ -96,14 +96,4 @@ Foam::label Foam::InjectionModel<CloudType>::parcelsAddedTotal() const
 }
 
 
-template<class CloudType>
-Foam::scalar Foam::InjectionModel<CloudType>::volumeFraction
-(
-    const scalar volume
-) const
-{
-    return volume/volumeTotal_;
-}
-
-
 // ************************************************************************* //
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
index abe193ce73..37a40ebaae 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
@@ -26,13 +26,9 @@ License
 
 #include "MeshedSurfaceIOAllocator.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-
 Foam::MeshedSurfaceIOAllocator::MeshedSurfaceIOAllocator
 (
     const IOobject& ioPoints,
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
index d3b6d5ff6a..3e9eec778f 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
@@ -63,6 +63,7 @@ class MeshedSurfaceIOAllocator
         //- Surface zones
         surfZoneIOList zones_;
 
+
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -71,6 +72,7 @@ class MeshedSurfaceIOAllocator
         //- Disallow default bitwise assignment
         void operator=(const MeshedSurfaceIOAllocator&);
 
+
 public:
 
     // Constructors
@@ -179,7 +181,6 @@ public:
                 const Xfer< faceList >& faces,
                 const Xfer< surfZoneList >& zones
             );
-
 };
 
 
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
index d9ba96704b..3eb0c9e40d 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
@@ -216,7 +216,6 @@ void Foam::MeshedSurfaceProxy<Face>::write
 }
 
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Face>
@@ -242,20 +241,4 @@ Foam::MeshedSurfaceProxy<Face>::~MeshedSurfaceProxy()
 {}
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
index 64fc7c4fcd..776c68372f 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
@@ -76,13 +76,14 @@ class MeshedSurfaceProxy
 
         const List<label>& faceMap_;
 
+
 public:
 
+    // Static
+
         //- Runtime type information
         ClassName("MeshedSurfaceProxy");
 
-    // Static
-
         //- The file format types that can be written via MeshedSurfaceProxy
         static wordHashSet writeTypes();
 
@@ -101,6 +102,7 @@ public:
             const List<label>& faceMap = List<label>()
         );
 
+
     // Destructor
 
         virtual ~MeshedSurfaceProxy();
@@ -127,53 +129,50 @@ public:
 
     // Member Functions
 
-    // Access
+        // Access
 
-        //- Return const access to the points
-        inline const pointField& points() const
-        {
-            return points_;
-        }
+            //- Return const access to the points
+            inline const pointField& points() const
+            {
+                return points_;
+            }
 
-        //- Return const access to the faces
-        inline const List<Face>& faces() const
-        {
-            return faces_;
-        }
+            //- Return const access to the faces
+            inline const List<Face>& faces() const
+            {
+                return faces_;
+            }
 
-        //- Const access to the surface zones.
-        //  If zones are defined, they must be contiguous and cover the entire
-        //  surface.
-        inline const List<surfZone>& surfZones() const
-        {
-            return zones_;
-        }
+            //- Const access to the surface zones.
+            //  If zones are defined, they must be contiguous and cover the
+            //  entire surface
+            inline const List<surfZone>& surfZones() const
+            {
+                return zones_;
+            }
 
-        //- Const access to the faceMap, zero-sized when unused
-        inline const List<label>& faceMap() const
-        {
-            return faceMap_;
-        }
+            //- Const access to the faceMap, zero-sized when unused
+            inline const List<label>& faceMap() const
+            {
+                return faceMap_;
+            }
 
-        //- Use faceMap?
-        inline bool useFaceMap() const
-        {
-            return faceMap_.size() == faces_.size();
-        }
+            //- Use faceMap?
+            inline bool useFaceMap() const
+            {
+                return faceMap_.size() == faces_.size();
+            }
 
-    // Write
+        // Write
 
-        //- Generic write routine. Chooses writer based on extension.
-        virtual void write(const fileName& name) const
-        {
-            write(name, *this);
-        }
-
-        //- Write to database
-        virtual void write(const Time&, const word& surfName = "") const;
-
-    //??        void writeStats(Ostream& os) const;
+            //- Generic write routine. Chooses writer based on extension.
+            virtual void write(const fileName& name) const
+            {
+                write(name, *this);
+            }
 
+            //- Write to database
+            virtual void write(const Time&, const word& surfName = "") const;
 };
 
 
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 881f73ebae..98397284b9 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -33,8 +33,6 @@ License
 #include "polyBoundaryMesh.H"
 #include "polyMesh.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 template<class Face>
@@ -301,10 +299,6 @@ Foam::UnsortedMeshedSurface<Face>::~UnsortedMeshedSurface()
 {}
 
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-
-
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class Face>
@@ -694,7 +688,6 @@ Foam::UnsortedMeshedSurface<Face>::xfer()
 }
 
 
-
 // Read from file, determine format from extension
 template<class Face>
 bool Foam::UnsortedMeshedSurface<Face>::read(const fileName& name)
@@ -773,11 +766,6 @@ Foam::MeshedSurfaceProxy<Face>() const
 }
 
 
-
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "UnsortedMeshedSurfaceNew.C"
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index 7a272240d1..bb4fa01b37 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -91,6 +91,7 @@ private:
         typedef MeshedSurface<Face>       FriendType;
         typedef MeshedSurfaceProxy<Face>  ProxyType;
 
+
     // Private Member Data
 
         //- The zone Id associated with each face
@@ -100,6 +101,7 @@ private:
         //  during reading and writing)
         List<surfZoneIdentifier> zoneToc_;
 
+
     // Private member functions
 
         //- Disable resize with value
@@ -111,6 +113,7 @@ private:
         //- Read OpenFOAM Surface format
         bool read(Istream&);
 
+
 protected:
 
     // Protected Member functions
@@ -130,11 +133,13 @@ protected:
         //- Set new zones from faceMap
         virtual void remapFaces(const UList<label>& faceMap);
 
+
 public:
 
         //- Runtime type information
         TypeName("UnsortedMeshedSurface");
 
+
     // Static
 
         //- Can we read this file format?
@@ -149,6 +154,7 @@ public:
         static wordHashSet readTypes();
         static wordHashSet writeTypes();
 
+
     // Constructors
 
         //- Construct null
@@ -198,6 +204,7 @@ public:
         //- Construct from objectRegistry and a named surface
         UnsortedMeshedSurface(const Time&, const word& surfName="");
 
+
     // Declare run-time constructor selection table
 
         declareRunTimeSelectionTable
@@ -211,6 +218,7 @@ public:
             (name)
         );
 
+
     // Selectors
 
         //- Select constructed from filename (explicit extension)
@@ -223,6 +231,7 @@ public:
         //- Select constructed from filename (implicit extension)
         static autoPtr<UnsortedMeshedSurface> New(const fileName&);
 
+
     // Destructor
 
         virtual ~UnsortedMeshedSurface();
@@ -249,120 +258,119 @@ public:
 
     // Member Functions
 
-    // Access
+        // Access
 
-        //- The surface size is the number of faces
-        label size() const
-        {
-            return ParentType::size();
-        }
+            //- The surface size is the number of faces
+            label size() const
+            {
+                return ParentType::size();
+            }
 
-        //- Reset size of face and zone list
-        void setSize(const label);
+            //- Reset size of face and zone list
+            void setSize(const label);
 
-        //- Return const access to the zone ids
-        const List<label>& zoneIds() const
-        {
-            return zoneIds_;
-        }
+            //- Return const access to the zone ids
+            const List<label>& zoneIds() const
+            {
+                return zoneIds_;
+            }
 
-        //- Return const access to the zone table-of-contents
-        const List<surfZoneIdentifier>& zoneToc() const
-        {
-            return zoneToc_;
-        }
+            //- Return const access to the zone table-of-contents
+            const List<surfZoneIdentifier>& zoneToc() const
+            {
+                return zoneToc_;
+            }
 
-        //- Sort faces according to zoneIds
-        //  Returns a surfZoneList and sets faceMap to index within faces()
-        surfZoneList sortedZones(labelList& faceMap) const;
+            //- Sort faces according to zoneIds
+            //  Returns a surfZoneList and sets faceMap to index within faces()
+            surfZoneList sortedZones(labelList& faceMap) const;
 
-        //- Set zones to 0 and set a single zone
-        void setOneZone();
+            //- Set zones to 0 and set a single zone
+            void setOneZone();
 
-        //- Set zone ids and zones
-        void setZones(const surfZoneList&);
+            //- Set zone ids and zones
+            void setZones(const surfZoneList&);
 
-        //- Set zone ids and zones
-        void setZones(const UList<label>& sizes, const UList<word>& names);
+            //- Set zone ids and zones
+            void setZones(const UList<label>& sizes, const UList<word>& names);
 
-        //- Set zone ids and zones with default names
-        void setZones(const UList<label>& sizes);
+            //- Set zone ids and zones with default names
+            void setZones(const UList<label>& sizes);
 
 
-    // Edit
+        // Edit
 
-        //- Clear all storage
-        virtual void clear();
+            //- Clear all storage
+            virtual void clear();
 
-        //- Return new surface.
-        //  Returns return pointMap, faceMap from subsetMeshMap
-        UnsortedMeshedSurface subsetMesh
-        (
-            const labelHashSet& include,
-            labelList& pointMap,
-            labelList& faceMap
-        ) const;
+            //- Return new surface.
+            //  Returns return pointMap, faceMap from subsetMeshMap
+            UnsortedMeshedSurface subsetMesh
+            (
+                const labelHashSet& include,
+                labelList& pointMap,
+                labelList& faceMap
+            ) const;
 
-        //- Return new surface.
-        UnsortedMeshedSurface subsetMesh
-        (
-            const labelHashSet& include
-        ) const;
+            //- Return new surface.
+            UnsortedMeshedSurface subsetMesh
+            (
+                const labelHashSet& include
+            ) const;
 
-        //- Transfer components (points, faces, zone ids).
-        virtual void reset
-        (
-            const Xfer< pointField >&,
-            const Xfer< List<Face> >&,
-            const Xfer< List<label> >& zoneIds
-        );
+            //- Transfer components (points, faces, zone ids).
+            virtual void reset
+            (
+                const Xfer< pointField >&,
+                const Xfer< List<Face> >&,
+                const Xfer< List<label> >& zoneIds
+            );
 
-        //- Transfer components (points, faces, zone ids).
-        virtual void reset
-        (
-            const Xfer< List<point> >&,
-            const Xfer< List<Face> >&,
-            const Xfer< List<label> >& zoneIds
-        );
+            //- Transfer components (points, faces, zone ids).
+            virtual void reset
+            (
+                const Xfer< List<point> >&,
+                const Xfer< List<Face> >&,
+                const Xfer< List<label> >& zoneIds
+            );
 
-        //- Transfer the contents of the argument and annull the argument
-        void transfer(UnsortedMeshedSurface<Face>&);
+            //- Transfer the contents of the argument and annull the argument
+            void transfer(UnsortedMeshedSurface<Face>&);
 
-        //- Transfer the contents of the argument and annull the argument
-        void transfer(MeshedSurface<Face>&);
+            //- Transfer the contents of the argument and annull the argument
+            void transfer(MeshedSurface<Face>&);
 
-        //- Transfer contents to the Xfer container
-        Xfer< UnsortedMeshedSurface<Face> > xfer();
+            //- Transfer contents to the Xfer container
+            Xfer< UnsortedMeshedSurface<Face> > xfer();
 
 
-    // Read
+        // Read
 
-        //- Read from file. Chooses reader based on explicit extension
-        bool read(const fileName&, const word& ext);
+            //- Read from file. Chooses reader based on explicit extension
+            bool read(const fileName&, const word& ext);
 
-        //- Read from file. Chooses reader based on detected extension
-        virtual bool read(const fileName&);
+            //- Read from file. Chooses reader based on detected extension
+            virtual bool read(const fileName&);
 
 
-    // Write
+        // Write
 
-        //- Generic write routine. Chooses writer based on extension.
-        virtual void write(const fileName& name) const
-        {
-            write(name, *this);
-        }
+            //- Generic write routine. Chooses writer based on extension.
+            virtual void write(const fileName& name) const
+            {
+                write(name, *this);
+            }
 
-        //- Write to database
-        void write(const Time&, const word& surfName="") const;
+            //- Write to database
+            void write(const Time&, const word& surfName="") const;
 
 
-    // Member operators
+        // Member operators
 
-        void operator=(const UnsortedMeshedSurface<Face>&);
-
-        //- Conversion operator to MeshedSurfaceProxy
-        operator MeshedSurfaceProxy<Face>() const;
+            void operator=(const UnsortedMeshedSurface<Face>&);
 
+            //- Conversion operator to MeshedSurfaceProxy
+            operator MeshedSurfaceProxy<Face>() const;
 };
 
 
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
index 222acc4055..44f4dcd4de 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
@@ -28,7 +28,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
 template<class Face>
 Foam::autoPtr< Foam::UnsortedMeshedSurface<Face> >
 Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
@@ -68,7 +67,7 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
             "(const fileName&, const word&) : "
             "constructing UnsortedMeshedSurface"
         )   << "Unknown file extension " << ext << nl << nl
-            << "Valid types are :" << nl
+            << "Valid types are:" << nl
             << supported
             << exit(FatalError);
     }
@@ -90,4 +89,5 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name)
     return New(name, ext);
 }
 
+
 // ************************************************************************* //
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H
index dabde60b7a..331b8e583d 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H
@@ -31,6 +31,8 @@ License
 
 namespace Foam
 {
+
+// Forward declaration of classes
 class face;
 class triFace;
 
diff --git a/src/surfMesh/surfFields/surfFields/surfGeoMesh.H b/src/surfMesh/surfFields/surfFields/surfGeoMesh.H
index 8ced148e4f..246d5f1cff 100644
--- a/src/surfMesh/surfFields/surfFields/surfGeoMesh.H
+++ b/src/surfMesh/surfFields/surfFields/surfGeoMesh.H
@@ -76,7 +76,6 @@ public:
         {
             return size(mesh_);
         }
-
 };
 
 
diff --git a/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H b/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H
index 188b3dd6bd..4565908a9c 100644
--- a/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H
+++ b/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H
@@ -76,7 +76,6 @@ public:
         {
             return size(mesh_);
         }
-
 };
 
 
diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C
index 1f2d35a54f..71f6fd82c4 100644
--- a/src/surfMesh/surfMesh/surfMesh.C
+++ b/src/surfMesh/surfMesh/surfMesh.C
@@ -70,7 +70,6 @@ Foam::word Foam::surfMesh::meshSubDir = "surfMesh";
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-
 Foam::surfMesh::surfMesh(const IOobject& io, const word& surfName)
 :
     surfaceRegistry(io.db(), (surfName.size() ? surfName : io.name())),
@@ -215,6 +214,7 @@ Foam::surfMesh::surfMesh
     }
 }
 
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::surfMesh::~surfMesh()
@@ -271,7 +271,6 @@ void Foam::surfMesh::resetPrimitives
 }
 
 
-
 void Foam::surfMesh::transfer
 (
     MeshedSurface<face>& surf
@@ -330,21 +329,25 @@ Foam::label Foam::surfMesh::nPoints() const
     return this->points().size();
 }
 
+
 Foam::label Foam::surfMesh::nFaces() const
 {
     return this->faces().size();
 }
 
+
 const Foam::pointField& Foam::surfMesh::points() const
 {
     return this->storedIOPoints();
 }
 
+
 const Foam::faceList& Foam::surfMesh::faces() const
 {
     return this->storedIOFaces();
 }
 
+
 void Foam::surfMesh::checkZones()
 {
     // extra safety, ensure we have at some zones
diff --git a/src/surfMesh/surfMesh/surfMesh.H b/src/surfMesh/surfMesh/surfMesh.H
index 234971788a..3215bfd345 100644
--- a/src/surfMesh/surfMesh/surfMesh.H
+++ b/src/surfMesh/surfMesh/surfMesh.H
@@ -96,9 +96,6 @@ private:
         MeshReference;
 
 
-    // Permanent data
-
-
     // Private member functions
 
         //- Disallow construct as copy
@@ -107,6 +104,7 @@ private:
         //- Disallow default bitwise assignment
         void operator=(const surfMesh&);
 
+
 protected:
 
     // Protected Member Functions
@@ -129,7 +127,6 @@ protected:
             return Allocator::storedIOZones();
         }
 
-
         //- Update references to storedFaces
         virtual void updateFacesRef();
 
@@ -139,6 +136,7 @@ protected:
         //- Update references to storedPoints/storedFaces
         virtual void updateRefs();
 
+
 public:
 
     // Public typedefs
@@ -178,6 +176,7 @@ public:
             const word& surfName=""
         );
 
+
     // Destructor
 
         virtual ~surfMesh();
diff --git a/src/surfMesh/surfMesh/surfMeshIO.C b/src/surfMesh/surfMesh/surfMeshIO.C
index f9c44dc8ba..c74b1c693e 100644
--- a/src/surfMesh/surfMesh/surfMeshIO.C
+++ b/src/surfMesh/surfMesh/surfMeshIO.C
@@ -203,6 +203,4 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
 }
 
 
-
-
 // ************************************************************************* //
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.C b/src/surfMesh/surfZone/surfZone/surfZone.C
index b10d1737c6..3551a86fbd 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.C
+++ b/src/surfMesh/surfZone/surfZone/surfZone.C
@@ -45,7 +45,6 @@ Foam::surfZone::surfZone()
 {}
 
 
-
 Foam::surfZone::surfZone
 (
     const word& name,
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.H b/src/surfMesh/surfZone/surfZone/surfZone.H
index f5ea6ec1fa..bfe6be604c 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.H
+++ b/src/surfMesh/surfZone/surfZone/surfZone.H
@@ -73,6 +73,7 @@ class surfZone
         //- Start label of this group in the face list
         label start_;
 
+
 public:
 
     //- Runtime type information
@@ -167,6 +168,7 @@ public:
         //- compare.
         bool operator==(const surfZone&) const;
 
+
     // IOstream Operators
 
         friend Istream& operator>>(Istream&, surfZone&);
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
index 0cda4e3069..3cd8b112bf 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
@@ -153,9 +153,4 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const surfZoneIOList& L)
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
index a386f65fab..268cbd1aa7 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
@@ -57,9 +57,6 @@ class surfZoneIOList
     public surfZoneList,
     public regIOobject
 {
-    // Private data
-
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -86,6 +83,7 @@ public:
         //- Construct from IOobject and surfZoneList
         surfZoneIOList(const IOobject&, const Xfer<surfZoneList>&);
 
+
     // Destructor
 
         ~surfZoneIOList();
@@ -97,12 +95,6 @@ public:
         bool writeData(Ostream&) const;
 
 
-    // Member Operators
-
-    // Friend Functions
-
-    // Friend Operators
-
     // IOstream Operators
 
         friend Ostream& operator<<(Ostream&, const surfZoneIOList&);
diff --git a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C
index 1149bfded3..67fc51f5ec 100644
--- a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C
+++ b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C
@@ -27,8 +27,6 @@ License
 #include "surfZoneIdentifier.H"
 #include "dictionary.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::surfZoneIdentifier::surfZoneIdentifier()
@@ -77,6 +75,7 @@ Foam::surfZoneIdentifier::surfZoneIdentifier
     geometricType_(p.geometricType())
 {}
 
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::surfZoneIdentifier::~surfZoneIdentifier()
@@ -136,4 +135,5 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const surfZoneIdentifier& p)
     return os;
 }
 
+
 // ************************************************************************* //
diff --git a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
index 7b87c3dd30..a2576bc392 100644
--- a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
+++ b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
@@ -72,6 +72,7 @@ class surfZoneIdentifier
         //- Type name of zone
         mutable word geometricType_;
 
+
 public:
 
     // Constructors
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
index 13066c9f67..f7c63278f5 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
@@ -30,11 +30,6 @@ License
 #include "tensor.H"
 #include "primitivePatch.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Face>
@@ -46,6 +41,7 @@ Foam::fileFormats::AC3DsurfaceFormat<Face>::AC3DsurfaceFormat
     read(filename);
 }
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Face>
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
index 0334538220..52f5ba1620 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
@@ -73,6 +73,7 @@ class AC3DsurfaceFormat
         //- Disallow default bitwise assignment
         void operator=(const AC3DsurfaceFormat<Face>&);
 
+
 public:
 
     // Constructors
@@ -80,6 +81,7 @@ public:
         //- Construct from file name
         AC3DsurfaceFormat(const fileName&);
 
+
     // Selectors
 
         //- Read file and return surface
@@ -91,6 +93,7 @@ public:
             );
         }
 
+
     // Destructor
 
         virtual ~AC3DsurfaceFormat()
@@ -105,7 +108,6 @@ public:
         //- Write UnsortedMeshedSurface, the output is always sorted by zones.
         static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
 
-
         //- Read from file
         virtual bool read(const fileName&);
 
@@ -114,7 +116,6 @@ public:
         {
             write(name, MeshedSurfaceProxy<Face>(*this));
         }
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C
index ef2860cd3c..54068ce85d 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C
@@ -29,8 +29,6 @@ License
 #include "IFstream.H"
 #include "IStringStream.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 bool Foam::fileFormats::AC3DsurfaceFormatCore::readCmd
@@ -156,6 +154,5 @@ void Foam::fileFormats::AC3DsurfaceFormatCore::writeHeader
         << "kids " << zoneLst.size() << endl;
 }
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
index 1c3e5dc828..c210db4ccc 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
@@ -55,30 +55,30 @@ namespace fileFormats
 class AC3DsurfaceFormatCore
 {
 protected:
+
     // Protected Member Functions
 
-    //- Read a type via IStringStream
-    template<class Type>
-    static Type parse(const string&);
+        //- Read a type via IStringStream
+        template<class Type>
+        static Type parse(const string&);
 
-    //- Read cmd, args from IFstream
-    static bool readCmd(IFstream&, string& cmd, string& args);
+        //- Read cmd, args from IFstream
+        static bool readCmd(IFstream&, string& cmd, string& args);
 
-    //- Cue up to cmd, reading args
-    static bool cueTo(IFstream&, const string& cmd, string& args);
+        //- Cue up to cmd, reading args
+        static bool cueTo(IFstream&, const string& cmd, string& args);
 
-    //- Cue up to cmd, reading args or exit with a FatalError
-    //  returns the command args
-    static string cueToOrDie
-    (
-        IFstream&,
-        const string& cmd,
-        const string& errorMsg=string::null
-    );
-
-    //- Write header with materials
-    static void writeHeader(Ostream&, const UList<surfZone>&);
+        //- Cue up to cmd, reading args or exit with a FatalError
+        //  returns the command args
+        static string cueToOrDie
+        (
+            IFstream&,
+            const string& cmd,
+            const string& errorMsg=string::null
+        );
 
+        //- Write header with materials
+        static void writeHeader(Ostream&, const UList<surfZone>&);
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCoreTemplates.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCoreTemplates.C
index 572d8455f7..13a5b65fb8 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCoreTemplates.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCoreTemplates.C
@@ -39,6 +39,5 @@ Type Foam::fileFormats::AC3DsurfaceFormatCore::parse(const string& s)
     return t;
 }
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatRunTime.C
index 05bf9d0ffa..268078df09 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
index 372427f4ad..d0ccd5a66f 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
@@ -28,8 +28,6 @@ License
 #include "Keyed.H"
 #include "IFstream.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Face>
@@ -101,4 +99,5 @@ bool Foam::fileFormats::FTRsurfaceFormat<Face>::read
     return true;
 }
 
+
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
index 25883d4eb3..767bf19707 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
@@ -82,6 +82,7 @@ class FTRsurfaceFormat
             }
         };
 
+
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -90,6 +91,7 @@ class FTRsurfaceFormat
         //- Disallow default bitwise assignment
         void operator=(const FTRsurfaceFormat<Face>&);
 
+
 public:
 
     // Constructors
@@ -97,6 +99,7 @@ public:
         //- Construct from file name
         FTRsurfaceFormat(const fileName&);
 
+
     // Selectors
 
         //- Read file and return surface
@@ -119,7 +122,6 @@ public:
 
         //- Read from file
         virtual bool read(const fileName&);
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormatRunTime.C
index e52c952b9d..58e28e1169 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
index a8b70d864e..86fbd61cd9 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
@@ -32,10 +32,6 @@ License
 #include "Ostream.H"
 #include "OFstream.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Face>
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
index 91ef7227c7..49711abac4 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
@@ -66,6 +66,7 @@ class GTSsurfaceFormat
         //- Disallow default bitwise assignment
         void operator=(const GTSsurfaceFormat<Face>&);
 
+
 public:
 
     // Constructors
@@ -73,6 +74,7 @@ public:
         //- Construct from file name
         GTSsurfaceFormat(const fileName&);
 
+
     // Selectors
 
         //- Read file and return surface
@@ -84,9 +86,11 @@ public:
             );
         }
 
-    // Destructor
-        virtual ~GTSsurfaceFormat()
-        {}
+
+    //- Destructor
+    virtual ~GTSsurfaceFormat()
+    {}
+
 
     // Member Functions
 
@@ -96,7 +100,6 @@ public:
         //- Write UnsortedMeshedSurface, the output remains unsorted
         static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
 
-
         //- Read from file
         virtual bool read(const fileName&);
 
@@ -105,7 +108,6 @@ public:
         {
             write(name, *this);
         }
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormatRunTime.C
index d3268962d2..5cc1fa2af0 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index 4933afa9d4..092b0696cd 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -28,11 +28,6 @@ License
 #include "IFstream.H"
 #include "IStringStream.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Face>
@@ -393,4 +388,5 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
     return true;
 }
 
+
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
index 46ea1e59c3..bf57a568a5 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
@@ -74,6 +74,7 @@ class NASsurfaceFormat
         //- Disallow default bitwise assignment
         void operator=(const NASsurfaceFormat<Face>&);
 
+
 public:
 
     // Constructors
@@ -81,6 +82,7 @@ public:
         //- Construct from file name
         NASsurfaceFormat(const fileName&);
 
+
     // Selectors
 
         //- Read file and return surface
@@ -92,16 +94,17 @@ public:
             );
         }
 
+
     // Destructor
 
         virtual ~NASsurfaceFormat()
         {}
 
+
     // Member Functions
 
         //- Read from a file
         virtual bool read(const fileName&);
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.C
index af182980ba..97b6a9ae40 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.C
@@ -27,8 +27,6 @@ License
 #include "NASsurfaceFormatCore.H"
 #include "IStringStream.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // Do weird things to extract a floating point number
@@ -56,7 +54,5 @@ Foam::scalar Foam::fileFormats::NASsurfaceFormatCore::parseNASCoord
     }
 }
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
 
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.H
index b9a3500432..2c7b32d781 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.H
@@ -53,11 +53,11 @@ namespace fileFormats
 class NASsurfaceFormatCore
 {
 protected:
+
     // Protected Member Functions
 
-    //- Do weird things to extract number
-    static scalar parseNASCoord(const string&);
-
+        //- Do weird things to extract number
+        static scalar parseNASCoord(const string&);
 };
 
 
@@ -68,8 +68,6 @@ protected:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatRunTime.C
index 7bebc54830..ac79c54358 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index 47ae2122eb..df10f47d43 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -32,8 +32,6 @@ License
 #include "OFstream.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Face>
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
index 424074b0f0..2489d2f988 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
@@ -66,6 +66,7 @@ class OBJsurfaceFormat
         //- Disallow default bitwise assignment
         void operator=(const OBJsurfaceFormat<Face>&);
 
+
 public:
 
     // Constructors
@@ -73,6 +74,7 @@ public:
         //- Construct from file name
         OBJsurfaceFormat(const fileName&);
 
+
     // Selectors
 
         //- Read file and return surface
@@ -84,6 +86,7 @@ public:
             );
         }
 
+
     // Destructor
 
         virtual ~OBJsurfaceFormat()
@@ -103,7 +106,6 @@ public:
         {
             write(name, MeshedSurfaceProxy<Face>(*this));
         }
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormatRunTime.C
index 6c6789a3ad..509b70ebb4 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
index 531e599f25..bb423f5ddd 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
@@ -31,10 +31,6 @@ License
 #include "Ostream.H"
 #include "OFstream.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Face>
@@ -214,7 +210,7 @@ void Foam::fileFormats::OFFsurfaceFormat<Face>::write
     {
         os << "# <zone name=\"" << zoneLst[zoneI].name() << "\">" << endl;
 
-        if (surf.useFaceMap()) 
+        if (surf.useFaceMap())
         {
             forAll(zoneLst[zoneI], localFaceI)
             {
@@ -245,7 +241,7 @@ void Foam::fileFormats::OFFsurfaceFormat<Face>::write
                 // add optional zone information
                 os << ' ' << zoneI << endl;
             }
-        }        
+        }
         os << "# </zone>" << endl;
     }
     os << "# </faces>" << endl;
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
index bc3f608add..c627ce38a8 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
@@ -74,6 +74,7 @@ class OFFsurfaceFormat
         //- Disallow default bitwise assignment
         void operator=(const OFFsurfaceFormat&);
 
+
 public:
 
     // Constructors
@@ -81,6 +82,7 @@ public:
         //- Construct from file name
         OFFsurfaceFormat(const fileName&);
 
+
     // Selectors
 
         //- Read file and return surface
@@ -92,16 +94,17 @@ public:
             );
         }
 
-    // Destructor
-        virtual ~OFFsurfaceFormat()
-        {}
+
+    //- Destructor
+    virtual ~OFFsurfaceFormat()
+    {}
+
 
     // Member Functions
 
         //- Write surface mesh components by proxy
         static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
 
-
         //- Read from file
         virtual bool read(const fileName&);
 
@@ -110,7 +113,6 @@ public:
         {
             write(name, MeshedSurfaceProxy<Face>(*this));
         }
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormatRunTime.C
index 5989f60bf0..6cde8cbdbb 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
index 3368ff3138..1df692c528 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
@@ -29,8 +29,6 @@ License
 #include "IStringStream.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Face>
@@ -257,4 +255,5 @@ void Foam::fileFormats::OFSsurfaceFormat<Face>::write
     os.check("OFSsurfaceFormat<Face>::write(Ostream&)");
 }
 
+
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
index e550d04e7d..5ca5ebd1c4 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
@@ -71,6 +71,7 @@ class OFSsurfaceFormat
         //- Disallow default bitwise assignment
         void operator=(const OFSsurfaceFormat<Face>&);
 
+
 public:
 
     // Constructors
@@ -78,6 +79,7 @@ public:
         //- Construct from file name
         OFSsurfaceFormat(const fileName&);
 
+
     // Selectors
 
         //- Read file and return surface
@@ -89,12 +91,14 @@ public:
             );
         }
 
+
     // Destructor
 
         virtual ~OFSsurfaceFormat()
         {}
 
 
+
     // Member Functions
 
         //- Read surface mesh components
@@ -124,7 +128,6 @@ public:
         //- Write surface mesh components by proxy
         static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
 
-
         //- Read from file
         virtual bool read(const fileName&);
 
@@ -133,7 +136,6 @@ public:
         {
             write(name, MeshedSurfaceProxy<Face>(*this));
         }
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C
index 09b4324f38..a3e1793de4 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C
@@ -27,8 +27,6 @@ License
 #include "OFSsurfaceFormatCore.H"
 #include "clock.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::fileFormats::OFSsurfaceFormatCore::writeHeader
@@ -71,6 +69,4 @@ void Foam::fileFormats::OFSsurfaceFormatCore::writeHeader
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.H
index d9d7ef5cd3..a13bae7526 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.H
@@ -55,16 +55,16 @@ namespace fileFormats
 class OFSsurfaceFormatCore
 {
 protected:
+
     // Protected Member Functions
 
-    //- Write header information and surfZoneList
-    static void writeHeader
-    (
-        Ostream&,
-        const pointField&,
-        const UList<surfZone>&
-    );
-
+        //- Write header information and surfZoneList
+        static void writeHeader
+        (
+            Ostream&,
+            const pointField&,
+            const UList<surfZone>&
+        );
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatRunTime.C
index fc1e609d67..2778510852 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
index c354f4ce5a..085de6d904 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
@@ -30,16 +30,13 @@ License
 #include "OFstream.H"
 #include "Ostream.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Face>
 Foam::fileFormats::SMESHsurfaceFormat<Face>::SMESHsurfaceFormat()
 {}
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Face>
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
index c3a472da3f..b1c54f5e60 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
@@ -70,6 +70,7 @@ class SMESHsurfaceFormat
         //- Disallow default bitwise assignment
         void operator=(const SMESHsurfaceFormat<Face>&);
 
+
 public:
 
     // Constructors
@@ -77,7 +78,6 @@ public:
         //- Construct null
         SMESHsurfaceFormat();
 
-    // Selectors
 
     // Destructor
 
@@ -90,13 +90,11 @@ public:
         //- Write surface mesh components by proxy
         static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
 
-
         //- Write object
         virtual void write(const fileName& name) const
         {
             write(name, MeshedSurfaceProxy<Face>(*this));
         }
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormatRunTime.C
index e985af30ad..77a094bd2b 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
index 0daa6de71b..2f8f48ccd5 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@@ -27,8 +27,6 @@ License
 #include "STARCDsurfaceFormat.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Face>
@@ -73,6 +71,7 @@ Foam::fileFormats::STARCDsurfaceFormat<Face>::STARCDsurfaceFormat
     read(filename);
 }
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Face>
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
index 9bdb435bd7..c799d8ebfa 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
@@ -72,6 +72,7 @@ class STARCDsurfaceFormat
         //- STAR-CD identifier for shell type (shells vs. baffles)
         static const int starcdShellType_  = 4;
 
+
     // Private Member Functions
 
         static inline void writeShell
@@ -88,6 +89,7 @@ class STARCDsurfaceFormat
         //- Disallow default bitwise assignment
         void operator=(const STARCDsurfaceFormat<Face>&);
 
+
 public:
 
     // Constructors
@@ -95,6 +97,7 @@ public:
         //- Construct from file name
         STARCDsurfaceFormat(const fileName&);
 
+
     // Selectors
 
         //- Read file and return surface
@@ -106,9 +109,10 @@ public:
             );
         }
 
-    // Destructor
-        virtual ~STARCDsurfaceFormat()
-        {}
+
+    //- Destructor
+    virtual ~STARCDsurfaceFormat()
+    {}
 
 
     // Member Functions
@@ -116,7 +120,6 @@ public:
         //- Write surface mesh components by proxy
         static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
 
-
         //- Read from file
         virtual bool read(const fileName&);
 
@@ -125,7 +128,6 @@ public:
         {
             write(name, MeshedSurfaceProxy<Face>(*this));
         }
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
index ab052f5229..5777dcb73c 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
@@ -28,8 +28,6 @@ License
 #include "clock.H"
 #include "IStringStream.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 bool Foam::fileFormats::STARCDsurfaceFormatCore::readHeader
@@ -193,7 +191,6 @@ void Foam::fileFormats::STARCDsurfaceFormatCore::writeCase
     os.flush();
 }
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 // ************************************************************************* //
 
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H
index 42d5cc077e..883a393047 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H
@@ -55,6 +55,7 @@ namespace fileFormats
 class STARCDsurfaceFormatCore
 {
 protected:
+
     // Protected Member Functions
 
     static bool readHeader(IFstream&, const word&);
@@ -72,7 +73,6 @@ protected:
         const label nFaces,
         const UList<surfZone>&
     );
-
 };
 
 
@@ -83,8 +83,6 @@ protected:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C
index 5affcb9960..a65d690ca2 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/stl/STLpoint.H b/src/surfMesh/surfaceFormats/stl/STLpoint.H
index a92c56fc8d..98a3c309f7 100644
--- a/src/surfMesh/surfaceFormats/stl/STLpoint.H
+++ b/src/surfMesh/surfaceFormats/stl/STLpoint.H
@@ -87,7 +87,6 @@ public:
         {
             return point(x(), y(), z());
         }
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
index 2f9d54371a..af3f3fff81 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
@@ -28,8 +28,6 @@ License
 #include "ListOps.H"
 #include "triPointRef.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Face>
@@ -441,6 +439,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeBinary
     }
 }
 
+
 template<class Face>
 void Foam::fileFormats::STLsurfaceFormat<Face>::write
 (
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
index ada49101ae..4e2de920c4 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
@@ -86,6 +86,8 @@ class STLsurfaceFormat
 
         //- Disallow default bitwise assignment
         void operator=(const STLsurfaceFormat<Face>&);
+
+
 public:
 
     // Constructors
@@ -93,6 +95,7 @@ public:
         //- Construct from file name
         STLsurfaceFormat(const fileName&);
 
+
     // Selectors
 
         //- Read file and return surface
@@ -104,9 +107,11 @@ public:
             );
         }
 
-    // Destructor
-        virtual ~STLsurfaceFormat()
-        {}
+
+    //- Destructor
+    virtual ~STLsurfaceFormat()
+    {}
+
 
     // Member Functions
 
@@ -146,7 +151,6 @@ public:
         //  as ASCII or BINARY, depending on the extension
         static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
 
-
         //- Read from file
         virtual bool read(const fileName&);
 
@@ -155,7 +159,6 @@ public:
         {
             write(name, MeshedSurfaceProxy<Face>(*this));
         }
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
index f9d052d6ac..887fed0fd9 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
@@ -33,8 +33,6 @@ License
 
 #undef DEBUG_STLBINARY
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // check binary by getting the header and number of facets
@@ -276,4 +274,5 @@ void Foam::fileFormats::STLsurfaceFormatCore::writeHeaderBINARY
 
 }
 
+
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
index 7e4fe94e8a..ee2308a820 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
@@ -71,6 +71,7 @@ class STLsurfaceFormatCore
         //- The solid count, in the order of their first appearance
         List<label> sizes_;
 
+
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -88,6 +89,7 @@ class STLsurfaceFormatCore
         //- Read BINARY
         bool readBINARY(istream&, const off_t);
 
+
 public:
 
     // Static Data
@@ -95,20 +97,24 @@ public:
         //- The number of bytes in the STL binary header
         static const unsigned int headerSize = 80;
 
+
     // Static Member Functions
 
         //- Write "STL binary file" and number of triangles to stream
         static void writeHeaderBINARY(ostream&, unsigned int);
 
+
     // Constructors
 
         //- Read from file, filling in the information
         STLsurfaceFormatCore(const fileName&);
 
+
     // Destructor
 
         ~STLsurfaceFormatCore();
 
+
     // Member Functions
 
         //- File read was already sorted
@@ -150,7 +156,6 @@ public:
         {
             return sizes_;
         }
-
 };
 
 
@@ -161,8 +166,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatRunTime.C
index 8e78ce7675..2358a4fe85 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/stl/STLtriangle.H b/src/surfMesh/surfaceFormats/stl/STLtriangle.H
index 924f0bb6b7..a5fe9f5640 100644
--- a/src/surfMesh/surfaceFormats/stl/STLtriangle.H
+++ b/src/surfMesh/surfaceFormats/stl/STLtriangle.H
@@ -65,6 +65,7 @@ class STLtriangle
         //- The attribute information could for colour or solid id, etc
         STLattrib attrib_;
 
+
 public:
 
     // Constructors
@@ -96,11 +97,13 @@ public:
             inline const STLpoint& c() const;
             inline unsigned short attrib() const;
 
+
         // Read
 
             //- Read from istream (binary)
             inline void read(istream&);
 
+
         // Write
 
             //- Write to ostream (binary)
diff --git a/src/surfMesh/surfaceFormats/stl/STLtriangleI.H b/src/surfMesh/surfaceFormats/stl/STLtriangleI.H
index 44b2bfe324..ef63c4ea62 100644
--- a/src/surfMesh/surfaceFormats/stl/STLtriangleI.H
+++ b/src/surfMesh/surfaceFormats/stl/STLtriangleI.H
@@ -24,8 +24,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 inline Foam::STLtriangle::STLtriangle()
@@ -62,21 +60,25 @@ inline const Foam::STLpoint& Foam::STLtriangle::normal() const
     return normal_;
 }
 
+
 inline const Foam::STLpoint& Foam::STLtriangle::a() const
 {
     return a_;
 }
 
+
 inline const Foam::STLpoint& Foam::STLtriangle::b() const
 {
     return b_;
 }
 
+
 inline const Foam::STLpoint& Foam::STLtriangle::c() const
 {
     return c_;
 }
 
+
 inline unsigned short Foam::STLtriangle::attrib() const
 {
     return attrib_;
@@ -96,6 +98,7 @@ inline void Foam::STLtriangle::write(ostream& os)
     os.write(reinterpret_cast<char*>(&attrib_), sizeof(STLattrib));
 }
 
+
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 inline Foam::Ostream& Foam::operator<<(Ostream& os, const STLtriangle& t)
@@ -110,6 +113,4 @@ inline Foam::Ostream& Foam::operator<<(Ostream& os, const STLtriangle& t)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
index 3c5a8a7344..497901609f 100644
--- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
+++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
@@ -38,8 +38,7 @@ Foam::word Foam::fileFormats::surfaceFormatsCore::nativeExt("ofs");
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-Foam::string
-Foam::fileFormats::surfaceFormatsCore::getLineNoComment
+Foam::string Foam::fileFormats::surfaceFormatsCore::getLineNoComment
 (
     IFstream& is
 )
@@ -54,9 +53,12 @@ Foam::fileFormats::surfaceFormatsCore::getLineNoComment
     return line;
 }
 
+
 #if 0
-Foam::fileName
-Foam::fileFormats::surfaceFormatsCore::localMeshFileName(const word& surfName)
+Foam::fileName Foam::fileFormats::surfaceFormatsCore::localMeshFileName
+(
+    const word& surfName
+)
 {
     const word name(surfName.size() ? surfName : surfaceRegistry::defaultName);
 
@@ -68,8 +70,7 @@ Foam::fileFormats::surfaceFormatsCore::localMeshFileName(const word& surfName)
 }
 
 
-Foam::fileName
-Foam::fileFormats::surfaceFormatsCore::findMeshInstance
+Foam::fileName Foam::fileFormats::surfaceFormatsCore::findMeshInstance
 (
     const Time& t,
     const word& surfName
@@ -109,8 +110,7 @@ Foam::fileFormats::surfaceFormatsCore::findMeshInstance
 }
 
 
-Foam::fileName
-Foam::fileFormats::surfaceFormatsCore::findMeshFile
+Foam::fileName Foam::fileFormats::surfaceFormatsCore::findMeshFile
 (
     const Time& t,
     const word& surfName
@@ -154,8 +154,7 @@ Foam::fileFormats::surfaceFormatsCore::findMeshFile
 #endif
 
 
-bool
-Foam::fileFormats::surfaceFormatsCore::checkSupport
+bool Foam::fileFormats::surfaceFormatsCore::checkSupport
 (
     const wordHashSet& available,
     const word& ext,
@@ -199,18 +198,4 @@ Foam::fileFormats::surfaceFormatsCore::~surfaceFormatsCore()
 {}
 
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.H b/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
index b23ff26719..83a2203b9d 100644
--- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
+++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
@@ -78,6 +78,7 @@ protected:
         //- Read non-comment line
         static string getLineNoComment(IFstream&);
 
+
 public:
 
     // Static Data
@@ -86,6 +87,7 @@ public:
         //  Normally "ofs" (mnemonic: OF = OpenFOAM, S = Surface)
         static word nativeExt;
 
+
     // Static Member Functions
 
         static bool checkSupport
@@ -96,7 +98,6 @@ public:
             const word& functionName
         );
 
-
         //- Return the local file name (within time directory)
         //  NEEDS FIXING
         static fileName localMeshFileName(const word& surfName="");
@@ -109,28 +110,16 @@ public:
         //  NEEDS FIXING
         static fileName findMeshFile(const Time&, const word& surfName="");
 
+
     // Constructors
 
         //- Construct null
         surfaceFormatsCore();
 
+
     // Destructor
 
         virtual ~surfaceFormatsCore();
-
-    // Member Functions
-
-    // Access
-
-    // Edit
-
-    // Read
-
-    // Write
-
-    // Member operators
-
-    // Ostream Operator
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
index da5d868514..f1db14b73d 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
@@ -27,8 +27,6 @@ License
 #include "TRIsurfaceFormat.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Face>
@@ -235,4 +233,5 @@ void Foam::fileFormats::TRIsurfaceFormat<Face>::write
     }
 }
 
+
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
index 557cb60170..1dce89f5f6 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
@@ -77,6 +77,7 @@ class TRIsurfaceFormat
         //- Disallow default bitwise assignment
         void operator=(const TRIsurfaceFormat<Face>&);
 
+
 public:
 
     // Constructors
@@ -84,6 +85,7 @@ public:
         //- Construct from file name
         TRIsurfaceFormat(const fileName&);
 
+
     // Selectors
 
         //- Read file and return surface
@@ -95,9 +97,11 @@ public:
             );
         }
 
-    // Destructor
-        virtual ~TRIsurfaceFormat()
-        {}
+
+    //- Destructor
+    virtual ~TRIsurfaceFormat()
+    {}
+
 
     // Member Functions
 
@@ -108,7 +112,6 @@ public:
         //  by default the output is not sorted by zones
         static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
 
-
         //- Read from file
         virtual bool read(const fileName&);
 
@@ -117,7 +120,6 @@ public:
         {
             write(name, MeshedSurfaceProxy<Face>(*this));
         }
-
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C
index 8bb4e875e2..a6b9c99912 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C
@@ -30,10 +30,6 @@ License
 #include "IStringStream.H"
 #include "Map.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::fileFormats::TRIsurfaceFormatCore::TRIsurfaceFormatCore
@@ -49,6 +45,7 @@ Foam::fileFormats::TRIsurfaceFormatCore::TRIsurfaceFormatCore
     read(filename);
 }
 
+
 // * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
 
 Foam::fileFormats::TRIsurfaceFormatCore::~TRIsurfaceFormatCore()
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
index 67b4595280..854078d307 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
@@ -71,6 +71,7 @@ class TRIsurfaceFormatCore
         //- The solid count, in the order of their first appearance
         List<label> sizes_;
 
+
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -81,6 +82,7 @@ class TRIsurfaceFormatCore
 
         bool read(const fileName&);
 
+
 public:
 
     // Constructors
@@ -88,10 +90,12 @@ public:
         //- Read from file, filling in the information
         TRIsurfaceFormatCore(const fileName&);
 
+
     // Destructor
 
         ~TRIsurfaceFormatCore();
 
+
     // Member Functions
 
         //- File read was already sorted
@@ -126,7 +130,6 @@ public:
         {
             return sizes_;
         }
-
 };
 
 
@@ -137,8 +140,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatRunTime.C
index 9f333cc4fe..ecce786c53 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index c8a1fbf1db..2b09481030 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -26,9 +26,8 @@ License
 
 #include "VTKsurfaceFormat.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
 template<class Face>
 void Foam::fileFormats::VTKsurfaceFormat<Face>::writeHeaderPolygons
 (
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
index 93e3510ca1..ffd9349b43 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
@@ -70,6 +70,7 @@ class VTKsurfaceFormat
         //- Disallow default bitwise assignment
         void operator=(const VTKsurfaceFormat<Face>&);
 
+
 public:
 
     // Constructors
@@ -77,30 +78,35 @@ public:
         //- Construct null
         VTKsurfaceFormat();
 
-    // Selectors
 
     // Destructor
 
         virtual ~VTKsurfaceFormat()
         {}
 
+
     // Member Functions
 
         // Write
 
-        //- Write surface mesh components by proxy
-        static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
+            //- Write surface mesh components by proxy
+            static void write
+            (
+                const fileName&, const MeshedSurfaceProxy<Face>&
+            );
 
-        //- Write UnsortedMeshedSurface, the output remains unsorted
-        static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
+            //- Write UnsortedMeshedSurface, the output remains unsorted
+            static void write
+            (
+                const fileName&, const UnsortedMeshedSurface<Face>&
+            );
 
 
-        //- Write object
-        virtual void write(Ostream& os) const
-        {
-            write(os, MeshedSurfaceProxy<Face>(*this));
-        }
-
+            //- Write object
+            virtual void write(Ostream& os) const
+            {
+                write(os, MeshedSurfaceProxy<Face>(*this));
+            }
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
index c4059632f1..edd6969bf7 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
@@ -27,8 +27,6 @@ License
 #include "VTKsurfaceFormatCore.H"
 #include "clock.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::fileFormats::VTKsurfaceFormatCore::writeHeader
@@ -127,6 +125,4 @@ void Foam::fileFormats::VTKsurfaceFormatCore::writeTail
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
index d0f6ed1de5..f446e0b4a0 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
@@ -54,21 +54,21 @@ namespace fileFormats
 class VTKsurfaceFormatCore
 {
 protected:
+
     // Protected Member Functions
 
-    //- Write header information with points
-    static void writeHeader
-    (
-        Ostream&,
-        const pointField&
-    );
+        //- Write header information with points
+        static void writeHeader
+        (
+            Ostream&,
+            const pointField&
+        );
 
-    //- Write trailing information with zone information
-    static void writeTail(Ostream&, const UList<surfZone>&);
-
-    //- Write trailing information with zone Ids
-    static void writeTail(Ostream&, const UList<label>& zoneIds);
+        //- Write trailing information with zone information
+        static void writeTail(Ostream&, const UList<surfZone>&);
 
+        //- Write trailing information with zone Ids
+        static void writeTail(Ostream&, const UList<label>& zoneIds);
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatRunTime.C
index bd300b84f7..fc9df8c52a 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
index c17280689e..e141096fbc 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
@@ -30,8 +30,6 @@ License
 #include "OFstream.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Face>
@@ -140,7 +138,6 @@ void Foam::fileFormats::WRLsurfaceFormat<Face>::write
         "  }\n"                        // end Shape
         " ]\n"                         // end children
         "}\n";                         // end Group
-
 }
 
 
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
index d89613d7b6..975cd76bfb 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
@@ -74,8 +74,6 @@ public:
         //- Construct null
         WRLsurfaceFormat();
 
-    // Selectors
-
 
     // Destructor
 
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C
index b5eb87058a..2b8f91bf8c 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C
@@ -27,8 +27,6 @@ License
 #include "WRLsurfaceFormatCore.H"
 #include "clock.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::fileFormats::WRLsurfaceFormatCore::writeHeader
@@ -36,7 +34,7 @@ void Foam::fileFormats::WRLsurfaceFormatCore::writeHeader
     Ostream& os,
     const pointField& pointLst,
     const label nFaces,
-    const UList<surfZone>& zoneLst    
+    const UList<surfZone>& zoneLst
 )
 {
     os  << "#VRML V2.0 utf8" << nl
@@ -52,8 +50,6 @@ void Foam::fileFormats::WRLsurfaceFormatCore::writeHeader
         os  << "#   " << zoneI << "  " << zoneLst[zoneI].name()
             << "  (nFaces: " << zoneLst[zoneI].size() << ")" << nl;
     }
-
-
 }
 
 
@@ -75,6 +71,4 @@ void Foam::fileFormats::WRLsurfaceFormatCore::writeAppearance
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C
index f621be7a98..dc97b93cb9 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
 namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
index f2e5afbcb8..0150168ff9 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
@@ -32,8 +32,6 @@ License
 #include "OFstream.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Face>
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
index 130bb226c8..7bde4dbb23 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
@@ -73,8 +73,6 @@ public:
         //- Construct null
         X3DsurfaceFormat();
 
-    // Selectors
-
 
     // Destructor
 
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C
index 104fb8e5f7..16f11f5810 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C
@@ -27,8 +27,6 @@ License
 #include "X3DsurfaceFormatCore.H"
 #include "clock.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::fileFormats::X3DsurfaceFormatCore::writeHeader
@@ -65,6 +63,4 @@ void Foam::fileFormats::X3DsurfaceFormatCore::writeAppearance
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceRegistry/surfaceRegistry.C b/src/surfMesh/surfaceRegistry/surfaceRegistry.C
index ed0460cdf0..5287d55590 100644
--- a/src/surfMesh/surfaceRegistry/surfaceRegistry.C
+++ b/src/surfMesh/surfaceRegistry/surfaceRegistry.C
@@ -62,7 +62,5 @@ Foam::surfaceRegistry::surfaceRegistry
 Foam::surfaceRegistry::~surfaceRegistry()
 {}
 
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
-
 
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceRegistry/surfaceRegistry.H b/src/surfMesh/surfaceRegistry/surfaceRegistry.H
index 11e0225506..40a38de20b 100644
--- a/src/surfMesh/surfaceRegistry/surfaceRegistry.H
+++ b/src/surfMesh/surfaceRegistry/surfaceRegistry.H
@@ -72,6 +72,7 @@ public:
         //- The default surface name: %default
         static word defaultName;
 
+
     // Constructors
 
         //- Construct for the given objectRegistry and named surface
@@ -81,7 +82,6 @@ public:
     // Destructor
 
         virtual ~surfaceRegistry();
-
 };
 
 
diff --git a/src/thermophysicalModels/radiation/include/createRadiationModel.H b/src/thermophysicalModels/radiation/include/createRadiationModel.H
index d61082c36f..87dd5e52e2 100644
--- a/src/thermophysicalModels/radiation/include/createRadiationModel.H
+++ b/src/thermophysicalModels/radiation/include/createRadiationModel.H
@@ -1,4 +1,3 @@
-    Info<< "Creating radiation model\n" << endl;
     autoPtr<radiation::radiationModel> radiation
     (
         radiation::radiationModel::New(thermo.T())
diff --git a/src/thermophysicalModels/solids/C/C.C b/src/thermophysicalModels/solids/C/C.C
index 1dbcfd2eed..e36eb71870 100644
--- a/src/thermophysicalModels/solids/C/C.C
+++ b/src/thermophysicalModels/solids/C/C.C
@@ -42,9 +42,12 @@ Foam::C::C()
 :
     solid(2010, 710, 0.04, 0.0, 1.0)
 {
-    WarningIn("C::C()")
-        << "Properties of graphite need to be checked!!!"
-        << endl;
+    if (debug)
+    {
+        WarningIn("C::C()")
+            << "Properties of graphite need to be checked!!!"
+            << endl;
+    }
 }
 
 
diff --git a/src/thermophysicalModels/solids/CaCO3/CaCO3.C b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
index 77a4398322..6a84f46c4c 100644
--- a/src/thermophysicalModels/solids/CaCO3/CaCO3.C
+++ b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
@@ -42,9 +42,12 @@ Foam::CaCO3::CaCO3()
 :
     solid(2710, 850, 1.3, 0.0, 1.0)
 {
-    WarningIn("CaCO3::CaCO3()")
-        << "Properties of CaCO3 need to be checked!!!"
-        << endl;
+    if (debug)
+    {
+        WarningIn("CaCO3::CaCO3()")
+            << "Properties of CaCO3 need to be checked!!!"
+            << endl;
+    }
 }
 
 
diff --git a/src/thermophysicalModels/solids/ash/ash.C b/src/thermophysicalModels/solids/ash/ash.C
index c904131aab..e666638d77 100644
--- a/src/thermophysicalModels/solids/ash/ash.C
+++ b/src/thermophysicalModels/solids/ash/ash.C
@@ -42,9 +42,12 @@ Foam::ash::ash()
 :
     solid(2010, 710, 0.04, 0.0, 1.0)
 {
-    WarningIn("ash::ash()")
-        << "Properties of ash need to be checked!!!"
-        << endl;
+    if (debug)
+    {
+        WarningIn("ash::ash()")
+            << "Properties of ash need to be checked!!!"
+            << endl;
+    }
 }
 
 
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
index 32191a8bfc..a0268ea59f 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
@@ -41,19 +41,20 @@ namespace LESModels
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF)
+    fixedValueFvPatchScalarField(p, iF),
+    UName_("U"),
+    rhoName_("rho"),
+    muName_("mu")
 {}
 
 
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 (
     const muSgsWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
@@ -61,52 +62,49 @@ muSgsWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    rhoName_(ptf.rhoName_),
+    muName_(ptf.muName_)
 {}
 
 
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    Istream& is
-)
-:
-    fixedValueFvPatchScalarField(p, iF, is)
-{}
-
-
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict)
+    fixedValueFvPatchScalarField(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu"))
 {}
 
 
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 (
-    const muSgsWallFunctionFvPatchScalarField& tppsf
+    const muSgsWallFunctionFvPatchScalarField& mwfpsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf)
+    fixedValueFvPatchScalarField(mwfpsf),
+    UName_(mwfpsf.UName_),
+    rhoName_(mwfpsf.rhoName_),
+    muName_(mwfpsf.muName_)
 {}
 
 
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 (
-    const muSgsWallFunctionFvPatchScalarField& tppsf,
+    const muSgsWallFunctionFvPatchScalarField& mwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF)
+    fixedValueFvPatchScalarField(mwfpsf, iF),
+    UName_(mwfpsf.UName_),
+    rhoName_(mwfpsf.rhoName_),
+    muName_(mwfpsf.muName_)
 {}
 
 
@@ -125,15 +123,15 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
     const scalarField& ry = patch().deltaCoeffs();
 
     const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     scalarField magUp = mag(U.patchInternalField() - U);
 
     const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>("mu");
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
 
     const scalarField& rhow =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
     scalarField& muSgsw = *this;
 
@@ -143,13 +141,10 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
     {
         scalar magUpara = magUp[facei];
 
-        scalar utau = sqrt
-        (
-            (muSgsw[facei] + muw[facei])
-            *magFaceGradU[facei]/rhow[facei]
-        );
+        scalar utau =
+            sqrt((muSgsw[facei] + muw[facei])*magFaceGradU[facei]/rhow[facei]);
 
-        if(utau > 0)
+        if (utau > 0)
         {
             int iter = 0;
             scalar err = GREAT;
@@ -176,7 +171,11 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
             } while (utau > VSMALL && err > 0.01 && ++iter < 10);
 
             muSgsw[facei] =
-                max(rhow[facei]*sqr(utau)/magFaceGradU[facei] - muw[facei],0.0);
+                max
+                (
+                    rhow[facei]*sqr(utau)/magFaceGradU[facei] - muw[facei],
+                    0.0
+                );
         }
         else
         {
@@ -186,6 +185,16 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
 }
 
 
+void muSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
+    writeEntry("value", os);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePatchTypeField
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
index 916685fd7c..0f55216d51 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
@@ -58,6 +58,15 @@ class muSgsWallFunctionFvPatchScalarField
 {
     // Private data
 
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of density field
+        word rhoName_;
+
+        //- Name of laminar viscosity field
+        word muName_;
+
 
 public:
 
@@ -74,14 +83,6 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct from patch, internal field and Istream
-        muSgsWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            Istream&
-        );
-
         //- Construct from patch, internal field and dictionary
         muSgsWallFunctionFvPatchScalarField
         (
@@ -149,6 +150,11 @@ public:
             (
                 const Pstream::commsTypes commsType=Pstream::blocking
             );
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index 133026c0bd..7673f8a887 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -229,10 +229,10 @@ LRR::LRR
             << exit(FatalError);
     }
 
-    mut_ == Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
     mut_.correctBoundaryConditions();
 
-    alphat_ == mut_/Prt_;
+    alphat_ = mut_/Prt_;
     alphat_.correctBoundaryConditions();
 
     printCoeffs();
@@ -418,7 +418,7 @@ void LRR::correct()
 
 
     // Re-calculate viscosity
-    mut_ == rho_*Cmu_*sqr(k_)/epsilon_;
+    mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
     mut_.correctBoundaryConditions();
 
     // Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index ee2edcb55e..08a5e0176b 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -27,8 +27,6 @@ License
 #include "LaunderGibsonRSTM.H"
 #include "addToRunTimeSelectionTable.H"
 #include "wallFvPatch.H"
-#include "wallDist.H"
-#include "wallDistReflection.H"
 
 #include "backwardsCompatibilityWallFunctions.H"
 
@@ -251,10 +249,10 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             << exit(FatalError);
     }
 
-    mut_ == Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
     mut_.correctBoundaryConditions();
 
-    alphat_ == mut_/Prt_;
+    alphat_ = mut_/Prt_;
     alphat_.correctBoundaryConditions();
 
     printCoeffs();
@@ -349,7 +347,7 @@ void LaunderGibsonRSTM::correct()
     if (!turbulence_)
     {
         // Re-calculate viscosity
-        mut_ == rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+        mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
         mut_.correctBoundaryConditions();
 
         // Re-calculate thermal diffusivity
@@ -457,7 +455,7 @@ void LaunderGibsonRSTM::correct()
 
 
     // Re-calculate turbulent viscosity
-    mut_ == Cmu_*rho_*sqr(k_)/epsilon_;
+    mut_ = Cmu_*rho_*sqr(k_)/epsilon_;
     mut_.correctBoundaryConditions();
 
     // Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index 1db5bdb72e..b742b14d20 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -26,7 +26,8 @@ License
 
 #include "LaunderSharmaKE.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -141,10 +142,10 @@ LaunderSharmaKE::LaunderSharmaKE
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
 
     epsilon_
@@ -154,10 +155,10 @@ LaunderSharmaKE::LaunderSharmaKE
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
 
     mut_
@@ -170,9 +171,28 @@ LaunderSharmaKE::LaunderSharmaKE
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        Cmu_*fMu()*rho_*sqr(k_)/(epsilon_ + epsilonSmall_)
+        autoCreateMut("mut", mesh_)
+    ),
+
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateAlphat("alphat", mesh_)
     )
 {
+    mut_ = rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_.correctBoundaryConditions();
+
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -256,6 +276,12 @@ void LaunderSharmaKE::correct()
     {
         // Re-calculate viscosity
         mut_ = rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_);
+        mut_.correctBoundaryConditions();
+
+        // Re-calculate thermal diffusivity
+        alphat_ = mut_/Prt_;
+        alphat_.correctBoundaryConditions();
+
         return;
     }
 
@@ -275,9 +301,11 @@ void LaunderSharmaKE::correct()
     }
 
     tmp<volTensorField> tgradU = fvc::grad(U_);
-    volScalarField G = mut_*(tgradU() && dev(twoSymm(tgradU())));
+    volScalarField G("RASModel::G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
     tgradU.clear();
 
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
 
@@ -294,6 +322,9 @@ void LaunderSharmaKE::correct()
     );
 
     epsEqn().relax();
+
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
 
@@ -317,7 +348,12 @@ void LaunderSharmaKE::correct()
 
 
     // Re-calculate viscosity
-    mut_ = Cmu_*fMu()*rho_*sqr(k_)/epsilon_;
+    mut_ = Cmu_*fMu()*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_.correctBoundaryConditions();
+
+    // Re-calculate thermal diffusivity
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 28cee3928b..b912ae539b 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -64,7 +64,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class LaunderSharmaKE Declaration
+                        Class LaunderSharmaKE Declaration
 \*---------------------------------------------------------------------------*/
 
 class LaunderSharmaKE
@@ -73,17 +73,23 @@ class LaunderSharmaKE
 {
     // Private data
 
-        dimensionedScalar Cmu_;
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar C3_;
-        dimensionedScalar alphak_;
-        dimensionedScalar alphaEps_;
-        dimensionedScalar alphah_;
+        // Model coefficients
 
-        volScalarField k_;
-        volScalarField epsilon_;
-        volScalarField mut_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar C3_;
+            dimensionedScalar alphak_;
+            dimensionedScalar alphaEps_;
+            dimensionedScalar alphah_;
+
+
+        // Fields
+
+            volScalarField k_;
+            volScalarField epsilon_;
+            volScalarField mut_;
+            volScalarField alphat_;
 
 
     // Private member functions
@@ -145,7 +151,7 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", alphah_*mut_ + alpha())
+                new volScalarField("alphaEff", alphah_*alphat_ + alpha())
             );
         }
 
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index d019b029db..e27c548014 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -26,7 +26,6 @@ License
 
 #include "RNGkEpsilon.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
 
 #include "backwardsCompatibilityWallFunctions.H"
 
@@ -187,10 +186,10 @@ RNGkEpsilon::RNGkEpsilon
         autoCreateAlphat("alphat", mesh_)
     )
 {
-    mut_ == Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
     mut_.correctBoundaryConditions();
 
-    alphat_ == mut_/Prt_;
+    alphat_ = mut_/Prt_;
     alphat_.correctBoundaryConditions();
 
     printCoeffs();
@@ -277,7 +276,7 @@ void RNGkEpsilon::correct()
     if (!turbulence_)
     {
         // Re-calculate viscosity
-        mut_ == rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+        mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
         mut_.correctBoundaryConditions();
 
         // Re-calculate thermal diffusivity
@@ -349,7 +348,7 @@ void RNGkEpsilon::correct()
 
 
     // Re-calculate viscosity
-    mut_ == rho_*Cmu_*sqr(k_)/epsilon_;
+    mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
     mut_.correctBoundaryConditions();
 
     // Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 4825c6464a..4daef2dd8e 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -26,7 +26,8 @@ License
 
 #include "SpalartAllmaras.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallDist.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -215,8 +216,24 @@ SpalartAllmaras::SpalartAllmaras
         mesh_
     ),
 
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateAlphat("alphat", mesh_)
+    ),
+
     d_(mesh_)
 {
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -305,6 +322,12 @@ void SpalartAllmaras::correct()
     {
         // Re-calculate viscosity
         mut_ = rho_*nuTilda_*fv1(chi());
+        mut_.correctBoundaryConditions();
+
+        // Re-calculate thermal diffusivity
+        alphat_ = mut_/Prt_;
+        alphat_.correctBoundaryConditions();
+
         return;
     }
 
@@ -338,8 +361,13 @@ void SpalartAllmaras::correct()
     bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0.0));
     nuTilda_.correctBoundaryConditions();
 
+    // Re-calculate viscosity
     mut_.internalField() = fv1*nuTilda_.internalField()*rho_.internalField();
     mut_.correctBoundaryConditions();
+
+    // Re-calculate thermal diffusivity
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index 5a75616347..7b96627f8e 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -81,7 +81,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class SpalartAllmaras Declaration
+                      Class SpalartAllmaras Declaration
 \*---------------------------------------------------------------------------*/
 
 class SpalartAllmaras
@@ -90,20 +90,27 @@ class SpalartAllmaras
 {
     // Private data
 
-        dimensionedScalar alphaNut_;
-        dimensionedScalar alphah_;
+        // Model coefficients
+            dimensionedScalar alphaNut_;
+            dimensionedScalar alphah_;
 
-        dimensionedScalar Cb1_;
-        dimensionedScalar Cb2_;
-        dimensionedScalar Cw1_;
-        dimensionedScalar Cw2_;
-        dimensionedScalar Cw3_;
-        dimensionedScalar Cv1_;
-        dimensionedScalar Cv2_;
+            dimensionedScalar Cb1_;
+            dimensionedScalar Cb2_;
+            dimensionedScalar Cw1_;
+            dimensionedScalar Cw2_;
+            dimensionedScalar Cw3_;
+            dimensionedScalar Cv1_;
+            dimensionedScalar Cv2_;
 
-        volScalarField nuTilda_;
-        volScalarField mut_;
 
+        // Fields
+
+            volScalarField nuTilda_;
+            volScalarField mut_;
+            volScalarField alphat_;
+
+
+        //- Wall distance
         wallDist d_;
 
 
@@ -173,7 +180,7 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", alphah_*mut_ + alpha())
+                new volScalarField("alphaEff", alphah_*alphat_ + alpha())
             );
         }
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
index cf78541322..36a3b819de 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
@@ -157,8 +157,6 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
         patch().lookupPatchField<volScalarField, scalar>(muName_);
     scalarField& mutw = *this;
 
-    scalarField magFaceGradU = mag(U.snGrad());
-
     if (roughnessHeight_ > 0.0)
     {
         // Rough Walls.
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
index 2b76be3c20..c7aa94cfe8 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
@@ -26,7 +26,6 @@ License
 
 #include "kEpsilon.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
 
 #include "backwardsCompatibilityWallFunctions.H"
 
@@ -169,10 +168,10 @@ kEpsilon::kEpsilon
         autoCreateAlphat("alphat", mesh_)
     )
 {
-    mut_ == Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
     mut_.correctBoundaryConditions();
 
-    alphat_ == mut_/Prt_;
+    alphat_ = mut_/Prt_;
     alphat_.correctBoundaryConditions();
 
     printCoeffs();
@@ -258,7 +257,7 @@ void kEpsilon::correct()
     if (!turbulence_)
     {
         // Re-calculate viscosity
-        mut_ == rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+        mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
         mut_.correctBoundaryConditions();
 
         // Re-calculate thermal diffusivity
@@ -323,7 +322,7 @@ void kEpsilon::correct()
 
 
     // Re-calculate viscosity
-    mut_ == rho_*Cmu_*sqr(k_)/epsilon_;
+    mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
     mut_.correctBoundaryConditions();
 
     // Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index 7636737f4e..a75cb0d749 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -26,7 +26,6 @@ License
 
 #include "kOmegaSST.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
 
 #include "backwardsCompatibilityWallFunctions.H"
 
@@ -259,10 +258,10 @@ kOmegaSST::kOmegaSST
         autoCreateAlphat("alphat", mesh_)
     )
 {
-    mut_ == a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
+    mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
     mut_.correctBoundaryConditions();
 
-    alphat_ == mut_/Prt_;
+    alphat_ = mut_/Prt_;
     alphat_.correctBoundaryConditions();
 
     printCoeffs();
@@ -352,7 +351,7 @@ void kOmegaSST::correct()
     if (!turbulence_)
     {
         // Re-calculate viscosity
-        mut_ ==
+        mut_ =
             a1_*rho_*k_
            /max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
         mut_.correctBoundaryConditions();
@@ -435,7 +434,7 @@ void kOmegaSST::correct()
 
 
     // Re-calculate viscosity
-    mut_ == a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(S2));
+    mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(S2));
     mut_.correctBoundaryConditions();
 
     // Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
index 23eb06705e..4eaa83683b 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -26,7 +26,6 @@ License
 
 #include "realizableKE.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
 
 #include "backwardsCompatibilityWallFunctions.H"
 
@@ -204,10 +203,10 @@ realizableKE::realizableKE
     bound(k_, k0_);
     bound(epsilon_, epsilon0_);
 
-    mut_ == rCmu(fvc::grad(U_))*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_ = rCmu(fvc::grad(U_))*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
     mut_.correctBoundaryConditions();
 
-    alphat_ == mut_/Prt_;
+    alphat_ = mut_/Prt_;
     alphat_.correctBoundaryConditions();
 
     printCoeffs();
@@ -291,7 +290,7 @@ void realizableKE::correct()
     if (!turbulence_)
     {
         // Re-calculate viscosity
-        mut_ == rCmu(fvc::grad(U_))*rho_*sqr(k_)/epsilon_;
+        mut_ = rCmu(fvc::grad(U_))*rho_*sqr(k_)/epsilon_;
         mut_.correctBoundaryConditions();
 
         // Re-calculate thermal diffusivity
@@ -362,7 +361,7 @@ void realizableKE::correct()
     bound(k_, k0_);
 
     // Re-calculate viscosity
-    mut_ == rCmu(gradU, S2, magS)*rho_*sqr(k_)/epsilon_;
+    mut_ = rCmu(gradU, S2, magS)*rho_*sqr(k_)/epsilon_;
     mut_.correctBoundaryConditions();
 
     // Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
index 610c1bf96b..b5d7b80c6e 100644
--- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
@@ -48,7 +48,9 @@ nuSgsWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF)
+    fixedValueFvPatchScalarField(p, iF),
+    UName_("U"),
+    nuName_("nu")
 {}
 
 
@@ -61,7 +63,9 @@ nuSgsWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    nuName_(ptf.nuName_)
 {}
 
 
@@ -73,28 +77,34 @@ nuSgsWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict)
+    fixedValueFvPatchScalarField(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    nuName_(dict.lookupOrDefault<word>("nu", "nu"))
 {}
 
 
 nuSgsWallFunctionFvPatchScalarField::
 nuSgsWallFunctionFvPatchScalarField
 (
-    const nuSgsWallFunctionFvPatchScalarField& tppsf
+    const nuSgsWallFunctionFvPatchScalarField& nwfpsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf)
+    fixedValueFvPatchScalarField(nwfpsf),
+    UName_(nwfpsf.UName_),
+    nuName_(nwfpsf.nuName_)
 {}
 
 
 nuSgsWallFunctionFvPatchScalarField::
 nuSgsWallFunctionFvPatchScalarField
 (
-    const nuSgsWallFunctionFvPatchScalarField& tppsf,
+    const nuSgsWallFunctionFvPatchScalarField& nwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF)
+    fixedValueFvPatchScalarField(nwfpsf, iF),
+    UName_(nwfpsf.UName_),
+    nuName_(nwfpsf.nuName_)
 {}
 
 
@@ -117,12 +127,12 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
     const scalarField& ry = patch().deltaCoeffs();
 
     const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     scalarField magUp = mag(U.patchInternalField() - U);
 
     const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
+        patch().lookupPatchField<volScalarField, scalar>(nuName_);
     scalarField& nuSgsw = *this;
 
 
@@ -134,7 +144,7 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
 
         scalar utau = sqrt((nuSgsw[facei] + nuw[facei])*magFaceGradU[facei]);
 
-        if(utau > VSMALL)
+        if (utau > VSMALL)
         {
             int iter = 0;
             scalar err = GREAT;
@@ -171,6 +181,15 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
 }
 
 
+void nuSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+    writeEntry("value", os);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePatchTypeField
diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
index d3f06ece81..9db775556e 100644
--- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
@@ -58,6 +58,12 @@ class nuSgsWallFunctionFvPatchScalarField
 {
     // Private data
 
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of laminar viscosity field
+        word nuName_;
+
 
 public:
 
@@ -141,6 +147,12 @@ public:
             (
                 const Pstream::commsTypes commsType=Pstream::blocking
             );
+
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index 9418a56519..6777535c7b 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -186,7 +186,7 @@ LRR::LRR
         autoCreateNut("nut", mesh_)
     )
 {
-    nut_ == Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
     nut_.correctBoundaryConditions();
 
     if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
@@ -380,7 +380,7 @@ void LRR::correct()
 
 
     // Re-calculate viscosity
-    nut_ == Cmu_*sqr(k_)/epsilon_;
+    nut_ = Cmu_*sqr(k_)/epsilon_;
     nut_.correctBoundaryConditions();
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 92c72770a8..8eb230792f 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -27,6 +27,8 @@ License
 #include "LamBremhorstKE.H"
 #include "addToRunTimeSelectionTable.H"
 
+#include "backwardsCompatibilityWallFunctions.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -112,7 +114,7 @@ LamBremhorstKE::LamBremhorstKE
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
 
     y_(mesh_),
@@ -125,8 +127,22 @@ LamBremhorstKE::LamBremhorstKE
        *(scalar(1) + 20.5/(Rt_ + SMALL))
     ),
 
-    nut_(Cmu_*fMu_*sqr(k_)/(epsilon_ + epsilonSmall_))
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateNut("nut", mesh_)
+    )
 {
+    nut_ = Cmu_*fMu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    nut_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -216,7 +232,7 @@ void LamBremhorstKE::correct()
         y_.correct();
     }
 
-    volScalarField G = nut_*2*magSqr(symm(fvc::grad(U_)));
+    volScalarField G("RASModel::G", nut_*2*magSqr(symm(fvc::grad(U_))));
 
     // Calculate parameters and coefficients for low-Reynolds number model
 
@@ -229,6 +245,8 @@ void LamBremhorstKE::correct()
     volScalarField f1 = scalar(1) + pow(0.05/(fMu_ + SMALL), 3);
     volScalarField f2 = scalar(1) - exp(-sqr(Rt_));
 
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
 
@@ -243,6 +261,9 @@ void LamBremhorstKE::correct()
     );
 
     epsEqn().relax();
+
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
 
@@ -265,6 +286,7 @@ void LamBremhorstKE::correct()
 
     // Re-calculate viscosity
     nut_ = Cmu_*fMu_*sqr(k_)/epsilon_;
+    nut_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index e9b5d3a28e..805bc3d453 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -421,7 +421,7 @@ void LaunderGibsonRSTM::correct()
 
 
     // Re-calculate turbulent viscosity
-    nut_ == Cmu_*sqr(k_)/epsilon_;
+    nut_ = Cmu_*sqr(k_)/epsilon_;
     nut_.correctBoundaryConditions();
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index d48d13845c..bc864c546a 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -26,7 +26,6 @@ License
 
 #include "LienCubicKE.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
 
 #include "backwardsCompatibilityWallFunctions.H"
 
@@ -227,7 +226,7 @@ LienCubicKE::LienCubicKE
         )
     )
 {
-    nut_ == Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_) + C5viscosity_;
+    nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_) + C5viscosity_;
     nut_.correctBoundaryConditions();
 
     printCoeffs();
@@ -382,7 +381,7 @@ void LienCubicKE::correct()
         - 2.0*pow(Cmu_, 3.0)*pow(k_, 4.0)/pow(epsilon_, 3.0)
        *(magSqr(gradU_ + gradU_.T()) - magSqr(gradU_ - gradU_.T()));
 
-    nut_ == Cmu_*sqr(k_)/epsilon_ + C5viscosity_;
+    nut_ = Cmu_*sqr(k_)/epsilon_ + C5viscosity_;
     nut_.correctBoundaryConditions();
 
     nonlinearStress_ = symm
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index bc10cdc478..96067ca63f 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -26,7 +26,6 @@ License
 
 #include "RNGkEpsilon.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
 
 #include "backwardsCompatibilityWallFunctions.H"
 
@@ -156,7 +155,7 @@ RNGkEpsilon::RNGkEpsilon
         autoCreateNut("nut", mesh_)
     )
 {
-    nut_ == Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
     nut_.correctBoundaryConditions();
 
     printCoeffs();
@@ -295,7 +294,7 @@ void RNGkEpsilon::correct()
 
 
     // Re-calculate viscosity
-    nut_ == Cmu_*sqr(k_)/epsilon_;
+    nut_ = Cmu_*sqr(k_)/epsilon_;
     nut_.correctBoundaryConditions();
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
index 4c8d457aff..35193acaf3 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
@@ -132,8 +132,6 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
         patch().lookupPatchField<volScalarField, scalar>(nuName_);
     scalarField& nutw = *this;
 
-    scalarField magFaceGradU = mag(U.snGrad());
-
     forAll(nutw, facei)
     {
         scalar magUpara = magUp[facei];
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
index cbbc645798..4b81fab16f 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
@@ -26,7 +26,6 @@ License
 
 #include "kEpsilon.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
 
 #include "backwardsCompatibilityWallFunctions.H"
 
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
index 916a3cdb34..64b095d27b 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
@@ -26,7 +26,6 @@ License
 
 #include "kOmega.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
 
 #include "backwardsCompatibilityWallFunctions.H"
 
@@ -138,7 +137,7 @@ kOmega::kOmega
         autoCreateNut("nut", mesh_)
     )
 {
-    nut_ == k_/(omega_ + omegaSmall_);
+    nut_ = k_/(omega_ + omegaSmall_);
     nut_.correctBoundaryConditions();
 
     printCoeffs();
@@ -268,7 +267,7 @@ void kOmega::correct()
 
 
     // Re-calculate viscosity
-    nut_ == k_/(omega_ + omegaSmall_);
+    nut_ = k_/(omega_ + omegaSmall_);
     nut_.correctBoundaryConditions();
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index 850205159d..99721f6a12 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -26,7 +26,6 @@ License
 
 #include "kOmegaSST.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
 
 #include "backwardsCompatibilityWallFunctions.H"
 
@@ -237,7 +236,7 @@ kOmegaSST::kOmegaSST
         autoCreateNut("nut", mesh_)
     )
 {
-    nut_ ==
+    nut_ =
         a1_*k_
        /max
         (
@@ -395,7 +394,7 @@ void kOmegaSST::correct()
 
 
     // Re-calculate viscosity
-    nut_ == a1_*k_/max(a1_*omega_, F2()*sqrt(S2));
+    nut_ = a1_*k_/max(a1_*omega_, F2()*sqrt(S2));
     nut_.correctBoundaryConditions();
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
index 576453df04..81bef2dc61 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
@@ -26,7 +26,6 @@ License
 
 #include "realizableKE.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
 
 #include "backwardsCompatibilityWallFunctions.H"
 
@@ -182,7 +181,7 @@ realizableKE::realizableKE
     bound(k_, k0_);
     bound(epsilon_, epsilon0_);
 
-    nut_ == rCmu(fvc::grad(U_))*sqr(k_)/(epsilon_ + epsilonSmall_);
+    nut_ = rCmu(fvc::grad(U_))*sqr(k_)/(epsilon_ + epsilonSmall_);
     nut_.correctBoundaryConditions();
 
     printCoeffs();
@@ -324,7 +323,7 @@ void realizableKE::correct()
 
 
     // Re-calculate viscosity
-    nut_ == rCmu(gradU, S2, magS)*sqr(k_)/epsilon_;
+    nut_ = rCmu(gradU, S2, magS)*sqr(k_)/epsilon_;
     nut_.correctBoundaryConditions();
 }
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index 7fcb35b37c..9af50d799d 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -55,6 +55,7 @@ constantProperties
     epsilon0        epsilon0 [ 0 0 0 0 0 ] 1;
     f0              f0 [ 0 0 0 0 0 ] 0.5;
     Tvap            Tvap [ 0 0 0 1 0 ] 400;
+    Tbp             Tvap [ 0 0 0 1 0 ] 400;
     LDevol          LDevol [ 0 0 0 0 0 ] 0;
     hRetentionCoeff hRetentionCoeff [ 0 0 0 0 0 ] 1;
     constantVolume  true;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
index 76e55a95ea..8f4467796d 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -51,6 +51,7 @@ constantProperties
     epsilon0        epsilon0 [ 0 0 0 0 0 ] 1;
     f0              f0 [ 0 0 0 0 0 ] 0.5;
     Tvap            Tvap [ 0 0 0 1 0 ] 273;
+    Tbp             Tvap [ 0 0 0 1 0 ] 373;
     constantVolume  false;
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
index ca03722b1c..fa4bbd94e6 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
@@ -21,10 +21,6 @@ radiationModel  none;
 
 solverFreq      10;
 
-noRadiation
-{
-}
-
 P1Coeffs
 {
     C               C [ 0 0 0 0 0 0 0 ] 0;
@@ -49,7 +45,10 @@ binaryAbsorptionEmissionCoeffs
         absorptionEmissionModel cloudAbsorptionEmission;
         cloudAbsorptionEmissionCoeffs
         {
-            cloudNames      ( coalCloud1 limestoneCloud1 );
+            cloudNames
+            (
+                reactingCloud1
+            );
         }
     }
 }
@@ -58,7 +57,10 @@ scatterModel    cloudScatter;
 
 cloudScatterCoeffs
 {
-    cloudNames      ( coalCloud1 limestoneCloud1 );
+    cloudNames
+    (
+        reactingCloud1
+    );
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
index 6a53da3143..38aa2b9837 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
@@ -51,6 +51,7 @@ constantProperties
     epsilon0        epsilon0 [ 0 0 0 0 0 ] 1;
     f0              f0 [ 0 0 0 0 0 ] 0.5;
     Tvap            Tvap [ 0 0 0 1 0 ] 273;
+    Tbp             Tvap [ 0 0 0 1 0 ] 373;
     constantVolume  false;
 }
 
@@ -72,7 +73,7 @@ integrationSchemes
 
 particleForces
 {
-    gravity         on;
+    gravity         off;
     virtualMass     off;
     pressureGradient off;
 }
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
index 9aa53af3ad..9b8fb0ea7f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
@@ -23,13 +23,13 @@ startTime       0;
 
 stopAt          endTime;
 
-endTime         1;
+endTime         0.5;
 
-deltaT          0.001;
+deltaT          1e-03;
 
 writeControl    adjustableRunTime;
 
-writeInterval   0.1;
+writeInterval   0.05;
 
 purgeWrite      0;
 
@@ -49,7 +49,7 @@ adjustTimeStep  yes;
 
 maxCo           0.3;
 
-maxDeltaT       1e-3;
+maxDeltaT       1e-03;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
index 294428ed7b..6811ddc336 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
@@ -33,8 +33,8 @@ solvers
     }
     p
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          PCG;
+        preconditioner  DIC;
         tolerance       1e-06;
         relTol          0;
     }
@@ -52,13 +52,6 @@ solvers
         tolerance       1e-06;
         relTol          0;
     }
-    CO2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
     O2
     {
         solver          PBiCG;
@@ -73,20 +66,6 @@ solvers
         tolerance       1e-06;
         relTol          0;
     }
-    CH4
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-    H2
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
     H2O
     {
         solver          PBiCG;
@@ -94,13 +73,6 @@ solvers
         tolerance       1e-06;
         relTol          0;
     }
-    CO
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
     h
     {
         solver          PBiCG;
@@ -108,13 +80,6 @@ solvers
         tolerance       1e-05;
         relTol          0;
     }
-    R
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
     k
     {
         solver          PBiCG;
@@ -133,7 +98,7 @@ solvers
 
 PISO
 {
-    transonic       yes;
+    transonic       no;
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     momentumPredictor yes;